feat: support ignore named query filter

fixes #79

Author: WeihanLi

samples/WeihanLi.EntityFramework.Sample/Program.cs

@@ -21,10 +21,10 @@ public static class Program
     public static async Task Main(string[] args)
     {
         // SoftDeleteTest();
-        // RepositoryTest();
+        RepositoryTest();
         // AutoAuditTest();
 
-        await DbContextInterceptorSamples.RunAsync();
+        // await DbContextInterceptorSamples.RunAsync();
 
         Console.WriteLine("completed");
         Console.ReadLine();
@@ -212,7 +212,7 @@ private static void RepositoryTest()
                 var conn = db.Database.GetDbConnection();
                 try
                 {
-                    conn.Execute($@"TRUNCATE TABLE {tableName}");
+                    conn.Execute($"TRUNCATE TABLE {tableName}");
                 }
                 catch
                 {
@@ -236,6 +236,10 @@ private static void RepositoryTest()
                 { "Extra", "12345"}
             });
 
+            var list = repo.Query(q => q.IgnoreQueryFilters(["not-null"]))
+                .ToArray();
+            Console.WriteLine(list.Length);
+
             repo.Update(x => x.SetProperty(_ => _.Extra, _ => "{}"), q => q.IgnoreQueryFilters());
 
             var abc = db.TestEntities.AsNoTracking().ToArray();

samples/WeihanLi.EntityFramework.Sample/TestDbContext.cs

@@ -11,6 +11,15 @@ public TestDbContext(DbContextOptions<TestDbContext> options) : base(options)
     {
     }
 
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+        modelBuilder.Entity<TestEntity>()
+            // .HasQueryFilter("one-month-ago", t => t.CreatedAt > DateTime.Now.AddMonths(-1))
+            .HasQueryFilter("not-null", t => t.Extra != null)
+            ;
+    }
+
     public DbSet<TestEntity> TestEntities { get; set; } = null!;
 }
 

src/WeihanLi.EntityFramework/EFRepositoryQueryBuilder.cs

@@ -1,8 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using WeihanLi.Common;
 
@@ -55,6 +52,28 @@ public EFRepositoryQueryBuilder<TEntity> IgnoreQueryFilters(bool ignoreQueryFilt
         _ignoreQueryFilters = ignoreQueryFilters;
         return this;
     }
+    
+    private readonly HashSet<string> _queryFiltersToIgnore = new();
+    
+    public EFRepositoryQueryBuilder<TEntity> IgnoreQueryFilters(IReadOnlyCollection<string> queryFilters, bool ignoreQueryFilters = true)
+    {
+        ArgumentNullException.ThrowIfNull(queryFilters);
+        if (ignoreQueryFilters)
+        {
+            foreach (var queryFilter in queryFilters)
+            {
+                _queryFiltersToIgnore.Add(queryFilter);
+            }
+        }
+        else
+        {
+            foreach (var queryFilter in queryFilters)
+            {
+                _queryFiltersToIgnore.Remove(queryFilter);
+            }
+        }
+        return this;
+    }
 
     private int _count;
 
@@ -83,6 +102,10 @@ public IQueryable<TEntity> Build()
         {
             query = query.IgnoreQueryFilters();
         }
+        else if (_queryFiltersToIgnore.Count > 0)
+        {
+            query = query.IgnoreQueryFilters(_queryFiltersToIgnore);
+        }
         if (_whereExpression.Count > 0)
         {
             foreach (var expression in _whereExpression)