Encrypted distincts

PandaTechAM · Jan 16, 2024 · 5b494bd · 5b494bd
1 parent b1c06e4
commit 5b494bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/IEnumerableExtenders/Extensions/DistinctColumnValuesExtensions.cs b/IEnumerableExtenders/Extensions/DistinctColumnValuesExtensions.cs
@@ -61,8 +61,8 @@ public static DistinctColumnValuesResult DistinctColumnValues<TModel>(this IQuer
             throw new PropertyNotFoundException($"Property {columnName} not found in {typeof(TModel).Name}");
 
         var mappedToPropertyAttribute = targetProperty.GetCustomAttribute<MappedToPropertyAttribute>()!;
-        if (mappedToPropertyAttribute.Encrypted)
-            return new();
+        /*if (mappedToPropertyAttribute.Encrypted)
+            return new();*/
 
         var propertyType = PropertyHelper.GetPropertyType(typeof(TModel), mappedToPropertyAttribute);
 
@@ -86,7 +86,7 @@ public static DistinctColumnValuesResult DistinctColumnValues<TModel>(this IQuer
 
         var property = PropertyHelper.GetPropertyLambda(mappedToPropertyAttribute);
 
-        if (propertyType.IsIEnumerable())
+        if (propertyType.IsIEnumerable() && !mappedToPropertyAttribute.Encrypted)
         {
             query2 = (IQueryable<object>)query.Select(property).SelectMany("x => x");
         }
@@ -137,8 +137,8 @@ public static async Task<DistinctColumnValuesResult> DistinctColumnValuesAsync<T
             throw new PropertyNotFoundException($"Property {columnName} not found in {typeof(TModel).Name}");
 
         var mappedToPropertyAttribute = targetProperty.GetCustomAttribute<MappedToPropertyAttribute>()!;
-        if (mappedToPropertyAttribute.Encrypted)
-            return new();
+        /*if (mappedToPropertyAttribute.Encrypted)
+            return new();*/
 
         var propertyType = PropertyHelper.GetPropertyType(typeof(TModel), mappedToPropertyAttribute);
 

diff --git a/IEnumerableExtenders/Extensions/FilterExtensions.cs b/IEnumerableExtenders/Extensions/FilterExtensions.cs
@@ -32,7 +32,7 @@ public static IQueryable<TModel> ApplyFilters<TModel>(this IQueryable<TModel> db
 
 
             var targetType = PropertyHelper.GetPropertyType(typeof(TModel), mappedToPropertyAttribute);
-            if (targetType.IsIEnumerable() && targetType != typeof(byte[]))
+            if (targetType.IsIEnumerable() && !mappedToPropertyAttribute.Encrypted)
                 targetType = targetType.GetCollectionType();
             var method = typeof(PropertyHelper).GetMethod("GetValues")!.MakeGenericMethod(targetType);
             var values = method.Invoke(null, [filter, mappedToPropertyAttribute]);

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