InvokeRunMethod implementation

Author: ddidgdimitrov-infragistics

QueryExecutor.cs

@@ -34,15 +34,18 @@ public static object[] Run<TSource, TTarget>(this IQueryable<TSource> source, Qu
             return db is not null ? BuildQuery<TSource, TTarget>(db, source, query, mapper).ToArray() : Array.Empty<object>();
         }
 
-        public static MethodInfo? GetRunMethod(Type executorType, Type[] genericArgs)
+        public static object[] InvokeRunMethod(Type[] genericArgs, object?[] parameters)
         {
-            return executorType
+            var method = typeof(QueryExecutor)
                 .GetMethods(BindingFlags.Static | BindingFlags.Public)
                 .FirstOrDefault(m =>
                     m.Name == "Run" &&
                     m.IsGenericMethodDefinition &&
                     m.GetGenericArguments().Length == genericArgs.Length)
                 ?.MakeGenericMethod(genericArgs);
+
+            var result = method?.Invoke(null, parameters) ?? Array.Empty<object>();
+            return (object[])result;
         }
 
         private static IQueryable<object> BuildQuery<TSource, TTarget>(DbContext db, IQueryable<TSource> source, Query? query, IMapper? mapper = null)
@@ -242,11 +245,10 @@ private static IEnumerable<dynamic> RunSubquery(DbContext db, Query? query)
             var method = methods?.FirstOrDefault(m => m.CustomAttributes.Count() == 1);
             var dbSet = prop.GetValue(db) ?? throw new ValidationException($"DbSet property '{prop.Name}' is null in DbContext.");
             var genericType = prop.PropertyType.GetGenericArguments().FirstOrDefault() ?? throw new ValidationException($"Missing DbSet generic type");
+            var queryable = dbSet?.GetType().GetMethod("AsQueryable")?.Invoke(dbSet, null);
 
-            var genericMethod = GetRunMethod(typeof(QueryExecutor), [genericType]);
+            return InvokeRunMethod([genericType], [queryable, query]);
 
-            var queryable = dbSet?.GetType().GetMethod("AsQueryable")?.Invoke(dbSet, null);
-            return genericMethod?.Invoke(null, [queryable, query]) as IEnumerable<dynamic> ?? Array.Empty<dynamic>();
         }
 
         private static dynamic? ProjectField(object? obj, string field)

Services/QueryBuilderService.cs

@@ -30,16 +30,11 @@ public Dictionary<string, object[]> RunQuery(Query query)
 
             var dtoGenericType = resultProperty.PropertyType.GetElementType() ?? throw new ValidationException($"Missing Dto generic type");
 
-            var genericMethod = QueryExecutor.GetRunMethod(typeof(QueryExecutor), [dbGenericType, dtoGenericType]);
-
             var queryable = dbSet.GetType().GetMethod("AsQueryable")?.Invoke(dbSet, null)
                 ?? throw new InvalidOperationException($"DbSet '{propInfo.Name}' does not support AsQueryable().");
-            if ( genericMethod?.Invoke(null, [queryable, query, mapper]) is object[] propRes)
-            {
-                return new Dictionary<string, object[]> { { propInfo.Name.ToLowerInvariant(), propRes } };
-            }
 
-            throw new InvalidOperationException($"Unknown entity {t}");
+            var propRes = QueryExecutor.InvokeRunMethod([dbGenericType, dtoGenericType], [queryable, query, mapper]);
+            return new Dictionary<string, object[]> { { propInfo.Name.ToLowerInvariant(), propRes } };
         }
     }
 }