Merge pull request #53 from PandaTechAM/development

TotalCount bug fix on edge cases

Author: HaikAsatryan

src/GridifyExtensions/Extensions/QueryableExtensions.cs

@@ -95,14 +95,17 @@ public static async Task<PagedResponse<TDto>> FilterOrderAndGetPagedAsync<TEntit
       var mapper = RequireMapper<TEntity>();
       model.OrderBy ??= mapper.GetDefaultOrderExpression();
 
-      query = query.ApplyFilteringAndOrdering(model, mapper);
+      var filtered = query.ApplyFiltering(model, mapper);
 
-      var totalCount = await query.CountAsync(cancellationToken);
+      var totalCount = await filtered.CountAsync(cancellationToken);
 
-      var dtoQuery = query.Select(selectExpression)
-                          .ApplyPaging(model.Page, model.PageSize);
+      var ordered = filtered.ApplyOrdering(model, mapper);
 
-      var data = await dtoQuery.ToListAsync(cancellationToken);
+      var data = await ordered
+                       .Select(selectExpression)
+                       .ApplyPaging(model.Page, model.PageSize)
+                       .ToListAsync(cancellationToken);
+      
       return new PagedResponse<TDto>(data, model.Page, model.PageSize, totalCount);
    }
 

src/GridifyExtensions/GridifyExtensions.csproj

@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>2.1.0</Version>
+        <Version>2.1.1</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>New overloads has been added</PackageReleaseNotes>
+        <PackageReleaseNotes>TotalCount bug fix on edge cases</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>