- Fix ResolveQueryParameter()

- Fix bug on parent/child query building.
CodeShayk · Nov 6, 2024 · 8f06f4e · 8f06f4e
1 parent 5842e63
commit 8f06f4e
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 69 deletions.
diff --git a/src/Schemio/BaseQuery.cs b/src/Schemio/BaseQuery.cs
@@ -5,7 +5,7 @@ namespace Schemio
     /// </summary>
     /// <typeparam name="TQueryParameter"></typeparam>
     /// <typeparam name="TQueryResult"></typeparam>
-    public abstract class BaseQuery<TQueryParameter, TQueryResult> : IQuery, IChildQuery, IRootQuery
+    public abstract class BaseQuery<TQueryParameter, TQueryResult> : IQuery
         where TQueryParameter : IQueryParameter
         where TQueryResult : IQueryResult
     {
@@ -36,27 +36,8 @@ public Type ResultType
         /// <summary>
         /// Implement to resolve query parameter.
         /// </summary>
-        /// <param name="context">root context.</param>
+        /// <param name="context">data context passed to the data provider.</param>
         /// <param name="parentQueryResult">query result from parent query (when configured as nested query). Can be null.</param>
-        protected abstract void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult);
-
-        /// <summary>
-        /// Implement to resolve query parameter for nested queries
-        /// </summary>
-        /// <param name="context">root context</param>
-        /// <param name="parentQueryResult">query result from parent query.</param>
-        public void ResolveChildQueryParameter(IDataContext context, IQueryResult parentQueryResult)
-        {
-            ResolveQueryParameter(context, parentQueryResult);
-        }
-
-        /// <summary>
-        /// Implement to resolve query parameter for first level queries.
-        /// </summary>
-        /// <param name="context">root context</param>
-        public void ResolveRootQueryParameter(IDataContext context)
-        {
-            ResolveQueryParameter(context, null);
-        }
+        public abstract void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult);
     }
 }
diff --git a/src/Schemio/IChildQuery.cs b/src/Schemio/IChildQuery.cs
diff --git a/src/Schemio/IQuery.cs b/src/Schemio/IQuery.cs
@@ -10,5 +10,7 @@ public interface IQuery
         Type ResultType { get; }
 
         bool IsContextResolved();
+
+        void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult = null);
     }
 }
diff --git a/src/Schemio/IRootQuery.cs b/src/Schemio/IRootQuery.cs
diff --git a/src/Schemio/Impl/DataProvider.cs b/src/Schemio/Impl/DataProvider.cs
@@ -52,6 +52,22 @@ internal TEntity GetData(IDataContext context)
             // Build queries for the data source based on the included xPaths
             var watch = System.Diagnostics.Stopwatch.StartNew();
             var queries = queryBuilder.Build(context);
+
+            foreach (var item in queries.Queries)
+            {
+                Console.WriteLine("L1 Query To Execute: " + item.GetType().Name);
+
+                foreach (var item2 in item.Children)
+                {
+                    Console.WriteLine("L2 Query To Execute: " + item2.GetType().Name);
+
+                    foreach (var item3 in item2.Children)
+                    {
+                        Console.WriteLine("L3 Query To Execute: " + item3.GetType().Name);
+                    }
+                }
+            }
+
             watch.Stop();
             logger?.LogInformation("Query builder executed in " + watch.ElapsedMilliseconds + " ms");
 

diff --git a/src/Schemio/Impl/EventSubscriber.cs b/src/Schemio/Impl/EventSubscriber.cs
@@ -28,8 +28,8 @@ public void OnEventHandler(IDataContext context, ExecutorResultArgs args)
                     if (unresolved.ParentQueryResultType != result.GetType())
                         continue;
 
-                    foreach (var query in unresolved.Queries.Cast<IChildQuery>())
-                        query.ResolveChildQueryParameter(context, queryResult);
+                    foreach (var query in unresolved.Queries)
+                        query.ResolveQueryParameter(context, queryResult);
                 }
             }
 
@@ -48,8 +48,8 @@ public void OnEventHandler(IDataContext context, ExecutorResultArgs args)
                         !unresolved.ParentQueryResultType.IsAssignableFrom(result.GetType()))
                         continue;
 
-                    foreach (var query in unresolved.Queries.Cast<IChildQuery>())
-                        query.ResolveChildQueryParameter(context, queryResult);
+                    foreach (var query in unresolved.Queries)
+                        query.ResolveQueryParameter(context, queryResult);
                 }
             }
         }

