c2-mongoose 2.1.22 → 2.1.24

package/dist/flow/SearchFlow.d.ts

@@ -9,11 +9,11 @@ declare abstract class SearchFlow {
     select: string;
     populate: any;
     filters: any;
+    pageable: boolean;
     constructor(params: any);
     buildPopulate(): any;
     buildPath(target: string, nested?: string): any;
     buildOrdenation(): any;
-    private isPageable;
     diacriticSensitiveRegex(string?: string): string;
     search(model: mongoose.Model<any>): Promise<SearchResponse<any>>;
     private searchPageable;

package/dist/flow/SearchFlow.js

@@ -56,15 +56,6 @@ var Utils_1 = require("../utils/Utils");
 var SearchFlow = /** @class */ (function () {
     function SearchFlow(params) {
         var _this = this;
-        this.isPageable = function () {
-            if ((0, Utils_1.isEmpty)(_this.page)) {
-                _this.page = 1;
-            }
-            if (_this.page >= 0) {
-                return true;
-            }
-            return false;
-        };
         this.searchPageable = function (model) { return __awaiter(_this, void 0, void 0, function () {
             var sort, items;
             return __generator(this, function (_a) {
@@ -93,6 +84,7 @@ var SearchFlow = /** @class */ (function () {
         this.populate = params.populate;
         this.page = Number(params.page || undefined);
         this.limit = Number(params.limit || 25);
+        this.pageable = params.pageable || true;
         this.buildPopulate();
     }
     SearchFlow.prototype.buildPopulate = function () {
@@ -141,7 +133,7 @@ var SearchFlow = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!this.isPageable()) return [3 /*break*/, 2];
+                        if (!this.pageable) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.searchPageable(model)];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2: return [4 /*yield*/, this.searchNoPageable(model)];
@@ -161,6 +153,7 @@ var SearchFlow = /** @class */ (function () {
                                 .find(this.filters, this.select)
                                 .populate(this.populate)
                                 .sort(sort)
+                                .limit(this.limit)
                                 .collation({
                                 locale: Environment_1.dbCollation || "pt"
                             })];
@@ -173,20 +166,23 @@ var SearchFlow = /** @class */ (function () {
     };
     SearchFlow.prototype.result = function (model, items) {
         return __awaiter(this, void 0, void 0, function () {
-            var total, paging, searchResponse;
+            var searchResponse, total, paging;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.count(model)];
+                    case 0:
+                        searchResponse = {};
+                        searchResponse.items = items;
+                        if (!this.pageable) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.count(model)];
                     case 1:
                         total = _a.sent();
                         paging = {};
                         paging.total = total;
                         paging.page = Number(this.page);
                         paging.limit = Number(this.limit);
-                        searchResponse = {};
-                        searchResponse.items = items;
                         searchResponse.paging = paging;
-                        return [2 /*return*/, searchResponse];
+                        _a.label = 2;
+                    case 2: return [2 /*return*/, searchResponse];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.22",
+  "version": "2.1.24",
   "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/SearchFlow.ts

@@ -13,6 +13,7 @@ abstract class SearchFlow {
   select: string
   populate: any
   filters: any
+  pageable: boolean
 
   constructor(params: any) {
     this.searchText = params.searchText || ""
@@ -22,6 +23,7 @@ abstract class SearchFlow {
     this.populate = params.populate
     this.page = Number(params.page || undefined)
     this.limit = Number(params.limit || 25)
+    this.pageable = params.pageable || true
     this.buildPopulate()
   }
 
@@ -59,18 +61,6 @@ abstract class SearchFlow {
     return order
   }
 
-  private isPageable = () => {
-    if (isEmpty(this.page)) {
-      this.page = 1
-    }
-
-    if (this.page >= 0) {
-      return true
-    }
-
-    return false
-  }
-
   public diacriticSensitiveRegex(string: string = ""): string {
     return string
       .replace(/[a|á|à|ä|â|A|Á|Â|Ã|Ä]/g, '[a,á,à,ä,â,A,Á,Â,Ã,Ä]')
@@ -82,7 +72,7 @@ abstract class SearchFlow {
   }
 
   public async search(model: mongoose.Model<any>): Promise<SearchResponse<any>> {
-    if (this.isPageable()) {
+    if (this.pageable) {
       return await this.searchPageable(model)
     }
 
@@ -110,6 +100,7 @@ abstract class SearchFlow {
       .find(this.filters, this.select)
       .populate(this.populate)
       .sort(sort)
+      .limit(this.limit)
       .collation({
         locale: dbCollation || "pt"
       }) as []
@@ -118,16 +109,17 @@ abstract class SearchFlow {
   }
 
   private async result(model: mongoose.Model<any>, items: []): Promise<SearchResponse<any>> {
-    var total = await this.count(model)
-
-    var paging: Pagination = {}
-    paging.total = total
-    paging.page = Number(this.page)
-    paging.limit = Number(this.limit)
-
     var searchResponse: SearchResponse<any> = {}
     searchResponse.items = items
-    searchResponse.paging = paging
+
+    if (this.pageable) {
+      var total = await this.count(model)
+      var paging: Pagination = {}
+      paging.total = total
+      paging.page = Number(this.page)
+      paging.limit = Number(this.limit)
+      searchResponse.paging = paging
+    }
 
     return searchResponse
   }