gemcap-be-common 1.5.181 → 1.5.182

package/models/BorrowerFinanceSettings.model.ts

@@ -37,10 +37,6 @@ export interface IBorrowerFinanceSettingsPlain extends Omit<IBorrowerFinanceSett
 
 export type TBorrowerFinanceSettingsModel = mongoose.Model<TBorrowerFinanceSettingsDoc>;
 
-type TBorrowerFinanceSettingsReadonlyFields = 'borrowerId';
-
-type TBorrowerFinanceSettingsUpdateFields = Omit<IBorrowerFinanceSettings, TBorrowerFinanceSettingsReadonlyFields>;
-
 export type TUpdateBorrowerFinanceSettings = TUpdatePayload<IBorrowerFinanceSettings, 'borrowerId'>;
 
 export const BorrowerFinanceSettingsSchema = new mongoose.Schema(

package/package.json

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

package/services/loan-statement.service.js

@@ -22,6 +22,7 @@ const TermLoan_model_1 = require("../models/TermLoan.model");
 const loan_statement_db_1 = require("../db/loan-statement.db");
 const BBCDate_model_1 = require("../models/BBCDate.model");
 const financial_indexes_service_1 = require("./financial-indexes.service");
+const BorrowerFinanceSettings_model_1 = require("../models/BorrowerFinanceSettings.model");
 dayjs_1.default.extend(utc_1.default);
 dayjs_1.default.extend(timezone_1.default);
 class LoanStatementService {
@@ -179,6 +180,11 @@ class LoanStatementService {
         await loanStatementEffectsService.saveMonthData(productId, statementDate);
         const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
         const product = await this.loanChargesService.getLoanProductById(productId);
+        const borrowerFinanceSettings = await BorrowerFinanceSettings_model_1.BorrowerFinanceSettings.findOne({ borrowerId: product.borrowerId }).lean().exec();
+        // If borrower accrual is enabled, skip everything early
+        if (borrowerFinanceSettings && borrowerFinanceSettings.accrualEnabled && (0, dayjs_1.default)(statementDate).isSameOrAfter((0, dayjs_1.default)(borrowerFinanceSettings.accrualAppliedFrom))) {
+            return;
+        }
         // 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;

package/services/loan-statement.service.ts

@@ -38,6 +38,7 @@ import { LoanStatementBalanceService } from './loan-statement-balance.service';
 import { TermLoanService } from './term-loan.service';
 import { UploadsService } from './uploads.service';
 import { LoanStatementEffectsService } from './loan-statement-effects.service';
+import { BorrowerFinanceSettings } from '../models/BorrowerFinanceSettings.model';
 
 dayjs.extend(utc);
 dayjs.extend(timezone);
@@ -218,6 +219,12 @@ export class LoanStatementService {
 
     const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
     const product = await this.loanChargesService.getLoanProductById(productId);
+    const borrowerFinanceSettings = await BorrowerFinanceSettings.findOne({ borrowerId: product.borrowerId }).lean().exec();
+
+    // If borrower accrual is enabled, skip everything early
+    if (borrowerFinanceSettings && borrowerFinanceSettings.accrualEnabled && dayjs(statementDate).isSameOrAfter(dayjs(borrowerFinanceSettings.accrualAppliedFrom))) {
+      return;
+    }
 
     // If product is already deactivated for this statement date (inclusive) — skip everything early
     if (product.deactivationDate && dayjs(statementDate).isSameOrAfter(dayjs(product.deactivationDate))) {