Merge pull request #55 from PandaTechAM/development

ColumnDistinctValue Encryption Handling Upgrade

Author: HaikAsatryan

src/GridifyExtensions/DbContextFunction/PostgresFunctions.cs

@@ -163,25 +163,34 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
                             .Distinct()
                             .OrderBy(x => x)
                             .GetPagedAsync(model, cancellationToken);
-
          return result;
       }
 
-      var item = await query
-                       .ApplyFiltering(model, mapper)
-                       .Select(CreateSelector<TEntity>(model.PropertyName))
-                       .FirstOrDefaultAsync(cancellationToken);
+      // Encrypted path (scalar byte[] or IEnumerable<byte[]>), use mapper-driven selection
+      var encryptedQuery = query
+                           .ApplyFiltering(model, mapper)
+                           .ApplySelect(model.PropertyName, mapper); // IQueryable<object?>
 
-      if (item is null || string.IsNullOrEmpty(model.Filter))
+      // Keep original behavior: if no filter, return empty for the obsolete API
+      if (string.IsNullOrWhiteSpace(model.Filter))
+      {
          return new PagedResponse<object>([], 1, 1, 0);
+      }
 
-      if (decryptor is null)
+      var selected = await encryptedQuery.FirstOrDefaultAsync(cancellationToken);
+      if (selected is null) return new PagedResponse<object>([], 1, 1, 0);
+      if (decryptor is null) throw new KeyNotFoundException("Decryptor is required for encrypted properties.");
+
+      object? decrypted = selected switch
       {
-         throw new KeyNotFoundException("Decryptor is required for encrypted properties.");
-      }
+         byte[] b => decryptor(b),
+         IEnumerable<byte[]> bs => bs.FirstOrDefault() is byte[] fb ? decryptor(fb) : null,
+         _ => throw new InvalidCastException("Encrypted selector did not return a byte[] or IEnumerable<byte[]> value.")
+      };
 
-      var decrypted = decryptor((byte[])item);
-      return new PagedResponse<object>([decrypted], 1, 1, 1);
+      return decrypted is null
+         ? new PagedResponse<object>([], 1, 1, 0)
+         : new PagedResponse<object>([decrypted], 1, 1, 1);
    }
 
    public static async Task<CursoredResponse<object?>> ColumnDistinctValuesAsync<TEntity>(
@@ -208,10 +217,7 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
          {
             // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
             hasNull = await baseQuery.AnyAsync(x => x == null, cancellationToken);
-            if (hasNull && take > 0)
-            {
-               take -= 1;
-            }
+            if (hasNull && take > 0) take -= 1;
          }
 
          var result = await baseQuery
@@ -221,38 +227,33 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
                             .ToListAsync(cancellationToken);
 
          if (!filterEmpty || !hasNull)
-         {
             return new CursoredResponse<object?>(result!, model.PageSize);
-         }
 
          if (result.Count > 0 && ReferenceEquals(result[^1], null))
-         {
             result.RemoveAt(result.Count - 1);
-         }
 
          result.Insert(0, null!);
          return new CursoredResponse<object?>(result!, model.PageSize);
       }
 
-      // Encrypted (byte[]) path:
+      // Encrypted path (scalar byte[] or IEnumerable<byte[]>)
       var encryptedQuery = query
                            .ApplyFiltering(gridifyModel, mapper)
-                           .Select(CreateSelector<TEntity>(model.PropertyName));
+                           .ApplySelect(model.PropertyName, mapper); // IQueryable<object?>
 
       if (string.IsNullOrWhiteSpace(model.Filter))
       {
+         // EF-translatable: only checks if the projection itself is NULL in DB
          // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
          var hasNull = await encryptedQuery.AnyAsync(x => x == null, cancellationToken);
 
-         if (hasNull)
-            return new CursoredResponse<object?>([null],
-               model.PageSize);
-
-         return new CursoredResponse<object?>([], model.PageSize);
+         return hasNull
+            ? new CursoredResponse<object?>([null], model.PageSize)
+            : new CursoredResponse<object?>([], model.PageSize);
       }
 
-      var item = await encryptedQuery.FirstOrDefaultAsync(cancellationToken);
-      if (item is null)
+      var selected = await encryptedQuery.FirstOrDefaultAsync(cancellationToken);
+      if (selected is null)
       {
          return new CursoredResponse<object?>([], model.PageSize);
       }
@@ -262,13 +263,19 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
          throw new KeyNotFoundException("Decryptor is required for encrypted properties.");
       }
 
-      if (item is not byte[] bytes)
+      object? decrypted = selected switch
       {
-         throw new InvalidCastException("Encrypted selector did not return a byte[] value.");
-      }
+         byte[] b => decryptor(b),
+         IEnumerable<byte[]> bs => bs.FirstOrDefault() is
+            { } fb
+            ? decryptor(fb)
+            : null,
+         _ => throw new InvalidCastException("Encrypted selector did not return a byte[] or IEnumerable<byte[]> value.")
+      };
 
-      var decrypted = decryptor(bytes);
-      return new CursoredResponse<object?>([decrypted], model.PageSize);
+      return decrypted is null
+         ? new CursoredResponse<object?>([], model.PageSize)
+         : new CursoredResponse<object?>([decrypted], model.PageSize);
    }
 
    // ---------- Aggregation ----------

src/GridifyExtensions/Extensions/QueryableExtensions.cs

@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>2.1.2</Version>
+        <Version>2.1.3</Version>
         <PackageId>Pandatech.GridifyExtensions</PackageId>
         <Title>Pandatech.Gridify.Extensions</Title>
         <PackageTags>Pandatech, library, Gridify, Pagination, Filters</PackageTags>
         <Description>Pandatech.Gridify.Extensions simplifies and extends the functionality of the Gridify NuGet package. It provides additional extension methods and functionality to streamline data filtering and pagination, making it more intuitive and powerful to use in .NET applications. Our enhancements ensure more flexibility, reduce boilerplate code, and improve overall developer productivity when working with Gridify.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-gridify-extensions</RepositoryUrl>
-        <PackageReleaseNotes>ColumnDistinctValue null handling extended</PackageReleaseNotes>
+        <PackageReleaseNotes>ColumnDistinctValue Encryption Handling Upgrade</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>
@@ -23,7 +23,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Gridify.EntityFramework" Version="2.16.3" />
+        <PackageReference Include="Gridify.EntityFramework" Version="2.17.0" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8" />
     </ItemGroup>