gemcap-be-common 1.5.7 → 1.5.9

package/helpers/date.helper.js

@@ -7,10 +7,12 @@ exports.isProductActive = exports.getShiftedMonth = exports.getDays = exports.ge
 const dayjs_1 = __importDefault(require("dayjs"));
 const utc_1 = __importDefault(require("dayjs/plugin/utc"));
 const timezone_1 = __importDefault(require("dayjs/plugin/timezone"));
+const isSameOrAfter_1 = __importDefault(require("dayjs/plugin/isSameOrAfter"));
 const objectSupport_1 = __importDefault(require("dayjs/plugin/objectSupport"));
 dayjs_1.default.extend(objectSupport_1.default);
 dayjs_1.default.extend(utc_1.default);
 dayjs_1.default.extend(timezone_1.default);
+dayjs_1.default.extend(isSameOrAfter_1.default);
 exports.defaultDateFormat = 'MM-DD-YYYY';
 const normalizeDate = (date, type) => {
     return type === 'start'

package/helpers/date.helper.ts

@@ -1,11 +1,13 @@
 import dayjs, { Dayjs, OpUnitType, QUnitType } from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import timezone from 'dayjs/plugin/timezone';
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
 import objectSupport from 'dayjs/plugin/objectSupport';
 
 dayjs.extend(objectSupport);
 dayjs.extend(utc);
 dayjs.extend(timezone);
+dayjs.extend(isSameOrAfter);
 
 export interface ISelectedMonth {
   year: number;

package/package.json

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

package/services/loan-statement.service.js

@@ -168,6 +168,11 @@ class LoanStatementService {
         if (!statementDate) {
             statementDate = (0, dayjs_1.default)().utc().startOf('day').toDate();
         }
+        const product = await this.loanChargesService.getLoanProductById(productId);
+        // If product is already deactivated for this statement date (inclusive) — skip everything early
+        if (product.deactivationDate && (0, dayjs_1.default)(statementDate).isSameOrAfter((0, dayjs_1.default)(product.deactivationDate))) {
+            return;
+        }
         const primeRate = await this.financialIndexesService.getFinancialIndexValue(financial_indexes_service_1.EFinancialIndex.PRIME_RATE, statementDate);
         if (!primeRate) {
             return;
@@ -178,7 +183,6 @@ class LoanStatementService {
         const loanStatementEffectsService = this.getLoanStatementEffectsService();
         await loanStatementEffectsService.saveMonthData(productId, statementDate);
         const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
-        const product = await this.loanChargesService.getLoanProductById(productId);
         const daysPerYear = 360;
         const dayInMonth = (0, dayjs_1.default)(period.end).diff(period.start, 'days') + 1;
         let orderIndex = 0;
@@ -289,19 +293,21 @@ class LoanStatementService {
                 };
                 fee = checkMinAmount(fee);
                 if (fee !== null && fee > 0) {
-                    const newStatement = {
-                        order: orderIndex,
-                        date: statementDate,
-                        chargeId: charge._id,
-                        amount: fee,
-                        amountPaid: 0,
-                        isSystem: true,
-                        memo: 'System Generated',
-                        balance: 0,
-                    };
-                    const newStatementDoc = await LoanStatementTransaction_model_1.LoanStatementTransactionModel.create(newStatement);
-                    await newStatementDoc.save();
-                    orderIndex = orderIndex + 1;
+                    if ((0, dayjs_1.default)(statementDate).isSame((0, dayjs_1.default)(charge.applyFrom)) || (0, dayjs_1.default)(statementDate).isAfter((0, dayjs_1.default)(charge.applyFrom))) {
+                        const newStatement = {
+                            order: orderIndex,
+                            date: statementDate,
+                            chargeId: charge._id,
+                            amount: fee,
+                            amountPaid: 0,
+                            isSystem: true,
+                            memo: 'System Generated',
+                            balance: 0,
+                        };
+                        const newStatementDoc = await LoanStatementTransaction_model_1.LoanStatementTransactionModel.create(newStatement);
+                        await newStatementDoc.save();
+                        orderIndex = orderIndex + 1;
+                    }
                 }
             }
         }

package/services/loan-statement.service.ts

@@ -203,6 +203,14 @@ export class LoanStatementService {
     if (!statementDate) {
       statementDate = dayjs().utc().startOf('day').toDate();
     }
+
+    const product = await this.loanChargesService.getLoanProductById(productId);
+
+    // If product is already deactivated for this statement date (inclusive) — skip everything early
+    if (product.deactivationDate && dayjs(statementDate).isSameOrAfter(dayjs(product.deactivationDate))) {
+      return;
+    }
+
     const primeRate = await this.financialIndexesService.getFinancialIndexValue(EFinancialIndex.PRIME_RATE, statementDate);
     if (!primeRate) {
       return;
@@ -215,7 +223,6 @@ export class LoanStatementService {
     await loanStatementEffectsService.saveMonthData(productId, statementDate);
 
     const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
-    const product = await this.loanChargesService.getLoanProductById(productId);
 
     const daysPerYear = 360;
     const dayInMonth = dayjs(period.end).diff(period.start, 'days') + 1;
@@ -333,19 +340,21 @@ export class LoanStatementService {
         fee = checkMinAmount(fee);
 
         if (fee !== null && fee > 0) {
-          const newStatement: ILoanStatementTransaction = {
-            order: orderIndex,
-            date: statementDate,
-            chargeId: charge._id,
-            amount: fee,
-            amountPaid: 0,
-            isSystem: true,
-            memo: 'System Generated',
-            balance: 0,
-          };
-          const newStatementDoc = await LoanStatementTransactionModel.create(newStatement);
-          await newStatementDoc.save();
-          orderIndex = orderIndex + 1;
+          if (dayjs(statementDate).isSame(dayjs(charge.applyFrom)) || dayjs(statementDate).isAfter(dayjs(charge.applyFrom))) {
+            const newStatement: ILoanStatementTransaction = {
+              order: orderIndex,
+              date: statementDate,
+              chargeId: charge._id,
+              amount: fee,
+              amountPaid: 0,
+              isSystem: true,
+              memo: 'System Generated',
+              balance: 0,
+            };
+            const newStatementDoc = await LoanStatementTransactionModel.create(newStatement);
+            await newStatementDoc.save();
+            orderIndex = orderIndex + 1;
+          }
         }
       }
     }