gemcap-be-common 1.4.152 → 1.4.154

package/models/FinancialSpreading.model.d.ts

@@ -41,7 +41,6 @@ export interface IFinancialSpreadingView {
     month: number;
     sheetId: string;
     amount: number;
-    isFixedCost?: boolean;
     minus_1?: number;
     minus_2?: number;
     minus_3?: number;

package/models/FinancialSpreading.model.js

@@ -24,7 +24,6 @@ exports.financialSpreadingViewValidationSchema = joi_1.default.object({
     year: joi_1.default.number().integer().min(1900).max(9999),
     sheetId: joi_1.default.string().required(),
     amount: joi_1.default.number().required().allow(0),
-    isFixedCost: joi_1.default.boolean().allow(null),
     minus_1: joi_1.default.number(),
     minus_2: joi_1.default.number(),
     minus_3: joi_1.default.number(),

package/models/FinancialSpreading.model.ts

@@ -21,7 +21,6 @@ export interface IFinancialSpreadingView {
   month: number;
   sheetId: string;
   amount: number;
-  isFixedCost?: boolean;
   minus_1?: number;
   minus_2?: number;
   minus_3?: number;
@@ -81,7 +80,6 @@ export const financialSpreadingViewValidationSchema = Joi.object<IFinancialSprea
   year: Joi.number().integer().min(1900).max(9999),
   sheetId: Joi.string().required(),
   amount: Joi.number().required().allow(0),
-  isFixedCost: Joi.boolean().allow(null),
   minus_1: Joi.number(),
   minus_2: Joi.number(),
   minus_3: Joi.number(),

package/models/_index.d.ts

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

package/package.json

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

package/services/financial-spreading.service.js

@@ -196,11 +196,10 @@ class FinancialSpreadingService {
             return { success: false, data, sheets, message: 'Invalid data' };
         }
         await Promise.all(editableData.map(async (item) => {
-            const { _id, isFixedCost, ...rest } = item;
+            const { _id, ...rest } = item;
             const update = {
                 amount: rest.amount,
             };
-            console.debug({ _id, update });
             if (_id.includes('new_')) {
                 if (rest.sheetId.includes('new_')) {
                     rest.sheetId = sheetMap[rest.sheetId];
@@ -403,23 +402,62 @@ class FinancialSpreadingService {
             v: header,
             s: { font: { bold: true } },
         }));
+        const buildAggregatedRow = (title, rows) => {
+            const oldData = range.map((r) => rows.reduce((sum, row) => new decimal_js_1.default(sum).add(row[`minus_${r}`] ?? 0).toNumber(), 0));
+            const current = rows.reduce((sum, row) => new decimal_js_1.default(sum).add(row.amount).toNumber(), 0);
+            return [
+                { v: '', s: { font: { bold: true } } },
+                { v: title, s: { font: { italic: true } } },
+                ...oldData.map((v) => ({ v, t: 'n' })),
+                { v: current, t: 'n' },
+            ];
+        };
         await Promise.all([FinancialSpreadingSheet_model_1.EFinancialSpreadingType.PROFIT_LOSS, FinancialSpreadingSheet_model_1.EFinancialSpreadingType.BALANCE_SHEET].map(async (financialSpreadingType) => {
             const financialSpreadingData = await this.getFinancialSpreadingData({ ...params, financialSpreadingType }, monthDeep);
             const sheetsView = financialSpreadingData.sheets;
-            const someData = financialSpreadingData.data.reduce((acc, rowData) => {
-                const foundSheet = sheetsView.find((sheet) => sheet._id === rowData.sheetId);
-                const oldData = range.reduce((acc, rangeValue) => [...acc, rowData[`minus_${rangeValue}`]], []);
-                const totalStyle = foundSheet.isTotal ? rowStyles[foundSheet.rowType] ?? {} : {};
-                const row = [
-                    { v: foundSheet.isTotal ? foundSheet.name : '', s: { font: { bold: true } } },
-                    { v: foundSheet.isTotal ? '' : foundSheet.name, s: { font: { italic: true } } },
-                    ...oldData.map((data) => ({ v: data, t: 'n' })),
-                    { v: rowData.amount, t: 'n' },
-                ];
-                const rowWithStyles = row.map((cell) => ({ ...cell, s: lodash_1.default.merge(cell.s, totalStyle) }));
-                return [...acc, rowWithStyles];
-            }, []);
-            fullData[financialSpreadingType] = [fullHeaders, ...someData];
+            const data = financialSpreadingData.data;
+            const sheetById = lodash_1.default.keyBy(sheetsView, '_id');
+            const dataByRowType = lodash_1.default.groupBy(data, (row) => {
+                const sheet = sheetById[row.sheetId];
+                return sheet?.rowType;
+            });
+            const rows = [];
+            for (const [rowType, rowsData] of Object.entries(dataByRowType)) {
+                // ===== OPERATING EXPENSES (special case)
+                if (rowType === FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.OPERATING_EXPENSES) {
+                    const fixed = rowsData.filter(r => sheetById[r.sheetId]?.isFixedCost);
+                    const variable = rowsData.filter(r => !sheetById[r.sheetId]?.isFixedCost);
+                    if (fixed.length) {
+                        rows.push(buildAggregatedRow('Fixed operating expenses', fixed));
+                    }
+                    if (variable.length) {
+                        rows.push(buildAggregatedRow('Variable operating expenses', variable));
+                    }
+                    continue;
+                }
+                // ===== DEFAULT ROW RENDERING
+                rowsData.forEach((rowData) => {
+                    const sheet = sheetById[rowData.sheetId];
+                    if (!sheet)
+                        return;
+                    const oldData = range.map(r => rowData[`minus_${r}`]);
+                    const baseRow = [
+                        { v: sheet.isTotal ? sheet.name : '', s: { font: { bold: true } } },
+                        { v: sheet.isTotal ? '' : sheet.name, s: { font: { italic: true } } },
+                        ...oldData.map(v => ({ v, t: 'n' })),
+                        { v: rowData.amount, t: 'n' },
+                    ];
+                    const style = sheet.isTotal ? rowStyles[sheet.rowType] ?? {} : {};
+                    rows.push(baseRow.map(cell => ({
+                        ...cell,
+                        s: lodash_1.default.merge(cell.s, style),
+                    })));
+                });
+            }
+            fullData[financialSpreadingType] = [
+                fullHeaders,
+                ...rows,
+            ];
         }));
         return await this.uploadsService.convertDataToFileWithStyleOld({
             'PROFIT LOSS': fullData[FinancialSpreadingSheet_model_1.EFinancialSpreadingType.PROFIT_LOSS],

package/services/financial-spreading.service.ts

@@ -213,7 +213,7 @@ export class FinancialSpreadingService {
           order: sheet.order,
           suborder: sheet.suborder,
           rowType: sheet.rowType as EFinanceSpreadingPLTotal | EFinanceSpreadingBSTotal,
-        }
+        };
         if (sheet.isFixedCost) {
           update.isFixedCost = sheet.isFixedCost;
         }
@@ -230,14 +230,12 @@ export class FinancialSpreadingService {
       return { success: false, data, sheets, message: 'Invalid data' };
     }
     await Promise.all(editableData.map(async (item) => {
-      const { _id, isFixedCost, ...rest } = item;
+      const { _id, ...rest } = item;
 
       const update: Partial<IFinancialSpreading> = {
         amount: rest.amount,
       };
 
-      console.debug({ _id, update });
-
       if (_id.includes('new_')) {
         if (rest.sheetId.includes('new_')) {
           rest.sheetId = sheetMap[rest.sheetId];
@@ -464,27 +462,90 @@ export class FinancialSpreadingService {
       s: { font: { bold: true } },
     }));
 
+    const buildAggregatedRow = (
+      title: string,
+      rows: IFinancialSpreadingViewWithDeepData[],
+    ): IExcelDataCellWithStyles[] => {
+      const oldData = range.map((r) =>
+        rows.reduce((sum, row) => new Decimal(sum).add(row[`minus_${r}`] as number ?? 0).toNumber(), 0),
+      );
+
+      const current = rows.reduce((sum, row) => new Decimal(sum).add(row.amount).toNumber(), 0);
+
+      return [
+        { v: '', s: { font: { bold: true } } },
+        { v: title, s: { font: { italic: true } } },
+        ...oldData.map((v) => ({ v, t: 'n' })),
+        { v: current, t: 'n' },
+      ];
+    };
+
     await Promise.all([EFinancialSpreadingType.PROFIT_LOSS, EFinancialSpreadingType.BALANCE_SHEET].map(async (financialSpreadingType) => {
       const financialSpreadingData = await this.getFinancialSpreadingData(
         { ...params, financialSpreadingType },
         monthDeep,
       );
 
-      const sheetsView = financialSpreadingData.sheets as unknown[] as IFinancialSpreadingSheetView[];
-      const someData = (financialSpreadingData.data as unknown as IFinancialSpreadingViewWithDeepData[]).reduce((acc, rowData) => {
-        const foundSheet = sheetsView.find((sheet) => sheet._id === rowData.sheetId);
-        const oldData = range.reduce((acc, rangeValue) => [...acc, rowData[`minus_${rangeValue}`]], []);
-        const totalStyle = foundSheet.isTotal ? rowStyles[foundSheet.rowType] ?? {} : {};
-        const row: IExcelDataCellWithStyles[] = [
-          { v: foundSheet.isTotal ? foundSheet.name : '', s: { font: { bold: true } } },
-          { v: foundSheet.isTotal ? '' : foundSheet.name, s: { font: { italic: true } } },
-          ...oldData.map((data) => ({ v: data, t: 'n' })),
-          { v: rowData.amount, t: 'n' },
-        ];
-        const rowWithStyles = row.map((cell) => ({ ...cell, s: _.merge(cell.s, totalStyle) }));
-        return [...acc, rowWithStyles];
-      }, []);
-      fullData[financialSpreadingType] = [fullHeaders, ...someData];
+      const sheetsView = financialSpreadingData.sheets as IFinancialSpreadingSheetView[];
+      const data = financialSpreadingData.data as unknown as IFinancialSpreadingViewWithDeepData[];
+
+      const sheetById = _.keyBy(sheetsView, '_id');
+
+      const dataByRowType = _.groupBy(data, (row) => {
+        const sheet = sheetById[row.sheetId];
+        return sheet?.rowType;
+      });
+
+      const rows: IExcelDataCellWithStyles[][] = [];
+
+      for (const [rowType, rowsData] of Object.entries(dataByRowType)) {
+
+        // ===== OPERATING EXPENSES (special case)
+        if (rowType === EFinanceSpreadingPLTotal.OPERATING_EXPENSES) {
+
+          const fixed = rowsData.filter(r => sheetById[r.sheetId]?.isFixedCost);
+          const variable = rowsData.filter(r => !sheetById[r.sheetId]?.isFixedCost);
+
+          if (fixed.length) {
+            rows.push(buildAggregatedRow('Fixed operating expenses', fixed));
+          }
+
+          if (variable.length) {
+            rows.push(buildAggregatedRow('Variable operating expenses', variable));
+          }
+
+          continue;
+        }
+
+        // ===== DEFAULT ROW RENDERING
+        rowsData.forEach((rowData) => {
+          const sheet = sheetById[rowData.sheetId];
+          if (!sheet) return;
+
+          const oldData = range.map(r => rowData[`minus_${r}`]);
+
+          const baseRow: IExcelDataCellWithStyles[] = [
+            { v: sheet.isTotal ? sheet.name : '', s: { font: { bold: true } } },
+            { v: sheet.isTotal ? '' : sheet.name, s: { font: { italic: true } } },
+            ...oldData.map(v => ({ v, t: 'n' })),
+            { v: rowData.amount, t: 'n' },
+          ];
+
+          const style = sheet.isTotal ? rowStyles[sheet.rowType] ?? {} : {};
+
+          rows.push(
+            baseRow.map(cell => ({
+              ...cell,
+              s: _.merge(cell.s, style),
+            })),
+          );
+        });
+      }
+
+      fullData[financialSpreadingType] = [
+        fullHeaders,
+        ...rows,
+      ];
     }));
 
     return await this.uploadsService.convertDataToFileWithStyleOld({