Merge pull request #8 from PoweredSoft/feature/queryinterceptorprovider

Resolve Query Interceptor and queryable Interceptor provider :)
PoweredSoft · Dec 12, 2019 · a8468e3 · a8468e3
2 parents 5be4b7e + 6a49098
commit a8468e3
Show file tree

Hide file tree

Showing 22 changed files with 158 additions and 52 deletions.
diff --git a/PoweredSoft.DynamicQuery.Cli/Program.cs b/PoweredSoft.DynamicQuery.Cli/Program.cs
@@ -119,7 +119,7 @@ private static void Play1()
                 new Aggregate { Path = "AgeStr", Type = AggregateType.Avg }
             };;
 
-            var handler = new QueryHandler();
+            var handler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
             handler.AddInterceptor(new PersonQueryInterceptor());
             var result = handler.Execute(queryable, criteria);
 

diff --git a/PoweredSoft.DynamicQuery.Core/IQueryHandler.cs b/PoweredSoft.DynamicQuery.Core/IQueryHandler.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -9,6 +10,7 @@ namespace PoweredSoft.DynamicQuery.Core
     public interface IInterceptableQueryHandler
     {
         void AddInterceptor(IQueryInterceptor interceptor);
+        IReadOnlyList<IQueryInterceptor> ResolveInterceptors<TSource, TResult>(IQueryCriteria criteria, IQueryable<TSource> queryable);
     }
 
     public interface IQueryHandler : IInterceptableQueryHandler

diff --git a/PoweredSoft.DynamicQuery.Core/IQueryInterceptorProvider.cs b/PoweredSoft.DynamicQuery.Core/IQueryInterceptorProvider.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace PoweredSoft.DynamicQuery.Core
+{
+    public interface IQueryInterceptorProvider
+    {
+        IEnumerable<IQueryInterceptor> GetInterceptors<TSource, TResult>(IQueryCriteria queryCriteria, IQueryable<TSource> queryable);
+    }
+}
diff --git a/PoweredSoft.DynamicQuery.Test/AggregateInterceptorTests.cs b/PoweredSoft.DynamicQuery.Test/AggregateInterceptorTests.cs
@@ -38,7 +38,7 @@ public void Simple()
                     Type = AggregateType.Avg,
                     Path = "ItemPrice"
                 });
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(new MockAggregateInterceptor());
                 var result = queryHandler.Execute(ctx.Items, criteria);
                 Assert.Equal(expected.PriceAtTheTime, result.Aggregates.First().Value);

diff --git a/PoweredSoft.DynamicQuery.Test/AggregateTests.cs b/PoweredSoft.DynamicQuery.Test/AggregateTests.cs
@@ -56,7 +56,7 @@ public void WithoutGrouping()
                     }
                 };
 
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = queryHandler.Execute(ctx.OrderItems, criteria, new QueryExecutionOptions
                 {
                     GroupByInMemory = true
@@ -122,7 +122,7 @@ public void WithGrouping()
                     }
                 };
 
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 var queryable = ctx.OrderItems.Include(t => t.Order);
                 var result = queryHandler.Execute(queryable, criteria, new QueryExecutionOptions
                 {

diff --git a/PoweredSoft.DynamicQuery.Test/AsyncTests.cs b/PoweredSoft.DynamicQuery.Test/AsyncTests.cs
@@ -27,7 +27,7 @@ public void TestEmptyCriteria()
                 // query handler that is empty should be the same as running to list.
                 var aqf = new AsyncQueryableService(new[] { new AsyncQueryableHandlerService() });
                 var criteria = new QueryCriteria();
-                var queryHandler = new QueryHandlerAsync(aqf);
+                var queryHandler = new QueryHandlerAsync(aqf, Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = await queryHandler.ExecuteAsync(queryable, criteria);
                 Assert.Equal(resultShouldMatch, result.Data);
             });
@@ -66,7 +66,7 @@ public void WithGrouping()
                     }
                 };
                 var asyncService = new AsyncQueryableService(new[] { new AsyncQueryableHandlerService() });
