c2-mongoose 2.1.118 → 2.1.120

package/dist/flow/SearchFlow.d.ts

@@ -24,6 +24,7 @@ declare abstract class SearchFlow {
     buildOrdenation(): any;
     buildRegex(searchText: string): RegExp;
     searchPageable(model: mongoose.Model<any>, options: SearchOptions): Promise<any>;
+    transformObject(originalObject: any): any;
     search(model: mongoose.Model<any>, options?: SearchOptions): Promise<SearchResponse<any>>;
     /**
      *

package/dist/flow/SearchFlow.js

@@ -185,11 +185,10 @@ var SearchFlow = /** @class */ (function () {
         return new RegExp("".concat(regexExpression), 'i');
     };
     SearchFlow.prototype.searchPageable = function (model, options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var stagesItems, stagesPaging, stagesMetadata, facet, _i, stagesMetadata_1, metadata, result, items, _b, _c, populate;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var stagesItems, stagesPaging, stagesMetadata, facet, _i, stagesMetadata_1, metadata, result, items, _a, _b, populate, resultAux;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         stagesItems = [{ $match: this.filters }];
                         if ((0, Utils_1.isNotEmpty)(options.unions)) {
@@ -228,26 +227,47 @@ var SearchFlow = /** @class */ (function () {
                                 },
                             ]).session(options === null || options === void 0 ? void 0 : options.session)];
                     case 1:
-                        result = _d.sent();
+                        result = _c.sent();
                         items = result[0].items;
                         if (!((0, Utils_1.isNotEmpty)(this.populate) && Array.isArray(this.populate))) return [3 /*break*/, 5];
-                        _b = 0, _c = this.populate;
-                        _d.label = 2;
+                        _a = 0, _b = this.populate;
+                        _c.label = 2;
                     case 2:
-                        if (!(_b < _c.length)) return [3 /*break*/, 5];
-                        populate = _c[_b];
+                        if (!(_a < _b.length)) return [3 /*break*/, 5];
+                        populate = _b[_a];
                         return [4 /*yield*/, model.populate(result[0].items, populate)];
                     case 3:
-                        items = _d.sent();
-                        _d.label = 4;
+                        items = _c.sent();
+                        _c.label = 4;
                     case 4:
-                        _b++;
+                        _a++;
                         return [3 /*break*/, 2];
-                    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 } })];
+                    case 5:
+                        resultAux = this.transformObject(result[0]);
+                        return [2 /*return*/, resultAux
+                            // return {
+                            //   ...result[0],
+                            //   items,
+                            //   paging: result[0]?.paging[0] || { total: 0, page: 1, limit: this.limit },
+                            // }
+                        ];
                 }
             });
         });
     };
