Merge remote-tracking branch 'origin/development' into development

Author: HaikAsatryan

Readme.md

@@ -105,15 +105,15 @@ var pagedResponse = await dbContext.Books
 
 Use ColumnDistinctValuesAsync to get distinct values of a specific column:
 ```csharp
-public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntity>(
-    this IQueryable<TEntity> query, ColumnDistinctValueQueryModel model,
+public static async Task<CursoredResponse<object>> ColumnDistinctValuesAsync<TEntity>(
+    this IQueryable<TEntity> query, ColumnDistinctValueCursoredQueryModel model,
     Func<byte[], string>? decryptor = default, CancellationToken cancellationToken = default)
 
 ```
 Example Usage:
 ```csharp
 var distinctValues = await dbContext.Books
-    .ColumnDistinctValuesAsync(new ColumnDistinctValueQueryModel { PropertyName = "Title" }, cancellationToken);
+    .ColumnDistinctValuesAsync(new ColumnDistinctValueCursoredQueryModel { PropertyName = "Title", PageSize=50, Filter="Title>abc" }, cancellationToken);
 ```
 
 Use AggregateAsync to perform aggregation operations on your data:

src/GridifyExtensions/Extensions/QueryableExtensions.cs

@@ -1,8 +1,8 @@
-using Gridify;
+using BaseConverter;
+using Gridify;
 using GridifyExtensions.Enums;
 using GridifyExtensions.Models;
 using Microsoft.EntityFrameworkCore;
-using System.Collections;
 using System.Linq.Expressions;
 
 namespace GridifyExtensions.Extensions;
@@ -17,7 +17,7 @@ public static async Task<PagedResponse<TDto>> FilterOrderAndGetPagedAsync<TEntit
         where TEntity : class
     {
         var mapper = EntityGridifyMapperByType[typeof(TEntity)] as FilterMapper<TEntity>;
-        
+
         model.OrderBy ??= mapper!.GetDefaultOrderExpression();
 
         query = query.ApplyFilteringAndOrdering(model, mapper);
@@ -75,13 +75,24 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
 
         if (!mapper!.IsEncrypted(model.PropertyName))
         {
-
-            return await query
+            var result = await query
                 .ApplyFiltering(model, mapper)
                 .ApplySelect(model.PropertyName, mapper)
                 .Distinct()
-                .OrderBy(x => x ?? 0)
+                .OrderBy(x => x)
                 .GetPagedAsync(model, cancellationToken);
+
+            if (mapper!.NeedBase36Conversion(model.PropertyName))
+            {
+                return result with
+                {
+                    Data = result.Data
+                                 .Select(x => PandaBaseConverter.Base10ToBase36((long)x) as object)
+                                 .ToList()
+                };
+            }
+
+            return result;
         }
 
         var item = await query
@@ -97,25 +108,31 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
         var decryptedItem = decryptor!((byte[])item);
         return new PagedResponse<object>([decryptedItem], 1, 1, 1);
     }
