Fixed: When determining total resource count, ResourceDefinition.OnApplyFilter needs to be called, so that user-defined filters are taken into account. (#902)

Author: Bart Koelman

src/JsonApiDotNetCore/Queries/IQueryLayerComposer.cs

@@ -14,7 +14,7 @@ public interface IQueryLayerComposer
         /// <summary>
         /// Builds a top-level filter from constraints, used to determine total resource count.
         /// </summary>
-        FilterExpression GetTopFilterFromConstraints();
+        FilterExpression GetTopFilterFromConstraints(ResourceContext resourceContext);
 
         /// <summary>
         /// Collects constraints and builds a <see cref="QueryLayer"/> out of them, used to retrieve the actual resources.

src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs

@@ -35,22 +35,17 @@ public QueryLayerComposer(
         }
 
         /// <inheritdoc />
-        public FilterExpression GetTopFilterFromConstraints()
+        public FilterExpression GetTopFilterFromConstraints(ResourceContext resourceContext)
         {
             var constraints = _constraintProviders.SelectMany(provider => provider.GetConstraints()).ToArray();
 
-            var topFilters = constraints
+            var filtersInTopScope = constraints
                 .Where(constraint => constraint.Scope == null)
                 .Select(constraint => constraint.Expression)
                 .OfType<FilterExpression>()
                 .ToArray();
 
-            if (topFilters.Length > 1)
-            {
-                return new LogicalExpression(LogicalOperator.And, topFilters);
-            }
-
-            return topFilters.Length == 1 ? topFilters[0] : null;
+            return GetFilter(filtersInTopScope, resourceContext);
         }
 
         /// <inheritdoc />

src/JsonApiDotNetCore/Services/JsonApiResourceService.cs

@@ -66,7 +66,7 @@ public virtual async Task<IReadOnlyCollection<TResource>> GetAsync(CancellationT
 
             if (_options.IncludeTotalResourceCount)
             {
-                var topFilter = _queryLayerComposer.GetTopFilterFromConstraints();
+                var topFilter = _queryLayerComposer.GetTopFilterFromConstraints(_request.PrimaryResource);
                 _paginationContext.TotalResourceCount = await _repositoryAccessor.CountAsync<TResource>(topFilter, cancellationToken);
 
                 if (_paginationContext.TotalResourceCount == 0)

test/JsonApiDotNetCoreExampleTests/IntegrationTests/ResourceDefinitions/ResourceDefinitionQueryCallbackTests.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Extensions;
+using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.Extensions.DependencyInjection;
@@ -23,6 +24,9 @@ public ResourceDefinitionQueryCallbackTests(IntegrationTestContext<TestableStart
                 services.AddScoped<IResourceDefinition<CallableResource>, CallableResourceDefinition>();
                 services.AddSingleton<IUserRolesService, FakeUserRolesService>();
             });
+
+            var options = (JsonApiOptions) testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+            options.IncludeTotalResourceCount = true;
         }
 
         [Fact]
@@ -32,9 +36,16 @@ public async Task Include_from_resource_definition_has_blocked_capability()
             var userRolesService = (FakeUserRolesService) _testContext.Factory.Services.GetRequiredService<IUserRolesService>();
             userRolesService.AllowIncludeOwner = false;
 
+            var resource = new CallableResource
+            {
+                Label = "A",
+                IsDeleted = false
+            };
+
             await _testContext.RunOnDatabaseAsync(async dbContext =>
             {
-                dbContext.RemoveRange(dbContext.CallableResources);
+                await dbContext.ClearTableAsync<CallableResource>();
+                dbContext.CallableResources.Add(resource);
 
                 await dbContext.SaveChangesAsync();
             });
@@ -99,6 +110,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             responseDocument.ManyData.Should().HaveCount(2);
             responseDocument.ManyData[0].Id.Should().Be(resources[1].StringId);
             responseDocument.ManyData[1].Id.Should().Be(resources[3].StringId);
+
+            responseDocument.Meta["totalResources"].Should().Be(2);
         }
 
         [Fact]
@@ -147,6 +160,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
             responseDocument.ManyData.Should().HaveCount(1);
             responseDocument.ManyData[0].Id.Should().Be(resources[3].StringId);
+
+            responseDocument.Meta["totalResources"].Should().Be(1);
         }
 
         [Fact]