gemcap-be-common 1.5.11 → 1.5.13

package/package.json

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

package/services/loan-statement.service.js

@@ -179,6 +179,7 @@ class LoanStatementService {
         await loanStatementEffectsService.saveMonthData(productId, statementDate);
         const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
         const product = await this.loanChargesService.getLoanProductById(productId);
+        console.debug({ charges });
         // 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;
@@ -292,8 +293,11 @@ class LoanStatementService {
                     return fee;
                 };
                 fee = checkMinAmount(fee);
+                if (charge.chargeType === loan_charge_type_enum_1.ELoanChargeType.ADMIN_FEE) {
+                    console.debug({ charge, statementDate, fee, isAfter: (0, dayjs_1.default)(statementDate).isSameOrAfter((0, dayjs_1.default)(charge.applyFrom)) });
+                }
                 if (fee !== null && fee > 0) {
-                    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))) {
+                    if ((0, dayjs_1.default)(statementDate).isSameOrAfter((0, dayjs_1.default)(charge.applyFrom))) {
                         const newStatement = {
                             order: orderIndex,
                             date: statementDate,

package/services/loan-statement.service.ts

@@ -204,7 +204,6 @@ export class LoanStatementService {
       statementDate = dayjs().utc().startOf('day').toDate();
     }
 
-
     const primeRate = await this.financialIndexesService.getFinancialIndexValue(EFinancialIndex.PRIME_RATE, statementDate);
     if (!primeRate) {
       return;
@@ -220,6 +219,8 @@ export class LoanStatementService {
     const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
     const product = await this.loanChargesService.getLoanProductById(productId);
 
+    console.debug({ charges });
+
     // If product is already deactivated for this statement date (inclusive) — skip everything early
     if (product.deactivationDate && dayjs(statementDate).isSameOrAfter(dayjs(product.deactivationDate))) {
       return;
@@ -340,8 +341,12 @@ export class LoanStatementService {
 
         fee = checkMinAmount(fee);
 
+        if (charge.chargeType === ELoanChargeType.ADMIN_FEE) {
+          console.debug({ charge, statementDate, fee, isAfter: dayjs(statementDate).isSameOrAfter(dayjs(charge.applyFrom)) });
+        }
+
         if (fee !== null && fee > 0) {
-          if (dayjs(statementDate).isSame(dayjs(charge.applyFrom)) || dayjs(statementDate).isAfter(dayjs(charge.applyFrom))) {
+          if (dayjs(statementDate).isSameOrAfter(dayjs(charge.applyFrom))) {
             const newStatement: ILoanStatementTransaction = {
               order: orderIndex,
               date: statementDate,