added tests for related / improvements

Author: spike83

JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Tests/FetchingResourcesQueryResolverTests.cs

@@ -50,5 +50,20 @@ public async Task GetWithSearchFilter() // this enables logic in Query resolver
             }
         }
 
+
+        [TestMethod]
+        [DeploymentItem(@"Data\CommentSearch.csv", @"Data")]
+        [DeploymentItem(@"Data\PostSearch.csv", @"Data")]
+        [DeploymentItem(@"Data\User.csv", @"Data")]
+        public async Task GetWithSearchFilter_related_to_many() // this enables logic in Query resolver for related
+        {
+            using (var effortConnection = GetEffortConnection())
+            {
+                var response = await SubmitGet(effortConnection, "post-searchs/201/comments?searchterm=efg");
+
+                await AssertResponseContent(response, @"Fixtures\FetchingResourcesQueryResolver\GetWithSearchFilter_related_to_many_Response.json", HttpStatusCode.OK);
+            }
+        }
+
     }
 }

JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Tests/Fixtures/FetchingResourcesQueryResolver/GetWithSearchFilter_related_to_many_Response.json

@@ -0,0 +1,20 @@
+{
+  "data": [
+    {
+      "type": "comment-searchs",
+      "id": "102",
+      "attributes": {
+        "created": "2015-01-31T14:35:00.0000000+00:00",
+        "text": "efgComment"
+      },
+      "relationships": {
+        "post": {
+          "links": {
+            "self": "https://www.example.com/comment-searchs/102/relationships/post",
+            "related": "https://www.example.com/comment-searchs/102/post"
+          }
+        }
+      }
+    }
+  ]
+}

JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Tests/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Tests.csproj

@@ -291,6 +291,7 @@
     <EmbeddedResource Include="Fixtures\Pagination\GetFilterPaged-1-2-sorted.json" />
     <EmbeddedResource Include="Fixtures\Pagination\GetFilterPaged-1-2-sorted-desc.json" />
     <EmbeddedResource Include="Fixtures\FetchingResources\Get_related_to_many_include_external_response.json" />
+    <EmbeddedResource Include="Fixtures\FetchingResourcesQueryResolver\GetWithSearchFilter_related_to_many_Response.json" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />

JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp/CommentSearchResourceQueryResolver.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Helper;
+using JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Models;
+using JSONAPI.QueryableResolvers;
+
+namespace JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp
+{
+    public class CommentSearchResourceQueryResolver : IResourceCollectionResolver<CommentSearch>
+    {
+        public Task<IQueryable<CommentSearch>> GetQueryForResourceCollection(IQueryable<CommentSearch> queryable, HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            var queryPairs = request.GetQueryNameValuePairs();
+            foreach (var queryPair in queryPairs)
+            {
+                if (String.IsNullOrWhiteSpace(queryPair.Key))
+                    continue;
+
+                if (!queryPair.Key.StartsWith("searchterm"))
+                    continue;
+
+                var searchTerm = queryPair.Value;
+                var predicate = PredicateBuilder.False<CommentSearch>();
+
+                foreach (var str in Regex.Split(searchTerm, "\\s+"))
+                {
+                    predicate = predicate.Or(y => y.Text.Contains(str));
+                }
+                queryable= queryable.Where(predicate);
+            }
+            return Task.FromResult(queryable);
+        }
+    }
+}

JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.csproj

@@ -157,6 +157,7 @@
     <Compile Include="Models\TestDbContext.cs" />
     <Compile Include="Models\User.cs" />
     <Compile Include="Models\UserGroup.cs" />
+    <Compile Include="CommentSearchResourceQueryResolver.cs" />
     <Compile Include="PostSearchResourceQueryResolver.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Startup.cs" />

JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp/Startup.cs

@@ -94,7 +94,7 @@ internal JsonApiConfiguration BuildConfiguration()
             configuration.RegisterEntityFrameworkResourceType<Master>();
             configuration.RegisterEntityFrameworkResourceType<Child>();
             configuration.RegisterResourceType<PostSearch>().ResolveCollectionWith<PostSearchResourceQueryResolver>();
-            configuration.RegisterEntityFrameworkResourceType<CommentSearch>();
+            configuration.RegisterResourceType<CommentSearch>().ResolveCollectionWith<CommentSearchResourceQueryResolver>();
             return configuration;
         }
 

JSONAPI.Autofac/JsonApiAutofacModule.cs

@@ -92,11 +92,14 @@ protected override void Load(ContainerBuilder builder)
                     var configuration = context.ResolveKeyed<IResourceTypeConfiguration>(clrType);
                     var registration = registry.GetRegistrationForType(clrType);
                     var parameters = new List<Parameter> { new TypedParameter(typeof(IResourceTypeRegistration), registration)};
+                    
+                    // add parameter for collectionResolver
                     if (configuration.ResourceCollectionResolverType != null)
                     {
                         var collectionResolver = context.Resolve(configuration.ResourceCollectionResolverType, parameters);
                         parameters.Add(new NamedParameter("collectionResolver", collectionResolver));
                     }
+
                     if (configuration.DocumentMaterializerType != null)
                         return (IDocumentMaterializer)context.Resolve(configuration.DocumentMaterializerType, parameters);
                     return context.Resolve<IDocumentMaterializer>(parameters);
@@ -120,12 +123,17 @@ protected override void Load(ContainerBuilder builder)
                         new TypedParameter(typeof(IResourceTypeRegistration), registration),
                         new TypedParameter(typeof(ResourceTypeRelationship), relationship)
                     };
-                    var relConfiguration = context.ResolveKeyed<IResourceTypeConfiguration>(relationshipName);
-                    if (relConfiguration.ResourceCollectionResolverType != null)
-                    {
-                        var collectionResolver = context.Resolve(relConfiguration.ResourceCollectionResolverType, parameters);
-                        parameters.Add(new NamedParameter("collectionResolver", collectionResolver));
+                    
+                    // add parameter for collectionResolver
+                    if (context.IsRegisteredWithKey<IResourceTypeConfiguration>(relationship.RelatedType)) { 
+                        var relConfiguration = context.ResolveKeyed<IResourceTypeConfiguration>(relationship.RelatedType);
+                        if (relConfiguration.ResourceCollectionResolverType != null)
+                        {
+                            var collectionResolver = context.Resolve(relConfiguration.ResourceCollectionResolverType, parameters);
+                            parameters.Add(new NamedParameter("collectionResolver", collectionResolver));
+                        }
                     }
+
                     // First, see if they have set an explicit materializer for this relationship
                     IResourceTypeRelationshipConfiguration relationshipConfiguration;
                     if (configuration.RelationshipConfigurations.TryGetValue(relationship.Property.Name,