Refactoring methods

Author: AngeloDotNet

src/ClassLibrary.EFCore/Extensions/RepositoryExtensions.cs

@@ -0,0 +1,39 @@
+namespace ClassLibrary.EFCore.Extensions;
+
+public static class RepositoryExtensions
+{
+    /// <summary>
+    /// Paginates the queryable source by skipping the specified number of items and taking the specified page size.
+    /// </summary>
+    /// <typeparam name="TSource">The type of the elements of source.</typeparam>
+    /// <param name="source">The queryable source to paginate.</param>
+    /// <param name="page">The page number to retrieve.</param>
+    /// <param name="pageSize">The number of items per page.</param>
+    /// <returns>A queryable source that contains the paginated items.</returns>
+    public static IQueryable<TSource> Page<TSource>(this IQueryable<TSource> source, int page, int pageSize)
+                => source.Skip((page - 1) * pageSize).Take(pageSize);
+
+    /// <summary>
+    /// Orders the queryable source by the specified order expression in ascending or descending order.
+    /// </summary>
+    /// <typeparam name="TSource">The type of the elements of source.</typeparam>
+    /// <param name="sources">The queryable source to order.</param>
+    /// <param name="orderBy">The expression to order by.</param>
+    /// <param name="ascending">A boolean value indicating whether to order in ascending (true) or descending (false) order. Default is true.</param>
+    /// <returns>A queryable source that is ordered according to the specified expression and order direction.</returns>
+    public static IQueryable<TSource> OrderedByAscending<TSource>(this IQueryable<TSource> sources,
+        Expression<Func<TSource, dynamic>> orderBy, bool ascending = true)
+    {
+        return ascending switch
+        {
+            false => sources.OrderByDescending(orderBy),
+            _ => sources.OrderBy(orderBy)
+        };
+    }
+
+    //public static IQueryable<TSource> OrderByAscending<TSource>(this IQueryable<TSource> sources, Expression<Func<TSource, dynamic>> orderBy)
+    //    => sources.OrderBy(orderBy);
+
+    //public static IQueryable<TSource> OrderByDescending<TSource>(this IQueryable<TSource> sources, Expression<Func<TSource, dynamic>> orderBy)
+    //    => sources.OrderByDescending(orderBy);
+}

src/ClassLibrary.EFCore/Interfaces/IRepository.cs

@@ -56,16 +56,15 @@
     Task DeleteByIdAsync(TKey id);
 
     /// <summary>
-    /// Asynchronously gets a paginated list of entities.
+    /// Asynchronously gets a paginated list of entities that satisfy the given conditions.
     /// </summary>
     /// <param name="includes">A function to include related entities.</param>
-    /// <param name="conditionWhere">A condition to filter the entities.</param>
-    /// <param name="orderBy">A function to order the entities.</param>
-    /// <param name="orderType">The type of the order.</param>
-    /// <param name="pageIndex">The index of the page.</param>
-    /// <param name="pageSize">The size of the page.</param>
-    /// <returns>A task that represents the asynchronous operation. The task result contains a list of entities.</returns>
-    Task<List<TEntity>> GetPaginatedAsync(Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> includes,
-        Expression<Func<TEntity, bool>> conditionWhere, Expression<Func<TEntity, dynamic>> orderBy, string orderType,
-        int pageIndex, int pageSize);
+    /// <param name="conditionWhere">A function to test each element for a condition.</param>
+    /// <param name="orderBy">A function to order the elements.</param>
+    /// <param name="ascending">A boolean indicating whether the order is ascending.</param>
+    /// <param name="pageIndex">The index of the page to retrieve.</param>
+    /// <param name="pageSize">The size of the page to retrieve.</param>
+    /// <returns>A task that represents the asynchronous operation. The task result contains a list of entities that satisfy the conditions.</returns>
+    public Task<List<TEntity>> GetPaginatedAsync(Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> includes,
+        Expression<Func<TEntity, bool>> conditionWhere, Expression<Func<TEntity, dynamic>> orderBy, bool ascending, int pageIndex, int pageSize);
 }

src/ClassLibrary.EFCore/Repository.cs

@@ -1,4 +1,6 @@
-namespace ClassLibrary.EFCore;
+using ClassLibrary.EFCore.Extensions;
+
+namespace ClassLibrary.EFCore;
 
 /// <summary>
 /// Repository class for Entity Framework Core operations.
@@ -104,14 +106,14 @@ public async Task DeleteByIdAsync(TKey id)
     /// Asynchronously gets a paginated list of entities.
     /// </summary>
     /// <param name="includes">A function to include related entities.</param>
-    /// <param name="conditionWhere">A function to filter the entities.</param>
-    /// <param name="orderBy">A function to sort the entities.</param>
-    /// <param name="orderType">The type of the order ("ASC" for ascending, "DESC" for descending).</param>
-    /// <param name="pageIndex">The index of the page.</param>
-    /// <param name="pageSize">The size of the page.</param>
-    /// <returns>A task that represents the asynchronous operation. The task result contains a list of entities.</returns>
+    /// <param name="conditionWhere">A condition to filter the entities.</param>
+    /// <param name="orderBy">A function to order the entities.</param>
+    /// <param name="ascending">A boolean indicating whether the order is ascending.</param>
+    /// <param name="pageIndex">The index of the page to retrieve.</param>
+    /// <param name="pageSize">The size of the page to retrieve.</param>
+    /// <returns>A task that represents the asynchronous operation. The task result contains a list of paginated entities.</returns>
     public Task<List<TEntity>> GetPaginatedAsync(Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> includes,
-    Expression<Func<TEntity, bool>> conditionWhere, Expression<Func<TEntity, dynamic>> orderBy, string orderType, int pageIndex, int pageSize)
+        Expression<Func<TEntity, bool>> conditionWhere, Expression<Func<TEntity, dynamic>> orderBy, bool ascending, int pageIndex, int pageSize)
     {
         IQueryable<TEntity> query = DbContext.Set<TEntity>();
 
@@ -127,19 +129,9 @@ public Task<List<TEntity>> GetPaginatedAsync(Func<IQueryable<TEntity>, IIncludab
 
         if (orderBy != null)
         {
-            query = orderType switch
-            {
-                "ASC" => query.OrderBy(orderBy),
-                "DESC" => query.OrderByDescending(orderBy),
-                _ => query.OrderBy(orderBy),
-            };
-        }
-
-        if (pageIndex != 0 && pageSize != 0)
-        {
-            query = query.Skip((pageIndex - 1) * pageSize).Take(pageSize);
+            query = query.OrderedByAscending(orderBy, ascending);
         }
 
-        return query.AsNoTracking().ToListAsync();
+        return query.Page(pageIndex, pageSize).AsNoTracking().ToListAsync();
     }
 }