gemcap-be-common 1.5.8 → 1.5.10

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.8",
+  "version": "1.5.10",
   "description": "",
   "main": "index.js",
   "scripts": {

package/services/loan-statement.service.js

@@ -179,6 +179,10 @@ class LoanStatementService {
         await loanStatementEffectsService.saveMonthData(productId, statementDate);
         const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
         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 daysPerYear = 360;
         const dayInMonth = (0, dayjs_1.default)(period.end).diff(period.start, 'days') + 1;
         let orderIndex = 0;

package/services/loan-statement.service.ts

@@ -203,11 +203,14 @@ export class LoanStatementService {
     if (!statementDate) {
       statementDate = dayjs().utc().startOf('day').toDate();
     }
+
+
     const primeRate = await this.financialIndexesService.getFinancialIndexValue(EFinancialIndex.PRIME_RATE, statementDate);
     if (!primeRate) {
       return;
     }
     await this.cleanProductStatement(productId, statementDate);
+
     const balanceDate = dayjs.utc(statementDate).add(1, 'day').subtract(1, 'second').toDate();
     const balance = await this.loanChargesService.getLoanProductBalance(productId, balanceDate);
 
@@ -217,6 +220,11 @@ export class LoanStatementService {
     const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
     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 daysPerYear = 360;
     const dayInMonth = dayjs(period.end).diff(period.start, 'days') + 1;
     let orderIndex = 0;