minor fix

suxrobGM · Dec 9, 2023 · db9d0b2 · db9d0b2
1 parent d26e188
commit db9d0b2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Core/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsHandler.cs b/src/Core/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsHandler.cs
@@ -34,14 +34,14 @@ public GetLoadsHandler(ITenantUnityOfWork tenantUow)
         {
             baseQuery = baseQuery.Where(i => i.AssignedTruckId == req.TruckId);
         }
-        if (req.StartDate.HasValue && req.EndDate.HasValue)
+        if (req is { StartDate: not null, EndDate: not null })
         {
             baseQuery = baseQuery.Where(i => i.DispatchedDate >= req.StartDate && 
                                              i.DispatchedDate <= req.EndDate);
         }
         if (!req.LoadAllPages)
         {
-            baseQuery = baseQuery.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize);
+            baseQuery = baseQuery.ApplyPaging(req.Page, req.PageSize);
         }
 
         var loads = baseQuery.Select(i => i.ToDto()).ToArray();