c2-mongoose 2.1.307 → 2.1.309

package/dist/flow/SearcherFlow.d.ts

@@ -38,5 +38,6 @@ declare class SearcherFlow<D> {
     buildOrdenation(): any;
     buildRegex(searchText: string): RegExp;
     buildGrouping(fieldsToGroup: string[], sumFields: string[], countFields: string[]): void;
+    buildPaginationData(): any[];
 }
 export default SearcherFlow;

package/dist/flow/SearcherFlow.js

@@ -113,24 +113,9 @@ var SearcherFlow = /** @class */ (function () {
                         if ((0, Utils_1.isNotEmpty)(options.unions)) {
                             stagesPaging.push.apply(stagesPaging, options.unions);
                         }
-                        if ((0, Utils_1.isEmpty)(options.paging)) {
+                        if ((0, Utils_1.isEmpty)(options.paging) && this.pageable) {
                             stagesPaging.push({ $match: this.filters });
-                            stagesPaging.push({ $count: "total" });
-                            stagesPaging.push({
-                                $addFields: {
-                                    page: this.pageable === true ? this.page : 1,
-                                    limit: this.pageable === true ? this.limit : '$total',
-                                    totalPages: this.pageable === true ? {
-                                        $cond: {
-                                            if: { $eq: ['$total', 0] },
-                                            then: 0,
-                                            else: { $ceil: { $divide: ['$total', this.limit] } }
-                                        }
-                                    } : 1,
-                                    startIndex: this.pageable === true ? { $subtract: [{ $multiply: [this.page, this.limit] }, this.limit - 1] } : 1,
-                                    endIndex: this.pageable === true ? { $multiply: [this.page, this.limit] } : '$total'
-                                }
-                            });
+                            stagesPaging.push(this.buildPaginationData());
                         }
                         else {
                             stagesPaging = __spreadArray(__spreadArray([], stagesPaging, true), options.paging, true);
@@ -466,6 +451,33 @@ var SearcherFlow = /** @class */ (function () {
             groupsClauses.push(groupClause);
         });
     };
+    SearcherFlow.prototype.buildPaginationData = function () {
+        return [
+            { $count: "total" },
+            {
+                $addFields: {
+                    page: this.page,
+                    limit: this.limit,
+                    total: "$total",
+                    totalPages: {
+                        $cond: {
+                            if: { $eq: ['$total', 0] },
+                            then: 0,
+                            else: { $ceil: { $divide: ['$total', this.limit] } }
+                        }
+                    },
+                    startIndex: { $subtract: [{ $multiply: [this.page, this.limit] }, this.limit - 1] },
+                    endIndex: {
+                        $cond: {
+                            if: { $gt: [{ $multiply: [this.page, this.limit] }, "$total"] },
+                            then: "$total",
+                            else: { $multiply: [this.page, this.limit] }
+                        }
+                    }
+                }
+            }
+        ];
+    };
     return SearcherFlow;
 }());
 exports.default = SearcherFlow;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.307",
+  "version": "2.1.309",
   "description": "Lib to make any search in database mongoose and use as basic crud",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/flow/SearcherFlow.ts

@@ -77,24 +77,9 @@ class SearcherFlow<D> {
         }
 
 
-        if (isEmpty(options.paging)) {
+        if (isEmpty(options.paging) && this.pageable) {
             stagesPaging.push({ $match: this.filters })
-            stagesPaging.push({ $count: "total" })
-            stagesPaging.push({
-                $addFields: {
-                    page: this.pageable === true ? this.page : 1,
-                    limit: this.pageable === true ? this.limit : '$total',
-                    totalPages: this.pageable === true ? {
-                        $cond: {
-                            if: { $eq: ['$total', 0] },
-                            then: 0,
-                            else: { $ceil: { $divide: ['$total', this.limit] } }
-                        }
-                    } : 1,
-                    startIndex: this.pageable === true ? { $subtract: [{ $multiply: [this.page, this.limit] }, this.limit - 1] } : 1,
-                    endIndex: this.pageable === true ? { $multiply: [this.page, this.limit] } : '$total'
-                }
-            })
+            stagesPaging.push(this.buildPaginationData())
         } else {
             stagesPaging = [...stagesPaging, ...options.paging]
         }
@@ -459,6 +444,34 @@ class SearcherFlow<D> {
             groupsClauses.push(groupClause)
         })
     }
+
+    buildPaginationData(): any[] {
+        return [
+            { $count: "total" },
+            {
+                $addFields: {
+                    page: this.page,
+                    limit: this.limit,
+                    total: "$total",
+                    totalPages: {
+                        $cond: {
+                            if: { $eq: ['$total', 0] },
+                            then: 0,
+                            else: { $ceil: { $divide: ['$total', this.limit] } }
+                        }
+                    },
+                    startIndex: { $subtract: [{ $multiply: [this.page, this.limit] }, this.limit - 1] },
+                    endIndex: {
+                        $cond: {
+                            if: { $gt: [{ $multiply: [this.page, this.limit] }, "$total"] },
+                            then: "$total",
+                            else: { $multiply: [this.page, this.limit] }
+                        }
+                    }
+                }
+            }
+        ]
+    }
 }
 
 export default SearcherFlow