-    
+
     public static async Task<CursoredResponse<object>> ColumnDistinctValuesAsync<TEntity>(this IQueryable<TEntity> query,
         ColumnDistinctValueCursoredQueryModel model, Func<byte[], string>? decryptor = default,
         CancellationToken cancellationToken = default)
     {
         var mapper = EntityGridifyMapperByType[typeof(TEntity)] as FilterMapper<TEntity>;
 
-        var gridifyModel = ColumnDistinctValueCursoredQueryModel.ToGridifyQueryModel(model);
+        var gridifyModel = model.ToGridifyQueryModel();
 
         if (!mapper!.IsEncrypted(model.PropertyName))
         {
-
             var result = await query
                 .ApplyFiltering(gridifyModel, mapper)
                 .ApplySelect(model.PropertyName, mapper)
                 .Distinct()
-                .OrderBy(x => x ?? 0)
+                .OrderBy(x => x)
+                .Take(model.PageSize)
                 .ToListAsync(cancellationToken: cancellationToken);
-            
+
+            if (mapper!.NeedBase36Conversion(model.PropertyName))
+            {
+                result = result.Select(x => PandaBaseConverter.Base10ToBase36((long)x) as object)
+                               .ToList();
+            }
+
             return new CursoredResponse<object>(result, model.PageSize);
         }
 

src/GridifyExtensions/Extensions/WebApplicationBuilderExtensions.cs

@@ -1,4 +1,5 @@
-using Gridify;
+using BaseConverter;
+using Gridify;
 using GridifyExtensions.Models;
 using Microsoft.AspNetCore.Builder;
 using System.Reflection;
@@ -7,8 +8,10 @@ namespace GridifyExtensions.Extensions;
 
 public static class WebApplicationBuilderExtensions
 {
-    public static WebApplicationBuilder AddGridify(this WebApplicationBuilder builder, params Assembly[] assemblies)
+    public static WebApplicationBuilder AddGridify(this WebApplicationBuilder builder, string base36Chars, params Assembly[] assemblies)
     {
+        PandaBaseConverter.Base36Chars = base36Chars;
+
         if (assemblies.Length == 0)
         {
             assemblies = [Assembly.GetCallingAssembly()];

src/GridifyExtensions/GridifyExtensions.csproj

@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.3.2</Version>
+        <Version>1.3.7</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>Cursored implementation for column distinct values</PackageReleaseNotes>
+        <PackageReleaseNotes>Readme updated</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

src/GridifyExtensions/Models/ColumnDistinctValueCursoredQueryModel.cs

@@ -23,15 +23,15 @@ public required int PageSize
     }
 
     public required string PropertyName { get; set; }
-    public string Filter { get; set; } = null!;
+    public string? Filter { get; set; }
 
-    public static GridifyQueryModel ToGridifyQueryModel(ColumnDistinctValueCursoredQueryModel model)
+    public GridifyQueryModel ToGridifyQueryModel()
     {
         return new GridifyQueryModel
         {
             Page = 1,
-            PageSize = model.PageSize,
-            Filter = model.Filter
+            PageSize = PageSize,
+            Filter = Filter
         };
     }
 }

src/GridifyExtensions/Models/FilterMapper.cs

@@ -4,17 +4,16 @@
 
 namespace GridifyExtensions.Models;
 
-
 public class FilterMapper<T> : GridifyMapper<T>, IOrderThenBy
 {
     internal const string Desc = " desc";
     internal const string Separator = ", ";
 
     private string _defaultOrderExpression = string.Empty;
     private readonly HashSet<string> _encryptedColumns = [];
-    private readonly HashSet<string> _arrayColumns = [];
+    private readonly HashSet<string> _needBase36ConversionColumns = [];
 
-    internal bool IsArray(string column) => _arrayColumns.Contains(column);
+    internal bool NeedBase36Conversion(string column) => _needBase36ConversionColumns.Contains(column);
     internal bool IsEncrypted(string column) => _encryptedColumns.Contains(column);
 
     internal string GetDefaultOrderExpression() => _defaultOrderExpression;
@@ -50,16 +49,16 @@ public IGridifyMapper<T> AddMap(string from,
                                         Func<string, object>? convertor = null,
                                         bool overrideIfExists = true,
                                         bool isEncrypted = false,
-                                        bool isArray = false)
+                                        bool needBase36Conversion = false)
     {
         if (isEncrypted)
         {
             _encryptedColumns.Add(from);
         }
 
-        if (isArray)
+        if (needBase36Conversion)
         {
-            _arrayColumns.Add(from);
+            _needBase36ConversionColumns.Add(from);
         }
 
         return base.AddMap(from, to, convertor, overrideIfExists);
@@ -70,16 +69,16 @@ public IGridifyMapper<T> AddMap(string from,
         Func<string, object>? convertor = null,
         bool overrideIfExists = true,
         bool isEncrypted = false,
-        bool isArray = false)
+        bool needBase36Conversion = false)
     {
         if (isEncrypted)
         {
             _encryptedColumns.Add(from);
         }
 
-        if (isArray)
+        if (needBase36Conversion)
         {
-            _arrayColumns.Add(from);
+            _needBase36ConversionColumns.Add(from);
         }
 
         return base.AddMap(from, to, convertor, overrideIfExists);

test/GridifyExtensions.Demo/Program.cs

@@ -2,6 +2,7 @@
 using System.Reflection;
 using GridifyExtensions.Models;
 using Microsoft.AspNetCore.Mvc;
+using BaseConverter;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -10,7 +11,7 @@
 builder.Services.AddSwaggerGen();
 builder.Services.AddControllers();
 
-builder.AddGridify(Assembly.GetExecutingAssembly());
+builder.AddGridify(PandaBaseConverter.Base36Chars, Assembly.GetExecutingAssembly());
 
 var app = builder.Build();