c2-mongoose 2.1.124 → 2.1.126

package/dist/flow/CrudFlow.d.ts

@@ -12,7 +12,7 @@ declare class CrudFlow<D> {
     update(id: string, data: D, session?: any): Promise<D>;
     updateAny(id: string, data: any, session?: any): Promise<D>;
     updateByModel(filter: any, data: any, params: any): Promise<D>;
-    find(options?: SearchOptions): Promise<SearchResponse<D>>;
+    find(options: SearchOptions): Promise<SearchResponse<D>>;
     getOne(model: D, session?: ClientSession): Promise<D>;
     get(id: string, pop?: string, sel?: string, session?: ClientSession): Promise<D>;
     getById(id: string, session?: ClientSession): Promise<Partial<D>>;

package/dist/flow/SearchFlow.js

@@ -155,10 +155,11 @@ var SearchFlow = /** @class */ (function () {
         return new RegExp("".concat(regexExpression), 'i');
     };
     SearchFlow.prototype.searchNoPageable = function (model, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var stagesItems, stagesMetadata, facet, _i, stagesMetadata_1, metadata, result, items, _a, _b, populate, resultAux;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var stagesItems, stagesMetadata, facet, _i, stagesMetadata_1, metadata, result, items, _b, _c, populate, resultAux;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         stagesItems = [{ $match: this.filters }];
                         if ((0, Utils_1.isNotEmpty)(options.unions)) {
@@ -171,8 +172,7 @@ var SearchFlow = /** @class */ (function () {
                             stagesItems.push.apply(stagesItems, options.pipelines);
                         }
                         stagesItems.push({ $sort: this.sort });
-                        stagesItems.push({ $skip: ((this.page - 1) * this.limit) || 0 });
-                        stagesItems.push({ $limit: this.limit });
+                        stagesItems.push({ $limit: (_a = this.limit) !== null && _a !== void 0 ? _a : 50 });
                         stagesMetadata = [];
                         if ((0, Utils_1.isNotEmpty)(options.metadata)) {
                             stagesMetadata.push.apply(stagesMetadata, options.metadata);
@@ -190,20 +190,20 @@ var SearchFlow = /** @class */ (function () {
                                 },
                             ]).session(options === null || options === void 0 ? void 0 : options.session)];
                     case 1:
-                        result = _c.sent();
+                        result = _d.sent();
                         items = result[0].items;
                         if (!((0, Utils_1.isNotEmpty)(this.populate) && Array.isArray(this.populate))) return [3 /*break*/, 5];
-                        _a = 0, _b = this.populate;
-                        _c.label = 2;
+                        _b = 0, _c = this.populate;
+                        _d.label = 2;
                     case 2:
-                        if (!(_a < _b.length)) return [3 /*break*/, 5];
-                        populate = _b[_a];
+                        if (!(_b < _c.length)) return [3 /*break*/, 5];
+                        populate = _c[_b];
                         return [4 /*yield*/, model.populate(result[0].items, populate)];
                     case 3:
-                        items = _c.sent();
-                        _c.label = 4;
+                        items = _d.sent();
+                        _d.label = 4;
                     case 4:
-                        _a++;
+                        _b++;
                         return [3 /*break*/, 2];
                     case 5:
                         resultAux = this.transformObject(result[0]);
@@ -288,7 +288,8 @@ var SearchFlow = /** @class */ (function () {
                 transformedObject[key] = originalObject[key];
             }
         }
-        return __assign(__assign({}, transformedObject), { metadata: metadata, paging: (originalObject === null || originalObject === void 0 ? void 0 : originalObject.paging[0]) || { total: 0, page: 1, limit: this.limit } });
+        var hasPagination = (originalObject === null || originalObject === void 0 ? void 0 : originalObject.paging) ? true : false;
+        return __assign(__assign({}, transformedObject), { metadata: metadata, paging: hasPagination ? (originalObject === null || originalObject === void 0 ? void 0 : originalObject.paging[0]) || { total: 0, page: 1, limit: this.limit } : undefined });
     };
     SearchFlow.prototype.search = function (model, options) {
         return __awaiter(this, void 0, void 0, function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.124",
+  "version": "2.1.126",
   "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/CrudFlow.ts

@@ -44,7 +44,7 @@ class CrudFlow<D> {
         return dataAfter as D
     }
 
-    public async find(options?: SearchOptions): Promise<SearchResponse<D>> {
+    public async find(options: SearchOptions): Promise<SearchResponse<D>> {
         return await this.search.search(this.repository, options)
     }
 

package/src/flow/SearchFlow.ts

@@ -1,7 +1,6 @@
 import moment from "moment"
 import mongoose, { ClientSession, Types } from "mongoose"
-import { dbCollation } from "../configuration/Environment"
-import { Pagination, SearchOptions, SearchResponse } from "../types/SearchResponse"
+import { SearchOptions, SearchResponse } from "../types/SearchResponse"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
 
 abstract class SearchFlow {
@@ -139,8 +138,7 @@ abstract class SearchFlow {
     }
 
     stagesItems.push({ $sort: this.sort })
-    stagesItems.push({ $skip: ((this.page - 1) * this.limit) || 0 })
-    stagesItems.push({ $limit: this.limit })
+    stagesItems.push({ $limit: this.limit ?? 50 })
 
     let stagesMetadata: any[] = []
     if (isNotEmpty(options.metadata)) {
@@ -253,10 +251,12 @@ abstract class SearchFlow {
       }
     }
 
+    let hasPagination = originalObject?.paging ? true : false
+
     return {
       ...transformedObject,
       metadata,
-      paging: originalObject?.paging[0] || { total: 0, page: 1, limit: this.limit },
+      paging: hasPagination ? originalObject?.paging[0] || { total: 0, page: 1, limit: this.limit } : undefined,
     };
   }