test: add nested resource filter test

Author: maurei

src/JsonApiDotNetCore/Services/DefaultResourceService.cs

@@ -135,11 +135,20 @@ public virtual async Task<TResource> GetRelationshipsAsync(TId id, string relati
             // TODO: it would be better if we could distinguish whether or not the relationship was not found,
             // vs the relationship not being set on the instance of T
 
-            var query = _repository.Get(id);
-            query = ApplyInclude(query, chainPrefix: new List<RelationshipAttribute> { relationship });
-            var entity = await _repository.FirstOrDefaultAsync(query);
-            if (entity == null) // this does not make sense. If the parent entity is not found, this error is thrown?
+            var entityQuery = _repository.Get(id);
+
+            entityQuery = ApplyFilter(entityQuery);
+            entityQuery = ApplySort(entityQuery);
+            entityQuery = ApplyInclude(entityQuery, chainPrefix: new List<RelationshipAttribute> { relationship });
+            entityQuery = ApplySelect(entityQuery);
+
+            var entity = await _repository.FirstOrDefaultAsync(entityQuery);
+            if (entity == null)
+            {
+                /// TODO: this does not make sense. If the **parent** entity is not found, this error is thrown?
+                /// this error should be thrown when the relationship is not found.
                 throw new JsonApiException(404, $"Relationship '{relationshipName}' not found.");
+            }
 
             if (!IsNull(_hookExecutor, entity))
             {   // AfterRead and OnReturn resource hook execution.

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/NestedResourceTests.cs

@@ -1,11 +1,9 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Bogus;
 using JsonApiDotNetCoreExample.Models;
 using JsonApiDotNetCoreExampleTests.Helpers.Models;
-using Microsoft.EntityFrameworkCore;
 using Xunit;
 using Person = JsonApiDotNetCoreExample.Models.Person;
 
@@ -31,7 +29,7 @@ public NestedResourceTests(StandardApplicationFactory factory) : base(factory)
         }
 
         [Fact]
-        public async Task Include_NestedResource_CanInclude()
+        public async Task NestedResourceRoute_IncludeDeeplyNestedRelationship_ReturnsRequestedRelationships()
         {
             // Arrange
             var assignee = _dbContext.Add(_personFaker.Generate()).Entity;
@@ -54,5 +52,26 @@ public async Task Include_NestedResource_CanInclude()
             Assert.Equal(todo.Owner.Id, resultTodoItem.Owner.Id);
             Assert.Equal(todo.Owner.Passport.Id, resultTodoItem.Owner.Passport.Id);
         }
+
+        [Fact]
+        public async Task NestedResourceRoute_Filter_ReturnsFilteredResources()
+        {
+            // Arrange
+            var assignee = _personFaker.Generate();
+            //var assignee = _dbContext.Add(_personFaker.Generate()).Entity;
+            //var todos = _todoItemFaker.Generate(10).ToList();
+            assignee.AssignedTodoItems = _todoItemFaker.Generate(10).ToList();
+            //assignee.AssignedTodoItems = todos;
+            _dbContext.Add(assignee);
+            var ordinal = assignee.AssignedTodoItems.First().Ordinal;
+
+            // Act
+            var (body, response) = await Get($"/api/v1/people/{assignee.Id}/assignedTodoItems?filter[ordinal]={ordinal}");
+
+            // Assert
+            AssertEqualStatusCode(HttpStatusCode.OK, response);
+            var resultTodoItem = _deserializer.DeserializeList<TodoItemClient>(body).Data.SingleOrDefault();
+            Assert.Equal(assignee.AssignedTodoItems.First().Id, resultTodoItem.Id);
+        }
     }
 }

test/UnitTests/Services/EntityResourceService_Tests.cs

@@ -19,9 +19,21 @@ public class EntityResourceService_Tests
     {
         private readonly Mock<IResourceRepository<TodoItem>> _repositoryMock = new Mock<IResourceRepository<TodoItem>>();
         private readonly IResourceGraph _resourceGraph;
+        private readonly Mock<IIncludeService> _includeService;
+        private readonly Mock<ISparseFieldsService> _sparseFieldsService;
+        private readonly Mock<IPageService> _pageService;
+
+        public Mock<ISortService> _sortService { get; }
+        public Mock<IFilterService> _filterService { get; }
 
         public EntityResourceService_Tests()
         {
+            _includeService = new Mock<IIncludeService>();
+            _includeService.Setup(m => m.Get()).Returns(new List<List<RelationshipAttribute>>());
+            _sparseFieldsService = new Mock<ISparseFieldsService>();
+            _pageService = new Mock<IPageService>();
+            _sortService = new Mock<ISortService>();
+            _filterService = new Mock<IFilterService>();
             _resourceGraph = new ResourceGraphBuilder()
                                 .AddResource<TodoItem>()
                                 .AddResource<TodoItemCollection, Guid>()
@@ -87,9 +99,13 @@ public async Task GetRelationshipAsync_Returns_Relationship_Value()
 
         private DefaultResourceService<TodoItem> GetService()
         {
-            var includeService = new Mock<IIncludeService>();
-            includeService.Setup(m => m.Get()).Returns(new List<List<RelationshipAttribute>>());
-            return new DefaultResourceService<TodoItem>(new List<IQueryParameterService>() { includeService.Object }, new JsonApiOptions(), _repositoryMock.Object, _resourceGraph);
+            var queryParamServices = new List<IQueryParameterService>
+            {
+                _includeService.Object, _pageService.Object, _filterService.Object,
+                _sortService.Object, _sparseFieldsService.Object
+            };
+
+            return new DefaultResourceService<TodoItem>(queryParamServices, new JsonApiOptions(), _repositoryMock.Object, _resourceGraph);
         }
     }
 }