diff --git a/src/Application/Borrows/Queries/GetAllBorrowRequestsPaginated.cs b/src/Application/Borrows/Queries/GetAllBorrowRequestsPaginated.cs index 5e30d3ec..c78f674a 100644 --- a/src/Application/Borrows/Queries/GetAllBorrowRequestsPaginated.cs +++ b/src/Application/Borrows/Queries/GetAllBorrowRequestsPaginated.cs @@ -97,15 +97,16 @@ public async Task> Handle(Query request, var sortOrder = request.SortOrder ?? "asc"; var pageNumber = request.Page is null or <= 0 ? 1 : request.Page; var sizeNumber = request.Size is null or <= 0 ? 5 : request.Size; - + + var count = await borrows.CountAsync(cancellationToken); var list = await borrows .OrderByCustom(sortBy, sortOrder) .Paginate(pageNumber.Value, sizeNumber.Value) .ToListAsync(cancellationToken); - + var result = _mapper.Map>(list); - return new PaginatedList(result, result.Count, pageNumber.Value, sizeNumber.Value); + return new PaginatedList(result, count, pageNumber.Value, sizeNumber.Value); } } } \ No newline at end of file diff --git a/src/Application/Documents/Queries/GetAllDocumentsPaginated.cs b/src/Application/Documents/Queries/GetAllDocumentsPaginated.cs index de7c13cf..fd5c6a0b 100644 --- a/src/Application/Documents/Queries/GetAllDocumentsPaginated.cs +++ b/src/Application/Documents/Queries/GetAllDocumentsPaginated.cs @@ -132,6 +132,7 @@ public async Task> Handle(Query request, var pageNumber = request.Page is null or <= 0 ? 1 : request.Page; var sizeNumber = request.Size is null or <= 0 ? 5 : request.Size; + var count = await documents.CountAsync(cancellationToken); var list = await documents .OrderByCustom(sortBy, sortOrder) .Paginate(pageNumber.Value, sizeNumber.Value) @@ -139,7 +140,7 @@ public async Task> Handle(Query request, var result = _mapper.Map>(list); - return new PaginatedList(result, result.Count, pageNumber.Value, sizeNumber.Value); + return new PaginatedList(result, count, pageNumber.Value, sizeNumber.Value); } } } \ No newline at end of file diff --git a/src/Application/Folders/Queries/GetAllFoldersPaginated.cs b/src/Application/Folders/Queries/GetAllFoldersPaginated.cs index f98ce633..530d039f 100644 --- a/src/Application/Folders/Queries/GetAllFoldersPaginated.cs +++ b/src/Application/Folders/Queries/GetAllFoldersPaginated.cs @@ -104,6 +104,7 @@ public async Task> Handle(Query request, CancellationTo var pageNumber = request.Page is null or <= 0 ? 1 : request.Page; var sizeNumber = request.Size is null or <= 0 ? 5 : request.Size; + var count = await folders.CountAsync(cancellationToken); var list = await folders .OrderByCustom(sortBy, sortOrder) .Paginate(pageNumber.Value, sizeNumber.Value) @@ -111,7 +112,7 @@ public async Task> Handle(Query request, CancellationTo var result = _mapper.Map>(list); - return new PaginatedList(result, result.Count, pageNumber.Value, sizeNumber.Value); + return new PaginatedList(result, count, pageNumber.Value, sizeNumber.Value); } } } \ No newline at end of file diff --git a/src/Application/Lockers/Queries/GetAllLockersPaginated.cs b/src/Application/Lockers/Queries/GetAllLockersPaginated.cs index 5e2a93ff..3e08e523 100644 --- a/src/Application/Lockers/Queries/GetAllLockersPaginated.cs +++ b/src/Application/Lockers/Queries/GetAllLockersPaginated.cs @@ -60,6 +60,7 @@ public async Task> Handle(Query request, CancellationTo var pageNumber = request.Page is null or <= 0 ? 1 : request.Page; var sizeNumber = request.Size is null or <= 0 ? 5 : request.Size; + var count = await lockers.CountAsync(cancellationToken); var list = await lockers .OrderByCustom(sortBy, sortOrder) .Paginate(pageNumber.Value, sizeNumber.Value) @@ -67,7 +68,7 @@ public async Task> Handle(Query request, CancellationTo var result = _mapper.Map>(list); - return new PaginatedList(result, result.Count, pageNumber.Value, sizeNumber.Value); + return new PaginatedList(result, count, pageNumber.Value, sizeNumber.Value); } } } \ No newline at end of file diff --git a/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs b/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs index 174b8dc9..ff89fe2b 100644 --- a/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs +++ b/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs @@ -54,6 +54,7 @@ public async Task> Handle(Query request, CancellationToke var pageNumber = request.Page is null or <= 0 ? 1 : request.Page; var sizeNumber = request.Size is null or <= 0 ? 5 : request.Size; + var count = await rooms.CountAsync(cancellationToken); var list = await rooms .OrderByCustom(sortBy, sortOrder) .Paginate(pageNumber.Value, sizeNumber.Value) @@ -61,7 +62,7 @@ public async Task> Handle(Query request, CancellationToke var result = _mapper.Map>(list); - return new PaginatedList(result, result.Count, pageNumber.Value, sizeNumber.Value); + return new PaginatedList(result, count, pageNumber.Value, sizeNumber.Value); } } } \ No newline at end of file diff --git a/src/Application/Staffs/Queries/GetAllStaffsPaginated.cs b/src/Application/Staffs/Queries/GetAllStaffsPaginated.cs index 8ad79883..61f62046 100644 --- a/src/Application/Staffs/Queries/GetAllStaffsPaginated.cs +++ b/src/Application/Staffs/Queries/GetAllStaffsPaginated.cs @@ -55,6 +55,7 @@ public async Task> Handle(Query request, CancellationTok var pageNumber = request.Page is null or <= 0 ? 1 : request.Page; var sizeNumber = request.Size is null or <= 0 ? 5 : request.Size; + var count = await staffs.CountAsync(cancellationToken); var list = await staffs .OrderByCustom(sortBy, sortOrder) .Paginate(pageNumber.Value,sizeNumber.Value) @@ -62,7 +63,7 @@ public async Task> Handle(Query request, CancellationTok var result = _mapper.Map>(list); - return new PaginatedList(result, result.Count, pageNumber.Value, sizeNumber.Value); + return new PaginatedList(result, count, pageNumber.Value, sizeNumber.Value); } } } \ No newline at end of file diff --git a/src/Application/Users/Queries/GetAllUsersPaginated.cs b/src/Application/Users/Queries/GetAllUsersPaginated.cs index e68b7f20..f8613324 100644 --- a/src/Application/Users/Queries/GetAllUsersPaginated.cs +++ b/src/Application/Users/Queries/GetAllUsersPaginated.cs @@ -59,6 +59,7 @@ public async Task> Handle(Query request, CancellationToke var pageNumber = request.Page is null or <= 0 ? 1 : request.Page; var sizeNumber = request.Size is null or <= 0 ? 5 : request.Size; + var count = await users.CountAsync(cancellationToken); var list = await users .Paginate(pageNumber.Value, sizeNumber.Value) .OrderByCustom(sortBy, sortOrder) @@ -66,7 +67,7 @@ public async Task> Handle(Query request, CancellationToke var result = _mapper.Map>(list); - return new PaginatedList(result, result.Count, pageNumber.Value, sizeNumber.Value); + return new PaginatedList(result, count, pageNumber.Value, sizeNumber.Value); } } } \ No newline at end of file