3.2.5

Added Comparator

IEnumerableExtenders/Converters/FilterPandaBaseConverter.cs

@@ -0,0 +1,16 @@
+using BaseConverter;
+
+namespace PandaTech.IEnumerableFilters.Converters;
+
+public class FilterPandaBaseConverter: IConverter<string, long>
+{
+    public long ConvertTo(string from)
+    {
+        return PandaBaseConverter.Base36ToBase10(from)!.Value;
+    }
+
+    public string ConvertFrom(long from)
+    {
+        return PandaBaseConverter.Base10ToBase36(from)!;
+    }
+}

IEnumerableExtenders/Dto/DistinctColumnValuesResult.cs

@@ -1,4 +1,4 @@
-namespace PandaTech.IEnumerableFilters;
+namespace PandaTech.IEnumerableFilters.Dto;
 
 public class DistinctColumnValuesResult
 {

IEnumerableExtenders/EnumerableExtendersV3.cs

@@ -31,7 +31,7 @@ private static ComparisonTypesDefault GetComparisonTypesDefault(Type type)
     {
         if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(List<>))
             type = type.GetGenericArguments()[0];
-        
+
         if (type == typeof(int) || type == typeof(long) || type == typeof(decimal) || type == typeof(double) ||
             type == typeof(float))
             return ComparisonTypesDefault.Numeric;
@@ -252,7 +252,7 @@ public static List<object> DistinctColumnValues<TModel, TDto>(this IQueryable<TM
         totalCount = result.TotalCount;
         return result.Values;
     }
-    
+
     public static DistinctColumnValuesResult DistinctColumnValues<T, TDto>(this IQueryable<T> dbSet,
         List<FilterDto> filters,
         string columnName, int pageSize, int page) where T : class
@@ -786,11 +786,42 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
 
             if (targetProperty.PropertyType == typeof(Guid))
             {
-                throw new NotImplementedException();
+                var lambda = Lambda<Func<TModel, Guid>>(propertyAccess, parameter);
+
+                if (aggregate.AggregateType == AggregateType.UniqueCount)
+                {
+                    tasks.Add(
+                        new KeyTask<long>()
+                        {
+                            Key = key,
+                            Task = await dbSet.Select(lambda).Distinct()
+                                .LongCountAsync(cancellationToken: cancellationToken)
+                        }
+                    );
+                }
+                else
+                {
+                    tasks.Add(
+                        new KeyTask<Guid?>()
+                        {
+                            Key = key,
+                            Task = await Task.FromResult<Guid?>(null)
+                        }
+                    );
+                }
             }
 
             if (targetProperty.PropertyType.IsClass)
             {
+                //TODO: Sub property 
+
+                throw new NotImplementedException();
+            }
+
+            if (targetProperty.PropertyType == typeof(byte[]))
+            {
+                // TODO: check if is encrypted field.
+                // if so - build proper lamda
                 throw new NotImplementedException();
             }
 
@@ -817,7 +848,9 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
         });
     }
 
-    public static async Task<object?> AggregateAsync<TModel, TDto>(this IQueryable<TModel> dbSet, AggregateType aggregateType, string columnName, CancellationToken cancellationToken = default) where TModel : class
+    public static async Task<object?> AggregateAsync<TModel, TDto>(this IQueryable<TModel> dbSet,
+        AggregateType aggregateType, string columnName, CancellationToken cancellationToken = default)
+        where TModel : class
     {
         var aggregates = new List<AggregateDto>
         {
@@ -830,10 +863,10 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
 
         var result = await dbSet.GetAggregatesAsync<TModel, TDto>(aggregates, cancellationToken);
 
-        return result.First().Value;
+        return result.First();
     }
 
-    
+
     private abstract class ImTask
     {
         public string Key = null!;

IEnumerableExtenders/IEnumerableExtenders.csproj

@@ -5,7 +5,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>PandaTech.IEnumerableFilters</RootNamespace>
-        <Version>3.2.4</Version>
+        <Version>3.2.5</Version>
         <Authors>PandaTech</Authors>
         <Description>This NuGet helps with filtering tables.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-ienumerable-extenders-filters.git</RepositoryUrl>