- fix query executor to take collection of queries

CodeShayk · Sep 24, 2024 · 497c761 · 497c761
1 parent 46aec18
commit 497c761
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 53 deletions.
diff --git a/src/Schemio.EF/BaseSQLQuery.cs b/src/Schemio.EF/BaseSQLQuery.cs
@@ -10,6 +10,6 @@ public abstract class BaseSQLQuery<TQueryParameter, TQueryResult>
         /// Delegate returns a collection from db.
         /// </summary>
         /// <returns>Func<DbContext, IEnumerable<IQueryResult>></returns>
-        public abstract Func<IDbContext, IEnumerable<IQueryResult>> GetQuery();
+        public abstract IEnumerable<IQueryResult> Run(IDbContext dbContext);
     }
 }
diff --git a/src/Schemio.EF/EFQueryEngine.cs b/src/Schemio.EF/EFQueryEngine.cs
@@ -9,24 +9,23 @@ public class EFQueryEngine<T> : IQueryEngine where T : DbContext
         public EFQueryEngine(IDbContextFactory<T> _dbContextFactory)
             => this._dbContextFactory = _dbContextFactory;
 
-        public IQueryResult[] Execute(IQuery query, IDataContext context)
+        public bool CanExecute(IQuery query) => query != null && query is ISQLQuery;
+
+        public IEnumerable<IQueryResult> Execute(IEnumerable<IQuery> queries, IDataContext context)
         {
             var output = new List<IQueryResult>();
 
-            if (query == null || !(query is ISQLQuery))
-                return output.ToArray();
-
             using (var dbcontext = _dbContextFactory.CreateDbContext())
             {
-                var queryDelegate = ((ISQLQuery)query).GetQuery();
-                if (queryDelegate == null)
-                    return output.ToArray();
+                foreach (var query in queries)
+                {
+                    var results = ((ISQLQuery)query).Run((IDbContext)dbcontext);
 
-                var results = queryDelegate((IDbContext)dbcontext);
-                if (results == null)
-                    return output.ToArray();
+                    if (results == null)
+                        continue;
 
-                output.AddRange(results);
+                    output.AddRange(results);
+                }
 
                 return output.ToArray();
             }

diff --git a/src/Schemio.EF/ISQLQuery.cs b/src/Schemio.EF/ISQLQuery.cs
@@ -7,6 +7,6 @@ public interface ISQLQuery
         /// Delegate returns a collection from db.
         /// </summary>
         /// <returns>Func<DbContext, IEnumerable<IQueryResult>></returns>
-        Func<IDbContext, IEnumerable<IQueryResult>> GetQuery();
+        IEnumerable<IQueryResult> Run(IDbContext dbContext);
     }
 }
diff --git a/src/Schemio.SQL/SQLEngine.cs b/src/Schemio.SQL/SQLEngine.cs
@@ -11,30 +11,33 @@ public SQLEngine(SqlConfiguration sqlConfiguration)
             this.sqlConfiguration = sqlConfiguration;
         }
 
-        public IQueryResult[] Execute(IQuery query, IDataContext context)
+        public bool CanExecute(IQuery query) => query != null && query is ISQLQuery;
+
+        public IEnumerable<IQueryResult> Execute(IEnumerable<IQuery> queries, IDataContext context)
         {
             var output = new List<IQueryResult>();
 
-            if (query == null || query is not ISQLQuery)
-                return output.ToArray();
-
             var factory = DbProviderFactories.GetFactory(sqlConfiguration.ConnectionSettings.ProviderName)
                ?? throw new InvalidOperationException($"Provider: {sqlConfiguration.ConnectionSettings.ProviderName} is not supported. Please register entry in DbProviderFactories ");
 
-            //var batches = queries.Chunk(sqlConfiguration.QuerySettings.QueryBatchSize);
-            //foreach (var batch in batches)
-            using (var connection = factory.CreateConnection())
-            {
-                if (connection == null)
-                    throw new Exception($"Failed to create connection with Provider: {sqlConfiguration.ConnectionSettings.ProviderName}. Please check the connection settings.");
+            var batches = queries.Chunk(sqlConfiguration.QuerySettings.QueryBatchSize);
+
+            foreach (var batch in batches)
+                using (var connection = factory.CreateConnection())
+                {
+                    if (connection == null)
+                        throw new Exception($"Failed to create connection with Provider: {sqlConfiguration.ConnectionSettings.ProviderName}. Please check the connection settings.");
 
-                connection.ConnectionString = sqlConfiguration.ConnectionSettings.ConnectionString;
+                    connection.ConnectionString = sqlConfiguration.ConnectionSettings.ConnectionString;
 
-                var results = ((ISQLQuery)query).Run(connection);
+                    foreach (var query in batch)
+                    {
+                        var results = ((ISQLQuery)query).Run(connection);
 
-                if (results != null && results.Any())
-                    output.AddRange(results);
-            }
+                        if (results != null && results.Any())
+                            output.AddRange(results);
+                    }
+                }
 
             return output.ToArray();
         }