-                var queryHandler = new QueryHandlerAsync(asyncService);
+                var queryHandler = new QueryHandlerAsync(asyncService, Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = await queryHandler.ExecuteAsync(ctx.OrderItems.Include(t => t.Order.Customer), criteria, new QueryExecutionOptions
                 {
                     GroupByInMemory = true
@@ -118,7 +118,7 @@ public void SimpleFilter()
                 };
 
                 var asyncService = new AsyncQueryableService(new[] { new AsyncQueryableHandlerService() });
-                var queryHandler = new QueryHandlerAsync(asyncService);
+                var queryHandler = new QueryHandlerAsync(asyncService, Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = await queryHandler.ExecuteAsync(ctx.Items, criteria);
                 Assert.Equal(resultShouldMatch, result.Data);
             });
@@ -146,7 +146,7 @@ public void SimpleFilterWithNot()
                 };
 
                 var asyncService = new AsyncQueryableService(new[] { new AsyncQueryableHandlerService() });
-                var queryHandler = new QueryHandlerAsync(asyncService);
+                var queryHandler = new QueryHandlerAsync(asyncService, Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = await queryHandler.ExecuteAsync(ctx.Items, criteria);
                 Assert.Equal(resultShouldMatch, result.Data);
             });
@@ -166,7 +166,7 @@ public void TestPaging()
                 criteria.PageSize = 5;
 
                 var asyncService = new AsyncQueryableService(new[] { new AsyncQueryableHandlerService() });
-                var queryHandler = new QueryHandlerAsync(asyncService);
+                var queryHandler = new QueryHandlerAsync(asyncService, Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = await queryHandler.ExecuteAsync(ctx.OrderItems, criteria);
                 Assert.Equal(resultShouldMatch, result.Data);
             });
@@ -205,7 +205,7 @@ public void WithGroupingInterceptorOptions()
                     }
                 };
                 var asyncService = new AsyncQueryableService(new[] { new AsyncQueryableHandlerService() });
-                var queryHandler = new QueryHandlerAsync(asyncService);
+                var queryHandler = new QueryHandlerAsync(asyncService, Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(new MockQueryExecutionOptionsInterceptor());
                 var result = await queryHandler.ExecuteAsync(ctx.OrderItems.Include(t => t.Order.Customer), criteria);
 

diff --git a/PoweredSoft.DynamicQuery.Test/BeforeFilterTests.cs b/PoweredSoft.DynamicQuery.Test/BeforeFilterTests.cs
@@ -50,7 +50,7 @@ public void NonGeneric()
                 queryable = (IQueryable<Order>)interceptor.InterceptBeforeFiltering(criteria, queryable);
 
                 // query handler should pass by the same interceptor.
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(interceptor);
                 var result = queryHandler.Execute(ctx.Orders, criteria);
 
@@ -75,7 +75,7 @@ public void Generic()
                 queryable = interceptor.InterceptBeforeFiltering(criteria, queryable);
 
                 // query handler should pass by the same interceptor.
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(interceptor);
                 var result = queryHandler.Execute(ctx.Orders, criteria);
 

diff --git a/PoweredSoft.DynamicQuery.Test/ConvertibleInterceptorTests.cs b/PoweredSoft.DynamicQuery.Test/ConvertibleInterceptorTests.cs
@@ -2,6 +2,7 @@
 using PoweredSoft.DynamicQuery.Test.Mock;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Xunit;
 
@@ -77,7 +78,7 @@ public void NonGeneric()
             MockContextFactory.SeedAndTestContextFor("QueryConvertInterceptorTests_NonGeneric", TestSeeders.SimpleSeedScenario, ctx =>
             {
                 var criteria = new QueryCriteria();
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(new MockQueryConvertInterceptor());
                 var result = queryHandler.Execute<Customer, CustomerModel>(ctx.Customers, criteria);
                 Assert.All(result.Data, t => Assert.IsType<CustomerModel>(t));
@@ -90,7 +91,7 @@ public void Generic()
             MockContextFactory.SeedAndTestContextFor("ConvertibleIntereceptorTests_Generic", TestSeeders.SimpleSeedScenario, ctx =>
             {
                 var criteria = new QueryCriteria();
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(new MockQueryConvertGenericInterceptor());
                 var result = queryHandler.Execute<Customer, CustomerModel>(ctx.Customers, criteria);
                 Assert.All(result.Data, t => Assert.IsType<CustomerModel>(t));
@@ -103,7 +104,7 @@ public void Generic2()
             MockContextFactory.SeedAndTestContextFor("ConvertibleIntereceptorTests_Generic2", TestSeeders.SimpleSeedScenario, ctx =>
             {
                 var criteria = new QueryCriteria();
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(new MockQueryConvertGenericInterceptor2());
                 var result = queryHandler.Execute<Customer, CustomerModel>(ctx.Customers, criteria);
                 Assert.All(result.Data, t => Assert.IsType<CustomerModel>(t));

diff --git a/PoweredSoft.DynamicQuery.Test/CriteriaTests.cs b/PoweredSoft.DynamicQuery.Test/CriteriaTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
+using PoweredSoft.DynamicQuery.Core;
 using PoweredSoft.DynamicQuery.Test.Mock;
 using Xunit;
 
@@ -19,7 +20,7 @@ public void TestEmptyCriteria()
 
                 // query handler that is empty should be the same as running to list.
                 var criteria = new QueryCriteria();
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = queryHandler.Execute(queryable, criteria);
                 Assert.Equal(resultShouldMatch, result.Data);
             });
@@ -38,7 +39,7 @@ public void TestPaging()
                 criteria.Page = 2;
                 criteria.PageSize = 5;
 
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = queryHandler.Execute(ctx.OrderItems, criteria);
                 Assert.Equal(resultShouldMatch, result.Data);
             });

diff --git a/PoweredSoft.DynamicQuery.Test/FilterInterceptorTests.cs b/PoweredSoft.DynamicQuery.Test/FilterInterceptorTests.cs
@@ -58,7 +58,7 @@ public void Simple()
                     }
                 };
 
-                var query = new QueryHandler();
+                var query = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 query.AddInterceptor(new MockFilterInterceptorA());
                 var result = query.Execute(queryable, criteria);
 
@@ -83,7 +83,7 @@ public void SimpleWithExtensions()
                     }
                 };
 
