c2-mongoose 2.1.104 → 2.1.106

package/dist/flow/SearchFlow.d.ts

@@ -23,11 +23,7 @@ declare abstract class SearchFlow {
     buildPath(target: string, nested?: string): any;
     buildOrdenation(): any;
     buildRegex(searchText: string): RegExp;
-    searchPageable(model: mongoose.Model<any>, options: SearchOptions): Promise<{
-        items: any;
-        paging: any;
-        metadata: any;
-    }>;
+    searchPageable(model: mongoose.Model<any>, options: SearchOptions): Promise<any>;
     search(model: mongoose.Model<any>, options?: SearchOptions): Promise<SearchResponse<any>>;
     /**
      *

package/dist/flow/SearchFlow.js

@@ -185,9 +185,9 @@ var SearchFlow = /** @class */ (function () {
         return new RegExp("".concat(regexExpression), 'i');
     };
     SearchFlow.prototype.searchPageable = function (model, options) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var stagesItems, stagesPaging, stagesMetadata, result, items, _i, _c, populate;
+            var stagesItems, stagesPaging, stagesMetadata, facet, _i, stagesMetadata_1, metadata, result, items, _b, _c, populate;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -214,36 +214,41 @@ var SearchFlow = /** @class */ (function () {
                         if ((0, Utils_1.isNotEmpty)(options.metadata)) {
                             stagesMetadata.push.apply(stagesMetadata, options.metadata);
                         }
+                        facet = {
+                            items: stagesItems,
+                            paging: stagesPaging,
+                        };
+                        for (_i = 0, stagesMetadata_1 = stagesMetadata; _i < stagesMetadata_1.length; _i++) {
+                            metadata = stagesMetadata_1[_i];
+                            facet[metadata.id] = metadata.conditions;
+                        }
                         return [4 /*yield*/, model.aggregate([
                                 {
-                                    $facet: {
-                                        items: stagesItems,
-                                        paging: stagesPaging,
-                                        metadata: stagesMetadata
-                                    }
-                                }
+                                    $facet: facet
+                                    // {
+                                    //   items: stagesItems,
+                                    //   paging: stagesPaging,
+                                    //   metadata: stagesMetadata
+                                    // }
+                                },
                             ]).session(options === null || options === void 0 ? void 0 : options.session)];
                     case 1:
                         result = _d.sent();
                         items = result[0].items;
                         if (!((0, Utils_1.isNotEmpty)(this.populate) && Array.isArray(this.populate))) return [3 /*break*/, 5];
-                        _i = 0, _c = this.populate;
+                        _b = 0, _c = this.populate;
                         _d.label = 2;
                     case 2:
-                        if (!(_i < _c.length)) return [3 /*break*/, 5];
-                        populate = _c[_i];
+                        if (!(_b < _c.length)) return [3 /*break*/, 5];
+                        populate = _c[_b];
                         return [4 /*yield*/, model.populate(result[0].items, populate)];
                     case 3:
                         items = _d.sent();
                         _d.label = 4;
                     case 4:
-                        _i++;
+                        _b++;
                         return [3 /*break*/, 2];
-                    case 5: return [2 /*return*/, {
-                            items: items,
-                            paging: ((_a = result[0]) === null || _a === void 0 ? void 0 : _a.paging[0]) || { total: 0, page: 1, limit: this.limit },
-                            metadata: ((_b = result[0]) === null || _b === void 0 ? void 0 : _b.metadata[0]) || undefined
-                        }];
+                    case 5: return [2 /*return*/, __assign(__assign({}, result[0]), { items: items, paging: ((_a = result[0]) === null || _a === void 0 ? void 0 : _a.paging[0]) || { total: 0, page: 1, limit: this.limit } })];
                 }
             });
         });

package/package.json

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

@@ -155,15 +155,28 @@ abstract class SearchFlow {
       stagesMetadata.push(...options.metadata)
     }
 
+
+    const facet: { [key: string]: any } = {
+      items: stagesItems,
+      paging: stagesPaging,
+    }
+
+    for (let metadata of stagesMetadata) {
+      facet[metadata.id] = metadata.conditions
+    }
+
+
+
     const result = await model.aggregate(
       [
         {
-          $facet: {
-            items: stagesItems,
-            paging: stagesPaging,
-            metadata: stagesMetadata
-          }
-        }
+          $facet: facet
+          // {
+          //   items: stagesItems,
+          //   paging: stagesPaging,
+          //   metadata: stagesMetadata
+          // }
+        },
       ]
     ).session(options?.session as ClientSession)
 
@@ -176,9 +189,9 @@ abstract class SearchFlow {
     }
 
     return {
+      ...result[0],
       items,
       paging: result[0]?.paging[0] || { total: 0, page: 1, limit: this.limit },
-      metadata: result[0]?.metadata[0] || undefined
     }
   }