diff --git a/src/Schemio/BaseQuery.cs b/src/Schemio/BaseQuery.cs
@@ -49,16 +49,5 @@ public virtual void ResolveParameterInChildMode(IDataContext context, IQueryResu
         public virtual void ResolveParameterInParentMode(IDataContext context)
         {
         }
-
-        /// <summary>
-        /// Runs this query with query engine instance.
-        /// </summary>
-        /// <param name="engine"></param>
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public IQueryResult[] Run(IQueryEngine engine, IDataContext context)
-        {
-            return engine.Execute(this, context);
-        }
     }
 }
diff --git a/src/Schemio/IQuery.cs b/src/Schemio/IQuery.cs
@@ -14,8 +14,6 @@ public interface IQuery
         void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult);
 
         bool IsContextResolved();
-
-        IQueryResult[] Run(IQueryEngine engine, IDataContext context);
     }
 
     //    public interface IQuery

diff --git a/src/Schemio/IQueryEngine.cs b/src/Schemio/IQueryEngine.cs
@@ -2,8 +2,8 @@ namespace Schemio
 {
     public interface IQueryEngine
     {
-        //IQueryResult[] Run(IQueryList queries, IDataContext context);
+        bool CanExecute(IQuery query);
 
-        IQueryResult[] Execute(IQuery query, IDataContext context);
+        IEnumerable<IQueryResult> Execute(IEnumerable<IQuery> queries, IDataContext context);
     }
 }
diff --git a/src/Schemio/Impl/QueryExecutor.cs b/src/Schemio/Impl/QueryExecutor.cs
@@ -42,18 +42,18 @@ private IQueryList Process(IDataContext context, IQueryList queries, List<IQuery
             return subscriber.ResolvedDependents;
         }
 
-        private List<IQueryResult> Run(IQueryList queries, IDataContext context)
+        private List<IQueryResult> Run(IQueryList queryList, IDataContext context)
         {
             var output = new List<IQueryResult>();
 
             foreach (var engine in queryEngines)
             {
-                foreach (var query in queries.Queries)
-                {
-                    var results = query.Run(engine, context);
-                    if (results != null)
-                        output.AddRange(results);
-                }
+                var queries = queryList.Queries.Where(x => engine.CanExecute(x));
+
+                var results = engine.Execute(queries, context);
+
+                if (results != null)
+                    output.AddRange(results);
             }
 
             return output;

diff --git a/tests/Schemio.Tests/DataProvider.Tests/QueryExecutorTests.cs b/tests/Schemio.Tests/DataProvider.Tests/QueryExecutorTests.cs
@@ -18,6 +18,8 @@ internal class QueryExecutorTests
         public void Setup()
         {
             _queryEngine = new Mock<IQueryEngine>();
+            _queryEngine.Setup(x => x.CanExecute(It.IsAny<IQuery>())).Returns(true);
+
             _queryExecutor = new QueryExecutor(new[] { _queryEngine.Object });
         }
 
@@ -26,15 +28,15 @@ public void TestQueryExecutorToReturnWhenNoQueries()
         {
             _queryExecutor.Execute(new DataContext(new EntityContext()), new QueryList());
 
-            _queryEngine.Verify(x => x.Execute(It.IsAny<IQuery>(), It.IsAny<IDataContext>()), Times.Never());
+            _queryEngine.Verify(x => x.Execute(It.IsAny<IEnumerable<IQuery>>(), It.IsAny<IDataContext>()), Times.Never());
         }
 
         [Test]
         public void TestQueryExecutorToCallEngineWhenQueriesExistForExecution()
         {
             _queryExecutor.Execute(new DataContext(new EntityContext()), new QueryList(new[] { new CustomerQuery() }) { });
 
-            _queryEngine.Verify(x => x.Execute(It.IsAny<IQuery>(), It.IsAny<IDataContext>()), Times.Once());
+            _queryEngine.Verify(x => x.Execute(It.IsAny<IEnumerable<IQuery>>(), It.IsAny<IDataContext>()), Times.Once());
         }
 
         [Test] // TODO - All sequence assertions
@@ -45,7 +47,7 @@ public void TestQueryExecutorToExecuteConfiguredQueriesInCorrectOrder()
 
             _queryExecutor.Execute(new DataContext(new EntityContext()), querList);
 
-            _queryEngine.Verify(x => x.Execute(It.IsAny<IQuery>(), It.IsAny<IDataContext>()), Times.Once());
+            _queryEngine.Verify(x => x.Execute(It.IsAny<IEnumerable<IQuery>>(), It.IsAny<IDataContext>()), Times.Once());
         }
     }
 }