- Add query interface seggration

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

Hide file tree

Showing 14 changed files with 90 additions and 102 deletions.
diff --git a/src/Schemio.SQL/BaseSQLChildQuery.cs b/src/Schemio.SQL/BaseSQLChildQuery.cs
@@ -0,0 +1,9 @@
+namespace Schemio.SQL
+{
+    public abstract class BaseSQLChildQuery<TQueryParameter, TQueryResult> : BaseSQLQuery<TQueryParameter, TQueryResult>, ISQLQuery, IChildQuery
+           where TQueryParameter : IQueryParameter
+           where TQueryResult : IQueryResult
+    {
+        public abstract void ResolveChildQueryParameter(IDataContext context, IQueryResult parentQueryResult);
+    }
+}
diff --git a/src/Schemio.SQL/BaseSQLRootQuery.cs b/src/Schemio.SQL/BaseSQLRootQuery.cs
@@ -0,0 +1,9 @@
+namespace Schemio.SQL
+{
+    public abstract class BaseSQLRootQuery<TQueryParameter, TQueryResult> : BaseSQLQuery<TQueryParameter, TQueryResult>, ISQLQuery, IRootQuery
+           where TQueryParameter : IQueryParameter
+           where TQueryResult : IQueryResult
+    {
+        public abstract void ResolveRootQueryParameter(IDataContext context);
+    }
+}
diff --git a/src/Schemio/BaseQuery.cs b/src/Schemio/BaseQuery.cs
@@ -33,21 +33,35 @@ public Type ResultType
         /// <returns></returns>
         public bool IsContextResolved() => QueryParameter != null;
 
-        /// <summary>
-        /// Implement this method to resolve query parameter to execute query in child mode to a parent query.
-        /// </summary>
-        /// <param name="context">DataContext object passed to dataprovider.</param>
-        /// <param name="parentQueryResult">Query result of parent query.</param>
-        public virtual void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult)
-        {
-        }
+        ///// <summary>
+        ///// Implement this method to resolve query parameter to execute query in child mode to a parent query.
+        ///// </summary>
+        ///// <param name="context">DataContext object passed to dataprovider.</param>
+        ///// <param name="parentQueryResult">Query result of parent query.</param>
+        //public virtual void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult)
+        //{
+        //}
 
-        /// <summary>
-        /// Implement this method to resolve query parameter to execute query in parent mode.
-        /// </summary>
-        /// <param name="context">DataContext object passed to dataprovider.</param>
-        public virtual void ResolveParameterInParentMode(IDataContext context)
-        {
-        }
+        ///// <summary>
+        ///// Implement this method to resolve query parameter to execute query in parent mode.
+        ///// </summary>
+        ///// <param name="context">DataContext object passed to dataprovider.</param>
+        //public virtual void ResolveParameterInParentMode(IDataContext context)
+        //{
+        //}
     }
+
+    //public abstract class BaseRootQuery<TQueryParameter, TQueryResult> : BaseQuery<TQueryParameter, TQueryResult>, IQuery, IRootQuery
+    //   where TQueryParameter : IQueryParameter
+    //   where TQueryResult : IQueryResult
+    //{
+    //    public abstract void ResolveRootQueryParameter(IDataContext context);
+    //}
+
+    //public abstract class BaseChildQuery<TQueryParameter, TQueryResult> : BaseQuery<TQueryParameter, TQueryResult>, IQuery, IChildQuery
+    //   where TQueryParameter : IQueryParameter
+    //   where TQueryResult : IQueryResult
+    //{
+    //    public abstract void ResolveChildQueryParameter(IDataContext context, IQueryResult parentQueryResult);
+    //}
 }
diff --git a/src/Schemio/IQuery.cs b/src/Schemio/IQuery.cs
@@ -3,51 +3,35 @@ namespace Schemio
     /// <summary>
     /// Implement IQuery to fetch data using API or database.
     /// </summary>
