gemcap-be-common 1.3.63 → 1.3.65

package/db/new-summary.js

@@ -80,7 +80,7 @@ const styles = {
         },
     },
 };
-const borrowerTitleLength = 12;
+const borrowerTitleLength = 16;
 const dateFormat = 'MM-DD-YYYY';
 const productsDataMap = new Map();
 const borrowersMap = new Map();
@@ -538,7 +538,15 @@ class NewSummaryExcel {
                 }
             });
             if (monthEndData.length) {
-                loanBalanceTotalRows.push({ ...emptyTotalRow, title: '', netValue: null, availability: null, grossValue: null, ineligible: null, advanceRate: null });
+                loanBalanceTotalRows.push({
+                    ...emptyTotalRow,
+                    title: '',
+                    netValue: null,
+                    availability: null,
+                    grossValue: null,
+                    ineligible: null,
+                    advanceRate: null,
+                });
             }
         }
         const loanBalanceTotalDataAsArrays = loanBalanceTotalRows.map((row) => (0, common_helper_1.reorderObject)(row, headerKeys));
@@ -757,6 +765,30 @@ class NewSummaryExcel {
             const month = (0, dayjs_1.default)(endDate).month();
             const year = (0, dayjs_1.default)(endDate).year();
             const monthDeep = 11;
+            const currentMonth = (0, dayjs_1.default)(endDate).utcOffset(0).month() + 1;
+            const currentYear = (0, dayjs_1.default)(endDate).utcOffset(0).year();
+            const { data: ytdDataPL } = await this.financialSpreadingService.getFinancialSpreadingData({
+                borrowerId,
+                financialSpreadingType: FinancialSpreadingSheet_model_1.EFinancialSpreadingType.PROFIT_LOSS,
+                selectedMonth: { year: currentYear, month: currentMonth },
+            }, currentMonth - 1); // jan to current
+            const { data: ytdDataBS } = await this.financialSpreadingService.getFinancialSpreadingData({
+                borrowerId,
+                financialSpreadingType: FinancialSpreadingSheet_model_1.EFinancialSpreadingType.BALANCE_SHEET,
+                selectedMonth: { year: currentYear, month: currentMonth },
+            }, currentMonth - 1); // jan to current
+            const { data: lyYtdDataPL } = await this.financialSpreadingService.getFinancialSpreadingData({
+                borrowerId,
+                financialSpreadingType: FinancialSpreadingSheet_model_1.EFinancialSpreadingType.PROFIT_LOSS,
+                selectedMonth: { year: currentYear - 1, month: currentMonth },
+            }, currentMonth - 1);
+            const { data: lyYtdDataBS } = await this.financialSpreadingService.getFinancialSpreadingData({
+                borrowerId,
+                financialSpreadingType: FinancialSpreadingSheet_model_1.EFinancialSpreadingType.BALANCE_SHEET,
+                selectedMonth: { year: currentYear - 1, month: currentMonth },
+            }, currentMonth - 1);
+            const ytdData = [...ytdDataPL, ...ytdDataBS];
+            const lyYtdData = [...lyYtdDataPL, ...lyYtdDataBS];
             const { data: dataPL, sheets: sheetsPL } = await this.financialSpreadingService.getFinancialSpreadingData({
                 borrowerId,
                 financialSpreadingType: FinancialSpreadingSheet_model_1.EFinancialSpreadingType.PROFIT_LOSS,
@@ -767,19 +799,52 @@ class NewSummaryExcel {
                 financialSpreadingType: FinancialSpreadingSheet_model_1.EFinancialSpreadingType.BALANCE_SHEET,
                 selectedMonth: { month, year },
             }, monthDeep);
-            const data = [...dataPL, ...dataBS];
-            const sheets = [...sheetsPL, ...sheetsBS];
+            const { data: sameMonthLastYearPL, sheets: sameMonthLastYearSheetsPL, } = await this.financialSpreadingService.getFinancialSpreadingData({
+                borrowerId,
+                financialSpreadingType: FinancialSpreadingSheet_model_1.EFinancialSpreadingType.PROFIT_LOSS,
+                selectedMonth: { year: currentYear - 1, month: currentMonth },
+            }, 0);
+            const { data: sameMonthLastYearBS, sheets: sameMonthLastYearSheetsBS, } = await this.financialSpreadingService.getFinancialSpreadingData({
+                borrowerId,
+                financialSpreadingType: FinancialSpreadingSheet_model_1.EFinancialSpreadingType.BALANCE_SHEET,
+                selectedMonth: { year: currentYear - 1, month: currentMonth },
+            }, 0);
+            const data = [
+                ...dataPL,
+                ...dataBS,
+                ...sameMonthLastYearPL,
+                ...sameMonthLastYearBS,
+            ];
+            const sheets = [
+                ...sheetsPL,
+                ...sheetsBS,
+                ...sameMonthLastYearSheetsPL,
+                ...sameMonthLastYearSheetsBS,
+            ];
             const generateMonthCells = () => {
-                const result = [];
-                for (let i = 0; i <= monthDeep; i++) {
-                    const date = (0, dayjs_1.default)(`${year}-${String(month).padStart(2, '0')}-01`).subtract(i, 'month');
-                    result.push({
+                const current = (0, dayjs_1.default)(`${year}-${String(month).padStart(2, '0')}-01`);
+                const sameMonthLastYear = current.subtract(1, 'year');
+                const ytdLabel = `YTD ${current.format('MMMM YYYY')}`;
+                const lyYtdLabel = `YTD ${sameMonthLastYear.format('MMMM YYYY')}`;
+                const historicalMonths = [];
+                for (let i = 1; i <= monthDeep; i++) {
+                    const date = current.subtract(i, 'month');
+                    historicalMonths.push({
                         v: date.endOf('month').format(dateFormat),
                         t: 's',
                         s: rightAlign,
                     });
                 }
-                return [{ v: 'Last 12 months', t: 's' }, ...result];
+                return [
+                    [
+                        { v: '', t: 's' },
+                        { v: 'Current Month', t: 's' },
+                        { v: 'Same Month Last Year', t: 's' },
+                        { v: ytdLabel, t: 's' },
+                        { v: lyYtdLabel, t: 's' },
+                        ...historicalMonths,
+                    ],
+                ];
             };
             const percentageIndexes = [FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.GROSS_MARGIN, FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.OPERATING_MARGIN];
             const convertAmount = (index, amount) => {
@@ -865,7 +930,19 @@ class NewSummaryExcel {
                 [FinancialSpreadingSheet_model_1.EFinanceSpreadingBSTotal.COMPANY_DEBT]: { title: 'Senior Debt' },
                 [FinancialSpreadingSheet_model_1.EFinanceSpreadingBSTotal.TOTAL_LIABILITIES]: { style: { font: { bold: true, name: 'Calibri' } } },
             });
+            const sumRowWithMinusFields = (entry) => {
+                const minusFields = Object.keys(entry).filter((field) => field.includes('minus_'));
+                const values = minusFields
+                    .map((key) => entry?.[key] ?? 0)
+                    .concat(entry.amount ?? 0);
+                return values.reduce((acc, val) => new decimal_js_1.default(acc).add(val).toNumber(), 0);
+            };
             const generateFinancialRows = (financialIndexes, enumObj) => {
+                const totalValues = {
+                    [FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.SALES]: { ytd: 0, lyYtd: 0 },
+                    [FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.GROSS_PROFIT]: { ytd: 0, lyYtd: 0 },
+                    [FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.OPERATING_EXPENSES]: { ytd: 0, lyYtd: 0 },
+                };
                 return Object.entries(financialIndexes).reduce((acc, [financialIndex, options]) => {
                     const sheet = sheets.find((s) => financialIndex === enumObj[s.rowType] && s.isTotal);
                     if (!sheet) {
@@ -876,6 +953,62 @@ class NewSummaryExcel {
                         return acc;
                     }
                     const baseValue = convertAmount(enumObj[financialIndex], dataEntry.amount);
+                    // Same month last year value, always for same calendar month last year (0-based month)
+                    const sameMonthLastYearEntry = data.find((d) => d.sheetId === sheet._id &&
+                        d.year === year - 1 &&
+                        d.month === month);
+                    const sameMonthLastYearValue = sameMonthLastYearEntry
+                        ? convertAmount(enumObj[financialIndex], sameMonthLastYearEntry.amount)
+                        : '';
+                    // YTD and LY YTD sums
+                    const entryYTD = ytdData.find((d) => d.sheetId === sheet._id);
+                    let ytdSumRaw = entryYTD ? sumRowWithMinusFields(entryYTD) : 0;
+                    const entryLY_YTD = lyYtdData.find((d) => d.sheetId === sheet._id);
+                    let lyYtdSumRaw = entryLY_YTD ? sumRowWithMinusFields(entryLY_YTD) : 0;
+                    if (Object.keys(totalValues).includes(sheet.rowType)) {
+                        totalValues[sheet.rowType] = {
+                            ytd: ytdSumRaw,
+                            lyYtd: lyYtdSumRaw,
+                        };
+                    }
+                    switch (sheet.rowType) {
+                        case FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.GROSS_MARGIN: {
+                            ytdSumRaw = totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.SALES].ytd === 0
+                                ? 0
+                                : new decimal_js_1.default(totalValues.GROSS_PROFIT.ytd)
+                                    .div(totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.SALES].ytd)
+                                    .mul(100)
+                                    .toDecimalPlaces(2)
+                                    .toNumber();
+                            lyYtdSumRaw = totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.SALES].lyYtd === 0
+                                ? 0
+                                : new decimal_js_1.default(totalValues.GROSS_PROFIT.lyYtd)
+                                    .div(totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.SALES].lyYtd)
+                                    .mul(100)
+                                    .toDecimalPlaces(2)
+                                    .toNumber();
+                            break;
+                        }
+                        case FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.OPERATING_MARGIN: {
+                            ytdSumRaw = totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.SALES].ytd === 0
+                                ? 0
+                                : new decimal_js_1.default(totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.GROSS_PROFIT].ytd)
+                                    .sub(totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.OPERATING_EXPENSES].ytd)
+                                    .div(totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.SALES].ytd)
+                                    .toDecimalPlaces(2)
+                                    .toNumber();
+                            lyYtdSumRaw = totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.SALES].lyYtd === 0
+                                ? 0
+                                : new decimal_js_1.default(totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.GROSS_PROFIT].lyYtd)
+                                    .sub(totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.OPERATING_EXPENSES].lyYtd)
+                                    .div(totalValues[FinancialSpreadingSheet_model_1.EFinanceSpreadingPLTotal.SALES].lyYtd)
+                                    .toDecimalPlaces(2)
+                                    .toNumber();
+                            break;
+                        }
+                    }
+                    const ytdSum = convertAmount(enumObj[financialIndex], ytdSumRaw);
+                    const lyYtdSum = convertAmount(enumObj[financialIndex], lyYtdSumRaw);
                     const monthlyValues = Array.from({ length: monthDeep }, (_, i) => ({
                         v: convertAmount(enumObj[financialIndex], dataEntry[`minus_${i + 1}`]),
                         t: 'n',
@@ -885,12 +1018,20 @@ class NewSummaryExcel {
                     const row = [
                         { v: options.title, t: 's', s: options.style },
                         { v: baseValue, t: 'n', z: options.format },
+                        {
+                            v: sameMonthLastYearValue,
+                            t: 'n',
+                            z: options.format,
+                            s: options.style,
+                        },
+                        { v: ytdSum, t: 'n', z: options.format, s: options.style },
+                        { v: lyYtdSum, t: 'n', z: options.format, s: options.style },
                         ...monthlyValues,
                     ];
                     return options.addEmptyRow ? [...acc, row, emptyRow] : [...acc, row];
                 }, []);
             };
-            const get = (base, i, key) => new decimal_js_1.default(i === 0 ? base[key]?.amount : base[key]?.[`minus_${i}`] ?? 0);
+            const get = (base, i, key) => new decimal_js_1.default((i === 0 ? base[key]?.amount : base[key]?.[`minus_${i}`]) ?? 0);
             const financialRatioFormulas = [
                 {
                     label: 'Fixed Charge Coverage Ratio',
@@ -1020,7 +1161,22 @@ class NewSummaryExcel {
                 const financialRatiosBaseKeys = lodash_1.default.uniq(financialRatioFormulas.flatMap((f) => f.dependencies));
                 const financialRatiosBase = financialRatiosBaseKeys.reduce((acc, key) => {
                     const sheet = sheets.find((s) => s.rowType === key && s.isTotal);
-                    const dataEntry = data.find((d) => d.sheetId.toString() === sheet._id.toString());
+                    const dataEntry = data.find((d) => {
+                        return d.sheetId.toString() === sheet._id.toString() && d.year === currentYear && d.month === currentMonth;
+                    });
+                    if (!dataEntry) {
+                        return acc;
+                    }
+                    return { ...acc, [key]: dataEntry };
+                }, {});
+                const financialRatiosBaseLY = financialRatiosBaseKeys.reduce((acc, key) => {
+                    const sheet = sheets.find((s) => s.rowType === key && s.isTotal);
+                    const dataEntry = data.find((d) => {
+                        return d.sheetId.toString() === sheet._id.toString() && d.year === currentYear - 1 && d.month === currentMonth;
+                    });
+                    if (!dataEntry) {
+                        return acc;
+                    }
                     return { ...acc, [key]: dataEntry };
                 }, {});
                 const ratioRows = financialRatioFormulas.map(({ label, formula, format }) => {
@@ -1034,6 +1190,14 @@ class NewSummaryExcel {
                             row.push(negativeCell);
                         }
                     }
+                    const result = formula(financialRatiosBaseLY, 0);
+                    if (result) {
+                        row.splice(2, 0, { v: result, t: 'n', z: format ?? excel_helper_1.NUMBER_FORMATS.thousands });
+                    }
+                    else {
+                        row.push(negativeCell);
+                    }
+                    row.splice(3, 0, ...[{ v: '' }, { v: '' }]);
                     return row;
                 });
                 return [...ratiosData, ...ratioRows];
@@ -1042,7 +1206,7 @@ class NewSummaryExcel {
             const financialBSDataFull = generateFinancialRows(financialBSIndexes, FinancialSpreadingSheet_model_1.EFinanceSpreadingBSTotal);
             const financialRatios = generateFinancialRatios();
             return [
-                generateMonthCells(),
+                ...generateMonthCells(),
                 emptyRow,
                 [{ v: 'PROFIT & LOSS HIGHLIGHTS', t: 's' }],
                 ...financialPLDataFull,

package/db/new-summary.ts

@@ -144,7 +144,7 @@ const styles: { [styleName: string]: Partial<ExcelJS.Style> } = {
 
 
 
-const borrowerTitleLength = 12;
+const borrowerTitleLength = 16;
 const dateFormat = 'MM-DD-YYYY';
 
 const productsDataMap = new Map<string, ReportRow>();
@@ -635,7 +635,15 @@ export class NewSummaryExcel {
         }
       });
       if (monthEndData.length) {
-        loanBalanceTotalRows.push({ ...emptyTotalRow, title: '', netValue: null, availability: null, grossValue: null, ineligible: null, advanceRate: null });
+        loanBalanceTotalRows.push({
+          ...emptyTotalRow,
+          title: '',
+          netValue: null,
+          availability: null,
+          grossValue: null,
+          ineligible: null,
+          advanceRate: null,
+        });
       }
     }
 
@@ -885,6 +893,37 @@ export class NewSummaryExcel {
       const month = dayjs(endDate).month();
       const year = dayjs(endDate).year();
       const monthDeep = 11;
+
+      const currentMonth = dayjs(endDate).utcOffset(0).month() + 1;
+      const currentYear = dayjs(endDate).utcOffset(0).year();
+
+      const { data: ytdDataPL } = await this.financialSpreadingService.getFinancialSpreadingData({
+        borrowerId,
+        financialSpreadingType: EFinancialSpreadingType.PROFIT_LOSS,
+        selectedMonth: { year: currentYear, month: currentMonth },
+      }, currentMonth - 1); // jan to current
+
+      const { data: ytdDataBS } = await this.financialSpreadingService.getFinancialSpreadingData({
+        borrowerId,
+        financialSpreadingType: EFinancialSpreadingType.BALANCE_SHEET,
+        selectedMonth: { year: currentYear, month: currentMonth },
+      }, currentMonth - 1); // jan to current
+
+      const { data: lyYtdDataPL } = await this.financialSpreadingService.getFinancialSpreadingData({
+        borrowerId,
+        financialSpreadingType: EFinancialSpreadingType.PROFIT_LOSS,
+        selectedMonth: { year: currentYear - 1, month: currentMonth },
+      }, currentMonth - 1);
+
+      const { data: lyYtdDataBS } = await this.financialSpreadingService.getFinancialSpreadingData({
+        borrowerId,
+        financialSpreadingType: EFinancialSpreadingType.BALANCE_SHEET,
+        selectedMonth: { year: currentYear - 1, month: currentMonth },
+      }, currentMonth - 1);
+
+      const ytdData = [...ytdDataPL, ...ytdDataBS];
+      const lyYtdData = [...lyYtdDataPL, ...lyYtdDataBS];
+
       const { data: dataPL, sheets: sheetsPL } = await this.financialSpreadingService.getFinancialSpreadingData({
         borrowerId,
         financialSpreadingType: EFinancialSpreadingType.PROFIT_LOSS,
@@ -897,22 +936,63 @@ export class NewSummaryExcel {
         selectedMonth: { month, year },
       }, monthDeep);
 
-      const data = [...dataPL, ...dataBS];
-      const sheets = [...sheetsPL, ...sheetsBS];
+      const {
+        data: sameMonthLastYearPL,
+        sheets: sameMonthLastYearSheetsPL,
+      } = await this.financialSpreadingService.getFinancialSpreadingData({
+        borrowerId,
+        financialSpreadingType: EFinancialSpreadingType.PROFIT_LOSS,
+        selectedMonth: { year: currentYear - 1, month: currentMonth },
+      }, 0);
+
+      const {
+        data: sameMonthLastYearBS,
+        sheets: sameMonthLastYearSheetsBS,
+      } = await this.financialSpreadingService.getFinancialSpreadingData({
+        borrowerId,
+        financialSpreadingType: EFinancialSpreadingType.BALANCE_SHEET,
+        selectedMonth: { year: currentYear - 1, month: currentMonth },
+      }, 0);
+
+      const data = [
+        ...dataPL,
+        ...dataBS,
+        ...sameMonthLastYearPL,
+        ...sameMonthLastYearBS,
+      ];
+      const sheets = [
+        ...sheetsPL,
+        ...sheetsBS,
+        ...sameMonthLastYearSheetsPL,
+        ...sameMonthLastYearSheetsBS,
+      ];
 
-      const generateMonthCells = (): IExcelJsCell[] => {
-        const result: IExcelJsCell[] = [];
+      const generateMonthCells = (): IExcelJsCell[][] => {
+        const current = dayjs(`${year}-${String(month).padStart(2, '0')}-01`);
+        const sameMonthLastYear = current.subtract(1, 'year');
+        const ytdLabel = `YTD ${current.format('MMMM YYYY')}`;
+        const lyYtdLabel = `YTD ${sameMonthLastYear.format('MMMM YYYY')}`;
 
-        for (let i = 0; i <= monthDeep; i++) {
-          const date = dayjs(`${year}-${String(month).padStart(2, '0')}-01`).subtract(i, 'month');
-          result.push({
+        const historicalMonths = [];
+        for (let i = 1; i <= monthDeep; i++) {
+          const date = current.subtract(i, 'month');
+          historicalMonths.push({
             v: date.endOf('month').format(dateFormat),
             t: 's',
             s: rightAlign,
           });
         }
 
-        return [{ v: 'Last 12 months', t: 's' }, ...result];
+        return [
+          [
+            { v: '', t: 's' },
+            { v: 'Current Month', t: 's' },
+            { v: 'Same Month Last Year', t: 's' },
+            { v: ytdLabel, t: 's' },
+            { v: lyYtdLabel, t: 's' },
+            ...historicalMonths,
+          ],
+        ];
       };
 
       const percentageIndexes = [EFinanceSpreadingPLTotal.GROSS_MARGIN, EFinanceSpreadingPLTotal.OPERATING_MARGIN] as const;
@@ -1009,7 +1089,22 @@ export class NewSummaryExcel {
         [EFinanceSpreadingBSTotal.TOTAL_LIABILITIES]: { style: { font: { bold: true, name: 'Calibri' } } },
       });
 
+      const sumRowWithMinusFields = (entry: FinancialSpreadingDTO): number => {
+        const minusFields = Object.keys(entry).filter((field) => field.includes('minus_'));
+        const values: number[] = minusFields
+          .map((key) => entry?.[key] ?? 0)
+          .concat(entry.amount ?? 0);
+
+        return values.reduce((acc, val) => new Decimal(acc).add(val).toNumber(), 0);
+      };
+
       const generateFinancialRows = <T extends Record<string, string>>(financialIndexes: Record<string, FinancialIndexOptions>, enumObj: T): IExcelJsCell[][] => {
+        const totalValues = {
+          [EFinanceSpreadingPLTotal.SALES]: { ytd: 0, lyYtd: 0 },
+          [EFinanceSpreadingPLTotal.GROSS_PROFIT]: { ytd: 0, lyYtd: 0 },
+          [EFinanceSpreadingPLTotal.OPERATING_EXPENSES]: { ytd: 0, lyYtd: 0 },
+        };
+
         return Object.entries(financialIndexes).reduce((acc, [financialIndex, options]) => {
           const sheet = sheets.find((s) => financialIndex === enumObj[s.rowType] && s.isTotal);
           if (!sheet) {
@@ -1022,6 +1117,71 @@ export class NewSummaryExcel {
           }
 
           const baseValue = convertAmount(enumObj[financialIndex as keyof T], dataEntry.amount);
+
+          // Same month last year value, always for same calendar month last year (0-based month)
+          const sameMonthLastYearEntry = data.find((d) =>
+            d.sheetId === sheet._id &&
+            d.year === year - 1 &&
+            d.month === month,
+          );
+          const sameMonthLastYearValue = sameMonthLastYearEntry
+            ? convertAmount(enumObj[financialIndex as keyof T], sameMonthLastYearEntry.amount)
+            : '';
+
+          // YTD and LY YTD sums
+          const entryYTD = ytdData.find((d) => d.sheetId === sheet._id);
+          let ytdSumRaw = entryYTD ? sumRowWithMinusFields(entryYTD) : 0;
+
+          const entryLY_YTD = lyYtdData.find((d) => d.sheetId === sheet._id);
+          let lyYtdSumRaw = entryLY_YTD ? sumRowWithMinusFields(entryLY_YTD) : 0;
+
+          if (Object.keys(totalValues).includes(sheet.rowType)) {
+            totalValues[sheet.rowType] = {
+              ytd: ytdSumRaw,
+              lyYtd: lyYtdSumRaw,
+            };
+          }
+
+          switch (sheet.rowType) {
+            case EFinanceSpreadingPLTotal.GROSS_MARGIN: {
+              ytdSumRaw = totalValues[EFinanceSpreadingPLTotal.SALES].ytd === 0
+                ? 0
+                : new Decimal(totalValues.GROSS_PROFIT.ytd)
+                  .div(totalValues[EFinanceSpreadingPLTotal.SALES].ytd)
+                  .mul(100)
+                  .toDecimalPlaces(2)
+                  .toNumber();
+              lyYtdSumRaw = totalValues[EFinanceSpreadingPLTotal.SALES].lyYtd === 0
+                ? 0
+                : new Decimal(totalValues.GROSS_PROFIT.lyYtd)
+                  .div(totalValues[EFinanceSpreadingPLTotal.SALES].lyYtd)
+                  .mul(100)
+                  .toDecimalPlaces(2)
+                  .toNumber();
+              break;
+            }
+            case EFinanceSpreadingPLTotal.OPERATING_MARGIN: {
+              ytdSumRaw = totalValues[EFinanceSpreadingPLTotal.SALES].ytd === 0
+                ? 0
+                : new Decimal(totalValues[EFinanceSpreadingPLTotal.GROSS_PROFIT].ytd)
+                  .sub(totalValues[EFinanceSpreadingPLTotal.OPERATING_EXPENSES].ytd)
+                  .div(totalValues[EFinanceSpreadingPLTotal.SALES].ytd)
+                  .toDecimalPlaces(2)
+                  .toNumber();
+              lyYtdSumRaw = totalValues[EFinanceSpreadingPLTotal.SALES].lyYtd === 0
+                ? 0
+                : new Decimal(totalValues[EFinanceSpreadingPLTotal.GROSS_PROFIT].lyYtd)
+                  .sub(totalValues[EFinanceSpreadingPLTotal.OPERATING_EXPENSES].lyYtd)
+                  .div(totalValues[EFinanceSpreadingPLTotal.SALES].lyYtd)
+                  .toDecimalPlaces(2)
+                  .toNumber();
+              break;
+            }
+          }
+
+          const ytdSum = convertAmount(enumObj[financialIndex as keyof T], ytdSumRaw);
+          const lyYtdSum = convertAmount(enumObj[financialIndex as keyof T], lyYtdSumRaw);
+
           const monthlyValues = Array.from({ length: monthDeep }, (_, i) => ({
             v: convertAmount(enumObj[financialIndex as keyof T], dataEntry[`minus_${i + 1}`]),
             t: 'n',
@@ -1032,6 +1192,14 @@ export class NewSummaryExcel {
           const row: IExcelJsCell[] = [
             { v: options.title, t: 's', s: options.style },
             { v: baseValue, t: 'n', z: options.format },
+            {
+              v: sameMonthLastYearValue,
+              t: 'n',
+              z: options.format,
+              s: options.style,
+            },
+            { v: ytdSum, t: 'n', z: options.format, s: options.style },
+            { v: lyYtdSum, t: 'n', z: options.format, s: options.style },
             ...monthlyValues,
           ];
 
@@ -1046,7 +1214,7 @@ export class NewSummaryExcel {
         formula: (data: Record<string, FinancialSpreadingDTO>, monthIndex: number) => number;
       };
 
-      const get = (base: Record<string, FinancialSpreadingDTO>, i: number, key: string) => new Decimal(i === 0 ? base[key]?.amount : base[key]?.[`minus_${i}`] ?? 0);
+      const get = (base: Record<string, FinancialSpreadingDTO>, i: number, key: string) => new Decimal((i === 0 ? base[key]?.amount : base[key]?.[`minus_${i}`]) ?? 0);
 
       const financialRatioFormulas: FinancialRatioFormula[] = [
         {
@@ -1180,7 +1348,23 @@ export class NewSummaryExcel {
 
         const financialRatiosBase = financialRatiosBaseKeys.reduce((acc, key) => {
           const sheet = sheets.find((s) => s.rowType === key && s.isTotal);
-          const dataEntry = data.find((d) => d.sheetId.toString() === sheet._id.toString());
+          const dataEntry = data.find((d) => {
+            return d.sheetId.toString() === sheet._id.toString() && d.year === currentYear && d.month === currentMonth;
+          });
+          if (!dataEntry) {
+            return acc;
+          }
+          return { ...acc, [key]: dataEntry };
+        }, {} as Record<string, FinancialSpreadingDTO>);
+
+        const financialRatiosBaseLY = financialRatiosBaseKeys.reduce((acc, key) => {
+          const sheet = sheets.find((s) => s.rowType === key && s.isTotal);
+          const dataEntry = data.find((d) => {
+            return d.sheetId.toString() === sheet._id.toString() && d.year === currentYear - 1 && d.month === currentMonth;
+          });
+          if (!dataEntry) {
+            return acc;
+          }
           return { ...acc, [key]: dataEntry };
         }, {} as Record<string, FinancialSpreadingDTO>);
 
@@ -1194,6 +1378,14 @@ export class NewSummaryExcel {
               row.push(negativeCell);
             }
           }
+          const result = formula(financialRatiosBaseLY, 0);
+          if (result) {
+            row.splice(2, 0, { v: result, t: 'n', z: format ?? NUMBER_FORMATS.thousands });
+          } else {
+            row.push(negativeCell);
+          }
+          row.splice(3, 0, ...[{ v: '' }, { v: '' }]);
+
           return row;
         });
 
@@ -1205,7 +1397,7 @@ export class NewSummaryExcel {
       const financialRatios = generateFinancialRatios();
 
       return [
-        generateMonthCells(),
+        ...generateMonthCells(),
         emptyRow,
         [{ v: 'PROFIT & LOSS HIGHLIGHTS', t: 's' }],
         ...financialPLDataFull,

package/models/Prospect.model.js

@@ -10,6 +10,7 @@ const _models_1 = require("./_models");
 const ProspectInfoStageTwo_model_1 = require("./ProspectInfoStageTwo.model");
 const ProspectInfoStageOne_model_1 = require("./ProspectInfoStageOne.model");
 const main_helper_1 = require("../helpers/main.helper");
+const textFieldMaxLength = 600;
 exports.prospectFieldsDictionary = {
     name: 'Name',
     industry: 'Industry',
@@ -302,13 +303,13 @@ exports.CRMProspectValidationSchema = joi_1.default.object({
         dropDate: joi_1.default.date().allow(null),
     }),
     priority: joi_1.default.string().valid(...Object.values(EProspectPriority)).required(),
-    businessDescription: joi_1.default.string().max(400).allow(''),
-    comments: joi_1.default.string().max(400).allow(''),
-    collateralDescription: joi_1.default.string().max(400).allow(''),
+    businessDescription: joi_1.default.string().max(textFieldMaxLength).allow(''),
+    comments: joi_1.default.string().max(textFieldMaxLength).allow(''),
+    collateralDescription: joi_1.default.string().max(textFieldMaxLength).allow(''),
     declineReason: joi_1.default.string().valid(...Object.values(EProspectDeclineReason)),
-    sourceId: joi_1.default.string(),
-    closingPoints: joi_1.default.number().required(),
-    expectedLoanYield: joi_1.default.number().required(),
+    sourceId: joi_1.default.string().required(),
+    closingPoints: joi_1.default.number().required().allow(null, 0).default(0),
+    expectedLoanYield: joi_1.default.number().required().allow(null, 0).default(0),
     state: joi_1.default.string().required(),
     contacts: joi_1.default.array().items(joi_1.default.object({
         name: joi_1.default.string().required().allow(''),

package/models/Prospect.model.ts

@@ -7,6 +7,8 @@ import { ExternalProspectStageTwoTables, ProspectInfoStageTwo } from './Prospect
 import { ExternalProspectStageOneTables, ProspectInfoStageOne } from './ProspectInfoStageOne.model';
 import { getUUID, TDictionary } from '../helpers/main.helper';
 
+const textFieldMaxLength = 600;
+
 export const prospectFieldsDictionary: TDictionary = {
   name: 'Name',
   industry: 'Industry',
@@ -448,13 +450,13 @@ export const CRMProspectValidationSchema = Joi.object({
     dropDate: Joi.date().allow(null),
   }),
   priority: Joi.string().valid(...Object.values(EProspectPriority)).required(),
-  businessDescription: Joi.string().max(400).allow(''),
-  comments: Joi.string().max(400).allow(''),
-  collateralDescription: Joi.string().max(400).allow(''),
+  businessDescription: Joi.string().max(textFieldMaxLength).allow(''),
+  comments: Joi.string().max(textFieldMaxLength).allow(''),
+  collateralDescription: Joi.string().max(textFieldMaxLength).allow(''),
   declineReason: Joi.string().valid(...Object.values(EProspectDeclineReason)),
-  sourceId: Joi.string(),
-  closingPoints: Joi.number().required(),
-  expectedLoanYield: Joi.number().required(),
+  sourceId: Joi.string().required(),
+  closingPoints: Joi.number().required().allow(null, 0).default(0),
+  expectedLoanYield: Joi.number().required().allow(null, 0).default(0),
   state: Joi.string().required(),
   contacts: Joi.array().items(Joi.object({
     name: Joi.string().required().allow(''),

package/package.json

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