gemcap-be-common 1.5.21 → 1.5.23

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.21",
+  "version": "1.5.23",
   "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/loan-statement.service.js

@@ -166,7 +166,7 @@ class LoanStatementService {
     }
     async calculateStatement(productId, period, statementDate) {
         if (!statementDate) {
-            statementDate = (0, dayjs_1.default)().utc().startOf('day').toDate();
+            statementDate = dayjs_1.default.utc().startOf('day').toDate();
         }
         const primeRate = await this.financialIndexesService.getFinancialIndexValue(financial_indexes_service_1.EFinancialIndex.PRIME_RATE, statementDate);
         if (!primeRate) {

package/services/loan-statement.service.ts

@@ -201,7 +201,7 @@ export class LoanStatementService {
 
   async calculateStatement(productId: string, period: IStatementPeriod, statementDate?: Date) {
     if (!statementDate) {
-      statementDate = dayjs().utc().startOf('day').toDate();
+      statementDate = dayjs.utc().startOf('day').toDate();
     }
 
     const primeRate = await this.financialIndexesService.getFinancialIndexValue(EFinancialIndex.PRIME_RATE, statementDate);

package/services/loan-transactions.service.js

@@ -176,8 +176,10 @@ class LoanTransactionsService {
         }));
     }
     async getDisbursementTransactions(productId, date) {
+        const startOfDay = dayjs_1.default.utc(date).startOf('day').toDate();
+        const endOfDay = dayjs_1.default.utc(date).endOf('day').toDate();
         return LoanTransaction_model_1.LoanTransaction.countDocuments({
-            date: date,
+            date: { $gte: startOfDay, $lte: endOfDay },
             productId: new mongoose_1.default.Types.ObjectId(productId),
             transactionType: LoanTransaction_model_1.ELoanTransactionTypes.DISBURSEMENT,
             bankId: { $ne: null },

package/services/loan-transactions.service.ts

@@ -218,9 +218,11 @@ export class LoanTransactionsService {
   }
 
   async getDisbursementTransactions(productId: string, date: Date) {
+    const startOfDay = dayjs.utc(date).startOf('day').toDate();
+    const endOfDay = dayjs.utc(date).endOf('day').toDate();
     return LoanTransaction.countDocuments(
       {
-        date: date,
+        date: { $gte: startOfDay, $lte: endOfDay },
         productId: new mongoose.Types.ObjectId(productId),
         transactionType: ELoanTransactionTypes.DISBURSEMENT,
         bankId: { $ne: null },

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);