+    //public interface IQuery
+    //{
+    //    List<IQuery> Children { get; set; }
+
+    //    Type ResultType { get; }
+
+    //    void ResolveParameterInParentMode(IDataContext context);
+
+    //    void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult);
+
+    //    bool IsContextResolved();
+    //}
+
     public interface IQuery
     {
         List<IQuery> Children { get; set; }
 
         Type ResultType { get; }
 
-        void ResolveParameterInParentMode(IDataContext context);
-
-        void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult);
-
         bool IsContextResolved();
     }
 
-    //    public interface IQuery
-    //    {
-    //        List<IQuery> Children { get; set; }
-
-    //        Type ResultType { get; }
-
-    //        bool IsContextResolved();
-    //    }
-
-    //    public interface IParentQuery : IQuery
-    //    {
-    //        //List<IQuery> Children { get; set; }
-
-    //        //Type GetResultType { get; }
-
-    //        void ResolveRootQueryParameter(IDataContext context);
-
-    //        //void ResolveChildQueryParameter(IDataContext context, IQueryResult parentQueryResult);
-
-    //        //bool IsContextResolved();
-    //    }
-
-    //    public interface IChildQuery : IQuery
-    //    {
-    //        //List<IQuery> Children { get; set; }
-
-    //        //Type GetResultType { get; }
-
-    //        //void ResolveRootQueryParameter(IDataContext context);
-
-    //        void ResolveChildQueryParameter(IDataContext context, IQueryResult parentQueryResult);
+    public interface IRootQuery : IQuery
+    {
+        void ResolveRootQueryParameter(IDataContext context);
+    }
 
-    //        //bool IsContextResolved();
-    //    }
+    public interface IChildQuery : IQuery
+    {
+        void ResolveChildQueryParameter(IDataContext context, IQueryResult parentQueryResult);
+    }
 }
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)
-                        query.ResolveParameterInChildMode(context, queryResult);
+                    foreach (var query in unresolved.Queries.Cast<IChildQuery>())
+                        query.ResolveChildQueryParameter(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)
-                        query.ResolveParameterInChildMode(context, queryResult);
+                    foreach (var query in unresolved.Queries.Cast<IChildQuery>())
+                        query.ResolveChildQueryParameter(context, queryResult);
                 }
             }
         }

diff --git a/src/Schemio/Impl/QueryBuilder.cs b/src/Schemio/Impl/QueryBuilder.cs
@@ -20,8 +20,8 @@ public IQueryList Build(IDataContext context)
         {
             var queries = GetMappedQueries(entitySchema.Mappings.ToList(), context);
 
-            foreach (var query in queries.Queries)
-                query.ResolveParameterInParentMode(context);
+            foreach (var query in queries.Queries.Cast<IRootQuery>())
+                query.ResolveRootQueryParameter(context);
 
             return new QueryList(queries.Queries);
         }

