better sorting api

Author: chrisK00

BugLab.Business/Extensions/IQueryableExtensions.cs

@@ -1,7 +1,8 @@
-using BugLab.Data;
-using BugLab.Data.Entities;
+using BugLab.Shared.Enums;
 using Microsoft.EntityFrameworkCore;
+using System;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -27,5 +28,17 @@ public static class IQueryableExtensions
 
  return (query, totalItems);
  }
+
+ public static IOrderedQueryable<T> SortBy<T, TKey>(this IQueryable<T> source,
+ Expression<Func<T, TKey>> sortOn, SortDirection sortDirection = SortDirection.Asc)
+ {
+ return sortDirection == SortDirection.Asc ? source.OrderBy(sortOn) : source.OrderByDescending(sortOn);
+ }
+
+ public static IOrderedQueryable<T> ThenSortBy<T, TKey>(this IOrderedQueryable<T> source,
+ Expression<Func<T, TKey>> sortOn, SortDirection sortDirection = SortDirection.Asc)
+ {
+ return sortDirection == SortDirection.Asc ? source.ThenBy(sortOn) : source.ThenByDescending(sortOn);
+ }
  }
 }

BugLab.Business/QueryHandlers/Bugs/GetBugsHandler.cs

@@ -1,5 +1,7 @@
-using BugLab.Business.Helpers;
+using BugLab.Business.Extensions;
+using BugLab.Business.Helpers;
 using BugLab.Data;
+using BugLab.Shared.Enums;
 using BugLab.Shared.Responses;
 using Mapster;
 using MediatR;
@@ -29,10 +31,12 @@ public async Task<PagedList<BugResponse>> Handle(GetBugsQuery request, Cancellat
 
  if (!string.IsNullOrWhiteSpace(request.Title)) query = query.Where(b => b.Title.Contains(request.Title));
 
- query = request.OrderBy switch
+ var defaultOrder = query.OrderBy(b => b.Status);
+
+ query = request.SortBy switch
  {
- "title" => query.OrderBy(b => b.Status).ThenBy(b => b.Title),
- _ => query.OrderBy(b => b.Status).ThenBy(b => b.Priority)
+ BugSortBy.Title => defaultOrder.ThenSortBy(b => b.Title, request.Sort),
+ _ => defaultOrder.ThenSortBy(b => b.Priority, request.Sort)
  };
 
  return await PagedList<BugResponse>.CreateAsync(query.ProjectToType<BugResponse>(),

BugLab.Shared/Enums/BugEnums.cs

@@ -14,4 +14,10 @@ public enum BugStatus
  InProgress,
  Resolved
  }
+
+ public enum BugSortBy
+ {
+ Priority,
+ Title
+ }
 }

BugLab.Shared/Enums/SortDirection.cs

@@ -0,0 +1,8 @@
+namespace BugLab.Shared.Enums
+{
+ public enum SortDirection
+ {
+ Asc,
+ Desc
+ }
+}

BugLab.Shared/QueryParams/BugParams.cs

@@ -1,11 +1,12 @@
-namespace BugLab.Shared.QueryParams
+using BugLab.Shared.Enums;
+
+namespace BugLab.Shared.QueryParams
 {
  public class BugParams : PaginationParams
  {
- private string _orderBy = "priority";
-
  public int? ProjectId { get; set; }
- public string OrderBy { get => _orderBy; set => _orderBy = value.ToLower(); }
+ public BugSortBy SortBy { get; set; }
+ public SortDirection Sort { get; set; }
  public string Title { get; set; }
  }
 }