diff --git a/src/Schemio/Impl/QueryBuilder.cs b/src/Schemio/Impl/QueryBuilder.cs
@@ -18,10 +18,12 @@ public QueryBuilder(IEntitySchema<T> entitySchema, ISchemaPathMatcher schemaPath
         /// <returns></returns>
         public IQueryList Build(IDataContext context)
         {
-            var queries = GetMappedQueries(entitySchema.Mappings.ToList(), context);
+            var mappings = entitySchema.Mappings.ToList();
 
-            foreach (var query in queries.Queries.Cast<IRootQuery>())
-                query.ResolveRootQueryParameter(context);
+            var queries = GetMappedQueries(mappings, context);
+
+            foreach (var query in queries.Queries)
+                query.ResolveQueryParameter(context);
 
             return new QueryList(queries.Queries);
         }
@@ -32,16 +34,17 @@ private QueryList GetMappedQueries(IReadOnlyCollection<Mapping<T, IQueryResult>>
 
             for (var index = 1; index <= queryDependencyDepth; index++)
             {
-                var maps = mappings.Where(x => x.Order == index);
+                var maps = mappings.Where(x => x.Order == index).ToList();
 
                 foreach (var map in maps)
                 {
                     var dependentQueries =
                         mappings.Where(x => x.Order == index + 1 && x.DependentOn != null && x.DependentOn.GetType() == map.Query.GetType()).ToList();
 
-                    map.Query.Children ??= new List<IQuery>();
+                    map.Query.Children = new List<IQuery>();
 
-                    map.Query.Children.AddRange(FilterByPaths(context, dependentQueries));
+                    var filtered = FilterByPaths(context, dependentQueries);
+                    map.Query.Children.AddRange(filtered);
                 }
             }
 

diff --git a/...mio.EntityFramework.Tests/EntitySetup/EntitySchemas/Queries/CustomerCommunicationQuery.cs b/...mio.EntityFramework.Tests/EntitySetup/EntitySchemas/Queries/CustomerCommunicationQuery.cs
@@ -5,7 +5,7 @@ namespace Schemio.EntityFramework.Tests.EntitySetup.EntitySchemas.Queries
 {
     internal class CustomerCommunicationQuery : BaseSQLQuery<CustomerParameter, CommunicationResult>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Execute as child to customer query.
             var customer = (CustomerResult)parentQueryResult;

diff --git a/...chemio.EntityFramework.Tests/EntitySetup/EntitySchemas/Queries/CustomerOrderItemsQuery.cs b/...chemio.EntityFramework.Tests/EntitySetup/EntitySchemas/Queries/CustomerOrderItemsQuery.cs
@@ -5,7 +5,7 @@ namespace Schemio.EntityFramework.Tests.EntitySetup.EntitySchemas.Queries
 {
     internal class CustomerOrderItemsQuery : BaseSQLQuery<OrderItemParameter, OrderItemResult>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Execute as child to order query.
             var ordersResult = (CustomerOrderResult)parentQueryResult;

diff --git a/tests/Schemio.EntityFramework.Tests/EntitySetup/EntitySchemas/Queries/CustomerOrdersQuery.cs b/tests/Schemio.EntityFramework.Tests/EntitySetup/EntitySchemas/Queries/CustomerOrdersQuery.cs
@@ -5,7 +5,7 @@ namespace Schemio.EntityFramework.Tests.EntitySetup.EntitySchemas.Queries
 {
     internal class CustomerOrdersQuery : BaseSQLQuery<CustomerParameter, CustomerOrderResult>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Execute as child to customer query.
             var customer = (CustomerResult)parentQueryResult;

diff --git a/tests/Schemio.EntityFramework.Tests/EntitySetup/EntitySchemas/Queries/CustomerQuery.cs b/tests/Schemio.EntityFramework.Tests/EntitySetup/EntitySchemas/Queries/CustomerQuery.cs
@@ -5,7 +5,7 @@ namespace Schemio.EntityFramework.Tests.EntitySetup.EntitySchemas.Queries
 {
     public class CustomerQuery : BaseSQLQuery<CustomerParameter, CustomerResult>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Executes as root or level 1 query.
             var customer = (CustomerContext)context.Entity;

diff --git a/tests/Schemio.SQL.Tests/EntitySetup/EntitySchemas/Queries/CustomerCommunicationQuery.cs b/tests/Schemio.SQL.Tests/EntitySetup/EntitySchemas/Queries/CustomerCommunicationQuery.cs
@@ -5,7 +5,7 @@ namespace Schemio.SQL.Tests.EntitySetup.EntitySchemas.Queries
 {
     internal class CustomerCommunicationQuery : BaseSQLQuery<CustomerParameter, CommunicationResult>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Execute as child to customer query.
             var customer = (CustomerResult)parentQueryResult;

diff --git a/tests/Schemio.SQL.Tests/EntitySetup/EntitySchemas/Queries/CustomerOrderItemsQuery.cs b/tests/Schemio.SQL.Tests/EntitySetup/EntitySchemas/Queries/CustomerOrderItemsQuery.cs
@@ -5,7 +5,7 @@ namespace Schemio.SQL.Tests.EntitySetup.EntitySchemas.Queries
 {
     internal class CustomerOrderItemsQuery : BaseSQLQuery<OrderItemParameter, OrderItemResult>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Execute as child query to order query taking OrderResult to resolve query parameter.
             var ordersResult = (OrderResult)parentQueryResult;

diff --git a/tests/Schemio.SQL.Tests/EntitySetup/EntitySchemas/Queries/CustomerOrdersQuery.cs b/tests/Schemio.SQL.Tests/EntitySetup/EntitySchemas/Queries/CustomerOrdersQuery.cs
@@ -5,7 +5,7 @@ namespace Schemio.SQL.Tests.EntitySetup.EntitySchemas.Queries
 {
     internal class CustomerOrdersQuery : BaseSQLQuery<CustomerParameter, OrderResult>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Execute as child to customer query.
             var customer = (CustomerResult)parentQueryResult;

diff --git a/tests/Schemio.SQL.Tests/EntitySetup/EntitySchemas/Queries/CustomerQuery.cs b/tests/Schemio.SQL.Tests/EntitySetup/EntitySchemas/Queries/CustomerQuery.cs
@@ -5,7 +5,7 @@ namespace Schemio.SQL.Tests.EntitySetup.EntitySchemas.Queries
 {
     public class CustomerQuery : BaseSQLQuery<CustomerParameter, CustomerResult>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Executes as root or level 1 query.
             var customer = (CustomerContext)context.Entity;

diff --git a/tests/Schemio.Tests/EntitySetup/Queries/CustomerCommunicationQuery.cs b/tests/Schemio.Tests/EntitySetup/Queries/CustomerCommunicationQuery.cs
@@ -2,7 +2,7 @@ namespace Schemio.Tests.EntitySetup.Queries
 {
     internal class CustomerCommunicationQuery : BaseQuery<CustomerParameter, CommunicationResult>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Execute as child to customer query.
             var customer = (CustomerResult)parentQueryResult;

diff --git a/tests/Schemio.Tests/EntitySetup/Queries/CustomerOrderItemsQuery.cs b/tests/Schemio.Tests/EntitySetup/Queries/CustomerOrderItemsQuery.cs
@@ -2,7 +2,7 @@ namespace Schemio.Tests.EntitySetup.Queries
 {
     internal class CustomerOrderItemsQuery : BaseQuery<OrderItemParameter, CollectionResult<OrderItemValue>>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Execute as child to order query.
             var ordersResult = (OrderCollectionResult)parentQueryResult;

diff --git a/tests/Schemio.Tests/EntitySetup/Queries/CustomerOrdersQuery.cs b/tests/Schemio.Tests/EntitySetup/Queries/CustomerOrdersQuery.cs
@@ -2,7 +2,7 @@ namespace Schemio.Tests.EntitySetup.Queries
 {
     internal class CustomerOrdersQuery : BaseQuery<CustomerParameter, CollectionResult<OrderValue>>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Does not execute as child to any query.
         }

diff --git a/tests/Schemio.Tests/EntitySetup/Queries/CustomerQuery.cs b/tests/Schemio.Tests/EntitySetup/Queries/CustomerQuery.cs
@@ -2,7 +2,7 @@ namespace Schemio.Tests.EntitySetup.Queries
 {
     public class CustomerQuery : BaseQuery<CustomerParameter, CustomerResult>
     {
-        protected override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Executes as root or level 1 query.
             var customer = (CustomerContext)context.Entity;