fix: pagination not correct

Roger13579 · Jun 13, 2024 · 86b19db · 86b19db
1 parent 633e616
commit 86b19db
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/dto/comment/getCommentsDto.ts b/src/dto/comment/getCommentsDto.ts
@@ -97,7 +97,7 @@ export class GetCommentsDTO {
   get options() {
     return {
       sort: this._sort,
-      skip: (this._page - 1) * this._limit,
+      page: this._page,
       limit: this._limit,
     };
   }

diff --git a/src/dto/group/groupFilterDto.ts b/src/dto/group/groupFilterDto.ts
@@ -45,7 +45,7 @@ export class GroupFilterDto {
 
   get options() {
     return {
-      skip: (this._page - 1) * this._limit,
+      page: this._page,
       limit: this._limit,
       sort: this._sort,
     };

diff --git a/src/dto/order/orderFilterDto.ts b/src/dto/order/orderFilterDto.ts
@@ -75,8 +75,8 @@ export class OrderFilterDto {
         path: 'user',
         select: 'account name phone email',
       },
-      skip: (this._page - 1) * this._limit,
-      ...(this._limit && { limit: this._limit }),
+      page: this._page,
+      limit: this._limit,
       sort: this._sort,
     };
   }

diff --git a/src/dto/product/getProductDto.ts b/src/dto/product/getProductDto.ts
@@ -123,8 +123,8 @@ export class GetProductDTO {
         }
       : { ...defaultProjection, recommendWeight: 0, isPublic: 0 };
     return {
-      skip: (this._page - 1) * this._limit,
-      ...(this._limit && { limit: this._limit }),
+      page: this._page,
+      limit: this._limit,
       sort: this._sort,
       projection,
     };

diff --git a/src/dto/ticket/getTicketsDto.ts b/src/dto/ticket/getTicketsDto.ts
@@ -128,8 +128,8 @@ export class GetTicketsDto {
         };
     return {
       productSelect,
-      skip: (this._page - 1) * this._limit,
-      ...(this._limit && { limit: this._limit }),
+      page: this._page,
+      limit: this._limit,
       sort: this._sort,
       ticketSelect,
     };

diff --git a/src/vo/cart/getCartVo.ts b/src/vo/cart/getCartVo.ts
@@ -12,7 +12,7 @@ export class GetCartVO {
   public readonly createdAt: Date;
   public readonly updatedAt: Date;
 
-  constructor(cart: ICartPagination | ICart, page: number, limit: number) {
+  constructor(cart: ICartPagination | ICart, limit: number, page: number) {
     this.createdAt = cart.createdAt;
     this.updatedAt = cart.updatedAt;
     this._id = cart._id;