gemcap-be-common 1.5.180 → 1.5.182

package/interfaces/db.interface.d.ts

@@ -0,0 +1,29 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import mongoose from 'mongoose';
+export type TToPlainValue<T> = T extends mongoose.Types.ObjectId | null ? string | null : T extends Date | null ? string | null : T;
+export type TUpdatePayload<T, TReadonly extends keyof T = never> = {
+    [K in keyof Omit<T, TReadonly>]?: TToPlainValue<T[K]>;
+};

package/interfaces/db.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/interfaces/db.interface.ts

@@ -0,0 +1,12 @@
+import mongoose from 'mongoose';
+
+export type TToPlainValue<T> =
+  T extends mongoose.Types.ObjectId | null
+    ? string | null
+    : T extends Date | null
+      ? string | null
+      : T;
+
+export type TUpdatePayload<T, TReadonly extends keyof T = never> = {
+  [K in keyof Omit<T, TReadonly>]?: TToPlainValue<T[K]>;
+};

package/models/BorrowerFinanceSettings.model.d.ts

@@ -23,6 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose from 'mongoose';
+import { TUpdatePayload } from '../interfaces/db.interface';
 export interface IBorrowerFinanceSettings {
     borrowerId: mongoose.Types.ObjectId;
     companyId: mongoose.Types.ObjectId | null;
@@ -42,13 +43,14 @@ export interface IBorrowerFinanceSettingsLean extends IBorrowerFinanceSettings {
 export interface IBorrowerFinanceSettingsPlain extends Omit<IBorrowerFinanceSettings, 'borrowerId' | 'companyId' | 'reserveCodeCompanyId' | 'reserveCodeId'> {
     _id: string;
     borrowerId: string;
-    companyId: string;
-    reserveCodeCompanyId: string;
-    reserveCodeId: string;
+    companyId: string | null;
+    reserveCodeCompanyId: string | null;
+    reserveCodeId: string | null;
     createdAt: Date;
     updatedAt: Date;
 }
 export type TBorrowerFinanceSettingsModel = mongoose.Model<TBorrowerFinanceSettingsDoc>;
+export type TUpdateBorrowerFinanceSettings = TUpdatePayload<IBorrowerFinanceSettings, 'borrowerId'>;
 export declare const BorrowerFinanceSettingsSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     timestamps: true;
 }, {

package/models/BorrowerFinanceSettings.model.ts

@@ -1,6 +1,7 @@
 import mongoose from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
+import { TToPlainValue, TUpdatePayload } from '../interfaces/db.interface';
 
 export interface IBorrowerFinanceSettings {
   borrowerId: mongoose.Types.ObjectId;
@@ -27,15 +28,17 @@ export interface IBorrowerFinanceSettingsLean extends IBorrowerFinanceSettings {
 export interface IBorrowerFinanceSettingsPlain extends Omit<IBorrowerFinanceSettings, 'borrowerId' | 'companyId' | 'reserveCodeCompanyId' | 'reserveCodeId'> {
   _id: string;
   borrowerId: string;
-  companyId: string;
-  reserveCodeCompanyId: string;
-  reserveCodeId: string;
+  companyId: string | null;
+  reserveCodeCompanyId: string | null;
+  reserveCodeId: string | null;
   createdAt: Date;
   updatedAt: Date;
 }
 
 export type TBorrowerFinanceSettingsModel = mongoose.Model<TBorrowerFinanceSettingsDoc>;
 
+export type TUpdateBorrowerFinanceSettings = TUpdatePayload<IBorrowerFinanceSettings, 'borrowerId'>;
+
 export const BorrowerFinanceSettingsSchema = new mongoose.Schema(
   {
     borrowerId: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.5.180",
+  "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))) {