Merge pull request #32 from PandaTechAM/development

Fix conversion issue related to ICollection and return enum without p…

src/EFCoreQueryMagic/EFCoreQueryMagic.csproj

@@ -8,7 +8,7 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>PandaTech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.0.11</Version>
+        <Version>1.0.12</Version>
         <PackageId>Pandatech.EFCoreQueryMagic</PackageId>
         <Title>Pandatech.EFCoreQueryMagic: Dynamic Query and Filter Generator for EF Core</Title>
         <Description>Unlock the full potential of your Entity Framework Core applications with Pandatech.EFCoreQueryMagic. This innovative package empowers developers to seamlessly create dynamic, complex queries and filters for SQL tables without diving deep into the intricacies of LINQ or manual query construction. Designed to enhance productivity and maintainability, EFCoreQueryMagic automates the translation of front-end filter requests into optimized, ready-to-execute EF Core queries. Embrace the magic of streamlined data retrieval and manipulation, and elevate your applications to new heights of efficiency and performance.</Description>

src/EFCoreQueryMagic/Extensions/DistinctColumnValuesExtensions.cs

@@ -140,16 +140,11 @@ private static DistinctColumnValues DistinctColumnValuesGeneral<TModel>(this IQu
                 .Where(x => (x as Enum)!.HasAttributeOfType<HideEnumValueAttribute>())
                 .ToList();
 
-            if (excludedValues.Count != 0)
-            {
-                queried = query3.ToList().Where(x => !excludedValues.Contains(x)).Skip(pageSize * (page - 1))
-                    .Take(pageSize).ToList();
-            }
-            else
-            {
-                queried = query3.ToList().Skip(pageSize * (page - 1))
-                    .Take(pageSize).ToList();
-            }
+            queried = query3.ToList()
+                .Where(x => !excludedValues.Contains(x))
+                // .Skip(pageSize * (page - 1))
+                // .Take(pageSize)
+                .ToList();
         }
         else
         {
@@ -277,16 +272,11 @@ private static async Task<DistinctColumnValues> DistinctColumnValuesGeneralAsync
                 .Where(x => (x as Enum)!.HasAttributeOfType<HideEnumValueAttribute>())
                 .ToList();
 
-            if (excludedValues.Count != 0)
-            {
-                queried = query3.ToList().Where(x => !excludedValues.Contains(x)).Skip(pageSize * (page - 1))
-                    .Take(pageSize).ToList();
-            }
-            else
-            {
-                queried = query3.ToList().Skip(pageSize * (page - 1))
-                    .Take(pageSize).ToList();
-            }
+            queried = query3.ToList()
+                .Where(x => !excludedValues.Contains(x))
+                // .Skip(pageSize * (page - 1))
+                // .Take(pageSize)
+                .ToList();
         }
         else
         {

src/EFCoreQueryMagic/Extensions/TypeExtensions.cs

@@ -24,15 +24,12 @@ public static Type GetCollectionType(this Type requestType)
         if (requestType.IsArray)
             return requestType.GetElementType()!;
 
-        if (requestType.IsGenericType && requestType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+        if (requestType.IsGenericType && requestType.GetGenericTypeDefinition().IsIEnumerable())
             return requestType.GetGenericArguments()[0];
 
         /*if (requestType.IsGenericType && requestType.GetGenericTypeDefinition() == typeof(Nullable<>))
             return requestType.GetGenericArguments()[0];*/
 
-        if (requestType.IsGenericType && requestType.GetGenericTypeDefinition() == typeof(List<>))
-            return requestType.GetGenericArguments()[0];
-
         return requestType;
     }
 

src/EFCoreQueryMagic/Helpers/PropertyHelper.cs

@@ -149,7 +149,7 @@ public static string GetPropertyLambda(MappedToPropertyAttribute propertyAttribu
     public static Type GetPropertyType(Type modelType, MappedToPropertyAttribute propertyAttribute)
     {
         if (propertyAttribute.Encrypted) return typeof(byte[]);
-
+        
         var propertyType = modelType.GetProperty(propertyAttribute.TargetPropertyName)?.PropertyType;
 
         if (propertyType is null)

test/EFCoreQueryMagic.Test/DistinctTests/ConverterTests/ListDtoTest.cs

@@ -57,7 +57,8 @@ public async Task TestDistinctColumnValuesAsync_WithValue()
         };
 
         var test = _context.Categories
-            .Include(x => x.Customers);
+            .Include(x => x.Customers)
+            .AsQueryable();
 
         var result = await test
             .DistinctColumnValuesAsync(qString.Filters, nameof(CategoryFilter.BirthDay), 20, 1, _context);