-                var query = new QueryHandler();
+                var query = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 query.AddInterceptor(new MockFilterInterceptorAWithExtension());
                 var result = query.Execute(queryable, criteria);
 
@@ -108,7 +108,7 @@ public void SimpleWithExtensions2()
                     }
                 };
 
-                var query = new QueryHandler();
+                var query = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 query.AddInterceptor(new MockFilterInterceptorAWithExtension());
                 var result = query.Execute(queryable, criteria);
 
@@ -133,7 +133,7 @@ public void Multi()
                     }
                 };
 
-                var query = new QueryHandler();
+                var query = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 query.AddInterceptor(new MockFilterInterceptorA());
                 query.AddInterceptor(new MockFilterInterceptorB());
                 var result = query.Execute(queryable, criteria);

diff --git a/PoweredSoft.DynamicQuery.Test/FilterTests.cs b/PoweredSoft.DynamicQuery.Test/FilterTests.cs
@@ -32,7 +32,7 @@ public void TestInversionOfControl()
                     Filters = new List<IFilter> { new MockIsChuckFilter() }
                 };
 
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = queryHandler.Execute(ctx.Customers, criteria);
                 Assert.Equal(resultShouldMatch, result.Data);
             });
@@ -58,7 +58,7 @@ public void SimpleFilter()
                     }
                 };
 
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = queryHandler.Execute(ctx.Items, criteria);
                 Assert.Equal(resultShouldMatch, result.Data);
             });
@@ -89,7 +89,7 @@ public void CompositeFilter()
                     }
                 };
 
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = queryHandler.Execute(ctx.Customers, criteria);
                 Assert.Equal(resultShouldMatch, result.Data);
             });
@@ -125,7 +125,7 @@ public void MoreComplexCompositeFilter()
                     }
                 };
 
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = queryHandler.Execute(ctx.Customers, criteria);
                 Assert.Equal(resultShouldMatch, result.Data);
             });

