gemcap-be-common 1.3.13 → 1.3.15

package/services/loan-products.service.js

@@ -1,13 +1,25 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoanProductsService = void 0;
+const mongoose_1 = __importDefault(require("mongoose"));
+const dayjs_1 = __importDefault(require("dayjs"));
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const LoanProducts_model_1 = require("../models/LoanProducts.model");
 const LoanCharges_model_1 = require("../models/LoanCharges.model");
 const loan_payments_service_1 = require("./loan-payments.service");
+const _models_1 = require("../models/_models");
+const LoanTransaction_model_1 = require("../models/LoanTransaction.model");
+const loan_statement_db_1 = require("../db/loan-statement.db");
+const loan_products_db_1 = require("../db/loan-products.db");
 class LoanProductsService {
     loanChargesService;
-    constructor(loanChargesService) {
+    borrowersDB;
+    constructor(loanChargesService, borrowersDB) {
         this.loanChargesService = loanChargesService;
+        this.borrowersDB = borrowersDB;
     }
     async getLinkedLoanProducts(codes) {
         const loanProducts = await LoanProducts_model_1.LoanProduct
@@ -51,5 +63,95 @@ class LoanProductsService {
             }));
         }
     }
+    async getAllLoanProducts(borrowerIds) {
+        if (!borrowerIds) {
+            const borrowers = await this.borrowersDB.getActiveBorrowers();
+            borrowerIds = borrowers.map((borrower) => borrower._id.toString());
+        }
+        return LoanProducts_model_1.LoanProduct.aggregate([
+            { $match: { borrowerId: { $in: borrowerIds.map((borrowerId) => new mongoose_1.default.Types.ObjectId(borrowerId)) } } },
+            {
+                $lookup: {
+                    from: _models_1.MODEL_NAMES.borrowers,
+                    localField: 'borrowerId',
+                    foreignField: '_id',
+                    as: 'borrower',
+                },
+            },
+            { $unwind: '$borrower' },
+            { $sort: { 'borrower.name': 1 } },
+            { $project: { borrower: 0 } },
+        ]);
+    }
+    ;
+    async getLoanProductBalance(productId, forDate = new Date()) {
+        const simpleTransactions = await LoanTransaction_model_1.LoanTransaction.aggregate([
+            {
+                $match: {
+                    productId: new mongoose_1.default.Types.ObjectId(productId),
+                    date: { $lte: (0, dayjs_1.default)(forDate).startOf('day').subtract(1, 'seconds').toDate() },
+                },
+            },
+            { $sort: { date: -1, order: -1, createdAt: -1 } },
+            { $limit: 1 },
+        ]);
+        const collectionsTransactions = await LoanTransaction_model_1.LoanTransaction.aggregate([
+            {
+                $match: {
+                    productId: new mongoose_1.default.Types.ObjectId(productId),
+                    effectiveDate: { $lte: forDate },
+                    $expr: { $ne: ['$date', '$effectiveDate'] },
+                },
+            },
+            { $sort: { effectiveDate: -1, order: -1, createdAt: -1 } },
+            { $limit: 1 },
+        ]);
+        const normalTransactions = await LoanTransaction_model_1.LoanTransaction.aggregate([
+            {
+                $match: {
+                    productId: new mongoose_1.default.Types.ObjectId(productId),
+                    effectiveDate: { $lte: forDate },
+                    $expr: { $eq: ['$date', '$effectiveDate'] },
+                },
+            },
+            { $sort: { effectiveDate: -1, order: -1, createdAt: -1 } },
+            { $limit: 1 },
+        ]);
+        return this.calculateBalanceFromTransactions(simpleTransactions.length > 0 ? simpleTransactions[0] : null, normalTransactions.length > 0 ? normalTransactions[0] : null, collectionsTransactions.length > 0 ? collectionsTransactions[0] : null, productId, forDate);
+    }
+    ;
+    async calculateBalanceFromTransactions(simpleTransaction, normalTransaction, collectionsTransaction, productId, forDate) {
+        const balance = simpleTransaction?.balance || 0;
+        let floatedBalance = 0;
+        if (normalTransaction && collectionsTransaction) {
+            const totalCollections = await (0, loan_statement_db_1.getTotalForDate)(productId, collectionsTransaction.effectiveDate);
+            if ((0, dayjs_1.default)(normalTransaction.date).isSame(collectionsTransaction.date)) {
+                floatedBalance = new decimal_js_1.default(normalTransaction.floatedBalance).add(totalCollections).toNumber();
+            }
+            else if ((0, dayjs_1.default)(normalTransaction.date).isAfter(collectionsTransaction.date)) {
+                floatedBalance = normalTransaction.floatedBalance;
+            }
+            else {
+                floatedBalance = collectionsTransaction.balance;
+            }
+        }
+        else if (normalTransaction) {
+            floatedBalance = normalTransaction.floatedBalance;
+        }
+        else if (!normalTransaction && !collectionsTransaction) {
+            const totalPostponed = await (0, loan_products_db_1.getPostponedTransactions)(forDate, productId);
+            return { balance: 0, floatedBalance: totalPostponed };
+        }
+        return { balance, floatedBalance };
+    }
+    ;
+    async getLoanProductBalances(productIds, forDate) {
+        const results = {};
+        await Promise.all(productIds.map(async (productId) => {
+            results[productId] = await this.getLoanProductBalance(productId, forDate);
+        }));
+        return results;
+    }
+    ;
 }
 exports.LoanProductsService = LoanProductsService;

