From 457e3b411ed15ccf2131faaaacdbc82b13598c0f Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 24 Nov 2025 11:04:53 +0530
Subject: [PATCH] Updated the dynamic sorting in collection controller

---
 .../Controllers/CollectionController.cs       | 37 ++++---------------
 .../Extensions/QueryableExtensions.cs         | 22 ++++++++---
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/CollectionController.cs b/Marco.Pms.Services/Controllers/CollectionController.cs
index b760ac4..61b18b4 100644
--- a/Marco.Pms.Services/Controllers/CollectionController.cs
+++ b/Marco.Pms.Services/Controllers/CollectionController.cs
@@ -24,6 +24,7 @@ using Microsoft.EntityFrameworkCore;
 using MongoDB.Driver;
 using System.Text.Json;
 using Document = Marco.Pms.Model.DocumentManager.Document;
+using Invoice = Marco.Pms.Model.Collection.Invoice;
 
 namespace Marco.Pms.Services.Controllers
 {
@@ -165,34 +166,21 @@ namespace Marco.Pms.Services.Controllers
                     _logger.LogDebug("Project filter applied: {ProjectId}", projectId.Value);
                 }
 
-                if (advanceFilter != null)
+                query = query.ApplyCustomFilters(advanceFilter, "InvoiceDate");
+
+                if (advanceFilter?.SearchFilters != null)
                 {
-                    query = query.ApplyCustomFilters(advanceFilter);
-                    if (advanceFilter.SearchFilters != null)
+                    var invoiceSearchFilter = advanceFilter.SearchFilters.Where(f => f.Column != "ProjectName").ToList();
+                    if (invoiceSearchFilter.Any())
                     {
-                        var invoiceSearchFilter = advanceFilter.SearchFilters.Where(f => f.Column != "ProjectName").ToList();
-                        if (invoiceSearchFilter.Any())
-                        {
-                            query = query.ApplySearchFilters(invoiceSearchFilter);
-                        }
+                        query = query.ApplySearchFilters(invoiceSearchFilter);
                     }
                 }
-                var hasSortFilters = advanceFilter?.SortFilters?.Any() ?? false;
-                if (!hasSortFilters)
-                {
-                    query = query.OrderByDescending(i => i.InvoiceDate);
-                }
 
                 var totalItems = await query.CountAsync();
+                var totalPages = (int)Math.Ceiling((double)totalItems / pageSize);
                 _logger.LogInfo("Total invoices found: {TotalItems}", totalItems);
 
-                string groupByColumn = "ProjectId";
-                if (!string.IsNullOrWhiteSpace(advanceFilter?.GroupByColumn))
-                {
-                    groupByColumn = advanceFilter.GroupByColumn;
-                }
-                query = query.ApplyGroupByFilters(groupByColumn);
-
                 var pagedInvoices = await query
                     .Skip((pageNumber - 1) * pageSize)
                     .Take(pageSize)
@@ -241,15 +229,6 @@ namespace Marco.Pms.Services.Controllers
                     results.Add(vm);
                 }
 
-                var totalPages = (int)Math.Ceiling((double)totalItems / pageSize);
-                //string groupByColumn = "Project";
-                //if (!string.IsNullOrWhiteSpace(advanceFilter?.GroupByColumn))
-                //{
-                //    groupByColumn = advanceFilter.GroupByColumn;
-                //}
-                //var resultQuery = results.AsQueryable();
-                //object finalResponseData = resultQuery.ApplyGroupByFilters(groupByColumn);
-
                 _logger.LogInfo("Returning {Count} invoices (page {PageNumber} of {TotalPages}).", results.Count, pageNumber, totalPages);
 
                 return Ok(ApiResponse<object>.SuccessResponse(
diff --git a/Marco.Pms.Services/Extensions/QueryableExtensions.cs b/Marco.Pms.Services/Extensions/QueryableExtensions.cs
index 6efea99..f0e8277 100644
--- a/Marco.Pms.Services/Extensions/QueryableExtensions.cs
+++ b/Marco.Pms.Services/Extensions/QueryableExtensions.cs
@@ -8,10 +8,10 @@ namespace Marco.Pms.Services.Extensions
     /// </summary>
     public static class QueryableExtensions
     {
-        public static IQueryable<T> ApplyCustomFilters<T>(this IQueryable<T> query, AdvanceFilter filter)
+        public static IQueryable<T> ApplyCustomFilters<T>(this IQueryable<T> query, AdvanceFilter? filter, string defaultSortColumn)
         {
             // 1. Apply Advanced Filters (Arithmetic/Logic)
-            if (filter.AdvanceFilters != null && filter.AdvanceFilters.Any())
+            if (filter?.AdvanceFilters != null && filter.AdvanceFilters.Any())
             {
                 foreach (var advanceFilter in filter.AdvanceFilters)
                 {
@@ -41,7 +41,7 @@ namespace Marco.Pms.Services.Extensions
             }
 
             // 2. Apply Sorting
-            if (filter.SortFilters != null && filter.SortFilters.Any())
+            if (filter?.SortFilters != null && filter.SortFilters.Any())
             {
                 // Build a comma-separated sort string: "Column1 desc, Column2 asc"
                 var sortExpressions = new List<string>();
@@ -53,7 +53,19 @@ namespace Marco.Pms.Services.Extensions
 
                 query = query.OrderBy(string.Join(", ", sortExpressions));
             }
+            else
+            {
+                // Default sorting
+                query = query.OrderBy($"{defaultSortColumn} desc");
+            }
 
+
+            // 3.Apply GroupBy
+            if (!string.IsNullOrEmpty(filter?.GroupByColumn))
+            {
+                query.GroupBy(filter.GroupByColumn, "it")
+                .Select("new (Key, it as Items)"); // Reshape to { Key: "Value", Items: [...] }
+            }
             return query;
         }
 
@@ -76,9 +88,9 @@ namespace Marco.Pms.Services.Extensions
 
         public static IQueryable<T> ApplyGroupByFilters<T>(this IQueryable<T> query, string groupByColumn)
         {
-            query.GroupBy(groupByColumn).Select("new (Key, ToList() as Items)"); // Reshape to { Key: "Value", Items: [...] }
+            query.GroupBy(groupByColumn, "it")
+                .Select("new (Key, it as Items)"); // Reshape to { Key: "Value", Items: [...] }
             return query;
         }
-
     }
 }