Base 36 not required

Author: HaikAsatryan

src/GridifyExtensions/Exceptions/GridifyException.cs

@@ -1,10 +1,3 @@
 namespace GridifyExtensions.Exceptions;
 
-public class GridifyException : Exception
-{
-    public GridifyException(string message)
-    : base(message)
-    {
-
-    }
-}
+public class GridifyException(string message) : Exception(message);

src/GridifyExtensions/Extensions/QueryableExtensions.cs

@@ -67,6 +67,7 @@ public static async Task<PagedResponse<TEntity>> GetPagedAsync<TEntity>(this IQu
             totalCount);
     }
 
+    [Obsolete("Use ColumnDistinctValueCursoredQueryModel instead.")]
     public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntity>(this IQueryable<TEntity> query,
         ColumnDistinctValueQueryModel model, Func<byte[], string>? decryptor = default,
         CancellationToken cancellationToken = default)
@@ -82,13 +83,18 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
                 .OrderBy(x => x)
                 .GetPagedAsync(model, cancellationToken);
 
-            if (mapper!.NeedBase36Conversion(model.PropertyName))
+            if (mapper.NeedBase36Conversion(model.PropertyName))
             {
+                if (string.IsNullOrWhiteSpace(PandaBaseConverter.Base36Chars))
+                {
+                    throw new Exception("Base36Chars should be set before using Base36 conversion.");
+                }
+
                 return result with
                 {
                     Data = result.Data
-                                 .Select(x => PandaBaseConverter.Base10ToBase36((long)x) as object)
-                                 .ToList()
+                        .Select(x => PandaBaseConverter.Base10ToBase36((long)x) as object)
+                        .ToList()
                 };
             }
 
@@ -109,7 +115,8 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
         return new PagedResponse<object>([decryptedItem], 1, 1, 1);
     }
 
-    public static async Task<CursoredResponse<object>> ColumnDistinctValuesAsync<TEntity>(this IQueryable<TEntity> query,
+    public static async Task<CursoredResponse<object>> ColumnDistinctValuesAsync<TEntity>(
+        this IQueryable<TEntity> query,
         ColumnDistinctValueCursoredQueryModel model, Func<byte[], string>? decryptor = default,
         CancellationToken cancellationToken = default)
     {
@@ -130,7 +137,7 @@ public static async Task<CursoredResponse<object>> ColumnDistinctValuesAsync<TEn
             if (mapper!.NeedBase36Conversion(model.PropertyName))
             {
                 result = result.Select(x => PandaBaseConverter.Base10ToBase36((long)x) as object)
-                               .ToList();
+                    .ToList();
             }
 
             return new CursoredResponse<object>(result, model.PageSize);
@@ -151,9 +158,9 @@ public static async Task<CursoredResponse<object>> ColumnDistinctValuesAsync<TEn
     }
 
     public static async Task<object> AggregateAsync<TEntity>(this IQueryable<TEntity> query,
-      AggregateQueryModel model,
-      CancellationToken cancellationToken = default)
-      where TEntity : class
+        AggregateQueryModel model,
+        CancellationToken cancellationToken = default)
+        where TEntity : class
     {
         var aggregateProperty = model.PropertyName;
 

src/GridifyExtensions/Extensions/WebApplicationBuilderExtensions.cs

@@ -8,10 +8,25 @@ namespace GridifyExtensions.Extensions;
 
 public static class WebApplicationBuilderExtensions
 {
-    public static WebApplicationBuilder AddGridify(this WebApplicationBuilder builder, string base36Chars, params Assembly[] assemblies)
+    public static WebApplicationBuilder AddGridify(this WebApplicationBuilder builder, string base36Chars,
+        params Assembly[] assemblies)
     {
         PandaBaseConverter.Base36Chars = base36Chars;
 
+        AddGridify(assemblies);
+
+        return builder;
+    }
+
+    public static WebApplicationBuilder AddGridify(this WebApplicationBuilder builder, params Assembly[] assemblies)
+    {
+        AddGridify(assemblies);
+
+        return builder;
+    }
+
+    private static void AddGridify(Assembly[] assemblies)
+    {
         if (assemblies.Length == 0)
         {
             assemblies = [Assembly.GetCallingAssembly()];
@@ -20,16 +35,16 @@ public static WebApplicationBuilder AddGridify(this WebApplicationBuilder builde
         GridifyGlobalConfiguration.EnableEntityFrameworkCompatibilityLayer();
 
         QueryableExtensions.EntityGridifyMapperByType =
-                                         assemblies.SelectMany(assembly => assembly
-                                                   .GetTypes()
-                                                   .Where(t => t.IsClass
-                                                           && !t.IsAbstract
-                                                            && t.BaseType != null
-                                                            && t.BaseType.IsGenericType
-                                                            && t.BaseType.GetGenericTypeDefinition() == typeof(FilterMapper<>))
-                                                   .Select(x => new KeyValuePair<Type, object>(x.BaseType!.GetGenericArguments()[0], Activator.CreateInstance(x)!)))
-                                                   .ToDictionary(x => x.Key, x => x.Value);
-
-        return builder;
+            assemblies.SelectMany(assembly => assembly
+                    .GetTypes()
+                    .Where(t => t.IsClass
+                                && !t.IsAbstract
+                                && t.BaseType != null
+                                && t.BaseType.IsGenericType
+                                && t.BaseType.GetGenericTypeDefinition() == typeof(FilterMapper<>))
+                    .Select(x =>
+                        new KeyValuePair<Type, object>(x.BaseType!.GetGenericArguments()[0],
+                            Activator.CreateInstance(x)!)))
+                .ToDictionary(x => x.Key, x => x.Value);
     }
-}
+}

src/GridifyExtensions/GridifyExtensions.csproj

@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.3.7</Version>
+        <Version>1.3.8</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>Readme updated</PackageReleaseNotes>
+        <PackageReleaseNotes>Base 36 not required</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>