gemcap-be-common 1.4.259 → 1.5.2

package/models/_index.d.ts

@@ -32,9 +32,9 @@ export declare const allSchemas: {
         updatedAt: NativeDate;
     } & {
         order: number;
+        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
-        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -46,9 +46,9 @@ export declare const allSchemas: {
         updatedAt: NativeDate;
     } & {
         order: number;
+        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
-        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -60,9 +60,9 @@ export declare const allSchemas: {
         updatedAt: NativeDate;
     } & {
         order: number;
+        amount: 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.259",
+  "version": "1.5.2",
   "description": "",
   "main": "index.js",
   "scripts": {

package/services/borrower-summary.service.js

@@ -213,7 +213,7 @@ class BorrowerSummaryService {
     }
     async getChartData(borrowerId) {
         const products = await this.loanChargesService.getLoanProducts(borrowerId);
-        const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER);
+        const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.deactivationDate, new Date()));
         const chartData = [];
         if (revolverProduct) {
             const lastSignedBBC = await (0, bbcDates_db_1.getLatestSignedBBCDateDoc)(borrowerId);

package/services/borrower-summary.service.ts

@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
 
 import { ILoanTransactionDoc, LoanTransaction } from '../models/LoanTransaction.model';
-import { defaultDateFormat, convertDateToFormat } from '../helpers/date.helper';
+import { defaultDateFormat, convertDateToFormat, isProductActive } from '../helpers/date.helper';
 import { formatNumbers } from '../helpers/numbers.helper';
 import { BorrowerCompliance } from '../models/BorrowerCompliance.model';
 import { EComplianceItemStatus } from '../models/ComplianceItem.model';
@@ -236,7 +236,7 @@ export class BorrowerSummaryService {
 
   private async getChartData(borrowerId: string) {
     const products = await this.loanChargesService.getLoanProducts(borrowerId);
-    const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER);
+    const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.deactivationDate, new Date()));
     const chartData = [];
     if (revolverProduct) {
       const lastSignedBBC = await getLatestSignedBBCDateDoc(borrowerId);

package/services/borrowers.service.d.ts

@@ -84,10 +84,10 @@ export declare class BorrowerService {
     getBorrowerCodesMap(): Promise<Map<string, string>>;
     getBorrowerStatementDetails(borrowers: IBorrowerDoc[]): Promise<{
         [x: string]: {
+            SELECTED_PERIOD?: boolean;
+            ENTIRE_LOAN?: boolean;
             LAST_MONTH?: boolean;
             CURRENT_MONTH?: boolean;
-            ENTIRE_LOAN?: boolean;
-            SELECTED_PERIOD?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

package/services/loan-charges.service.js

@@ -195,6 +195,7 @@ class LoanChargesService {
     }
     validateLoanCharge(loanCharge) {
         const validationResult = LoanCharges_model_1.chargeViewValidationSchema.validate(loanCharge);
+        console.debug({ validationResult });
         return !!validationResult.error;
     }
     async saveLoanCharges(borrowerId, loanCharges, quickCreate = false) {

package/services/loan-charges.service.ts

@@ -227,6 +227,7 @@ export class LoanChargesService {
 
   validateLoanCharge(loanCharge: ILoanChargeView) {
     const validationResult = chargeViewValidationSchema.validate(loanCharge);
+    console.debug({ validationResult })
     return !!validationResult.error;
   }
 

package/services/loan-payments.service.js

@@ -17,6 +17,7 @@ const LoanTransaction_model_1 = require("../models/LoanTransaction.model");
 const LoanProducts_model_1 = require("../models/LoanProducts.model");
 const Borrower_model_1 = require("../models/Borrower.model");
 const LoanPayment_model_1 = require("../models/LoanPayment.model");
+const date_helper_1 = require("../helpers/date.helper");
 exports.paymentOrder = [
     loan_charge_type_enum_1.ELoanChargeType.RECOVERABLE,
     loan_charge_type_enum_1.ELoanChargeType.INTEREST_FEE,
@@ -329,7 +330,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);
+            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)));
             for (const p of combinedPayment.products) {
                 await this.loanProductsService.savePaymentOrder(p.productId, p.paymentOrder);
                 const desiredProductSum = data.productTotals[p.productId];
@@ -439,7 +440,7 @@ class LoanPaymentsService {
             if (borrowerIds.includes(borrower._id.toString())) {
                 try {
                     const borrowerProducts = await this.loanChargesService.getLoanProducts(borrower._id.toString());
-                    const revolverProduct = borrowerProducts.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER);
+                    const revolverProduct = borrowerProducts.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.deactivationDate, selectedDate));
                     const loanStatementService = this.getLoanStatementService();
                     const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
                     if (dueAmounts.total === 0) {

package/services/loan-payments.service.ts

@@ -40,6 +40,7 @@ import { LoanTransactionsService } from './loan-transactions.service';
 import { TermLoanService } from './term-loan.service';
 import { LockService } from './lock.service';
 import { UsersService } from './users.service';
+import { isProductActive } from '../helpers/date.helper';
 
 export const paymentOrder = [
   ELoanChargeType.RECOVERABLE,
@@ -371,7 +372,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);
+      const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && dayjs(product.deactivationDate).isBefore(dayjs(combinedPayment.date)));
 
       for (const p of combinedPayment.products) {
         await this.loanProductsService.savePaymentOrder(p.productId, p.paymentOrder);
@@ -490,7 +491,7 @@ export class LoanPaymentsService {
       if (borrowerIds.includes(borrower._id.toString())) {
         try {
           const borrowerProducts = await this.loanChargesService.getLoanProducts(borrower._id.toString());
-          const revolverProduct = borrowerProducts.find((product) => product.type === ELoanTypes.REVOLVER);
+          const revolverProduct = borrowerProducts.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.deactivationDate, selectedDate));
           const loanStatementService = this.getLoanStatementService();
           const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
           if (dueAmounts.total === 0) {

package/services/loan-transactions.service.js

@@ -676,7 +676,9 @@ class LoanTransactionsService {
             [loan_types_enum_1.ELoanTypes.TERM]: 0,
             [loan_types_enum_1.ELoanTypes.REVOLVER]: 0,
         };
-        await Promise.all(loanProducts.map(async (product) => {
+        await Promise.all(loanProducts
+            .filter((product) => (0, date_helper_1.isProductActive)(product.deactivationDate, bbcDate.bbcDate))
+            .map(async (product) => {
             const lastTransaction = await this.getLastTransactionForDate(product._id.toString(), (0, dayjs_1.default)(bbcDate.bbcDate).utcOffset(0).endOf('day').toDate());
             if (lastTransaction) {
                 balances[loan_types_enum_1.ELoanTypes[product.type]] = new decimal_js_1.default(balances[loan_types_enum_1.ELoanTypes[product.type]]).add(lastTransaction.balance).toNumber();

package/services/loan-transactions.service.ts

@@ -4,7 +4,7 @@ import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
 
 import { IEmail } from '../interfaces/email.interface';
-import { calculateTimeZone } from '../helpers/date.helper';
+import { calculateTimeZone, isProductActive } from '../helpers/date.helper';
 import { createFilteredObject } from '../helpers/common.helper';
 import { IPaginatorOptions } from '../interfaces/collaterals.interface';
 import { BBCDateModel } from '../models/BBCDate.model';
@@ -765,7 +765,9 @@ export class LoanTransactionsService {
       [ELoanTypes.TERM]: 0,
       [ELoanTypes.REVOLVER]: 0,
     };
-    await Promise.all(loanProducts.map(async (product) => {
+    await Promise.all(loanProducts
+      .filter((product) => isProductActive(product.deactivationDate, bbcDate.bbcDate))
+      .map(async (product) => {
       const lastTransaction = await this.getLastTransactionForDate(product._id.toString(), dayjs(bbcDate.bbcDate).utcOffset(0).endOf('day').toDate());
       if (lastTransaction) {
         balances[ELoanTypes[product.type]] = new Decimal(balances[ELoanTypes[product.type]]).add(lastTransaction.balance).toNumber();

package/services/pdf.service.js

@@ -368,6 +368,13 @@ class PdfService {
     async createStatementDoc(params, getOnlyTotal = false) {
         const { borrowerId, start, end } = params;
         const products = await this.loanChargesService.getLoanProducts(borrowerId);
+        const productForPeriod = products.filter(product => {
+            if (!product.deactivationDate) {
+                return true;
+            }
+            const deactivation = (0, dayjs_1.default)(product.deactivationDate);
+            return deactivation.isAfter((0, dayjs_1.default)(start)) && deactivation.isBefore((0, dayjs_1.default)(end));
+        });
         const borrower = await Borrower_model_1.BorrowerModel.findById(borrowerId).lean();
         const organization = await this.organizationsService.getOrganizationForBorrower(borrowerId);
         pdfmake_1.default.vfs = vfs_fonts_1.default.pdfMake.vfs;
@@ -389,11 +396,11 @@ class PdfService {
             [loan_charge_type_enum_1.ELoanChargeType.RECOVERABLE]: 0,
         };
         let totalOverDueStatementBalance = 0;
-        const productTotals = products.reduce((acc, p) => ({
+        const productTotals = productForPeriod.reduce((acc, p) => ({
             ...acc,
             [p._id.toString()]: 0,
         }), {});
-        const docContent = await Promise.all(products.map(async (product, index) => {
+        const docContent = await Promise.all(productForPeriod.map(async (product, index) => {
             const { startStatementBalance, preparedStatementHeader, preparedStatement, preparedTransactionsHeader, preparedTransactions, groupedData, otherStatements, } = await this.getProductStatementData(product._id.toString(), start, end);
             totalOverDueStatementBalance = new decimal_js_1.default(totalOverDueStatementBalance).add(startStatementBalance).toNumber();
             let totalPerProduct = 0;
@@ -427,7 +434,7 @@ class PdfService {
                 emptyString,
                 ...preparedTransactionsHeader,
                 preparedTransactions,
-                products.length === index + 1 ? emptyString : pageBreaker,
+                productForPeriod.length === index + 1 ? emptyString : pageBreaker,
             ];
         }));
         let totalStatementValue = 0;
@@ -448,7 +455,7 @@ class PdfService {
             : [];
         const principalData = [];
         let paymentDueDate = null;
-        const termLoanProducts = products.filter((product) => product.type === loan_types_enum_1.ELoanTypes.TERM);
+        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) {

package/services/pdf.service.ts

@@ -426,6 +426,14 @@ export class PdfService {
 
     const { borrowerId, start, end } = params;
     const products = await this.loanChargesService.getLoanProducts(borrowerId);
+    const productForPeriod = products.filter(product => {
+      if (!product.deactivationDate) {
+        return true;
+      }
+      const deactivation = dayjs(product.deactivationDate);
+      return deactivation.isAfter(dayjs(start)) && deactivation.isBefore(dayjs(end));
+    });
+
     const borrower = await BorrowerModel.findById(borrowerId).lean();
 
     const organization = await this.organizationsService.getOrganizationForBorrower(borrowerId);
@@ -455,12 +463,12 @@ export class PdfService {
 
     let totalOverDueStatementBalance = 0;
 
-    const productTotals: { [productId: string]: number } = products.reduce((acc, p) => ({
+    const productTotals: { [productId: string]: number } = productForPeriod.reduce((acc, p) => ({
       ...acc,
       [p._id.toString()]: 0,
     }), {});
 
-    const docContent = await Promise.all(products.map(async (product, index) => {
+    const docContent = await Promise.all(productForPeriod.map(async (product, index) => {
       const {
         startStatementBalance,
         preparedStatementHeader,
@@ -506,7 +514,7 @@ export class PdfService {
         emptyString,
         ...preparedTransactionsHeader,
         preparedTransactions,
-        products.length === index + 1 ? emptyString : pageBreaker,
+        productForPeriod.length === index + 1 ? emptyString : pageBreaker,
       ];
     }));
 
@@ -529,7 +537,7 @@ export class PdfService {
 
     const principalData = [];
     let paymentDueDate: Date = null;
-    const termLoanProducts = products.filter((product) => product.type === ELoanTypes.TERM);
+    const termLoanProducts = productForPeriod.filter((product) => product.type === ELoanTypes.TERM);
     await Promise.all(termLoanProducts.map(async (product) => {
       const {
         termLoanTableData,

package/services/quickbooks.service.js

@@ -15,6 +15,7 @@ const Borrower_model_1 = require("../models/Borrower.model");
 const TermLoan_model_1 = require("../models/TermLoan.model");
 const reports_db_1 = require("../db/reports.db");
 const QuickbooksAccount_model_1 = require("../models/QuickbooksAccount.model");
+const date_helper_1 = require("../helpers/date.helper");
 const headersIIF = [
     {
         service: '!TRNS',
@@ -433,7 +434,7 @@ class QuickbooksService {
                 };
                 if (settlementCode === 'null') {
                     const products = await this.loanChargesService.getLoanProducts(borrower._id.toString());
-                    const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER);
+                    const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.deactivationDate, reportDate));
                     if (revolverProduct) {
                         settlementCode = revolverProduct.code;
                     }

package/services/quickbooks.service.ts

@@ -22,6 +22,7 @@ import { CashAllocationService } from './cash-allocation.service';
 import { CompaniesService } from './companies.service';
 import { LoanChargesService } from './loan-charges.service';
 import { LoanPaymentsService } from './loan-payments.service';
+import { isProductActive } from '../helpers/date.helper';
 
 export type QuickBookReportType = 'accrual' | 'payment' | 'cash';
 
@@ -505,7 +506,7 @@ export class QuickbooksService {
 
         if (settlementCode === 'null') {
           const products = await this.loanChargesService.getLoanProducts(borrower._id.toString());
-          const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER);
+          const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.deactivationDate, reportDate));
           if (revolverProduct) {
             settlementCode = revolverProduct.code;
           }

package/services/reports.service.js

@@ -231,7 +231,7 @@ class ReportsService {
             if (!borrower) {
                 return;
             }
-            const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER);
+            const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.deactivationDate, date));
             const termProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.TERM);
             let revolverDataGroup = null;
             if (revolverProduct) {

package/services/reports.service.ts

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
 
 import { BorrowerModel } from '../models/Borrower.model';
-import { defaultDateFormat, convertDateToFormat } from '../helpers/date.helper';
+import { defaultDateFormat, convertDateToFormat, isProductActive } from '../helpers/date.helper';
 import { IInventoryAvailabilitySummary } from '../models/InventoryAvailability.model';
 import { IReserveSummary, IReserveSummaryItem } from '../models/Reserve.model';
 import { IAvailabilitySummary } from '../models/ReceivableAvailability.model';
@@ -314,7 +314,7 @@ export class ReportsService {
       if (!borrower) {
         return;
       }
-      const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER);
+      const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.deactivationDate, date));
       const termProduct = products.find((product) => product.type === ELoanTypes.TERM);
 
       let revolverDataGroup: ISummaryReportDataGroup = null;