gemcap-be-common 1.5.22 → 1.5.24

package/db/new-summary.js

@@ -28,6 +28,7 @@ const ProspectIndustry_model_1 = require("../models/ProspectIndustry.model");
 const financial_spreading_service_1 = require("../services/financial-spreading.service");
 const MonthEndData_Model_1 = require("../models/MonthEndData.Model");
 const Yield_model_1 = require("../models/Yield.model");
+const date_helper_1 = require("../helpers/date.helper");
 const styles = {
     blackOnWhiteWithTopBorder: {
         fill: {
@@ -561,7 +562,7 @@ class NewSummaryExcel {
         });
         // TERM LOAN
         const getTermLoanSection = async () => {
-            const termProduct = [...productsMap.values()].find((product) => product.borrowerId.toString() === borrowerId && product.type === loan_types_enum_1.ELoanTypes.TERM && product.active);
+            const termProduct = [...productsMap.values()].find((product) => product.borrowerId.toString() === borrowerId && product.type === loan_types_enum_1.ELoanTypes.TERM && (0, date_helper_1.isProductActive)(product.startDate, product.deactivationDate, new Date()));
             if (!termProduct || !availability) {
                 return [emptyRow];
             }

package/db/new-summary.ts

@@ -44,6 +44,7 @@ import { SignsService } from '../services/signs.service';
 import { MonthEndDataService } from '../services/month-end-data.service';
 import { EMonthEndDataType } from '../models/MonthEndData.Model';
 import { ETotalType, YIELD_TOTALS_MAP } from '../models/Yield.model';
+import { isProductActive } from '../helpers/date.helper';
 
 type DataSheet = {
   [p: string]: IExcelJsCell[][]
@@ -661,7 +662,7 @@ export class NewSummaryExcel {
 
     // TERM LOAN
     const getTermLoanSection = async (): Promise<IExcelJsCell[][]> => {
-      const termProduct = [...productsMap.values()].find((product) => product.borrowerId.toString() === borrowerId && product.type === ELoanTypes.TERM && product.active);
+      const termProduct = [...productsMap.values()].find((product) => product.borrowerId.toString() === borrowerId && product.type === ELoanTypes.TERM && isProductActive(product.startDate, product.deactivationDate, new Date()));
       if (!termProduct || !availability) {
         return [emptyRow];
       }

package/package.json

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

package/services/loan-payments.service.js

@@ -283,9 +283,9 @@ class LoanPaymentsService {
         for (const [index, payment] of payments.entries()) {
             try {
                 console.log(`updating payment (for ${product.name}) ${index + 1}/${payments.length}`, (0, dayjs_1.default)(payment.date).format('DD-MM-YYYY'), payment.amount);
-                for (const loanTransaction of payment.loanTransactions) {
-                    await LoanTransaction_model_1.LoanTransaction.findByIdAndDelete(loanTransaction.transactionId);
-                }
+                await LoanTransaction_model_1.LoanTransaction.deleteMany({
+                    _id: { $in: payment.loanTransactions.map(t => t.transactionId) }
+                });
                 await LoanPayment_model_1.LoanPaymentModel.findByIdAndUpdate(payment._id, { paid: [], loanTransactions: [] });
                 await this.updateLoanPayment(payment, userId);
             }
@@ -334,7 +334,7 @@ class LoanPaymentsService {
             const data = await loanStatementService.getBorrowerComplianceData(combinedPayment.borrowerId, new Date());
             let totalSumToCover = combinedPayment.payment;
             const products = await this.loanChargesService.getLoanProducts(combinedPayment.borrowerId);
-            const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, dayjs_1.default)(product.deactivationDate).isBefore((0, dayjs_1.default)(combinedPayment.date)));
+            const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.startDate, product.deactivationDate, combinedPayment.date));
             for (const p of combinedPayment.products) {
                 await this.loanProductsService.savePaymentOrder(p.productId, p.paymentOrder);
                 const desiredProductSum = data.productTotals[p.productId];

package/services/loan-payments.service.ts

@@ -323,9 +323,9 @@ export class LoanPaymentsService {
     for (const [index, payment] of payments.entries()) {
       try {
         console.log(`updating payment (for ${product.name}) ${index + 1}/${payments.length}`, dayjs(payment.date).format('DD-MM-YYYY'), payment.amount);
-        for (const loanTransaction of payment.loanTransactions) {
-          await LoanTransaction.findByIdAndDelete(loanTransaction.transactionId);
-        }
+        await LoanTransaction.deleteMany({
+          _id: { $in: payment.loanTransactions.map(t => t.transactionId) }
+        });
         await LoanPaymentModel.findByIdAndUpdate(payment._id, { paid: [], loanTransactions: [] });
         await this.updateLoanPayment(payment as Partial<ILoanPaymentWithId>, userId);
       } catch (e) {
@@ -375,7 +375,7 @@ export class LoanPaymentsService {
       const data = await loanStatementService.getBorrowerComplianceData(combinedPayment.borrowerId, new Date());
       let totalSumToCover = combinedPayment.payment;
       const products = await this.loanChargesService.getLoanProducts(combinedPayment.borrowerId);
-      const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && dayjs(product.deactivationDate).isBefore(dayjs(combinedPayment.date)));
+      const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.startDate, product.deactivationDate, combinedPayment.date));
 
       for (const p of combinedPayment.products) {
         await this.loanProductsService.savePaymentOrder(p.productId, p.paymentOrder);

package/services/nodemailer.service.js

@@ -35,6 +35,7 @@ const loan_types_enum_1 = require("../enums/loan-types.enum");
 const Organization_model_1 = require("../models/Organization.model");
 const FinancialCompliance_model_1 = __importDefault(require("../models/FinancialCompliance.model"));
 const OrganizationEmails_model_1 = require("../models/OrganizationEmails.model");
+const date_helper_1 = require("../helpers/date.helper");
 var ESenderType;
 (function (ESenderType) {
     ESenderType[ESenderType["REGULAR"] = 0] = "REGULAR";
@@ -406,7 +407,7 @@ class NodemailerService {
         const borrower = await this.borrowerService.getBorrowerById(borrowerId);
         const organization = await this.organizationsService.getOrganizationForBorrower(borrowerId);
         const products = await this.loanChargesService.getLoanProducts(borrower._id.toString());
-        const borrowerHasRevolver = products.filter((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && product.active).length > 0;
+        const borrowerHasRevolver = products.filter((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.startDate, product.deactivationDate, new Date())).length > 0;
         const textPath = path_1.default.resolve(__dirname, '../public/emails', organization.subfolder, borrowerHasRevolver ? 'interest-statement.html' : 'interest-statement-only-term.html');
         const text = await fs.promises.readFile(textPath, 'utf8');
         const signature = await this.getSignatureAsync(ESenderType.FINANCIAL, organization.subfolder);

package/services/nodemailer.service.ts

@@ -21,6 +21,7 @@ import { LoanChargesService } from './loan-charges.service';
 import { OrganizationEmailsService } from './organization-emails.service';
 import { OrganizationsService } from './organizations.service';
 import { SentryService } from './sentry.service';
+import { isProductActive } from '../helpers/date.helper';
 
 export enum ESenderType {
   REGULAR,
@@ -472,7 +473,7 @@ export class NodemailerService {
     const borrower = await this.borrowerService.getBorrowerById(borrowerId);
     const organization = await this.organizationsService.getOrganizationForBorrower(borrowerId);
     const products = await this.loanChargesService.getLoanProducts(borrower._id.toString());
-    const borrowerHasRevolver = products.filter((product) => product.type === ELoanTypes.REVOLVER && product.active).length > 0;
+    const borrowerHasRevolver = products.filter((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.startDate, product.deactivationDate, new Date())).length > 0;
     const textPath = path.resolve(__dirname, '../public/emails', organization.subfolder, borrowerHasRevolver ? 'interest-statement.html' : 'interest-statement-only-term.html');
     const text = await fs.promises.readFile(textPath, 'utf8');
     const signature = await this.getSignatureAsync(ESenderType.FINANCIAL, organization.subfolder);

package/services/pdf.service.js

@@ -419,8 +419,8 @@ class PdfService {
             const warningText = product.type === loan_types_enum_1.ELoanTypes.REVOLVER
                 ? `AMOUNT WILL BE ADDED TO THE LOAN ON 1ST. ${organization.name.toUpperCase()} RESERVES THE RIGHT TO STOP FUNDING IF THERE IS INSUFFICIENT AVAILABILITY TO ADD IT TO THE LOAN.`
                 : `PAYABLE BY 7TH. ${organization.name.toUpperCase()} RESERVES THE RIGHT TO STOP FUNDING IF THE STATEMENT IS NOT PAID.`;
-            return [
-                this.addHeaderNew(organization.subfolder), // Add the image element to the content
+            const baseContent = [
+                this.addHeaderNew(organization.subfolder),
                 emptyString,
                 ...preparedStatementHeader,
                 emptyString,
@@ -439,6 +439,32 @@ class PdfService {
                 preparedTransactions,
                 productForPeriod.length === index + 1 ? emptyString : pageBreaker,
             ];
+            if (product.type === loan_types_enum_1.ELoanTypes.TERM) {
+                const { termLoanTableData, monthlyPrincipal, dueDate, } = await this.getTermLoan(product._id.toString(), new Date(start));
+                if (monthlyPrincipal !== null) {
+                    totalStatementValue = new decimal_js_1.default(totalStatementValue).add(monthlyPrincipal).toNumber();
+                    principalData.push([
+                        { text: `Principal (${product.name})` },
+                        { text: (0, numbers_helper_1.formatNumbers)(monthlyPrincipal), alignment: 'right' },
+                        { text: '' },
+                    ]);
+                    paymentDueDate = dueDate;
+                    productTotals[product._id.toString()] = new decimal_js_1.default(productTotals[product._id.toString()]).add(monthlyPrincipal).toNumber();
+                }
+                return [
+                    ...baseContent,
+                    pageBreaker,
+                    this.addHeaderNew(organization.subfolder),
+                    emptyString,
+                    { text: `Term loan schedule: `, fontSize: 15, bold: true },
+                    emptyString,
+                    {
+                        table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
+                        layout: 'lightHorizontalLines',
+                    },
+                ];
+            }
+            return baseContent;
         }));
         let totalStatementValue = 0;
         const preparedTotal = Object.entries(totalGroupedData).map(([chargeType, amount]) => {
@@ -458,31 +484,6 @@ class PdfService {
             : [];
         const principalData = [];
         let paymentDueDate = null;
-        const termLoanProducts = productForPeriod.filter((product) => product.type === loan_types_enum_1.ELoanTypes.TERM);
-        await Promise.all(termLoanProducts.map(async (product) => {
-            const { termLoanTableData, monthlyPrincipal, dueDate, } = await this.getTermLoan(product._id.toString(), new Date(start));
-            if (monthlyPrincipal !== null) {
-                totalStatementValue = new decimal_js_1.default(totalStatementValue).add(monthlyPrincipal).toNumber();
-                principalData.push([
-                    { text: 'Principal' },
-                    { text: (0, numbers_helper_1.formatNumbers)(monthlyPrincipal), alignment: 'right' },
-                    { text: '' },
-                ]);
-                paymentDueDate = dueDate;
-                productTotals[product._id.toString()] = new decimal_js_1.default(productTotals[product._id.toString()]).add(monthlyPrincipal).toNumber();
-            }
-            docContent.push([
-                pageBreaker,
-                this.addHeaderNew(organization.subfolder),
-                emptyString,
-                { text: `Term loan schedule: `, fontSize: 15, bold: true },
-                emptyString,
-                {
-                    table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
-                    layout: 'lightHorizontalLines',
-                },
-            ]);
-        }));
         const totalOwed = new decimal_js_1.default(totalStatementValue).add(totalOverDueStatementBalance).toNumber();
         if (getOnlyTotal) {
             return { total: totalOwed, dueDate: paymentDueDate, productTotals };

package/services/pdf.service.ts

@@ -500,8 +500,8 @@ export class PdfService {
         ? `AMOUNT WILL BE ADDED TO THE LOAN ON 1ST. ${organization.name.toUpperCase()} RESERVES THE RIGHT TO STOP FUNDING IF THERE IS INSUFFICIENT AVAILABILITY TO ADD IT TO THE LOAN.`
         : `PAYABLE BY 7TH. ${organization.name.toUpperCase()} RESERVES THE RIGHT TO STOP FUNDING IF THE STATEMENT IS NOT PAID.`;
 
-      return [
-        this.addHeaderNew(organization.subfolder), // Add the image element to the content
+      const baseContent = [
+        this.addHeaderNew(organization.subfolder),
         emptyString,
         ...preparedStatementHeader,
         emptyString,
@@ -520,6 +520,40 @@ export class PdfService {
         preparedTransactions,
         productForPeriod.length === index + 1 ? emptyString : pageBreaker,
       ];
+
+      if (product.type === ELoanTypes.TERM) {
+        const {
+          termLoanTableData,
+          monthlyPrincipal,
+          dueDate,
+        } = await this.getTermLoan(product._id.toString(), new Date(start));
+
+        if (monthlyPrincipal !== null) {
+          totalStatementValue = new Decimal(totalStatementValue).add(monthlyPrincipal).toNumber();
+          principalData.push([
+            { text: `Principal (${product.name})` },
+            { text: formatNumbers(monthlyPrincipal), alignment: 'right' },
+            { text: '' },
+          ]);
+          paymentDueDate = dueDate;
+          productTotals[product._id.toString()] = new Decimal(productTotals[product._id.toString()]).add(monthlyPrincipal).toNumber();
+        }
+
+        return [
+          ...baseContent,
+          pageBreaker,
+          this.addHeaderNew(organization.subfolder),
+          emptyString,
+          <any>{ text: `Term loan schedule: `, fontSize: 15, bold: true },
+          emptyString,
+          {
+            table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
+            layout: 'lightHorizontalLines',
+          },
+        ];
+      }
+
+      return baseContent;
     }));
 
     let totalStatementValue = 0;
@@ -541,37 +575,6 @@ export class PdfService {
 
     const principalData = [];
     let paymentDueDate: Date = null;
-    const termLoanProducts = productForPeriod.filter((product) => product.type === ELoanTypes.TERM);
-    await Promise.all(termLoanProducts.map(async (product) => {
-      const {
-        termLoanTableData,
-        monthlyPrincipal,
-        dueDate,
-      } = await this.getTermLoan(product._id.toString(), new Date(start));
-
-      if (monthlyPrincipal !== null) {
-        totalStatementValue = new Decimal(totalStatementValue).add(monthlyPrincipal).toNumber();
-        principalData.push([
-          { text: 'Principal' },
-          { text: formatNumbers(monthlyPrincipal), alignment: 'right' },
-          { text: '' },
-        ]);
-        paymentDueDate = dueDate;
-        productTotals[product._id.toString()] = new Decimal(productTotals[product._id.toString()]).add(monthlyPrincipal).toNumber();
-      }
-
-      docContent.push([
-        pageBreaker,
-        this.addHeaderNew(organization.subfolder),
-        emptyString,
-        <any>{ text: `Term loan schedule: `, fontSize: 15, bold: true },
-        emptyString,
-        {
-          table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
-          layout: 'lightHorizontalLines',
-        },
-      ]);
-    }));
 
     const totalOwed = new Decimal(totalStatementValue).add(totalOverDueStatementBalance).toNumber();