package/services/loan-products.service.ts

@@ -1,13 +1,27 @@
-import { ILoanProductView, ILoanProductViewWithBalances, LoanProduct } from '../models/LoanProducts.model';
-import { LoanCharge } from '../models/LoanCharges.model';
+import mongoose from 'mongoose';
+import dayjs from 'dayjs';
+import Decimal from 'decimal.js';
 
+import {
+  ILoanProductDoc,
+  ILoanProductView,
+  ILoanProductViewWithBalances,
+  LoanProduct,
+} from '../models/LoanProducts.model';
+import { LoanCharge } from '../models/LoanCharges.model';
 import { paymentOrder } from './loan-payments.service';
 import { LoanChargesService } from './loan-charges.service';
+import { BorrowersDB } from './borrowers.db';
+import { MODEL_NAMES } from '../models/_models';
+import { ILoanTransactionDoc, LoanTransaction } from '../models/LoanTransaction.model';
+import { getTotalForDate } from '../db/loan-statement.db';
+import { getPostponedTransactions } from '../db/loan-products.db';
 
 export class LoanProductsService {
 
   constructor(
     private readonly loanChargesService: LoanChargesService,
+    private readonly borrowersDB: BorrowersDB,
   ) {
   }
 
@@ -55,4 +69,113 @@ export class LoanProductsService {
       }));
     }
   }
