Merge pull request #130 from PhenX/feature/query-filters

Handle global query filters (Fixes #81)

Author: koenbeuk

src/EntityFrameworkCore.Projectables/Infrastructure/Internal/CustomConventionSetPlugin.cs

@@ -0,0 +1,14 @@
+using Microsoft.EntityFrameworkCore.Metadata.Conventions;
+using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure;
+
+namespace EntityFrameworkCore.Projectables.Infrastructure.Internal;
+
+public class CustomConventionSetPlugin : IConventionSetPlugin
+{
+    public ConventionSet ModifyConventions(ConventionSet conventionSet)
+    {
+        conventionSet.ModelFinalizingConventions.Add(new ProjectablesExpandQueryFiltersConvention());
+        
+        return conventionSet;
+    }
+}

src/EntityFrameworkCore.Projectables/Infrastructure/Internal/ProjectablesExpandQueryFiltersConvention.cs

@@ -0,0 +1,26 @@
+using System.Linq.Expressions;
+using EntityFrameworkCore.Projectables.Extensions;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Metadata.Conventions;
+
+namespace EntityFrameworkCore.Projectables.Infrastructure.Internal;
+
+public class ProjectablesExpandQueryFiltersConvention : IModelFinalizingConvention 
+{
+
+    /// <inheritdoc />
+    public void ProcessModelFinalizing(
+        IConventionModelBuilder modelBuilder,
+        IConventionContext<IConventionModelBuilder> context)
+    {
+        foreach (var entityType in modelBuilder.Metadata.GetEntityTypes())
+        {
+            var queryFilter = entityType.GetQueryFilter();
+            if (queryFilter != null)
+            {
+                // Expands query filters
+                entityType.SetQueryFilter(queryFilter.ExpandProjectables() as LambdaExpression);
+            }
+        }
+    }
+}

src/EntityFrameworkCore.Projectables/Infrastructure/Internal/ProjectionOptionsExtension.cs

@@ -54,6 +54,9 @@ static object CreateTargetInstance(IServiceProvider services, ServiceDescriptor
                 return ActivatorUtilities.GetServiceOrCreateInstance(services, descriptor.ImplementationType!);
             }
 
+            // Custom convention to handle global query filters, etc
+            services.AddScoped<IConventionSetPlugin, CustomConventionSetPlugin>();
+
             if (_compatibilityMode is CompatibilityMode.Full)
             {
                 var targetDescriptor = services.FirstOrDefault(x => x.ServiceType == typeof(IQueryCompiler));

tests/EntityFrameworkCore.Projectables.FunctionalTests/ComplexModelTests.ProjectQueryFilters.verified.txt

@@ -0,0 +1,15 @@
+SELECT [t0].[RecordDate]
+FROM [User] AS [u]
+INNER JOIN (
+    SELECT [t].[RecordDate], [t].[UserId]
+    FROM (
+        SELECT [o0].[RecordDate], [o0].[UserId], ROW_NUMBER() OVER(PARTITION BY [o0].[UserId] ORDER BY [o0].[RecordDate] DESC) AS [row]
+        FROM [Order] AS [o0]
+    ) AS [t]
+    WHERE [t].[row] <= 2
+) AS [t0] ON [u].[Id] = [t0].[UserId]
+WHERE (
+    SELECT TOP(1) [o].[Id]
+    FROM [Order] AS [o]
+    WHERE [u].[Id] = [o].[UserId]
+    ORDER BY [o].[RecordDate] DESC) > 100

tests/EntityFrameworkCore.Projectables.FunctionalTests/ComplexModelTests.cs

@@ -86,5 +86,17 @@ public Task ProjectOverMethodTakingDbContext()
 
             return Verifier.Verify(query.ToQueryString());
         }
+
+        [Fact]
+        public Task ProjectQueryFilters()
+        {
+            using var dbContext = new SampleUserWithGlobalQueryFilterDbContext();
+
+            var query = dbContext.Set<User>()
+                .SelectMany(x => x.Last2Orders)
+                .Select(x => x.RecordDate);
+
+            return Verifier.Verify(query.ToQueryString());
+        }
     }
 }

tests/EntityFrameworkCore.Projectables.FunctionalTests/Helpers/SampleUserWithGlobalQueryFilterDbContext.cs

@@ -0,0 +1,21 @@
+using EntityFrameworkCore.Projectables.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+
+namespace EntityFrameworkCore.Projectables.FunctionalTests.Helpers
+{
+    public class SampleUserWithGlobalQueryFilterDbContext : SampleDbContext<ComplexModelTests.User>
+    {
+        public SampleUserWithGlobalQueryFilterDbContext(CompatibilityMode compatibilityMode = CompatibilityMode.Full) : base(compatibilityMode)
+        {
+        }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            
+            modelBuilder.Entity<ComplexModelTests.User>(b => {
+                b.HasQueryFilter(u => u.LastOrder.Id > 100);
+            });
+        }
+    }
+}