bug fix

Author: HaikAsatryan

Readme.md

@@ -137,7 +137,6 @@ var pagedBooks = await dbContext.Books
 ```
 
 ```csharp
-
 **Gridify QueryModel**
 
 By default, `GridifyQueryModel` limits `PageSize` to 500 records. To remove this restriction, initialize it with

src/GridifyExtensions/Extensions/QueryableExtensions.cs

@@ -170,21 +170,21 @@ public static async Task<CursoredResponse<TDto>> FilterOrderAndGetCursoredAsync<
       CancellationToken cancellationToken = default)
       where TEntity : class
    {
-      var mapper = EntityGridifyMapperByType[typeof(TEntity)] as FilterMapper<TEntity>;
-
-      model.OrderBy ??= mapper!.GetDefaultOrderExpression();
 
-      query = query.ApplyFilteringAndOrdering(model, mapper);
+      var mapper = EntityGridifyMapperByType[typeof(TEntity)] as FilterMapper<TEntity>;
 
-      var totalCount = await query.CountAsync(cancellationToken);
+      var queryModel = model.ToGridifyQueryModel();
+      queryModel.OrderBy ??= mapper!.GetDefaultOrderExpression();
 
+      query = query.ApplyFilteringAndOrdering(queryModel, mapper);
+      
       var dtoQuery = query.Select(selectExpression);
 
       var data = await dtoQuery
                        .Take(model.PageSize)
                        .ToListAsync(cancellationToken);
 
-      return new CursoredResponse<TDto>(data, totalCount);
+      return new CursoredResponse<TDto>(data, model.PageSize);
    }
 
    public static Task<CursoredResponse<TEntity>> FilterOrderAndGetCursoredAsync<TEntity>(this IQueryable<TEntity> query,

src/GridifyExtensions/GridifyExtensions.csproj

@@ -8,15 +8,15 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.6.0</Version>
+        <Version>1.6.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>Cursored model has been added</PackageReleaseNotes>
+        <PackageReleaseNotes>Bug fix on query model</PackageReleaseNotes>
     </PropertyGroup>
-
+ 
     <ItemGroup>
         <None Include="..\..\pandatech.png" Pack="true" PackagePath="\" />
         <None Include="..\..\Readme.md" Pack="true" PackagePath="\" />

src/GridifyExtensions/Models/GridifyCursoredQueryModel.cs

@@ -3,7 +3,7 @@
 
 namespace GridifyExtensions.Models;
 
-public class GridifyCursoredQueryModel : GridifyQuery
+public class GridifyCursoredQueryModel
 {
    private int _pageSize = 20;
    public required int PageSize
@@ -21,15 +21,16 @@ public required int PageSize
          _pageSize = value;
       }
    }
-
+   
    public string? Filter { get; set; }
-    
-   public GridifyQueryModel ToGridifyQueryModel()
+   
+   internal GridifyQueryModel ToGridifyQueryModel()
    {
       return new GridifyQueryModel
       {
-         Page = 1,
+         Page = 0,
          PageSize = PageSize,
+         OrderBy = "",
          Filter = Filter
       };
    }

src/GridifyExtensions/Models/GridifyQueryModel.cs

@@ -3,9 +3,21 @@
 
 namespace GridifyExtensions.Models
 {
-    public class GridifyQueryModel(bool validatePageSize = true) : GridifyQuery
+    public class GridifyQueryModel : GridifyQuery
     {
-        public new required int Page
+       private bool _validatePageSize;
+
+       public GridifyQueryModel()
+       {
+          _validatePageSize = true;
+       }
+
+       public GridifyQueryModel(bool validatePageSize)
+       {
+          _validatePageSize = validatePageSize;
+       }
+
+       public new required int Page
         {
             get => base.Page;
             set
@@ -29,7 +41,7 @@ public class GridifyQueryModel(bool validatePageSize = true) : GridifyQuery
                     throw new GridifyException($"{nameof(PageSize)} should be positive number.");
                 }
 
-                if (value > 500 && validatePageSize)
+                if (value > 500 && _validatePageSize)
                 {
                     value = 500;
                 }
@@ -52,7 +64,7 @@ public class GridifyQueryModel(bool validatePageSize = true) : GridifyQuery
 
         public void SetMaxPageSize()
         {
-            validatePageSize = false;
+            _validatePageSize = false;
             PageSize = int.MaxValue;
         }
     }