diff --git a/PoweredSoft.DynamicQuery.Test/GroupInterceptorTests.cs b/PoweredSoft.DynamicQuery.Test/GroupInterceptorTests.cs
@@ -36,7 +36,7 @@ public void Simple()
 
                 var criteria = new QueryCriteria();
                 criteria.Groups.Add(new Group { Path = "CustomerFirstName" });
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(new MockGroupInterceptor());
                 var result = queryHandler.Execute(ctx.Orders.Include(t => t.Customer), criteria, new QueryExecutionOptions
                 {
@@ -52,7 +52,7 @@ public void Simple()
         [Fact]
         public void WithInterptorSimple()
         {
-            MockContextFactory.SeedAndTestContextFor("GroupInterceptorTests_Simple", TestSeeders.SimpleSeedScenario, ctx =>
+            MockContextFactory.SeedAndTestContextFor("GroupInterceptorTests_WithInterptorSimple", TestSeeders.SimpleSeedScenario, ctx =>
             {
                 var expected = ctx.Orders
                     .OrderBy(t => t.Customer.FirstName)
@@ -62,7 +62,7 @@ public void WithInterptorSimple()
 
                 var criteria = new QueryCriteria();
                 criteria.Groups.Add(new Group { Path = "CustomerFirstName" });
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(new MockGroupInterceptor());
                 queryHandler.AddInterceptor(new MockQueryExecutionOptionsInterceptor());
                 var result = queryHandler.Execute(ctx.Orders.Include(t => t.Customer), criteria);

diff --git a/PoweredSoft.DynamicQuery.Test/GroupTests.cs b/PoweredSoft.DynamicQuery.Test/GroupTests.cs
@@ -39,7 +39,7 @@ public void Simple()
                     }
                 };
 
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = queryHandler.Execute(ctx.Orders, criteria, new QueryExecutionOptions
                 {
                     GroupByInMemory = true,
@@ -80,7 +80,7 @@ public void GroupComplex()
                     }
                 };
 
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 var result = queryHandler.Execute(ctx.Tickets, criteria, new QueryExecutionOptions
                 {
                     GroupByInMemory = true
@@ -117,7 +117,7 @@ public void InterceptorsWithGrouping()
                 };
 
                 var interceptor = new InterceptorsWithGrouping();
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(interceptor);
                 var result = queryHandler.Execute<Ticket, InterceptorWithGroupingFakeModel>(ctx.Tickets, criteria, new QueryExecutionOptions
                 {

diff --git a/PoweredSoft.DynamicQuery.Test/IncludeStrategyTests.cs b/PoweredSoft.DynamicQuery.Test/IncludeStrategyTests.cs
@@ -51,7 +51,7 @@ public void NonGeneric()
                 queryable = (IQueryable<Order>)interceptor.InterceptIncludeStrategy(criteria, queryable);
 
                 // query handler should pass by the same interceptor.
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(interceptor);
                 var result = queryHandler.Execute(ctx.Orders, criteria);
 
@@ -76,7 +76,7 @@ public void Generic()
                 queryable = interceptor.InterceptIncludeStrategy(criteria, queryable);
 
                 // query handler should pass by the same interceptor.
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(interceptor);
                 var result = queryHandler.Execute(ctx.Orders, criteria);
 

diff --git a/PoweredSoft.DynamicQuery.Test/NoSortTests.cs b/PoweredSoft.DynamicQuery.Test/NoSortTests.cs
@@ -51,7 +51,7 @@ public void NonGeneric()
                 queryable = (IQueryable<Order>)interceptor.InterceptNoSort(criteria, queryable);
 
                 // query handler should pass by the same interceptor.
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(interceptor);
                 var result = queryHandler.Execute(ctx.Orders, criteria);
 
@@ -76,7 +76,7 @@ public void Generic()
                 queryable = interceptor.InterceptNoSort(criteria, queryable);
 
                 // query handler should pass by the same interceptor.
-                var queryHandler = new QueryHandler();
+                var queryHandler = new QueryHandler(Enumerable.Empty<IQueryInterceptorProvider>());
                 queryHandler.AddInterceptor(interceptor);
                 var result = queryHandler.Execute(ctx.Orders, criteria);