ability to set default ordering

Author: MnatsakanMargaryan

src/GridifyExtensions/Abstractions/IOrderThenBy.cs

@@ -0,0 +1,7 @@
+namespace GridifyExtensions.Abstractions;
+
+public interface IOrderThenBy
+{
+    IOrderThenBy ThenBy(string column);
+    IOrderThenBy ThenByDescending(string column);
+}

src/GridifyExtensions/Extensions/QueryableExtensions.cs

@@ -17,6 +17,8 @@ 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);
 
@@ -48,6 +50,8 @@ public static IQueryable<TEntity> ApplyOrder<TEntity>(this IQueryable<TEntity> q
     {
         var mapper = EntityGridifyMapperByType[typeof(TEntity)] as FilterMapper<TEntity>;
 
+        model.OrderBy ??= mapper!.GetDefaultOrderExpression();
+
         return query.AsNoTracking().ApplyOrdering(model, mapper);
     }
 
@@ -86,7 +90,6 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
                 return new PagedResponse<object>(result, model.Page, model.PageSize, result.Count);
             }
 
-
             return await query
                 .ApplyFiltering(model, mapper)
                 .ApplySelect(model.PropertyName, mapper)
@@ -109,15 +112,6 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
         return new PagedResponse<object>([decryptedItem], 1, 1, 1);
     }
 
-    private static Expression<Func<T, object>> CreateSelector<T>(string propertyName)
-    {
-        var parameter = Expression.Parameter(typeof(T), "x");
-        var property = Expression.Property(parameter, propertyName);
-        var converted = Expression.Convert(property, typeof(object));
-
-        return Expression.Lambda<Func<T, object>>(converted, parameter);
-    }
-
     public static async Task<object> AggregateAsync<TEntity>(this IQueryable<TEntity> query,
       AggregateQueryModel model,
       CancellationToken cancellationToken = default)
@@ -155,4 +149,13 @@ public static IEnumerable<MappingModel> GetMappings<TEntity>()
                     : x.To.Body.Type.Name,
         });
     }
+
+    private static Expression<Func<T, object>> CreateSelector<T>(string propertyName)
+    {
+        var parameter = Expression.Parameter(typeof(T), "x");
+        var property = Expression.Property(parameter, propertyName);
+        var converted = Expression.Convert(property, typeof(object));
+
+        return Expression.Lambda<Func<T, object>>(converted, parameter);
+    }
 }

src/GridifyExtensions/GridifyExtensions.csproj

@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.2.2</Version>
+        <Version>1.3.0</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>Ability to set encrypted columns or array type columns in mapper</PackageReleaseNotes>
+        <PackageReleaseNotes>Ability to set default ordering using fluent API.</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

src/GridifyExtensions/Models/FilterMapper.cs

@@ -1,15 +1,49 @@
 using Gridify;
+using GridifyExtensions.Abstractions;
 using System.Linq.Expressions;
 
 namespace GridifyExtensions.Models;
 
-public class FilterMapper<T> : GridifyMapper<T>
+
+public class FilterMapper<T> : GridifyMapper<T>, IOrderThenBy
 {
-    private HashSet<string> _encryptedColumns { get; set; } = [];
-    private HashSet<string> _arrayColumns { get; set; } = [];
+    internal const string Desc = " desc";
+    internal const string Separator = ", ";
+
+    private string _defaultOrderExpression = string.Empty;
+    private readonly HashSet<string> _encryptedColumns = [];
+    private readonly HashSet<string> _arrayColumns = [];
+
+    internal bool IsArray(string column) => _arrayColumns.Contains(column);
+    internal bool IsEncrypted(string column) => _encryptedColumns.Contains(column);
 
-    public bool IsArray(string column) => _arrayColumns.Contains(column);
-    public bool IsEncrypted(string column) => _encryptedColumns.Contains(column);
+    internal string GetDefaultOrderExpression() => _defaultOrderExpression;
+
+    public IOrderThenBy AddDefaultOrderBy(string column)
+    {
+        _defaultOrderExpression = column;
+        return this;
+    }
+
+    public IOrderThenBy AddDefaultOrderByDescending(string column)
+    {
+        _defaultOrderExpression = column + Desc;
+        return this;
+    }
+
+    IOrderThenBy IOrderThenBy.ThenBy(string column)
+    {
+        _defaultOrderExpression += Separator + column;
+
+        return this;
+    }
+
+    IOrderThenBy IOrderThenBy.ThenByDescending(string column)
+    {
+        _defaultOrderExpression += Separator + column + Desc;
+
+        return this;
+    }
 
     public IGridifyMapper<T> AddMap(string from,
                                         Expression<Func<T, object?>> to,