diff --git a/tests/Schemio.SQL.Tests/EntitySetup/EntitySchemas/Queries/CustomerCommunicationQuery.cs b/tests/Schemio.SQL.Tests/EntitySetup/EntitySchemas/Queries/CustomerCommunicationQuery.cs
@@ -3,9 +3,9 @@
 
 namespace Schemio.SQL.Tests.EntitySetup.EntitySchemas.Queries
 {
-    internal class CustomerCommunicationQuery : BaseSQLQuery<CustomerParameter, CommunicationResult>
+    internal class CustomerCommunicationQuery : BaseSQLChildQuery<CustomerParameter, CommunicationResult>
     {
-        public override void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveChildQueryParameter(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
@@ -3,9 +3,9 @@
 
 namespace Schemio.SQL.Tests.EntitySetup.EntitySchemas.Queries
 {
-    internal class CustomerOrderItemsQuery : BaseSQLQuery<OrderItemParameter, OrderItemResult>
+    internal class CustomerOrderItemsQuery : BaseSQLChildQuery<OrderItemParameter, OrderItemResult>
     {
-        public override void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveChildQueryParameter(IDataContext context, IQueryResult parentQueryResult)
         {
             // Execute as child to order query.
             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
@@ -3,9 +3,9 @@
 
 namespace Schemio.SQL.Tests.EntitySetup.EntitySchemas.Queries
 {
-    internal class CustomerOrdersQuery : BaseSQLQuery<CustomerParameter, OrderResult>
+    internal class CustomerOrdersQuery : BaseSQLChildQuery<CustomerParameter, OrderResult>
     {
-        public override void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult)
+        public override void ResolveChildQueryParameter(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
@@ -1,11 +1,10 @@
-using System.Data;
 using Dapper;
 
 namespace Schemio.SQL.Tests.EntitySetup.EntitySchemas.Queries
 {
-    public class CustomerQuery : BaseSQLQuery<CustomerParameter, CustomerResult>
+    public class CustomerQuery : BaseSQLRootQuery<CustomerParameter, CustomerResult>
     {
-        public override void ResolveParameterInParentMode(IDataContext context)
+        public override void ResolveRootQueryParameter(IDataContext context)
         {
             // 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
@@ -1,13 +1,8 @@
 namespace Schemio.Tests.EntitySetup.Queries
 {
-    internal class CustomerCommunicationQuery : BaseQuery<CustomerParameter, CommunicationResult>
+    internal class CustomerCommunicationQuery : BaseQuery<CustomerParameter, CommunicationResult>, IChildQuery
     {
-        public override void ResolveParameterInParentMode(IDataContext context)
-        {
-            // Does not execute as root or level 1 queries.
-        }
-
-        public override void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult)
+        public void ResolveChildQueryParameter(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
@@ -1,13 +1,8 @@
 namespace Schemio.Tests.EntitySetup.Queries
 {
-    internal class CustomerOrderItemsQuery : BaseQuery<OrderItemParameter, CollectionResult<OrderItemValue>>
+    internal class CustomerOrderItemsQuery : BaseQuery<OrderItemParameter, CollectionResult<OrderItemValue>>, IChildQuery
     {
-        public override void ResolveParameterInParentMode(IDataContext context)
-        {
-            // Does not execute as root or level 1 queries.
-        }
-
-        public override void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult)
+        public void ResolveChildQueryParameter(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
@@ -1,20 +1,8 @@
-using Schemio.Tests.EntitySetup;
-
 namespace Schemio.Tests.EntitySetup.Queries
 {
-    internal class CustomerOrdersQuery : BaseQuery<CustomerParameter, CollectionResult<OrderValue>>
+    internal class CustomerOrdersQuery : BaseQuery<CustomerParameter, CollectionResult<OrderValue>>, IChildQuery
     {
-        public override void ResolveParameterInParentMode(IDataContext context)
-        {
-            // Executes as root or level 1 query.
-            var customer = (CustomerContext)context;
-            QueryParameter = new CustomerParameter
-            {
-                CustomerId = customer.CustomerId
-            };
-        }
-
-        public override void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult)
+        public void ResolveChildQueryParameter(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,9 +2,9 @@
 
 namespace Schemio.Tests.EntitySetup.Queries
 {
-    public class CustomerQuery : BaseQuery<CustomerParameter, CustomerResult>
+    public class CustomerQuery : BaseQuery<CustomerParameter, CustomerResult>, IRootQuery
     {
-        public override void ResolveParameterInParentMode(IDataContext context)
+        public void ResolveRootQueryParameter(IDataContext context)
         {
             // Executes as root or level 1 query.
             var customer = (CustomerContext)context.Entity;
@@ -13,10 +13,5 @@ public override void ResolveParameterInParentMode(IDataContext context)
                 CustomerId = customer.CustomerId
             };
         }
-
-        public override void ResolveParameterInChildMode(IDataContext context, IQueryResult parentQueryResult)
-        {
-            // Does not execute as child to any query.
-        }
     }
 }