+
+  async getAllLoanProducts(borrowerIds?: string[]) {
+    if (!borrowerIds) {
+      const borrowers = await this.borrowersDB.getActiveBorrowers();
+      borrowerIds = borrowers.map((borrower) => borrower._id.toString());
+    }
+    return LoanProduct.aggregate<ILoanProductDoc>([
+      { $match: { borrowerId: { $in: borrowerIds.map((borrowerId) => new mongoose.Types.ObjectId(borrowerId)) } } },
+      {
+        $lookup: {
+          from: MODEL_NAMES.borrowers,
+          localField: 'borrowerId',
+          foreignField: '_id',
+          as: 'borrower',
+        },
+      },
+      { $unwind: '$borrower' },
+      { $sort: { 'borrower.name': 1 } },
+      { $project: { borrower: 0 } },
+    ]);
+  };
+
+  async getLoanProductBalance(productId: string, forDate = new Date()) {
+    const simpleTransactions = await LoanTransaction.aggregate<ILoanTransactionDoc>([
+      {
+        $match: {
+          productId: new mongoose.Types.ObjectId(productId),
+          date: { $lte: dayjs(forDate).startOf('day').subtract(1, 'seconds').toDate() },
+        },
+      },
+      { $sort: { date: -1, order: -1, createdAt: -1 } },
+      { $limit: 1 },
+    ]);
+
+    const collectionsTransactions = await LoanTransaction.aggregate<ILoanTransactionDoc>([
+      {
+        $match: {
+          productId: new mongoose.Types.ObjectId(productId),
+          effectiveDate: { $lte: forDate },
+          $expr: { $ne: ['$date', '$effectiveDate'] },
+        },
+      },
+      { $sort: { effectiveDate: -1, order: -1, createdAt: -1 } },
+      { $limit: 1 },
+    ]);
+
+    const normalTransactions = await LoanTransaction.aggregate<ILoanTransactionDoc>([
+      {
+        $match: {
+          productId: new mongoose.Types.ObjectId(productId),
+          effectiveDate: { $lte: forDate },
+          $expr: { $eq: ['$date', '$effectiveDate'] },
+        },
+      },
+      { $sort: { effectiveDate: -1, order: -1, createdAt: -1 } },
+      { $limit: 1 },
+    ]);
+
+    return this.calculateBalanceFromTransactions(
+      simpleTransactions.length > 0 ? simpleTransactions[0] : null,
+      normalTransactions.length > 0 ? normalTransactions[0] : null,
+      collectionsTransactions.length > 0 ? collectionsTransactions[0] : null,
+      productId,
+      forDate,
+    );
+  };
+
+  async calculateBalanceFromTransactions(
+    simpleTransaction: ILoanTransactionDoc | null,
+    normalTransaction: ILoanTransactionDoc | null,
+    collectionsTransaction: ILoanTransactionDoc | null,
+    productId: string,
+    forDate: Date,
+  ): Promise<{ balance: number; floatedBalance: number }> {
+    const balance = simpleTransaction?.balance || 0;
+    let floatedBalance = 0;
+
+    if (normalTransaction && collectionsTransaction) {
+      const totalCollections = await getTotalForDate(productId, collectionsTransaction.effectiveDate);
+      if (dayjs(normalTransaction.date).isSame(collectionsTransaction.date)) {
+        floatedBalance = new Decimal(normalTransaction.floatedBalance).add(totalCollections).toNumber();
+      } else if (dayjs(normalTransaction.date).isAfter(collectionsTransaction.date)) {
+        floatedBalance = normalTransaction.floatedBalance;
+      } else {
+        floatedBalance = collectionsTransaction.balance;
+      }
+    } else if (normalTransaction) {
+      floatedBalance = normalTransaction.floatedBalance;
+    } else if (!normalTransaction && !collectionsTransaction) {
+      const totalPostponed = await getPostponedTransactions(forDate, productId);
+      return { balance: 0, floatedBalance: totalPostponed };
+    }
+
+    return { balance, floatedBalance };
+  };
+
+  async getLoanProductBalances(
+    productIds: string[],
+    forDate: Date,
+  ): Promise<Record<string, { balance: number, floatedBalance: number }>> {
+    const results: Record<string, { balance: number, floatedBalance: number }> = {};
+    await Promise.all(
+      productIds.map(async (productId) => {
+        results[productId] = await this.getLoanProductBalance(productId, forDate);
+      }),
+    );
+    return results;
+  };
+
 }

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

@@ -30,7 +30,7 @@ import { ILoanProductDoc } from '../models/LoanProducts.model';
 import { IUploadOption, UploadsService } from './uploads.service';
 import { AttachedFilesService } from './attached-files.service';
 import { BanksService } from './banks.service';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 import { CalendarService } from './calendar.service';
 import { LoanChargesService } from './loan-charges.service';
 import { LoanPaymentsService } from './loan-payments.service';