+    SearchFlow.prototype.transformObject = function (originalObject) {
+        var metadata = {};
+        var transformedObject = {};
+        for (var key in originalObject) {
+            if (key.startsWith('metadata-')) {
+                metadata[key] = originalObject[key];
+            }
+            else {
+                transformedObject[key] = originalObject[key];
+            }
+        }
+        return __assign({ metadata: metadata, paging: (originalObject === null || originalObject === void 0 ? void 0 : originalObject.paging[0]) || { total: 0, page: 1, limit: this.limit } }, transformedObject);
+    };
     SearchFlow.prototype.search = function (model, options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {

package/dist/model/Logger.d.ts

@@ -20,62 +20,20 @@ declare const LoggerModel: mongoose.Schema<any, mongoose.Model<any, any, any, an
         updatedAt: string;
     };
 }>, {
-    owner: {
-        prototype?: Types.ObjectId | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | undefined;
-        createFromTime?: {} | undefined;
-        createFromHexString?: {} | undefined;
-        isValid?: {} | undefined;
-    };
-    user: {
-        prototype?: Types.ObjectId | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | undefined;
-        createFromTime?: {} | undefined;
-        createFromHexString?: {} | undefined;
-        isValid?: {} | undefined;
-    };
+    owner: Types.ObjectId;
+    user: Types.ObjectId;
     collectionName: string;
     operation: string;
     data?: any;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
-    owner: {
-        prototype?: Types.ObjectId | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | undefined;
-        createFromTime?: {} | undefined;
-        createFromHexString?: {} | undefined;
-        isValid?: {} | undefined;
-    };
-    user: {
-        prototype?: Types.ObjectId | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | undefined;
-        createFromTime?: {} | undefined;
-        createFromHexString?: {} | undefined;
-        isValid?: {} | undefined;
-    };
+    owner: Types.ObjectId;
+    user: Types.ObjectId;
     collectionName: string;
     operation: string;
     data?: any;
 }>> & Omit<mongoose.FlatRecord<{
-    owner: {
-        prototype?: Types.ObjectId | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | undefined;
-        createFromTime?: {} | undefined;
-        createFromHexString?: {} | undefined;
-        isValid?: {} | undefined;
-    };
-    user: {
-        prototype?: Types.ObjectId | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | undefined;
-        createFromTime?: {} | undefined;
-        createFromHexString?: {} | undefined;
-        isValid?: {} | undefined;
-    };
+    owner: Types.ObjectId;
+    user: Types.ObjectId;
     collectionName: string;
     operation: string;
     data?: any;

package/dist/model/Logger.js

@@ -53,8 +53,8 @@ var TypeOfOperation;
 })(TypeOfOperation || (TypeOfOperation = {}));
 exports.TypeOfOperation = TypeOfOperation;
 var LoggerModel = new mongoose_1.Schema({
-    owner: { type: mongoose_1.Types.ObjectId, required: true, immutable: true },
-    user: { type: mongoose_1.Types.ObjectId, required: true, immutable: true },
+    owner: { type: mongoose_1.default.Schema.Types.ObjectId, required: true, immutable: true },
+    user: { type: mongoose_1.default.Schema.Types.ObjectId, required: true, immutable: true },
     collectionName: { type: String, required: true, immutable: true },
     operation: { type: String, enum: TypeOfOperation, required: true, immutable: true },
     data: { type: mongoose_1.default.Schema.Types.Mixed, immutable: true }

package/package.json

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

@@ -183,11 +183,32 @@ abstract class SearchFlow {
       }
     }
 
-    return {
-      ...result[0],
-      items,
-      paging: result[0]?.paging[0] || { total: 0, page: 1, limit: this.limit },
+    let resultAux = this.transformObject(result[0])
+    return resultAux
+    // return {
+    //   ...result[0],
+    //   items,
+    //   paging: result[0]?.paging[0] || { total: 0, page: 1, limit: this.limit },
+    // }
+  }
+
+  transformObject(originalObject: any): any {
+    const metadata: any = {};
+    const transformedObject: any = {};
+  
+    for (const key in originalObject) {
+      if (key.startsWith('metadata-')) {
+        metadata[key] = originalObject[key];
+      } else {
+        transformedObject[key] = originalObject[key];
+      }
     }
+  
+    return {
+      metadata,
+      paging: originalObject?.paging[0] || { total: 0, page: 1, limit: this.limit },
+      ...transformedObject,
+    };
   }
 
   public async search(model: mongoose.Model<any>, options?: SearchOptions): Promise<SearchResponse<any>> {

package/src/model/Logger.ts

@@ -19,8 +19,8 @@ interface ILogger {
 }
 
 const LoggerModel = new Schema({
-  owner: { type: Types.ObjectId, required: true, immutable: true },
-  user: { type: Types.ObjectId, required: true, immutable: true },
+  owner: { type: mongoose.Schema.Types.ObjectId, required: true, immutable: true },
+  user: { type: mongoose.Schema.Types.ObjectId, required: true, immutable: true },
   collectionName: { type: String, required: true, immutable: true },
   operation: { type: String, enum: TypeOfOperation, required: true, immutable: true },
   data: { type: mongoose.Schema.Types.Mixed, immutable: true }