@nextage/nx-frame-be 1.0.11 → 1.0.13

package/build/common/base/base.controller.d.ts

@@ -64,6 +64,20 @@ export declare abstract class BaseController<TAttrs, TDoc extends BaseMongoDoc,
      * @param item
      * @param context
      */
+    protected parseCreateItem(item: TAttrs, context: NxContext): Promise<void>;
+    /**
+     *
+     * @param id
+     * @param item
+     * @param context
+     */
+    protected parseUpdateItem(id: string, item: TAttrs, context: NxContext): Promise<void>;
+    /**
+     *
+     * @param item
+     * @param context
+     * @returns
+     */
     protected parseItem(item: TAttrs, context: NxContext): Promise<void>;
     /**
      *

package/build/common/base/base.controller.js

@@ -57,8 +57,31 @@ class BaseController {
      * @param item
      * @param context
      */
+    parseCreateItem(item, context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.parseItem(item, context);
+        });
+    }
+    /**
+     *
+     * @param id
+     * @param item
+     * @param context
+     */
+    parseUpdateItem(id, item, context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.parseItem(item, context);
+        });
+    }
+    /**
+     *
+     * @param item
+     * @param context
+     * @returns
+     */
     parseItem(item, context) {
         return __awaiter(this, void 0, void 0, function* () {
+            return;
         });
     }
     /**
@@ -78,7 +101,7 @@ class BaseController {
      */
     create(item, context) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.parseItem(item, context);
+            yield this.parseCreateItem(item, context);
             return this.model.create(item, context);
         });
     }
@@ -91,7 +114,7 @@ class BaseController {
      */
     update(id, item, context) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.parseItem(item, context);
+            yield this.parseUpdateItem(id, item, context);
             return this.model.update(id, item, this.mergeUpdate, context);
         });
     }

package/build/common/base/base.model.js

@@ -432,8 +432,13 @@ class BaseModel extends events_1.EventEmitter {
             if (!itemDoc)
                 throw new errors_1.AppError('messages.notFound');
             // complete merge
-            if (mergeItem)
-                item = (0, utils_1.merge)(itemDoc.toObject(), item); // Merge with existing doc
+            if (mergeItem) {
+                // item = merge (itemDoc.toObject(), item); // Merge with existing doc
+                item = (0, utils_1.merge)(itemDoc.toObject(), item, (objValue, srcValue) => {
+                    if (Array.isArray(objValue))
+                        return srcValue; // sovrascrivi invece di mergiare
+                });
+            }
             itemDoc === null || itemDoc === void 0 ? void 0 : itemDoc.set(item);
             const res = yield itemDoc.save();
             if (context)

package/build/common/utils.d.ts

@@ -336,7 +336,7 @@ export declare function uniqBy(arr: any[], iteratee: Function): any[];
  * @param {*} obj2
  * @returns
  */
-export declare function merge(obj1: any, obj2: any): any;
+export declare function merge(obj1: any, obj2: any, mergeFnc?: Function): any;
 /**
  *
  * @param data

package/build/common/utils.js

@@ -709,10 +709,10 @@ exports.uniqBy = uniqBy;
  * @param {*} obj2
  * @returns
  */
-function merge(obj1, obj2) {
+function merge(obj1, obj2, mergeFnc) {
     if (!isObject(obj1) || !isObject(obj2))
         return;
-    return lodash_1.default.merge(obj1, obj2);
+    return mergeFnc ? lodash_1.default.mergeWith(obj1, obj2, mergeFnc) : lodash_1.default.merge(obj1, obj2);
 }
 exports.merge = merge;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextage/nx-frame-be",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",