@@ -53,7 +53,7 @@ export interface ITransactionsFilter {
 export declare class LoanTransactionsService {
     private readonly attachedFilesService;
     private readonly banksService;
-    private readonly borrowerService;
+    private readonly borrowersDB;
     private readonly calendarService;
     private readonly loanChargesService;
     private readonly getLoanPaymentsService;
@@ -64,7 +64,7 @@ export declare class LoanTransactionsService {
     private readonly termLoanService;
     private readonly uploadsService;
     private readonly config;
-    constructor(config: ILoanTransactionsServiceConfig, attachedFilesService: AttachedFilesService, banksService: BanksService, borrowerService: BorrowerService, calendarService: CalendarService, loanChargesService: LoanChargesService, getLoanPaymentsService: () => LoanPaymentsService, getLoanStatementService: () => LoanStatementService, loanStatementStatusService: LoanStatementStatusService, getNodemailerService: () => NodemailerService, lockService: LockService, termLoanService: TermLoanService, uploadsService: UploadsService);
+    constructor(config: ILoanTransactionsServiceConfig, attachedFilesService: AttachedFilesService, banksService: BanksService, borrowersDB: BorrowersDB, calendarService: CalendarService, loanChargesService: LoanChargesService, getLoanPaymentsService: () => LoanPaymentsService, getLoanStatementService: () => LoanStatementService, loanStatementStatusService: LoanStatementStatusService, getNodemailerService: () => NodemailerService, lockService: LockService, termLoanService: TermLoanService, uploadsService: UploadsService);
     getTransactionsById(transactionId: string): Promise<mongoose.FlattenMaps<ILoanTransaction> & {
         _id: mongoose.Types.ObjectId;
     }>;

package/services/loan-transactions.service.js

@@ -27,7 +27,7 @@ const LoanTransactionFile_model_1 = require("../models/LoanTransactionFile.model
 class LoanTransactionsService {
     attachedFilesService;
     banksService;
-    borrowerService;
+    borrowersDB;
     calendarService;
     loanChargesService;
     getLoanPaymentsService;
@@ -38,10 +38,10 @@ class LoanTransactionsService {
     termLoanService;
     uploadsService;
     config;
-    constructor(config, attachedFilesService, banksService, borrowerService, calendarService, loanChargesService, getLoanPaymentsService, getLoanStatementService, loanStatementStatusService, getNodemailerService, lockService, termLoanService, uploadsService) {
+    constructor(config, attachedFilesService, banksService, borrowersDB, calendarService, loanChargesService, getLoanPaymentsService, getLoanStatementService, loanStatementStatusService, getNodemailerService, lockService, termLoanService, uploadsService) {
         this.attachedFilesService = attachedFilesService;
         this.banksService = banksService;
-        this.borrowerService = borrowerService;
+        this.borrowersDB = borrowersDB;
         this.calendarService = calendarService;
         this.loanChargesService = loanChargesService;
         this.getLoanPaymentsService = getLoanPaymentsService;
@@ -878,7 +878,7 @@ class LoanTransactionsService {
         }));
     }
     async sendAllReport(effectiveDate) {
-        const borrowers = await this.borrowerService.getActiveBorrowers();
+        const borrowers = await this.borrowersDB.getActiveBorrowers();
         await Promise.all(borrowers.map(async (borrower) => {
             if (!borrower.active) {
                 return;

package/services/loan-transactions.service.ts

@@ -43,7 +43,7 @@ import { IUploadOption, UploadsService } from './uploads.service';
 import { ILoanTransactionFileDoc, LoanTransactionFileModel } from '../models/LoanTransactionFile.model';
 import { AttachedFilesService } from './attached-files.service';
 import { BanksService } from './banks.service';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 import { CalendarService } from './calendar.service';
 import { LoanChargesService } from './loan-charges.service';
 import { LoanPaymentsService } from './loan-payments.service';
@@ -74,7 +74,7 @@ export class LoanTransactionsService {
     config: ILoanTransactionsServiceConfig,
     private readonly attachedFilesService: AttachedFilesService,
     private readonly banksService: BanksService,
-    private readonly borrowerService: BorrowerService,
+    private readonly borrowersDB: BorrowersDB,
     private readonly calendarService: CalendarService,
     private readonly loanChargesService: LoanChargesService,
     private readonly getLoanPaymentsService: () => LoanPaymentsService,
@@ -976,7 +976,7 @@ export class LoanTransactionsService {
   }
 
   async sendAllReport(effectiveDate: Date) {
-    const borrowers = await this.borrowerService.getActiveBorrowers();
+    const borrowers = await this.borrowersDB.getActiveBorrowers();
     await Promise.all(borrowers.map(async (borrower) => {
       if (!borrower.active) {
         return;

package/services/quickbooks.service.d.ts

@@ -27,7 +27,7 @@ import { IQuickbooksAccount } from '../models/QuickbooksAccount.model';
 import { IQuickbooksUploadItem } from '../classes/quickbook-item';
 import { BanksService } from './banks.service';
 import { BankUploadedTransactionsService } from './bank-uploaded-transactions.service';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 import { BrokersService } from './brokers.service';
 import { CashAllocationService } from './cash-allocation.service';
 import { CompaniesService } from './companies.service';
@@ -50,13 +50,13 @@ interface IQBReportTransaction {
 export declare class QuickbooksService {
     private readonly banksService;
     private readonly bankUploadedTransactionsService;
-    private readonly borrowerService;
+    private readonly borrowersDB;
     private readonly brokersService;
     private readonly cashAllocationService;
     private readonly companiesService;
     private readonly loanChargesService;
     private readonly loanPaymentsService;
-    constructor(banksService: BanksService, bankUploadedTransactionsService: BankUploadedTransactionsService, borrowerService: BorrowerService, brokersService: BrokersService, cashAllocationService: CashAllocationService, companiesService: CompaniesService, loanChargesService: LoanChargesService, loanPaymentsService: LoanPaymentsService);
+    constructor(banksService: BanksService, bankUploadedTransactionsService: BankUploadedTransactionsService, borrowersDB: BorrowersDB, brokersService: BrokersService, cashAllocationService: CashAllocationService, companiesService: CompaniesService, loanChargesService: LoanChargesService, loanPaymentsService: LoanPaymentsService);
     uploadAccounts(accounts: IQuickbooksUploadItem[], deleteOld: boolean): Promise<void>;
     getAllAccounts(): Promise<(mongoose.FlattenMaps<IQuickbooksAccount> & {
         _id: mongoose.Types.ObjectId;

package/services/quickbooks.service.js

@@ -81,16 +81,16 @@ const IIFDateFormat = 'M/D/YYYY';
 class QuickbooksService {
     banksService;
     bankUploadedTransactionsService;
-    borrowerService;
+    borrowersDB;
     brokersService;
     cashAllocationService;
     companiesService;
     loanChargesService;
     loanPaymentsService;
-    constructor(banksService, bankUploadedTransactionsService, borrowerService, brokersService, cashAllocationService, companiesService, loanChargesService, loanPaymentsService) {
+    constructor(banksService, bankUploadedTransactionsService, borrowersDB, brokersService, cashAllocationService, companiesService, loanChargesService, loanPaymentsService) {
         this.banksService = banksService;
         this.bankUploadedTransactionsService = bankUploadedTransactionsService;
-        this.borrowerService = borrowerService;
+        this.borrowersDB = borrowersDB;
         this.brokersService = brokersService;
         this.cashAllocationService = cashAllocationService;
         this.companiesService = companiesService;
@@ -132,7 +132,7 @@ class QuickbooksService {
         return Promise.all(accountSavePromises);
     }
     async getAllProducts() {
-        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([
             {

package/services/quickbooks.service.ts

@@ -17,7 +17,7 @@ import { IQuickbooksUploadItem } from '../classes/quickbook-item';
 import { IUploadedBankTransaction } from '../models/UploadedBankTransaction.model';
 import { BanksService } from './banks.service';
 import { BankUploadedTransactionsService } from './bank-uploaded-transactions.service';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 import { BrokersService } from './brokers.service';
 import { CashAllocationService } from './cash-allocation.service';
 import { CompaniesService } from './companies.service';
@@ -129,7 +129,7 @@ export class QuickbooksService {
   constructor(
     private readonly banksService: BanksService,
     private readonly bankUploadedTransactionsService: BankUploadedTransactionsService,
-    private readonly borrowerService: BorrowerService,
+    private readonly borrowersDB: BorrowersDB,
     private readonly brokersService: BrokersService,
     private readonly cashAllocationService: CashAllocationService,
     private readonly companiesService: CompaniesService,
@@ -176,7 +176,7 @@ export class QuickbooksService {
   }
 
   async getAllProducts() {
-    const borrowers = await this.borrowerService.getActiveBorrowers();
+    const borrowers = await this.borrowersDB.getActiveBorrowers();
     const borrowerIds = borrowers.map((borrower) => borrower._id);
     return LoanProduct.aggregate([
       {

package/services/uploads.service.d.ts

@@ -36,7 +36,7 @@ import { LoanTransactionsService } from './loan-transactions.service';
 import { QuickbooksService } from './quickbooks.service';
 import { UserLogsService } from './user-logs.service';
 import { LockService } from './lock.service';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 interface IMappedColumns {
     [columnName: string]: number;
 }
@@ -72,8 +72,8 @@ export declare class UploadsService {
     private readonly getQuickbooksService;
     private readonly getLockService;
     private readonly userLogsService;
-    private readonly borrowerService;
-    constructor(rootDir: string, bankUploadedTransactionsService: BankUploadedTransactionsService, getCollateralsService: () => CollateralsService, getLoanTransactionsService: () => LoanTransactionsService, getQuickbooksService: () => QuickbooksService, getLockService: () => LockService, userLogsService: UserLogsService, borrowerService: BorrowerService);
+    private readonly borrowersDB;
+    constructor(rootDir: string, bankUploadedTransactionsService: BankUploadedTransactionsService, getCollateralsService: () => CollateralsService, getLoanTransactionsService: () => LoanTransactionsService, getQuickbooksService: () => QuickbooksService, getLockService: () => LockService, userLogsService: UserLogsService, borrowersDB: BorrowersDB);
     createUploadFile(file: IMulterFile, borrowerId: string, userId: string, uploadType: EUploadTypes): Promise<mongoose.Document<unknown, {}, IUploadedFileDoc> & IUploadedFileDoc & {
         _id: mongoose.Types.ObjectId;
     }>;

package/services/uploads.service.js

@@ -100,8 +100,8 @@ class UploadsService {
     getQuickbooksService;
     getLockService;
     userLogsService;
-    borrowerService;
-    constructor(rootDir, bankUploadedTransactionsService, getCollateralsService, getLoanTransactionsService, getQuickbooksService, getLockService, userLogsService, borrowerService) {
+    borrowersDB;
+    constructor(rootDir, bankUploadedTransactionsService, getCollateralsService, getLoanTransactionsService, getQuickbooksService, getLockService, userLogsService, borrowersDB) {
         this.rootDir = rootDir;
         this.bankUploadedTransactionsService = bankUploadedTransactionsService;
         this.getCollateralsService = getCollateralsService;
@@ -109,7 +109,7 @@ class UploadsService {
         this.getQuickbooksService = getQuickbooksService;
         this.getLockService = getLockService;
         this.userLogsService = userLogsService;
-        this.borrowerService = borrowerService;
+        this.borrowersDB = borrowersDB;
     }
     async createUploadFile(file, borrowerId, userId, uploadType) {
         const borrowerIdToWrite = new mongoose_1.default.Types.ObjectId(borrowerId);
@@ -456,7 +456,7 @@ class UploadsService {
                     [collaterals_enum_1.ECollaterals.RECEIVABLE]: () => new receivable_item_1.ReceivableItem(row, bbcDate),
                     [collaterals_enum_1.ECollaterals.ACCOUNT_PAYABLE]: () => new payable_account_item_1.PayableAccountItem(row, bbcDate),
                     [collaterals_enum_1.ECollaterals.LOAN_TRANSACTIONS]: async () => {
-                        const newItem = new bank_transaction_item_1.LoanTransactionItem(row, this.borrowerService);
+                        const newItem = new bank_transaction_item_1.LoanTransactionItem(row, this.borrowersDB);
                         const classErrors = await newItem.initialize();
                         if (classErrors.length) {
                             classErrors.forEach((error) => extraErrors.push(error));

package/services/uploads.service.ts

@@ -52,7 +52,7 @@ import { LoanTransactionsService } from './loan-transactions.service';
 import { QuickbooksService } from './quickbooks.service';
 import { UserLogsService } from './user-logs.service';
 import { LockService } from './lock.service';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 
 interface IMappedColumns {
   [columnName: string]: number;
@@ -128,7 +128,7 @@ export class UploadsService {
     private readonly getQuickbooksService: () => QuickbooksService,
     private readonly getLockService: () => LockService,
     private readonly userLogsService: UserLogsService,
-    private readonly borrowerService: BorrowerService,
+    private readonly borrowersDB: BorrowersDB,
   ) {
   }
 
@@ -513,7 +513,7 @@ export class UploadsService {
           [ECollaterals.RECEIVABLE]: () => new ReceivableItem(row, bbcDate),
           [ECollaterals.ACCOUNT_PAYABLE]: () => new PayableAccountItem(row, bbcDate),
           [ECollaterals.LOAN_TRANSACTIONS]: async () => {
-            const newItem = new LoanTransactionItem(row, this.borrowerService);
+            const newItem = new LoanTransactionItem(row, this.borrowersDB);
             const classErrors = await newItem.initialize();
             if (classErrors.length) {
               classErrors.forEach((error) => extraErrors.push(error));

package/services/user-logs.service.d.ts

@@ -1,7 +1,7 @@
 import { ICreateLogParams } from '../db/user-logs.db';
 import { IUserLog, IUserLogWithLookup } from '../models/UserLog.model';
 import { BanksService } from './banks.service';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 import { LoanChargesService } from './loan-charges.service';
 export interface IUserLogFilter {
     userId: string;
@@ -11,9 +11,9 @@ export interface IUserLogFilter {
 }
 export declare class UserLogsService {
     private readonly banksService;
-    private readonly borrowerService;
+    private readonly borrowerDB;
     private readonly loanChargesService;
-    constructor(banksService: BanksService, borrowerService: BorrowerService, loanChargesService: LoanChargesService);
+    constructor(banksService: BanksService, borrowerDB: BorrowersDB, loanChargesService: LoanChargesService);
     createUserLog(params: ICreateLogParams): Promise<void>;
     filterByBorrower(logs: IUserLogWithLookup[], borrowerId: string): Promise<IUserLogWithLookup[]>;
     replaceBorrowers(logs: IUserLogWithLookup[]): Promise<void[]>;

package/services/user-logs.service.js

@@ -11,11 +11,11 @@ const DeletedRecords_model_1 = require("../models/DeletedRecords.model");
 const createLogs = true;
 class UserLogsService {
     banksService;
-    borrowerService;
+    borrowerDB;
     loanChargesService;
-    constructor(banksService, borrowerService, loanChargesService) {
+    constructor(banksService, borrowerDB, loanChargesService) {
         this.banksService = banksService;
-        this.borrowerService = borrowerService;
+        this.borrowerDB = borrowerDB;
         this.loanChargesService = loanChargesService;
     }
     async createUserLog(params) {
@@ -45,7 +45,7 @@ class UserLogsService {
                 return acc;
             }, new Map());
         };
-        const borrowers = await this.borrowerService.getAllBorrowers();
+        const borrowers = await this.borrowerDB.getAllBorrowers();
         const borrowersMap = convertToMap(borrowers);
         const products = await this.loanChargesService.getAllLoanProducts();
         const productsMap = convertToMap(products);

package/services/user-logs.service.ts

@@ -5,7 +5,7 @@ import { ELogType, IUserLog, IUserLogWithLookup, UserLog } from '../models/UserL
 import { DeletedRecord } from '../models/DeletedRecords.model';
 
 import { BanksService } from './banks.service';
-import { BorrowerService } from './borrowers.service';
+import { BorrowersDB } from './borrowers.db';
 import { LoanChargesService } from './loan-charges.service';
 
 export interface IUserLogFilter {
@@ -21,7 +21,7 @@ export class UserLogsService {
 
   constructor(
     private readonly banksService: BanksService,
-    private readonly borrowerService: BorrowerService,
+    private readonly borrowerDB: BorrowersDB,
     private readonly loanChargesService: LoanChargesService,
   ) {
   }
@@ -55,7 +55,7 @@ export class UserLogsService {
         return acc;
       }, new Map<string, string>());
     };
-    const borrowers = await this.borrowerService.getAllBorrowers();
+    const borrowers = await this.borrowerDB.getAllBorrowers();
     const borrowersMap = convertToMap(borrowers);
 
     const products = await this.loanChargesService.getAllLoanProducts();