gemcap-be-common 1.4.150 → 1.4.152

package/models/FinancialSpreading.model.d.ts

@@ -68,7 +68,6 @@ export interface IFinancialSpreading {
     month: number;
     sheetId: mongoose.Types.ObjectId;
     amount: number;
-    isFixedCost?: boolean;
 }
 export interface IFinancialSpreadingDoc extends IFinancialSpreading, Document {
     _id: mongoose.Types.ObjectId;

package/models/FinancialSpreading.model.js

@@ -60,10 +60,6 @@ exports.FinancialSpreadingSchema = new mongoose_1.default.Schema({
         type: Number,
         required: true,
     },
-    isFixedCost: {
-        type: Boolean,
-        default: false,
-    },
 }, {
     timestamps: { createdAt: true, updatedAt: true },
 });

package/models/FinancialSpreading.model.ts

@@ -52,7 +52,6 @@ export interface IFinancialSpreading {
   month: number;
   sheetId: mongoose.Types.ObjectId;
   amount: number;
-  isFixedCost?: boolean;
 }
 
 export interface IFinancialSpreadingDoc extends IFinancialSpreading, Document {
@@ -123,10 +122,6 @@ export const FinancialSpreadingSchema = new mongoose.Schema<IFinancialSpreading,
       type: Number,
       required: true,
     },
