Merge pull request #2 from bkoelman/optimize-query-layer

Replace hacky PruningQueryableBuilder

Author: JohnStrim

JsonApiBugReport/JsonApiBugReport.csproj

@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="$(UseLatestJsonApiDotNetCoreVersion) == 'True'">
-		<JsonApiDotNetCoreVersion>5.7.2-master-01199</JsonApiDotNetCoreVersion>
+		<JsonApiDotNetCoreVersion>5.7.2-master-01204</JsonApiDotNetCoreVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="$(UseLatestJsonApiDotNetCoreVersion) != 'True'">

JsonApiBugReport/JsonApiBugReport.http

@@ -8,10 +8,40 @@ GET {{HostAddress}}/PriceGroup?include=products.unitGroup.units
 
 GET {{HostAddress}}/PriceGroup?include=products
 
-### Sparse fieldset on subset of derived types
+### Sparse fieldset on derived type Bundle
+
+GET {{HostAddress}}/PriceGroup?include=products.unitGroup.units&fields[Bundle]=isTaxable
+
+### Sparse fieldset on derived type Addon
+
+GET {{HostAddress}}/PriceGroup?include=products.unitGroup.units&fields[Addon]=trialDuration,allowsCustomEndDate
+
+### Sparse fieldset on subset of derived types [SLOW]
 
 GET {{HostAddress}}/PriceGroup?include=products.unitGroup.units&fields[Addon]=trialDuration,allowsCustomEndDate&fields[Bundle]=isTaxable
 
 ### Non-default page size on top-level include
 
 GET {{HostAddress}}/PriceGroup?include=products.unitGroup.units&page[size]=products:5
+
+### Filter on type hierarchy
+
+GET {{HostAddress}}/PriceGroup?include=products&filter[products]=equals(id,'FFFFFFFF-0000-0000-0000-FFFFFFFFFFFF')
+
+### Filter after type hierarchy [HAS NEVER WORKED]
+
+GET {{HostAddress}}/PriceGroup?include=products.unitGroup.units&filter[products.unitGroup.units]=equals(id,'FFFFFFFF-0000-0000-0000-FFFFFFFFFFFF')
+
+### ProductBase
+###     : CommonProduct
+###         : ProductBundle = "Bundle"
+###     : StandaloneProduct
+###         : Product
+###         : ProductAddon = "Addon"
+###     : ProductGroup
+###    
+###     HasOne: UnitGroup
+###     HasMany: Units
+###    
+### PriceGroup
+###     HasMany: Products

JsonApiBugReport/Program.cs

@@ -21,8 +21,6 @@
     {
         ["Logging:LogLevel:JsonApiDotNetCore.Repositories"] = "Debug"
     });
-
-    builder.Services.AddTransient<IQueryableBuilder, PruningQueryableBuilder>();
 }
 else
 {
@@ -43,4 +41,4 @@
 
 await app.RunDbMigrations();
 
-await app.RunAsync();
+await app.RunAsync();

JsonApiBugReport/PruningQueryableBuilder.cs

@@ -0,0 +1,19 @@
+#nullable enable
+using System;
+using JsonApiBugReport.Data;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Queries.Expressions;
+using JsonApiDotNetCore.Resources;
+
+namespace JsonApiBugReport.ResourceDefinitions;
+
+public sealed class UnitDefinition(IResourceGraph resourceGraph)
+    : JsonApiResourceDefinition<Unit, Guid>(resourceGraph)
+{
+    private static readonly PaginationExpression NoPagination = new(PageNumber.ValueOne, null);
+
+    public override PaginationExpression OnApplyPagination(PaginationExpression? existingPagination)
+    {
+        return NoPagination;
+    }
+}

JsonApiBugReport/ResourceDefinitions/UnitDefinition.cs

@@ -0,0 +1,19 @@
+using JsonApiBugReport.Data;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Queries.Expressions;
+using JsonApiDotNetCore.Resources;
+
+#nullable enable
+
+namespace JsonApiBugReport.ResourceDefinitions;
+
+public sealed class UnitGroupDefinition(IResourceGraph resourceGraph)
+    : JsonApiResourceDefinition<UnitGroup, int>(resourceGraph)
+{
+    private static readonly PaginationExpression NoPagination = new(PageNumber.ValueOne, null);
+
+    public override PaginationExpression OnApplyPagination(PaginationExpression? existingPagination)
+    {
+        return NoPagination;
+    }
+}