c2-mongoose 2.1.239 → 2.1.241

package/dist/flow/C2Flow.d.ts

@@ -8,6 +8,7 @@ declare class C2Flow<D> {
     createMany(data: Partial<D>[], options: Partial<Options>): Promise<Partial<D>[]>;
     updateById(_id: Types.ObjectId, data: Partial<D>, options: Partial<Options>): Promise<Partial<D>>;
     updateByModel(searcher: SearchFlow, data: Partial<D>, options: Partial<Options>): Promise<Partial<D>>;
+    updateMany(searcher: SearchFlow, data: D, options: Options): Promise<any>;
     deleteById(_id: Types.ObjectId, options: Partial<Options>): Promise<void>;
     deleteByModel(searcher: SearchFlow, options: Partial<Options>): Promise<void>;
 }

package/dist/flow/C2Flow.js

@@ -155,6 +155,35 @@ var C2Flow = /** @class */ (function () {
             });
         });
     };
+    C2Flow.prototype.updateMany = function (searcher, data, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var dataAfter, log;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.repository.updateMany(searcher.filters, data, { returnDocument: 'after', session: options.session })];
+                    case 1:
+                        dataAfter = _a.sent();
+                        if (options.logger === false) {
+                            if ((0, Utils_1.isEmpty)(dataAfter)) {
+                                return [2 /*return*/, dataAfter];
+                            }
+                            return [2 /*return*/, dataAfter];
+                        }
+                        if ((0, Utils_1.isEmpty)(dataAfter)) {
+                            return [2 /*return*/, dataAfter];
+                        }
+                        log = BuildLogFlowItem_1.default.build(options, __assign({ filters: searcher.filters }, data), Logger_1.TypeOfOperation.UPDATE, this.repository);
+                        return [4 /*yield*/, global.LoggerRepository.create([log], { session: options.session })];
+                    case 2:
+                        _a.sent();
+                        if ((0, Utils_1.isEmpty)(dataAfter)) {
+                            return [2 /*return*/, dataAfter];
+                        }
+                        return [2 /*return*/, dataAfter];
+                }
+            });
+        });
+    };
     C2Flow.prototype.deleteById = function (_id, options) {
         return __awaiter(this, void 0, void 0, function () {
             var dataAfter, log;

package/dist/flow/item/BuildPopulateSingleFlowItem.d.ts

@@ -2,7 +2,7 @@ import mongoose from "mongoose";
 import { IPopulate } from "../SearcherFlow";
 declare class BuildPopulateSingleFlowItem {
     buildPopulate(model: mongoose.Model<any>, populatesStr: string[], selectsStr: string[]): IPopulate[];
-    buildPath(target: string, nested?: string): IPopulate;
+    buildPath(target: string, nested: string | undefined, populateAcc: IPopulate): IPopulate;
 }
 declare const _default: BuildPopulateSingleFlowItem;
 export default _default;

package/dist/flow/item/BuildPopulateSingleFlowItem.js

@@ -16,15 +16,16 @@ var BuildPopulateSingleFlowItem = /** @class */ (function () {
     function BuildPopulateSingleFlowItem() {
     }
     BuildPopulateSingleFlowItem.prototype.buildPopulate = function (model, populatesStr, selectsStr) {
-        var _a, _b, _c, _d;
-        var populate = [];
+        var _a;
+        var populateArray = [];
         if ((0, Utils_1.isEmpty)(populatesStr)) {
             return [];
         }
         var _loop_1 = function () {
-            var _e = property.split('.'), first = _e[0], rest = _e.slice(1);
+            var _b = property.split('.'), first = _b[0], rest = _b.slice(1);
             var nested = rest.join('.');
-            var populateLocal = this_1.buildPath(first, nested);
+            var existing2 = (_a = populateArray.find(function (populateAux) { return populateAux.path === first; })) !== null && _a !== void 0 ? _a : { path: '', populate: {} };
+            var populateLocal = this_1.buildPath(first, nested, existing2);
             //EXISTE UMA LIMITACAO DE SELECT A PARTIR DO 3 NIVEL DENTRO DOS CAMPO POPULATE, MELHORAR O CODIGO ABAIXO PARA PERCORRER MAIS NIVEIS
             if (Array.isArray(selectsStr)) {
                 var allSelectOfPopulate = selectsStr.filter(function (sel) { return sel.startsWith("".concat(first, ".").concat(populateLocal.path)); });
@@ -35,31 +36,42 @@ var BuildPopulateSingleFlowItem = /** @class */ (function () {
                 }
             }
             //FIM
-            var existing = populate.find(function (populateAux) { return populateAux.path === populateLocal.path; });
-            if (existing) {
-                var populateAux = __assign(__assign({}, existing === null || existing === void 0 ? void 0 : existing.populate), { path: "".concat((_b = (_a = existing.populate) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : "", " ").concat((_d = (_c = populateLocal.populate) === null || _c === void 0 ? void 0 : _c.path) !== null && _d !== void 0 ? _d : "").trim() });
-                existing.populate = populateAux;
-                return "continue";
-            }
-            populate.push(populateLocal);
+            // const existing = populateArray.find((populateAux: IPopulate) => populateAux.path === populateLocal.path)
+            // if (existing) {
+            // if (populateLocal.populate && existing.populate){
+            //   if (!existing.populate.path.includes(populateLocal.populate.path)){
+            //     existing.populate.path += populateLocal.populate.path
+            //   }
+            // }
+            //   const populateAux = {
+            //     ...existing?.populate,
+            //     path: `${existing.populate?.path ?? ``} ${populateLocal.populate?.path ?? ``}`.trim()
+            //   }
+            //   existing.populate = populateAux
+            //   continue
+            // }
+            populateArray.push(populateLocal);
         };
         var this_1 = this;
         for (var _i = 0, populatesStr_1 = populatesStr; _i < populatesStr_1.length; _i++) {
             var property = populatesStr_1[_i];
             _loop_1();
         }
-        return populate;
+        return populateArray;
     };
-    BuildPopulateSingleFlowItem.prototype.buildPath = function (target, nested) {
+    BuildPopulateSingleFlowItem.prototype.buildPath = function (target, nested, populateAcc) {
+        // var populate = {} as IPopulate
+        var _a;
         if (nested === void 0) { nested = ""; }
-        var populate = {};
-        populate.path = target;
+        if (!((_a = populateAcc.path) === null || _a === void 0 ? void 0 : _a.includes(target))) {
+            populateAcc.path += " ".concat(target);
+        }
         if ((0, Utils_1.isNotEmpty)(nested)) {
-            var _a = nested.split('.'), first = _a[0], rest = _a.slice(1);
+            var _b = nested.split('.'), first = _b[0], rest = _b.slice(1);
             var nested2 = rest.join('.');
-            populate.populate = this.buildPath(first, nested2);
+            populateAcc.populate = __assign(__assign({}, populateAcc.populate), this.buildPath(first, nested2, populateAcc.populate));
         }
-        return populate;
+        return populateAcc;
     };
     return BuildPopulateSingleFlowItem;
 }());

package/dist/model/Logger.d.ts

@@ -13,6 +13,8 @@ interface ILogger {
     createdAtDateTime: moment.Moment;
     operation: TypeOfOperation;
     data: any;
+    filters: any;
+    notes: string;
 }
 declare const LoggerModel: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, mongoose.ResolveSchemaOptions<{
     timestamps: {
@@ -25,18 +27,24 @@ declare const LoggerModel: mongoose.Schema<any, mongoose.Model<any, any, any, an
     collectionName: string;
     operation: string;
     data?: any;
+    filters?: any;
+    notes?: string | undefined;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     owner: Types.ObjectId;
     user: Types.ObjectId;
     collectionName: string;
     operation: string;
     data?: any;
+    filters?: any;
+    notes?: string | undefined;
 }>> & Omit<mongoose.FlatRecord<{
     owner: Types.ObjectId;
     user: Types.ObjectId;
     collectionName: string;
     operation: string;
     data?: any;
+    filters?: any;
+    notes?: string | undefined;
 }> & {
     _id: Types.ObjectId;
 }, never>>;

package/dist/model/Logger.js

@@ -57,7 +57,9 @@ var LoggerModel = new mongoose_1.Schema({
     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 }
+    data: { type: mongoose_1.default.Schema.Types.Mixed, immutable: true },
+    filters: { type: mongoose_1.default.Schema.Types.Mixed, immutable: true },
+    notes: { type: String, immutable: true }
 }, {
     timestamps: { createdAt: 'createdAtDateTime', updatedAt: 'updatedAtDateTime' }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.239",
+  "version": "2.1.241",
   "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/C2Flow.ts

@@ -1,5 +1,5 @@
 
-import mongoose, { Types } from "mongoose"
+import mongoose, { QueryWithHelpers, Types, UpdateWriteOpResult } from "mongoose"
 import { ILogger, TypeOfOperation } from "../model/Logger"
 import { Options } from "../types/Options"
 import BuildLogFlowItem from "./item/BuildLogFlowItem"
@@ -83,6 +83,27 @@ class C2Flow<D> {
         return dataAfter._doc
     }
 
+    async updateMany(searcher: SearchFlow, data: D, options: Options): Promise<any> {
+        let dataAfter = await this.repository.updateMany(searcher.filters, data as Partial<D>, { returnDocument: 'after', session: options.session })
+        if (options.logger === false) {
+            if (isEmpty(dataAfter)) {
+                return dataAfter
+            }
+            return dataAfter
+        }
+
+        if (isEmpty(dataAfter)) {
+            return dataAfter
+        }
+
+        let log: Partial<ILogger> = BuildLogFlowItem.build(options, { filters: searcher.filters, ...data }, TypeOfOperation.UPDATE, this.repository)
+        await (global as any).LoggerRepository.create([log], { session: options.session })
+        if (isEmpty(dataAfter)) {
+            return dataAfter
+        }
+        return dataAfter
+    }
+
 
     public async deleteById(_id: Types.ObjectId, options: Partial<Options>) {
 

package/src/flow/item/BuildPopulateSingleFlowItem.ts

@@ -5,7 +5,7 @@ import { IPopulate } from "../SearcherFlow";
 class BuildPopulateSingleFlowItem {
 
   public buildPopulate(model: mongoose.Model<any>, populatesStr: string[], selectsStr: string[]): IPopulate[] {
-    var populate = [] as IPopulate[]
+    var populateArray = [] as IPopulate[]
     if (isEmpty(populatesStr)) {
       return []
     }
@@ -14,7 +14,9 @@ class BuildPopulateSingleFlowItem {
       let [first, ...rest] = property.split('.')
       let nested = rest.join('.')
 
-      let populateLocal = this.buildPath(first, nested)
+      const existing2 = populateArray.find((populateAux: IPopulate) => populateAux.path === first) ?? { path: '', populate: {} }
+
+      let populateLocal = this.buildPath(first, nested, existing2 as IPopulate)
 
       //EXISTE UMA LIMITACAO DE SELECT A PARTIR DO 3 NIVEL DENTRO DOS CAMPO POPULATE, MELHORAR O CODIGO ABAIXO PARA PERCORRER MAIS NIVEIS
       if (Array.isArray(selectsStr)) {
@@ -27,31 +29,45 @@ class BuildPopulateSingleFlowItem {
       }
       //FIM
 
-      const existing = populate.find((populateAux: IPopulate) => populateAux.path === populateLocal.path)
-      if (existing) {
-        const populateAux = {
-          ...existing?.populate,
-          path: `${existing.populate?.path ?? ``} ${populateLocal.populate?.path ?? ``}`.trim()
-        }
-        existing.populate = populateAux
-        continue
-      }
+      // const existing = populateArray.find((populateAux: IPopulate) => populateAux.path === populateLocal.path)
+      // if (existing) {
+
+        // if (populateLocal.populate && existing.populate){
+        //   if (!existing.populate.path.includes(populateLocal.populate.path)){
+        //     existing.populate.path += populateLocal.populate.path
+        //   }
+        // }
 
-      populate.push(populateLocal)
+      //   const populateAux = {
+      //     ...existing?.populate,
+      //     path: `${existing.populate?.path ?? ``} ${populateLocal.populate?.path ?? ``}`.trim()
+      //   }
+      //   existing.populate = populateAux
+      //   continue
+      // }
+
+      populateArray.push(populateLocal)
     }
 
-    return populate
+    return populateArray
   }
 
-  public buildPath(target: string, nested: string = ""): IPopulate {
-    var populate = {} as IPopulate
-    populate.path = target
+  public buildPath(target: string, nested: string = "", populateAcc: IPopulate): IPopulate {
+    // var populate = {} as IPopulate
+
+    if (!populateAcc.path?.includes(target)){
+      populateAcc.path += ` ${target}`
+    } 
+    
     if (isNotEmpty(nested)) {
       let [first, ...rest] = nested.split('.')
       let nested2 = rest.join('.')
-      populate.populate = this.buildPath(first, nested2)
+      populateAcc.populate = { 
+        ...populateAcc.populate,
+        ...this.buildPath(first, nested2, populateAcc.populate) 
+      }
     }
-    return populate
+    return populateAcc
   }
 }
 

package/src/model/Logger.ts

@@ -16,6 +16,8 @@ interface ILogger {
   createdAtDateTime: moment.Moment
   operation: TypeOfOperation
   data: any
+  filters: any
+  notes: string
 }
 
 const LoggerModel = new Schema({
@@ -23,7 +25,9 @@ const LoggerModel = new Schema({
   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 }
+  data: { type: mongoose.Schema.Types.Mixed, immutable: true },
+  filters: { type: mongoose.Schema.Types.Mixed, immutable: true },
+  notes: { type: String, immutable: true }
 }, {
   timestamps: { createdAt: 'createdAtDateTime', updatedAt: 'updatedAtDateTime' }
 })