-    isFixedCost: {
-      type: Boolean,
-      default: false,
-    },
   },
   {
     timestamps: { createdAt: true, updatedAt: true },

package/models/FinancialSpreadingSheet.model.d.ts

@@ -124,6 +124,7 @@ export interface IFinancialSpreadingSheetView {
     suborder: number;
     isTotal: boolean;
     isCalculated: boolean;
+    isFixedCost?: boolean;
 }
 export declare class FinancialSpreadingSheetDTO extends BasicDTO {
     borrowerId: string;
@@ -134,6 +135,7 @@ export declare class FinancialSpreadingSheetDTO extends BasicDTO {
     suborder: number;
     isTotal: boolean;
     isCalculated: boolean;
+    isFixedCost?: boolean;
 }
 export declare const financialSpreadingSheetViewValidationSchema: Joi.ObjectSchema<IFinancialSpreadingSheetView>;
 export interface IFinancialSpreadingSheet {
@@ -145,6 +147,7 @@ export interface IFinancialSpreadingSheet {
     suborder: number;
     isTotal: boolean;
     isCalculated: boolean;
+    isFixedCost?: boolean;
 }
 export interface IFinancialSpreadingSheetDoc extends IFinancialSpreadingSheet, Document {
     _id: mongoose.Types.ObjectId;

package/models/FinancialSpreadingSheet.model.js

@@ -140,6 +140,7 @@ class FinancialSpreadingSheetDTO extends db_data_helper_1.BasicDTO {
     suborder;
     isTotal;
     isCalculated;
+    isFixedCost;
 }
 exports.FinancialSpreadingSheetDTO = FinancialSpreadingSheetDTO;
 exports.financialSpreadingSheetViewValidationSchema = joi_1.default.object({
@@ -152,6 +153,7 @@ exports.financialSpreadingSheetViewValidationSchema = joi_1.default.object({
     suborder: joi_1.default.number().integer().required(),
     isTotal: joi_1.default.boolean().required(),
     isCalculated: joi_1.default.boolean().required(),
+    isFixedCost: joi_1.default.boolean().allow(null),
 });
 exports.FinancialSpreadingSheetSchema = new mongoose_1.default.Schema({
     borrowerId: {
@@ -201,6 +203,10 @@ exports.FinancialSpreadingSheetSchema = new mongoose_1.default.Schema({
         type: Boolean,
         required: true,
     },
+    isFixedCost: {
+        type: Boolean,
+        default: false,
+    },
 }, {
     timestamps: { createdAt: true, updatedAt: true },
 });

package/models/FinancialSpreadingSheet.model.ts

@@ -141,6 +141,7 @@ export interface IFinancialSpreadingSheetView {
   suborder: number;
   isTotal: boolean;
   isCalculated: boolean;
+  isFixedCost?: boolean;
 }
 
 export class FinancialSpreadingSheetDTO extends BasicDTO {
@@ -152,6 +153,7 @@ export class FinancialSpreadingSheetDTO extends BasicDTO {
   suborder: number;
   isTotal: boolean;
   isCalculated: boolean;
+  isFixedCost?: boolean;
 }
 
 export const financialSpreadingSheetViewValidationSchema = Joi.object<IFinancialSpreadingSheetView>({
@@ -164,6 +166,7 @@ export const financialSpreadingSheetViewValidationSchema = Joi.object<IFinancial
   suborder: Joi.number().integer().required(),
   isTotal: Joi.boolean().required(),
   isCalculated: Joi.boolean().required(),
+  isFixedCost: Joi.boolean().allow(null),
 });
 
 export interface IFinancialSpreadingSheet {
@@ -175,6 +178,7 @@ export interface IFinancialSpreadingSheet {
   suborder: number;
   isTotal: boolean;
   isCalculated: boolean;
+  isFixedCost?: boolean;
 }
 
 export interface IFinancialSpreadingSheetDoc extends IFinancialSpreadingSheet, Document {
@@ -249,6 +253,10 @@ export const FinancialSpreadingSheetSchema = new mongoose.Schema<IFinancialSprea
       type: Boolean,
       required: true,
     },
+    isFixedCost: {
+      type: Boolean,
+      default: false,
+    },
   },
   {
     timestamps: { createdAt: true, updatedAt: true },

package/models/_index.d.ts

@@ -31,10 +31,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        amount: number;
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
+        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -45,10 +45,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        amount: number;
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
+        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -59,10 +59,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        amount: number;
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
+        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.4.150",
+  "version": "1.4.152",
   "description": "",
   "main": "index.js",
   "scripts": {

package/services/financial-spreading.service.js

@@ -175,13 +175,17 @@ class FinancialSpreadingService {
             }
             else {
                 redundantSheetIdSet.delete(sheet._id);
-                await FinancialSpreadingSheet_model_1.FinancialSpreadingSheet
-                    .findByIdAndUpdate(sheet._id, {
+                const update = {
                     name: sheet.name,
                     order: sheet.order,
                     suborder: sheet.suborder,
                     rowType: sheet.rowType,
-                }, { new: true })
+                };
+                if (sheet.isFixedCost) {
+                    update.isFixedCost = sheet.isFixedCost;
+                }
+                await FinancialSpreadingSheet_model_1.FinancialSpreadingSheet
+                    .findByIdAndUpdate(sheet._id, update, { new: true })
                     .lean();
             }
         }));
@@ -196,9 +200,7 @@ class FinancialSpreadingService {
             const update = {
                 amount: rest.amount,
             };
-            if (typeof isFixedCost === 'boolean') {
-                update.isFixedCost = item.isFixedCost;
-            }
+            console.debug({ _id, update });
             if (_id.includes('new_')) {
                 if (rest.sheetId.includes('new_')) {
                     rest.sheetId = sheetMap[rest.sheetId];

package/services/financial-spreading.service.ts

@@ -208,13 +208,17 @@ export class FinancialSpreadingService {
         sheetMap[sheet._id] = newSheet._id.toString();
       } else {
         redundantSheetIdSet.delete(sheet._id);
+        const update: Partial<IFinancialSpreadingSheet> = {
+          name: sheet.name,
+          order: sheet.order,
+          suborder: sheet.suborder,
+          rowType: sheet.rowType as EFinanceSpreadingPLTotal | EFinanceSpreadingBSTotal,
+        }
+        if (sheet.isFixedCost) {
+          update.isFixedCost = sheet.isFixedCost;
+        }
         await FinancialSpreadingSheet
-          .findByIdAndUpdate(sheet._id, {
-            name: sheet.name,
-            order: sheet.order,
-            suborder: sheet.suborder,
-            rowType: sheet.rowType,
-          }, { new: true })
+          .findByIdAndUpdate(sheet._id, update, { new: true })
           .lean();
       }
     }));
@@ -232,9 +236,7 @@ export class FinancialSpreadingService {
         amount: rest.amount,
       };
 
-      if (typeof isFixedCost === 'boolean') {
-        update.isFixedCost = item.isFixedCost;
-      }
+      console.debug({ _id, update });
 
       if (_id.includes('new_')) {
         if (rest.sheetId.includes('new_')) {