c2-mongoose 2.1.94 → 2.1.96

package/dist/flow/SearchFlow.d.ts

@@ -41,6 +41,7 @@ declare abstract class SearchFlow {
     findOne(repository: mongoose.Model<any>, model: any, params?: any): Promise<any>;
     sumBy(model: mongoose.Model<any>, _sum: any, _by: any, items?: any, session?: ClientSession): Promise<any[]>;
     sumByPaging(model: mongoose.Model<any>, fieldToSum: any, fieldToGroup: any, items?: any): Promise<SearchResponse<any>>;
+    isValidObjectId(value: string): boolean;
     buildDefaultFilters(objectSearch: any): any;
     addFilterModel(model: any, filters: any): void;
 }

package/dist/flow/SearchFlow.js

@@ -46,15 +46,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -191,34 +182,34 @@ var SearchFlow = /** @class */ (function () {
     SearchFlow.prototype.searchPageable = function (model, options) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var stagesItems, result, items, _i, _b, populate;
+            var stagesItems, stagesPaging, result, items, _i, _b, populate;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        stagesItems = __spreadArray(__spreadArray([
-                            { $match: this.filters },
-                            (0, Utils_1.isNotEmpty)(options.unions) ? options.unions : undefined,
-                            this.projection ? { $project: this.projection } : { $addFields: {} }
-                        ], options.pipelines, true), [
-                            { $sort: this.sort },
-                            { $skip: ((this.page - 1) * this.limit) || 0 },
-                            { $limit: this.limit },
-                        ], false);
+                        stagesItems = [{ $match: this.filters }];
+                        if ((0, Utils_1.isNotEmpty)(options.unions)) {
+                            stagesItems.push.apply(stagesItems, options.unions);
+                        }
+                        if ((0, Utils_1.isNotEmpty)(this.projection)) {
+                            stagesItems.push({ $project: this.projection });
+                        }
+                        if ((0, Utils_1.isNotEmpty)(options.pipelines)) {
+                            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 });
+                        stagesPaging = [{ $match: this.filters }];
+                        if ((0, Utils_1.isNotEmpty)(options.unions)) {
+                            stagesPaging.push.apply(stagesPaging, options.unions);
+                        }
+                        stagesPaging.push({ $count: "total" });
+                        stagesPaging.push({ $addFields: { page: this.page || 1, limit: this.limit } });
                         return [4 /*yield*/, model.aggregate([
                                 {
                                     $facet: {
                                         items: stagesItems,
-                                        paging: [
-                                            { $match: this.filters },
-                                            (0, Utils_1.isNotEmpty)(options.unions) ? options.unions : undefined,
-                                            { $count: "total" },
-                                            {
-                                                $addFields: {
-                                                    page: this.page || 1,
-                                                    limit: this.limit
-                                                }
-                                            }
-                                        ]
+                                        paging: stagesPaging
                                     }
                                 }
                             ]).session(options === null || options === void 0 ? void 0 : options.session)];
@@ -413,6 +404,10 @@ var SearchFlow = /** @class */ (function () {
             });
         });
     };
+    SearchFlow.prototype.isValidObjectId = function (value) {
+        var objectIdPattern = /^[0-9a-fA-F]{24}$/;
+        return objectIdPattern.test(value);
+    };
     SearchFlow.prototype.buildDefaultFilters = function (objectSearch) {
         var _this = this;
         var filters = { $and: [] };
@@ -423,7 +418,7 @@ var SearchFlow = /** @class */ (function () {
                 if (['projection', 'pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
                     return;
                 }
-                if (typeof value === 'string' && mongoose_1.Types.ObjectId.isValid(value)) {
+                if (typeof value === 'string' && _this.isValidObjectId(value)) {
                     value = new mongoose_1.Types.ObjectId(value);
                 }
                 if (value === 'true') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.94",
+  "version": "2.1.96",
   "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

@@ -118,33 +118,49 @@ abstract class SearchFlow {
   }
 
   async searchPageable(model: mongoose.Model<any>, options: SearchOptions) {
-    let stagesItems = [
-      { $match: this.filters },
-      isNotEmpty(options.unions) ? options.unions : undefined,
-      this.projection ? { $project: this.projection } : { $addFields: {} },
-      ...options.pipelines,
-      { $sort: this.sort },
-      { $skip: ((this.page - 1) * this.limit) || 0 },
-      { $limit: this.limit },
-    ]
+    // let stagesItems = [
+    //   { $match: this.filters },
+    //   isNotEmpty(options.unions) ? options.unions : undefined,
+    //   this.projection ? { $project: this.projection } : { $addFields: {} },
+    //   ...options.pipelines,
+    //   { $sort: this.sort },
+    //   { $skip: ((this.page - 1) * this.limit) || 0 },
+    //   { $limit: this.limit },
+    // ]
+
+    let stagesItems: any[] = [{ $match: this.filters }]
+
+    if (isNotEmpty(options.unions)) {
+      stagesItems.push(...options.unions)
+    }
+
+    if (isNotEmpty(this.projection)) {
+      stagesItems.push({ $project: this.projection })
+    }
+
+    if (isNotEmpty(options.pipelines)) {
+      stagesItems.push(...options.pipelines)
+    }
+
+    stagesItems.push({ $sort: this.sort })
+    stagesItems.push({ $skip: ((this.page - 1) * this.limit) || 0 })
+    stagesItems.push({ $limit: this.limit })
+
+
+    let stagesPaging: any[] = [{ $match: this.filters }]
+    if (isNotEmpty(options.unions)) {
+      stagesPaging.push(...options.unions)
+    }
+    stagesPaging.push({ $count: "total" })
+    stagesPaging.push({ $addFields: { page: this.page || 1, limit: this.limit } })
+
 
     const result = await model.aggregate(
       [
         {
           $facet: {
-            items: stagesItems as any,
-            paging: [
-              { $match: this.filters },
-              isNotEmpty(options.unions) ? options.unions as any : undefined,
-              { $count: "total" },
-              {
-                $addFields:
-                {
-                  page: this.page || 1,
-                  limit: this.limit
-                }
-              }
-            ]
+            items: stagesItems,
+            paging: stagesPaging
           }
         }
       ]
@@ -305,6 +321,11 @@ abstract class SearchFlow {
     }
   }
 
+  public isValidObjectId(value: string) {
+    const objectIdPattern = /^[0-9a-fA-F]{24}$/;
+    return objectIdPattern.test(value);
+  }
+
   public buildDefaultFilters(objectSearch: any) {
     let filters = { $and: [] } as any
     Object.entries(objectSearch.model).forEach(([key, value]) => {
@@ -314,7 +335,7 @@ abstract class SearchFlow {
           return
         }
 
-        if (typeof value === 'string' && Types.ObjectId.isValid(value as any)) {
+        if (typeof value === 'string' && this.isValidObjectId(value as string)) {
           value = new Types.ObjectId(value as string)
         }