Enhance NoSqlResourceService

Author: ThomasBarnekow

src/JsonApiDotNetCore/Queries/NoSqlQueryLayerComposer.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -259,26 +258,11 @@ public override bool VisitComparison(ComparisonExpression expression, object? ar
             /// <inheritdoc />
             public override bool VisitResourceFieldChain(ResourceFieldChainExpression expression, object? argument)
             {
-                _isSimpleFilterExpression &= expression.Fields.All(IsFieldSupported);
+                _isSimpleFilterExpression &= expression.Fields.All(field => field is AttrAttribute);
 
                 return _isSimpleFilterExpression;
             }
 
-            private static bool IsFieldSupported(ResourceFieldAttribute field)
-            {
-                return field switch
-                {
-                    AttrAttribute => true,
-                    HasManyAttribute hasMany when HasOwnsManyAttribute(hasMany) => true,
-                    _ => false
-                };
-            }
-
-            private static bool HasOwnsManyAttribute(ResourceFieldAttribute field)
-            {
-                return Attribute.GetCustomAttribute(field.Property, typeof(NoSqlOwnsManyAttribute)) is not null;
-            }
-
             /// <inheritdoc />
             public override bool VisitLogical(LogicalExpression expression, object? argument)
             {

src/JsonApiDotNetCore/Resources/Annotations/NoSqlOwnsManyAttribute.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Net;
 using System.Reflection;
@@ -185,10 +186,48 @@ public async Task<TResource> GetAsync(TId id, CancellationToken cancellationToke
         }
 
         /// <inheritdoc />
-        public Task AddToToManyRelationshipAsync(TId primaryId, string relationshipName, ISet<IIdentifiable> secondaryResourceIds,
+        public async Task AddToToManyRelationshipAsync(TId primaryId, string relationshipName, ISet<IIdentifiable> secondaryResourceIds,
             CancellationToken cancellationToken)
         {
-            return _resourceService.AddToToManyRelationshipAsync(primaryId, relationshipName, secondaryResourceIds, cancellationToken);
+            RelationshipAttribute? relationship = _request.Relationship;
+
+            if (relationship == null)
+            {
+                throw new RelationshipNotFoundException(relationshipName, _request.PrimaryResourceType!.PublicName);
+            }
+
+            if (!secondaryResourceIds.Any())
+            {
+                return;
+            }
+
+            ResourceType resourceType = relationship.RightType;
+
+            var targetAttribute = new ResourceFieldChainExpression(resourceType.FindAttributeByPropertyName(nameof(IIdentifiable<object>.Id))!);
+
+            ImmutableHashSet<LiteralConstantExpression> idConstants =
+                secondaryResourceIds.Select(identifiable => new LiteralConstantExpression(identifiable.StringId!)).ToImmutableHashSet();
+
+            var queryLayer = new QueryLayer(resourceType)
+            {
+                Filter = idConstants.Count > 1
+                    ? new AnyExpression(targetAttribute, idConstants)
+                    : new ComparisonExpression(ComparisonOperator.Equals, targetAttribute, idConstants.Single())
+            };
+
+            IReadOnlyCollection<IIdentifiable> secondaryResources = await _repositoryAccessor.GetAsync(resourceType, queryLayer, cancellationToken);
+
+            ImmutableHashSet<IIdentifiable> missingResources = secondaryResourceIds
+                .Where(requestResource => secondaryResources.All(resource => resource.StringId != requestResource.StringId)).ToImmutableHashSet();
+
+            if (missingResources.Any())
+            {
+                IIdentifiable missingResource = missingResources.First();
+
+                throw new ResourceNotFoundException(missingResource.StringId!, resourceType.PublicName);
+            }
+
+            await _resourceService.AddToToManyRelationshipAsync(primaryId, relationshipName, secondaryResourceIds, cancellationToken);
         }
 
         /// <inheritdoc />
@@ -423,14 +462,6 @@ protected virtual async Task GetIncludedElementAsync(IReadOnlyCollection<IIdenti
                 });
             }
 
-            PropertyInfo property = includeElementExpression.Relationship.Property;
-            var ownsMany = Attribute.GetCustomAttribute(property, typeof(NoSqlOwnsManyAttribute));
-
-            if (ownsMany is not null)
-            {
-                return;
-            }
-
             string relationshipName = includeElementExpression.Relationship.PublicName;
 
             foreach (var primaryResource in primaryResources)
@@ -480,15 +511,6 @@ protected virtual async Task GetIncludedElementAsync(IReadOnlyCollection<IIdenti
                 });
             }
 
-            // Check whether the secondary resource is owned by the primary resource.
-            PropertyInfo property = relationshipAttribute.Property;
-            var ownsMany = Attribute.GetCustomAttribute(property, typeof(NoSqlOwnsManyAttribute));
-
-            if (ownsMany is not null)
-            {
-                return relationshipAttribute.GetValue(primaryResource);
-            }
-
             // Get the HasForeignKey attribute corresponding to the relationship, if any.
             var foreignKeyAttribute = (NoSqlHasForeignKeyAttribute?)Attribute.GetCustomAttribute(
                 relationshipAttribute.Property, typeof(NoSqlHasForeignKeyAttribute));
@@ -630,15 +652,6 @@ private static void AssertPrimaryResourceTypeInJsonApiRequestIsNotNull([SysNotNu
             }
         }
 
-        [AssertionMethod]
-        private static void AssertRelationshipInJsonApiRequestIsNotNull([SysNotNull] RelationshipAttribute? relationship)
-        {
-            if (relationship is null)
-            {
-                throw new InvalidOperationException($"Expected {nameof(IJsonApiRequest)}.{nameof(IJsonApiRequest.Relationship)} not to be null at this point.");
-            }
-        }
-
         /// <summary>
         /// Gets the <see cref="string" /> value of the named property.
         /// </summary>