gemcap-be-common 1.3.13 → 1.3.14

package/classes/bank-transaction-item.d.ts

@@ -1,7 +1,7 @@
 import { ELoanTransactionTypes, ILoanTransactionUpload } from '../models/LoanTransaction.model';
-import { BorrowerService } from '../services/borrowers.service';
+import { BorrowersDB } from '../services/borrowers.db';
 export declare class LoanTransactionItem implements ILoanTransactionUpload {
-    private readonly borrowerService;
+    private readonly borrowersDB;
     amount: number;
     customerId: string;
     date: Date;
@@ -11,7 +11,7 @@ export declare class LoanTransactionItem implements ILoanTransactionUpload {
     bankAccountNumber: string;
     transactionType: ELoanTransactionTypes;
     isStatement: boolean;
-    constructor(item: Partial<ILoanTransactionUpload>, borrowerService: BorrowerService);
+    constructor(item: Partial<ILoanTransactionUpload>, borrowersDB: BorrowersDB);
     initialize(): Promise<any[]>;
     validateData(): Promise<any[]>;
 }

package/classes/bank-transaction-item.js

@@ -13,7 +13,7 @@ const Borrower_model_1 = require("../models/Borrower.model");
 const banks_service_1 = require("../services/banks.service");
 const loan_charges_service_1 = require("../services/loan-charges.service");
 class LoanTransactionItem {
-    borrowerService;
+    borrowersDB;
     amount = 0;
     customerId = '';
     date = new Date();
@@ -23,8 +23,8 @@ class LoanTransactionItem {
     bankAccountNumber = '';
     transactionType = null;
     isStatement = false;
-    constructor(item, borrowerService) {
-        this.borrowerService = borrowerService;
+    constructor(item, borrowersDB) {
+        this.borrowersDB = borrowersDB;
         const itemWithDates = (0, column_desciptions_helper_1.convertIntoDates)(item, collaterals_enum_1.ECollaterals.LOAN_TRANSACTIONS);
         const itemWithoutNulls = lodash_1.default.omitBy(itemWithDates, (value) => value === null);
         this.transactionType = item.amount < 0 ? LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION : LoanTransaction_model_1.ELoanTransactionTypes.DISBURSEMENT;
@@ -37,7 +37,7 @@ class LoanTransactionItem {
         const errors = [];
         const banksService = new banks_service_1.BanksService();
         const foundBank = await banksService.findBankByNumber(this.bankAccountNumber);
-        const loanChargesService = new loan_charges_service_1.LoanChargesService(this.borrowerService);
+        const loanChargesService = new loan_charges_service_1.LoanChargesService(this.borrowersDB);
         const foundProductId = await loanChargesService.getLoanProductIdByCode(this.ledgerAccountCode);
         const foundChargeId = await loanChargesService.getLoanChargeIdByCode(this.ledgerAccountCode);
         if (foundChargeId) {

package/classes/bank-transaction-item.ts

@@ -7,7 +7,7 @@ import { LoanProduct } from '../models/LoanProducts.model';
 import { BorrowerModel } from '../models/Borrower.model';
 import { BanksService } from '../services/banks.service';
 import { LoanChargesService } from '../services/loan-charges.service';
-import { BorrowerService } from '../services/borrowers.service';
+import { BorrowersDB } from '../services/borrowers.db';
 
 export class LoanTransactionItem implements ILoanTransactionUpload {
 
@@ -23,7 +23,7 @@ export class LoanTransactionItem implements ILoanTransactionUpload {
 
   constructor(
     item: Partial<ILoanTransactionUpload>,
-    private readonly borrowerService: BorrowerService,
+    private readonly borrowersDB: BorrowersDB,
   ) {
     const itemWithDates = convertIntoDates(item, ECollaterals.LOAN_TRANSACTIONS);
     const itemWithoutNulls = _.omitBy(itemWithDates, (value) => value === null);
@@ -39,7 +39,7 @@ export class LoanTransactionItem implements ILoanTransactionUpload {
     const errors = [];
     const banksService: BanksService = new BanksService();
     const foundBank = await banksService.findBankByNumber(this.bankAccountNumber);
-    const loanChargesService: LoanChargesService = new LoanChargesService(this.borrowerService);
+    const loanChargesService: LoanChargesService = new LoanChargesService(this.borrowersDB);
     const foundProductId = await loanChargesService.getLoanProductIdByCode(this.ledgerAccountCode);
     const foundChargeId = await loanChargesService.getLoanChargeIdByCode(this.ledgerAccountCode);
     if (foundChargeId) {

package/package.json

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

package/services/borrower-summary.service.d.ts

@@ -5,14 +5,16 @@ import { InventoryService } from './inventory.service';
 import { LoanChargesService } from './loan-charges.service';
 import { LoanTransactionsService } from './loan-transactions.service';
 import { ReportsService } from './reports.service';
+import { BorrowersDB } from './borrowers.db';
 export declare class BorrowerSummaryService {
     private readonly availabilityService;
+    private readonly borrowersDB;
     private readonly borrowerService;
     private readonly inventoryService;
     private readonly loanChargesService;
     private readonly loanTransactionsService;
     private readonly reportsService;
-    constructor(availabilityService: AvailabilityService, borrowerService: BorrowerService, inventoryService: InventoryService, loanChargesService: LoanChargesService, loanTransactionsService: LoanTransactionsService, reportsService: ReportsService);
+    constructor(availabilityService: AvailabilityService, borrowersDB: BorrowersDB, borrowerService: BorrowerService, inventoryService: InventoryService, loanChargesService: LoanChargesService, loanTransactionsService: LoanTransactionsService, reportsService: ReportsService);
     getBorrowerSummary(borrowerId: string): Promise<IBorrowerSummaryDoc>;
     private getHighLevelTable;
     private getComplianceItemsTable;

package/services/borrower-summary.service.js

@@ -21,13 +21,15 @@ const BorrowerSummary_model_1 = require("../models/BorrowerSummary.model");
 const inventories_1 = require("../db/inventories");
 class BorrowerSummaryService {
     availabilityService;
+    borrowersDB;
     borrowerService;
     inventoryService;
     loanChargesService;
     loanTransactionsService;
     reportsService;
-    constructor(availabilityService, borrowerService, inventoryService, loanChargesService, loanTransactionsService, reportsService) {
+    constructor(availabilityService, borrowersDB, borrowerService, inventoryService, loanChargesService, loanTransactionsService, reportsService) {
         this.availabilityService = availabilityService;
+        this.borrowersDB = borrowersDB;
         this.borrowerService = borrowerService;
         this.inventoryService = inventoryService;
         this.loanChargesService = loanChargesService;
@@ -294,7 +296,7 @@ class BorrowerSummaryService {
         console.log(`calculation finished - ${borrowerId}`);
     }
     async recalculateAllActive() {
-        const borrowers = await this.borrowerService.getActiveBorrowers();
+        const borrowers = await this.borrowersDB.getActiveBorrowers();
         let i = 1;
         for (const borrower of borrowers) {
             try {

package/services/borrower-summary.service.ts

@@ -31,11 +31,13 @@ import { InventoryService } from './inventory.service';
 import { LoanChargesService } from './loan-charges.service';
 import { LoanTransactionsService } from './loan-transactions.service';
 import { ReportsService } from './reports.service';
+import { BorrowersDB } from './borrowers.db';
 
 export class BorrowerSummaryService {
 
   constructor(
     private readonly availabilityService: AvailabilityService,
+    private readonly borrowersDB: BorrowersDB,
     private readonly borrowerService: BorrowerService,
     private readonly inventoryService: InventoryService,
     private readonly loanChargesService: LoanChargesService,
@@ -320,7 +322,7 @@ export class BorrowerSummaryService {
   }
 
   async recalculateAllActive() {
-    const borrowers = await this.borrowerService.getActiveBorrowers();
+    const borrowers = await this.borrowersDB.getActiveBorrowers();
     let i = 1;
     for (const borrower of borrowers) {
       try {

package/services/borrowers.db.d.ts

@@ -0,0 +1,37 @@
+/// <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" />
+/// <reference types="mongoose/types/inferschematype" />
+import { IUser } from '../models/User.model';
+export declare class BorrowersDB {
+    getAllBorrowers(): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
+        _id: import("mongoose").Types.ObjectId;
+    })[]>;
+    getActiveBorrowers(): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
+        _id: import("mongoose").Types.ObjectId;
+    })[]>;
+    getAllowedBorrowers(user: IUser): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
+        _id: import("mongoose").Types.ObjectId;
+    })[]>;
+}

package/services/borrowers.db.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BorrowersDB = void 0;
+const Borrower_model_1 = require("../models/Borrower.model");
+class BorrowersDB {
+    async getAllBorrowers() {
+        return Borrower_model_1.BorrowerModel.find().sort({ name: 1 }).lean();
+    }
+    async getActiveBorrowers() {
+        return Borrower_model_1.BorrowerModel.find({ active: true }).sort({ name: 1 }).lean();
+    }
+    async getAllowedBorrowers(user) {
+        return Borrower_model_1.BorrowerModel
+            .find(user.allBorrowers ? {} : { '_id': { $in: user.borrowersAccess.map((b) => b.borrower) } })
+            .collation({ locale: 'en' })
+            .sort({ code: 1 })
+            .lean();
+    }
+}
+exports.BorrowersDB = BorrowersDB;

package/services/borrowers.db.ts

@@ -0,0 +1,20 @@
+import { BorrowerModel } from '../models/Borrower.model';
+import { IUser } from '../models/User.model';
+
+export class BorrowersDB {
+  async getAllBorrowers() {
+    return BorrowerModel.find().sort({ name: 1 }).lean();
+  }
+
+  async getActiveBorrowers() {
+    return BorrowerModel.find({ active: true }).sort({ name: 1 }).lean();
+  }
+
+  async getAllowedBorrowers(user: IUser) {
+    return BorrowerModel
+      .find(user.allBorrowers ? {} : { '_id': { $in: user.borrowersAccess.map((b) => b.borrower) } })
+      .collation({ locale: 'en' })
+      .sort({ code: 1 })
+      .lean();
+  }
+}

package/services/borrowers.service.d.ts

@@ -26,7 +26,6 @@ import mongoose from 'mongoose';
 import { IBorrowerSettingsDocPopulated } from '../models/BorrowerSettings.model';
 import { IBorrowerDocument } from '../models/Borrower.model';
 import { IBorrowerDataDocWithName } from '../models/BorrowerData.model';
-import { IUser } from '../models/User.model';
 import { CollateralsService } from './collaterals.service';
 import { LoanStatementStatusService } from './loan-statement-status.service';
 import { LoanTransactionsService } from './loan-transactions.service';
@@ -82,21 +81,12 @@ export declare class BorrowerService {
     }>;
     updateBorrowerSettings(borrowerId: string, borrowerSettings: IBorrowerSettingsDocPopulated): Promise<void>;
     getBorrowerCodesMap(): Promise<Map<string, string>>;
-    getAllBorrowers(): Promise<(mongoose.FlattenMaps<IBorrowerDocument> & {
-        _id: mongoose.Types.ObjectId;
-    })[]>;
-    getActiveBorrowers(): Promise<(mongoose.FlattenMaps<IBorrowerDocument> & {
-        _id: mongoose.Types.ObjectId;
-    })[]>;
-    getAllowedBorrowers(user: IUser): Promise<(mongoose.FlattenMaps<IBorrowerDocument> & {
-        _id: mongoose.Types.ObjectId;
-    })[]>;
     getBorrowerStatementDetails(borrowers: IBorrowerDocument[]): Promise<{
         [x: number]: {
+            SELECTED_PERIOD?: boolean;
+            ENTIRE_LOAN?: boolean;
             LAST_MONTH?: boolean;
             CURRENT_MONTH?: boolean;
-            ENTIRE_LOAN?: boolean;
-            SELECTED_PERIOD?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

package/services/borrowers.service.js

@@ -240,19 +240,6 @@ class BorrowerService {
         });
         return codesMap;
     }
-    async getAllBorrowers() {
-        return Borrower_model_1.BorrowerModel.find().sort({ name: 1 }).lean();
-    }
-    async getActiveBorrowers() {
-        return Borrower_model_1.BorrowerModel.find({ active: true }).sort({ name: 1 }).lean();
-    }
-    async getAllowedBorrowers(user) {
-        return Borrower_model_1.BorrowerModel
-            .find(user.allBorrowers ? {} : { '_id': { $in: user.borrowersAccess.map((b) => b.borrower) } })
-            .collation({ locale: 'en' })
-            .sort({ code: 1 })
-            .lean();
-    }
     async getBorrowerStatementDetails(borrowers) {
         const allBorrowersWithExtraInfo = await Promise.all(borrowers.map(async (borrower) => {
             const borrowerId = borrower._id.toString();

package/services/borrowers.service.ts

@@ -20,7 +20,6 @@ import { BorrowerDataReceivableModel } from '../models/BorrowerDataReceivable.mo
 import { BorrowerDataInventoryModel } from '../models/BorrowerDataInventory.model';
 import { BorrowerDataTermModel } from '../models/BorrowerDataTerm.model';
 import { BorrowerDataBootCollateralModel } from '../models/BorrowerDataBootCollateral.model';
-import { IUser } from '../models/User.model';
 import { CollateralsService } from './collaterals.service';
 import { LoanStatementStatusService } from './loan-statement-status.service';
 import { LoanTransactionsService } from './loan-transactions.service';
@@ -271,22 +270,6 @@ export class BorrowerService {
     return codesMap;
   }
 
-  async getAllBorrowers() {
-    return BorrowerModel.find().sort({ name: 1 }).lean();
-  }
-
-  async getActiveBorrowers() {
-    return BorrowerModel.find({ active: true }).sort({ name: 1 }).lean();
-  }
-
-  async getAllowedBorrowers(user: IUser) {
-    return BorrowerModel
-      .find(user.allBorrowers ? {} : { '_id': { $in: user.borrowersAccess.map((b) => b.borrower) } })
-      .collation({ locale: 'en' })
-      .sort({ code: 1 })
-      .lean();
-  }
-
   async getBorrowerStatementDetails(borrowers: IBorrowerDocument[]) {
     const allBorrowersWithExtraInfo = await Promise.all(borrowers.map(async (borrower) => {
       const borrowerId = borrower._id.toString();

package/services/brokers.service.d.ts

@@ -46,9 +46,9 @@ export declare class BrokersService {
     getAllProductBrokers(): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _id: import("mongoose").Types.ObjectId;
     })[]>;
-    getBorrowerBrokers(borrowerId: string): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
+    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _id: import("mongoose").Types.ObjectId;
-    })[] | BrokerView[]>;
+    })[]>;
     getProductBrokers(productId: string): Promise<import("../models/ProductBroker.model").IProductBrokerDocWithBroker[]>;
     getTotalShares(borrowerId: string, brokers: IProductBrokerView[], replaceNames?: boolean): Promise<ProductTotal>;
     getTotals(borrowerId: string): Promise<BrokerTotalView[]>;

package/services/compliance-borrowers.service.d.ts

@@ -45,7 +45,7 @@ export declare class ComplianceBorrowersService {
         };
     };
     getFullComplianceBorrowerById(complianceBorrowerId: any): Promise<any>;
-    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "borrower" | "fundingStatus" | "items"> | {
+    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "items" | "borrower" | "fundingStatus"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;

package/services/loan-charges.service.d.ts

@@ -28,10 +28,10 @@ import { ELoanChargeType } from '../enums/loan-charge-type.enum';
 import { ILoanProductDoc, ILoanProductView } from '../models/LoanProducts.model';
 import { ILoanChargeView } from '../models/LoanCharges.model';
 import { ILoanStatementTransactionDoc, ILoanStatementTransactionDocWithCharge } from '../models/LoanStatementTransaction.model';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 export declare class LoanChargesService {
-    private readonly borrowerService;
-    constructor(borrowerService: BorrowerService);
+    private readonly borrowersDB;
+    constructor(borrowersDB: BorrowersDB);
     private validateCharge;
     getProductByChargeId(chargeId: string): Promise<mongoose.FlattenMaps<ILoanProductDoc> & {
         _id: mongoose.Types.ObjectId;

package/services/loan-charges.service.js

@@ -17,9 +17,9 @@ const LoanStatementTransaction_model_1 = require("../models/LoanStatementTransac
 const collaterals_db_1 = require("../db/collaterals.db");
 const updateChargesForProduct = false;
 class LoanChargesService {
-    borrowerService;
-    constructor(borrowerService) {
-        this.borrowerService = borrowerService;
+    borrowersDB;
+    constructor(borrowersDB) {
+        this.borrowersDB = borrowersDB;
     }
     validateCharge = (charge) => {
         const chargePLCode = charge.PLCode ? charge.PLCode.trim() : '';
@@ -37,7 +37,7 @@ class LoanChargesService {
         return LoanProducts_model_1.LoanProduct.find({ borrowerId }).lean();
     }
     async getAllLoanProducts() {
-        const borrowers = await this.borrowerService.getActiveBorrowers();
+        const borrowers = await this.borrowersDB.getActiveBorrowers();
         const borrowerIds = borrowers.map((borrower) => borrower._id);
         return LoanProducts_model_1.LoanProduct.aggregate([
             { $match: { borrowerId: { $in: borrowerIds } } },

package/services/loan-charges.service.ts

@@ -30,14 +30,14 @@ import {
   LoanStatementTransactionModel,
 } from '../models/LoanStatementTransaction.model';
 import { ITEMS_PAGINATION } from '../db/collaterals.db';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 
 const updateChargesForProduct = false;
 
 export class LoanChargesService {
 
   constructor(
-    private readonly borrowerService: BorrowerService,
+    private readonly borrowersDB: BorrowersDB,
   ) {
   }
 
@@ -60,7 +60,7 @@ export class LoanChargesService {
   }
 
   async getAllLoanProducts() {
-    const borrowers = await this.borrowerService.getActiveBorrowers();
+    const borrowers = await this.borrowersDB.getActiveBorrowers();
     const borrowerIds = borrowers.map((borrower) => borrower._id);
     return LoanProduct.aggregate<ILoanProductDoc>([
       { $match: { borrowerId: { $in: borrowerIds } } },

package/services/loan-payments.service.d.ts

@@ -27,7 +27,7 @@ import { RedisClientType } from 'redis';
 import { IPaginatorOptions } from '../interfaces/collaterals.interface';
 import { ELoanChargeType } from '../enums/loan-charge-type.enum';
 import { ICombinedPayment, ILoanPaymentDoc, ILoanPaymentWithId } from '../models/LoanPayment.model';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 import { LoanStatementBalanceService } from './loan-statement-balance.service';
 import { LoanProductsService } from './loan-products.service';
 import { LoanChargesService } from './loan-charges.service';
@@ -40,7 +40,7 @@ import { LockService } from './lock.service';
 export declare const paymentOrder: ELoanChargeType[];
 export declare class LoanPaymentsService {
     private readonly redisClient;
-    private readonly borrowerService;
+    private readonly borrowersDB;
     private readonly financialComplianceService;
     private readonly loanChargesService;
     private readonly loanProductsService;
@@ -50,7 +50,7 @@ export declare class LoanPaymentsService {
     private readonly loanTransactionsService;
     private readonly lockService;
     private readonly termLoanService;
-    constructor(redisClient: RedisClientType, borrowerService: BorrowerService, financialComplianceService: FinancialComplianceService, loanChargesService: LoanChargesService, loanProductsService: LoanProductsService, loanStatementBalanceService: LoanStatementBalanceService, getLoanStatementService: () => LoanStatementService, loanStatementStatusService: LoanStatementStatusService, loanTransactionsService: LoanTransactionsService, lockService: LockService, termLoanService: TermLoanService);
+    constructor(redisClient: RedisClientType, borrowersDB: BorrowersDB, financialComplianceService: FinancialComplianceService, loanChargesService: LoanChargesService, loanProductsService: LoanProductsService, loanStatementBalanceService: LoanStatementBalanceService, getLoanStatementService: () => LoanStatementService, loanStatementStatusService: LoanStatementStatusService, loanTransactionsService: LoanTransactionsService, lockService: LockService, termLoanService: TermLoanService);
     getLoanPayment(paymentId: string): Promise<mongoose.FlattenMaps<ILoanPaymentDoc> & {
         _id: mongoose.Types.ObjectId;
     }>;

package/services/loan-payments.service.js

@@ -30,7 +30,7 @@ exports.paymentOrder = [
 const CALCULATION_VAR = 'BULK_PAYMENT';
 class LoanPaymentsService {
     redisClient;
-    borrowerService;
+    borrowersDB;
     financialComplianceService;
     loanChargesService;
     loanProductsService;
@@ -40,9 +40,9 @@ class LoanPaymentsService {
     loanTransactionsService;
     lockService;
     termLoanService;
-    constructor(redisClient, borrowerService, financialComplianceService, loanChargesService, loanProductsService, loanStatementBalanceService, getLoanStatementService, loanStatementStatusService, loanTransactionsService, lockService, termLoanService) {
+    constructor(redisClient, borrowersDB, financialComplianceService, loanChargesService, loanProductsService, loanStatementBalanceService, getLoanStatementService, loanStatementStatusService, loanTransactionsService, lockService, termLoanService) {
         this.redisClient = redisClient;
-        this.borrowerService = borrowerService;
+        this.borrowersDB = borrowersDB;
         this.financialComplianceService = financialComplianceService;
         this.loanChargesService = loanChargesService;
         this.loanProductsService = loanProductsService;
@@ -403,7 +403,7 @@ class LoanPaymentsService {
         if (!user) {
             return [];
         }
-        const borrowers = await this.borrowerService.getAllowedBorrowers(user);
+        const borrowers = await this.borrowersDB.getAllowedBorrowers(user);
         const isCalculated = await this.redisClient.get(CALCULATION_VAR);
         const borrowersData = await Promise.all(borrowers
             .filter((borrower) => borrower.active)
@@ -431,7 +431,7 @@ class LoanPaymentsService {
         if (!user) {
             return { message: 'Cannot find user with this id' };
         }
-        const borrowers = await this.borrowerService.getAllowedBorrowers(user);
+        const borrowers = await this.borrowersDB.getAllowedBorrowers(user);
         const paymentPromises = borrowers.map(async (borrower) => {
             if (borrowerIds.includes(borrower._id.toString())) {
                 try {

package/services/loan-payments.service.ts

@@ -30,7 +30,7 @@ import {
   LoanPaymentModel,
 } from '../models/LoanPayment.model';
 
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 import { LoanStatementBalanceService } from './loan-statement-balance.service';
 import { LoanProductsService } from './loan-products.service';
 import { LoanChargesService } from './loan-charges.service';
@@ -56,7 +56,7 @@ const CALCULATION_VAR = 'BULK_PAYMENT';
 export class LoanPaymentsService {
   constructor(
     private readonly redisClient: RedisClientType,
-    private readonly borrowerService: BorrowerService,
+    private readonly borrowersDB: BorrowersDB,
     private readonly financialComplianceService: FinancialComplianceService,
     private readonly loanChargesService: LoanChargesService,
     private readonly loanProductsService: LoanProductsService,
@@ -450,7 +450,7 @@ export class LoanPaymentsService {
     if (!user) {
       return [];
     }
-    const borrowers = await this.borrowerService.getAllowedBorrowers(user);
+    const borrowers = await this.borrowersDB.getAllowedBorrowers(user);
     const isCalculated = await this.redisClient.get(CALCULATION_VAR);
     const borrowersData = await Promise.all(borrowers
       .filter((borrower) => borrower.active)
@@ -483,7 +483,7 @@ export class LoanPaymentsService {
     if (!user) {
       return { message: 'Cannot find user with this id' };
     }
-    const borrowers = await this.borrowerService.getAllowedBorrowers(user);
+    const borrowers = await this.borrowersDB.getAllowedBorrowers(user);
     const paymentPromises = borrowers.map(async (borrower) => {
       if (borrowerIds.includes(borrower._id.toString())) {
         try {

package/services/loan-products.service.d.ts

@@ -1,12 +1,28 @@
-import { ILoanProductView } from '../models/LoanProducts.model';
+import { ILoanProductDoc, ILoanProductView } from '../models/LoanProducts.model';
 import { LoanChargesService } from './loan-charges.service';
+import { BorrowersDB } from './borrowers.db';
+import { ILoanTransactionDoc } from '../models/LoanTransaction.model';
 export declare class LoanProductsService {
     private readonly loanChargesService;
-    constructor(loanChargesService: LoanChargesService);
+    private readonly borrowersDB;
+    constructor(loanChargesService: LoanChargesService, borrowersDB: BorrowersDB);
     getLinkedLoanProducts(codes: string[]): Promise<{
         [code: string]: string;
     }>;
     getProductsWithBalances(products: ILoanProductView[], showFloatedBalance: boolean): Promise<ILoanProductView[]>;
     getProductPaymentOrder(productId: string): Promise<any[]>;
     savePaymentOrder(productId: string, paymentOrder: string[]): Promise<void>;
+    getAllLoanProducts(borrowerIds?: string[]): Promise<ILoanProductDoc[]>;
+    getLoanProductBalance(productId: string, forDate?: Date): Promise<{
+        balance: number;
+        floatedBalance: number;
+    }>;
+    calculateBalanceFromTransactions(simpleTransaction: ILoanTransactionDoc | null, normalTransaction: ILoanTransactionDoc | null, collectionsTransaction: ILoanTransactionDoc | null, productId: string, forDate: Date): Promise<{
+        balance: number;
+        floatedBalance: number;
+    }>;
+    getLoanProductBalances(productIds: string[], forDate: Date): Promise<Record<string, {
+        balance: number;
+        floatedBalance: number;
+    }>>;
 }