gemcap-be-common 1.5.133 → 1.5.135

package/db/brokers.db.d.ts

@@ -27,8 +27,10 @@ import mongoose from 'mongoose';
 import { ILedgerDataRow } from './reports.db';
 import { ILoanProductDoc } from '../models/LoanProducts.model';
 import { IProductBrokerDocWithLoanBroker, IProductBrokerLean } from '../models/ProductBroker.model';
+import { ILoanChargeDoc, ILoanChargeView } from '../models/LoanCharges.model';
+export declare const handleBrokerInterestFee: (statementAmount: number, charges: ILoanChargeView[], interestShare: number, baseInterestTotal: number, primeRate: number) => number;
 export declare const getProductBrokers: (productId: string) => Promise<IProductBrokerDocWithLoanBroker[]>;
-export declare const enrichWithBrokers: (transactions: ILedgerDataRow[], product: ILoanProductDoc) => Promise<ILedgerDataRow[]>;
+export declare const enrichWithBrokers: (transactions: ILedgerDataRow[], product: ILoanProductDoc, charges: ILoanChargeDoc[], primeRate: number) => Promise<ILedgerDataRow[]>;
 export declare const getBorrowerBrokers: (borrowerId: string) => Promise<IProductBrokerLean[]>;
 export declare const getAllProductBrokers: () => Promise<IProductBrokerLean[]>;
 export declare const getAllLoanBrokers: () => Promise<{

package/db/brokers.db.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBrokerProducts = exports.getAllLoanBrokers = exports.getAllProductBrokers = exports.getBorrowerBrokers = exports.enrichWithBrokers = exports.getProductBrokers = void 0;
+exports.getBrokerProducts = exports.getAllLoanBrokers = exports.getAllProductBrokers = exports.getBorrowerBrokers = exports.enrichWithBrokers = exports.getProductBrokers = exports.handleBrokerInterestFee = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("../models/_models");
@@ -11,6 +11,15 @@ const reports_db_1 = require("./reports.db");
 const ProductBroker_model_1 = require("../models/ProductBroker.model");
 const LoanBroker_model_1 = require("../models/LoanBroker.model");
 const main_helper_1 = require("../helpers/main.helper");
+const handleBrokerInterestFee = (statementAmount, charges, interestShare, baseInterestTotal, primeRate) => {
+    const interestCharge = charges.find((charge) => reports_db_1.EChargeType[charge.chargeType] === reports_db_1.EChargeType.INTEREST_FEE && charge.active && !charge.deletedAt);
+    const interestBase = baseInterestTotal
+        ? new decimal_js_1.default(primeRate).add(interestCharge?.percent || 0).div(baseInterestTotal).toDP(2).toNumber()
+        : 0;
+    const minBase = Math.min(1, interestBase);
+    return new decimal_js_1.default(statementAmount).mul(interestShare).mul(minBase).toDP(2).toNumber();
+};
+exports.handleBrokerInterestFee = handleBrokerInterestFee;
 const getProductBrokers = async (productId) => {
     return ProductBroker_model_1.ProductBroker.aggregate([
         {
@@ -37,15 +46,22 @@ const getProductBrokers = async (productId) => {
     ]);
 };
 exports.getProductBrokers = getProductBrokers;
-const enrichWithBrokers = async (transactions, product) => {
+const enrichWithBrokers = async (transactions, product, charges, primeRate) => {
     const productBrokers = await (0, exports.getProductBrokers)(product._id.toString());
     if (productBrokers.length === 0) {
         return transactions;
     }
     const handleFee = (t, broker, shareName) => {
+        let statementAmount;
+        if (shareName === 'interestShare') {
+            statementAmount = (0, exports.handleBrokerInterestFee)(-t.statementAmount, charges, broker.interestShare, broker.baseInterestTotal, primeRate);
+        }
+        else {
+            statementAmount = new decimal_js_1.default(-t.statementAmount).mul(broker[shareName]).toDP(2).toNumber();
+        }
         return {
             ...t,
-            statementAmount: new decimal_js_1.default(-t.statementAmount).mul(broker[shareName]).toDP(2).toNumber(),
+            statementAmount,
             title: `${t.title.replace('ACCRUED', '').trim()}: ${broker.loanBroker.name}`,
             chargeCode: broker.BSCode,
             PLCode: broker.PLCode,

package/db/brokers.db.ts

@@ -7,6 +7,16 @@ import { ILoanProductDoc } from '../models/LoanProducts.model';
 import { IProductBrokerDocWithLoanBroker, IProductBrokerLean, ProductBroker } from '../models/ProductBroker.model';
 import { ILoanBrokerLean, LoanBroker } from '../models/LoanBroker.model';
 import { fieldsToUnset, sanitizePlainObject } from '../helpers/main.helper';
+import { ILoanChargeDoc, ILoanChargeView } from '../models/LoanCharges.model';
+
+export const handleBrokerInterestFee = (statementAmount: number, charges: ILoanChargeView[], interestShare: number, baseInterestTotal: number, primeRate: number) => {
+  const interestCharge = charges.find((charge) => EChargeType[charge.chargeType] === EChargeType.INTEREST_FEE && charge.active && !charge.deletedAt);
+  const interestBase = baseInterestTotal
+    ? new Decimal(primeRate).add(interestCharge?.percent || 0).div(baseInterestTotal).toDP(2).toNumber()
+    : 0;
+  const minBase = Math.min(1, interestBase);
+  return new Decimal(statementAmount).mul(interestShare).mul(minBase).toDP(2).toNumber();
+};
 
 export const getProductBrokers = async (productId: string) => {
   return ProductBroker.aggregate<IProductBrokerDocWithLoanBroker>([
@@ -34,15 +44,23 @@ export const getProductBrokers = async (productId: string) => {
   ]);
 };
 
-export const enrichWithBrokers = async (transactions: ILedgerDataRow[], product: ILoanProductDoc): Promise<ILedgerDataRow[]> => {
+export const enrichWithBrokers = async (transactions: ILedgerDataRow[], product: ILoanProductDoc, charges: ILoanChargeDoc[], primeRate: number): Promise<ILedgerDataRow[]> => {
   const productBrokers = await getProductBrokers(product._id.toString());
   if (productBrokers.length === 0) {
     return transactions;
   }
   const handleFee = (t: ILedgerDataRow, broker: IProductBrokerDocWithLoanBroker, shareName: 'adminShare' | 'interestShare' | 'otherShare'): ILedgerDataRow => {
+    let statementAmount: number;
+
+
+    if (shareName === 'interestShare') {
+      statementAmount = handleBrokerInterestFee(-t.statementAmount, charges, broker.interestShare, broker.baseInterestTotal, primeRate);
+    } else {
+      statementAmount = new Decimal(-t.statementAmount).mul(broker[shareName]).toDP(2).toNumber();
+    }
     return {
       ...t,
-      statementAmount: new Decimal(-t.statementAmount).mul(broker[shareName]).toDP(2).toNumber(),
+      statementAmount,
       title: `${t.title.replace('ACCRUED', '').trim()}: ${broker.loanBroker.name}`,
       chargeCode: broker.BSCode,
       PLCode: broker.PLCode,

package/db/loan-statement.db.js

@@ -7,6 +7,7 @@ exports.getPeriods = exports.getBorrowerWithPeriods = exports.getStatementBorrow
 const lodash_1 = __importDefault(require("lodash"));
 const mongoose_1 = __importDefault(require("mongoose"));
 const dayjs_1 = __importDefault(require("dayjs"));
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const LoanStatementTransaction_model_1 = require("../models/LoanStatementTransaction.model");
 const LoanTransaction_model_1 = require("../models/LoanTransaction.model");
 const loan_products_db_1 = require("./loan-products.db");
@@ -14,7 +15,7 @@ const LoanProducts_model_1 = require("../models/LoanProducts.model");
 const Borrower_model_1 = require("../models/Borrower.model");
 const loan_transactions_db_1 = require("./loan-transactions.db");
 const reports_db_1 = require("./reports.db");
-const decimal_js_1 = __importDefault(require("decimal.js"));
+const financial_indexes_service_1 = require("../services/financial-indexes.service");
 var ELedgerReportType;
 (function (ELedgerReportType) {
     ELedgerReportType[ELedgerReportType["SHORT"] = 0] = "SHORT";
@@ -50,6 +51,7 @@ exports.ledgerHeadersMap = {
         paymentDate: 'payment date',
     },
 };
+const financialIndexesService = new financial_indexes_service_1.FinancialIndexesService({ apiKey: '' });
 const getTotalTransactionAmountForCharge = async (chargeId, start, end) => {
     const results = await LoanStatementTransaction_model_1.LoanStatementTransactionModel.aggregate([
         {
@@ -132,7 +134,12 @@ const getStatementBorrowersTransactions = async (start, end, selectedPeriod, sel
         startDate: new Date((0, dayjs_1.default)(periodFull[0].period.start).utc().toDate().toISOString()),
         endDate: new Date((0, dayjs_1.default)(periodFull[0].period.end).utc().toDate().toISOString()),
         reportType: ledgerType,
-    }, { showBalances: showBalances, showFloatedBalance: showBalances });
+    }, {
+        showBalances: showBalances,
+        showFloatedBalance: showBalances,
+    }, {
+        getFinancialIndexValue: (index, date) => financialIndexesService.getFinancialIndexValue(index, date),
+    });
     const transactions = Object.values(ledgerData).reduce((acc, ledgerTransaction) => [...acc, ...ledgerTransaction], []);
     const transactionsWithoutBalance = showBalances
         ? transactions.map((tr) => {

package/db/loan-statement.db.ts

@@ -1,6 +1,7 @@
 import _ from 'lodash';
 import mongoose from 'mongoose';
 import dayjs from 'dayjs';
+import Decimal from 'decimal.js';
 
 import { IStatementPeriod, LoanStatementTransactionModel } from '../models/LoanStatementTransaction.model';
 import { LoanTransaction } from '../models/LoanTransaction.model';
@@ -9,7 +10,7 @@ import { LoanProduct } from '../models/LoanProducts.model';
 import { BorrowerModel } from '../models/Borrower.model';
 import { getLastTransactionForDate } from './loan-transactions.db';
 import { getLedger } from './reports.db';
-import Decimal from 'decimal.js';
+import { FinancialIndexesService } from '../services/financial-indexes.service';
 
 export enum ELedgerReportType {
   SHORT,
@@ -47,6 +48,8 @@ export const ledgerHeadersMap = {
   },
 };
 
+const financialIndexesService = new FinancialIndexesService({ apiKey: '' });
+
 export const getTotalTransactionAmountForCharge = async (chargeId: string, start: Date, end: Date) => {
   const results = await LoanStatementTransactionModel.aggregate([
     {
@@ -129,12 +132,20 @@ export const getStatementBorrowersTransactions = async (start: string, end: stri
 
   const products = await LoanProduct.find({ borrowerId: { $in: selectedBorrowerIds.map((id) => new mongoose.Types.ObjectId(id)) } }).lean();
   const productIds = products.map((product) => product._id.toString());
-  const ledgerData = await getLedger({
+  const ledgerData = await getLedger(
+    {
       productIds,
       startDate: new Date(dayjs(periodFull[0].period.start).utc().toDate().toISOString()),
       endDate: new Date(dayjs(periodFull[0].period.end).utc().toDate().toISOString()),
       reportType: ledgerType,
-    }, { showBalances: showBalances, showFloatedBalance: showBalances },
+    },
+    {
+      showBalances: showBalances,
+      showFloatedBalance: showBalances,
+    },
+    {
+      getFinancialIndexValue: (index, date) => financialIndexesService.getFinancialIndexValue(index, date),
+    },
   );
   const transactions = Object.values(ledgerData).reduce((acc, ledgerTransaction) => [...acc, ...ledgerTransaction], []);
   const transactionsWithoutBalance = showBalances
@@ -143,7 +154,7 @@ export const getStatementBorrowersTransactions = async (start: string, end: stri
         ...tr,
         balance: tr.balance ? new Decimal(tr.balance).toDP(2).toNumber() : tr.balance,
         floatedBalance: tr.floatedBalance ? new Decimal(tr.floatedBalance).toDP(2).toNumber() : tr.floatedBalance,
-      }
+      };
     })
     : _.map(transactions, (obj) => _.omit(obj, ['balance', 'floatedBalance']));
   return [{ transactions: [header, ...transactionsWithoutBalance] }];

package/db/reports.db.d.ts

@@ -27,6 +27,7 @@ import { ILoanProductDoc } from '../models/LoanProducts.model';
 import { ELedgerReportType } from './loan-statement.db';
 import mongoose from 'mongoose';
 import { ILoanTransactionDoc } from '../models/LoanTransaction.model';
+import { EFinancialIndex } from '../services/financial-indexes.service';
 export declare enum EChargeType {
     INTEREST_FEE = "INTEREST",
     ADMIN_FEE = "ADMIN FEE",
@@ -92,6 +93,10 @@ export type ReportLedgerOptions = {
     showFloatedBalance: boolean;
     showBalances: boolean;
 };
-export declare const getLedger: (params: ReportLedgerParams, options?: ReportLedgerOptions) => Promise<{
+type GetFinancialIndexValue = (index: EFinancialIndex, date?: Date) => Promise<number>;
+export declare const getLedger: (params: ReportLedgerParams, options: ReportLedgerOptions, deps: {
+    getFinancialIndexValue: GetFinancialIndexValue;
+}) => Promise<{
     [productId: string]: ILedgerReportRow[];
 }>;
+export {};

package/db/reports.db.js

@@ -22,6 +22,8 @@ const brokers_db_1 = require("./brokers.db");
 const TermLoan_model_1 = require("../models/TermLoan.model");
 const TermLoanCalculated_model_1 = require("../models/TermLoanCalculated.model");
 const _models_1 = require("../models/_models");
+const LoanCharges_model_1 = require("../models/LoanCharges.model");
+const financial_indexes_service_1 = require("../services/financial-indexes.service");
 var EChargeType;
 (function (EChargeType) {
     EChargeType["INTEREST_FEE"] = "INTEREST";
@@ -42,9 +44,9 @@ const defaultReportLedgerOptions = {
     showBalances: true,
     showFloatedBalance: true,
 };
-const getLedger = async (params, options = defaultReportLedgerOptions) => {
+const getLedger = async (params, options = defaultReportLedgerOptions, deps) => {
     const { productIds, reportType } = params;
-    const fullTransactions = await getLedgerData(params, options);
+    const fullTransactions = await getLedgerData(params, options, deps.getFinancialIndexValue);
     const products = await LoanProducts_model_1.LoanProduct
         .find({ _id: { $in: productIds.map((id) => new mongoose_1.default.Types.ObjectId(id)) } })
         .sort({ code: 1 })
@@ -66,10 +68,13 @@ const getLedger = async (params, options = defaultReportLedgerOptions) => {
     }, {});
 };
 exports.getLedger = getLedger;
-const getLedgerData = async (params, options = defaultReportLedgerOptions) => {
+const getLedgerData = async (params, options = defaultReportLedgerOptions, getFinancialIndexValue) => {
     const { productIds, startDate, endDate } = params;
     const addBrokers = true;
-    const products = await LoanProducts_model_1.LoanProduct.find({ _id: { $in: productIds.map((id) => new mongoose_1.default.Types.ObjectId(id)) } }).lean();
+    const productMongoIds = productIds.map((id) => new mongoose_1.default.Types.ObjectId(id));
+    const products = await LoanProducts_model_1.LoanProduct.find({ _id: { $in: productMongoIds } }).lean();
+    const charges = await LoanCharges_model_1.LoanCharge.find({ productId: { $in: productMongoIds } }).lean();
+    const primeRate = await getFinancialIndexValue(financial_indexes_service_1.EFinancialIndex.PRIME_RATE, params.startDate);
     const borrowers = await Borrower_model_1.BorrowerModel.find({ _id: { $in: products.map((product) => product.borrowerId) } }).lean();
     const borrowerMap = borrowers.reduce((acc, borrower) => ({ ...acc, [borrower._id.toString()]: borrower.code }), {});
     const borrowerCodesMap = products.reduce((acc, product) => ({
@@ -135,6 +140,7 @@ const getLedgerData = async (params, options = defaultReportLedgerOptions) => {
             product: p,
             productId: p._id,
             transactions: productTransactions ? productTransactions.transactions : [],
+            charges: charges.filter((charge) => charge.productId.toString() === p._id.toString()),
         };
     });
     const mappedGroups = groupedProductsWithTransactions.reduce((acc, group) => {
@@ -162,6 +168,7 @@ const getLedgerData = async (params, options = defaultReportLedgerOptions) => {
                         paymentDate: null,
                     };
                 }),
+                charges: group.charges,
             },
         };
     }, {});
@@ -255,7 +262,7 @@ const getLedgerData = async (params, options = defaultReportLedgerOptions) => {
         const mappedStatementTransactions = groupedMappedStatementTransactions
             .reduce((acc, group) => [...acc, ...group], []);
         const statementTransactionsWithBrokers = addBrokers
-            ? await (0, brokers_db_1.enrichWithBrokers)(mappedStatementTransactions, group.product)
+            ? await (0, brokers_db_1.enrichWithBrokers)(mappedStatementTransactions, group.product, group.charges, primeRate)
             : mappedStatementTransactions;
         const sortedTransactions = [...statementTransactionsWithBrokers, ...group.transactions]
             .sort((a, b) => {

package/db/reports.db.ts

@@ -24,6 +24,8 @@ import { enrichWithBrokers } from './brokers.db';
 import { TermLoanModel } from '../models/TermLoan.model';
 import { TermLoanCalculatedModel } from '../models/TermLoanCalculated.model';
 import { MODEL_NAMES } from '../models/_models';
+import { ILoanChargeDoc, LoanCharge } from '../models/LoanCharges.model';
+import { EFinancialIndex } from '../services/financial-indexes.service';
 
 export enum EChargeType {
   INTEREST_FEE = 'INTEREST',
@@ -101,11 +103,19 @@ const defaultReportLedgerOptions: ReportLedgerOptions = {
   showFloatedBalance: true,
 };
 
-export const getLedger = async (params: ReportLedgerParams, options = defaultReportLedgerOptions): Promise<{
+type GetFinancialIndexValue = (index: EFinancialIndex, date?: Date) => Promise<number>;
+
+export const getLedger = async (
+  params: ReportLedgerParams,
+  options = defaultReportLedgerOptions,
+  deps: {
+    getFinancialIndexValue: GetFinancialIndexValue;
+  },
+): Promise<{
   [productId: string]: ILedgerReportRow  []
 }> => {
   const { productIds, reportType } = params;
-  const fullTransactions = await getLedgerData(params, options);
+  const fullTransactions = await getLedgerData(params, options, deps.getFinancialIndexValue);
   const products = await LoanProduct
     .find({ _id: { $in: productIds.map((id) => new mongoose.Types.ObjectId(id)) } })
     .sort({ code: 1 })
@@ -130,13 +140,16 @@ export const getLedger = async (params: ReportLedgerParams, options = defaultRep
   }, {});
 };
 
-const getLedgerData = async (params: ReportLedgerParams, options = defaultReportLedgerOptions): Promise<{
+const getLedgerData = async (params: ReportLedgerParams, options = defaultReportLedgerOptions, getFinancialIndexValue: GetFinancialIndexValue,): Promise<{
   [productId: string]: ILedgerReportRow[]
 }> => {
   const { productIds, startDate, endDate } = params;
 
   const addBrokers = true;
-  const products = await LoanProduct.find({ _id: { $in: productIds.map((id) => new mongoose.Types.ObjectId(id)) } }).lean();
+  const productMongoIds = productIds.map((id) => new mongoose.Types.ObjectId(id));
+  const products = await LoanProduct.find({ _id: { $in: productMongoIds } }).lean();
+  const charges = await LoanCharge.find({ productId: { $in: productMongoIds } }).lean();
+  const primeRate = await getFinancialIndexValue(EFinancialIndex.PRIME_RATE, params.startDate);
   const borrowers = await BorrowerModel.find({ _id: { $in: products.map((product) => product.borrowerId) } }).lean();
   const borrowerMap = borrowers.reduce((acc, borrower) => (
     { ...acc, [borrower._id.toString()]: borrower.code }
@@ -207,11 +220,12 @@ const getLedgerData = async (params: ReportLedgerParams, options = defaultReport
       product: p,
       productId: p._id,
       transactions: productTransactions ? productTransactions.transactions : [],
+      charges: charges.filter((charge) => charge.productId.toString() === p._id.toString()),
     };
   });
 
   const mappedGroups: {
-    [productId: string]: { transactions: ILedgerDataRow[], product: ILoanProductDoc }
+    [productId: string]: { transactions: ILedgerDataRow[], product: ILoanProductDoc, charges: ILoanChargeDoc[] }
   } = groupedProductsWithTransactions.reduce((acc, group) => {
     return {
       ...acc,
@@ -237,6 +251,7 @@ const getLedgerData = async (params: ReportLedgerParams, options = defaultReport
             paymentDate: null,
           };
         }),
+        charges: group.charges,
       },
     };
   }, {});
@@ -335,7 +350,7 @@ const getLedgerData = async (params: ReportLedgerParams, options = defaultReport
     const mappedStatementTransactions: ILedgerDataRow[] = groupedMappedStatementTransactions
       .reduce((acc, group) => [...acc, ...group], []);
     const statementTransactionsWithBrokers = addBrokers
-      ? await enrichWithBrokers(mappedStatementTransactions, group.product)
+      ? await enrichWithBrokers(mappedStatementTransactions, group.product, group.charges, primeRate)
       : mappedStatementTransactions;
     const sortedTransactions = [...statementTransactionsWithBrokers, ...group.transactions]
       .sort((a, b) => {

package/models/ProductBroker.model.d.ts

@@ -39,6 +39,7 @@ export interface IProductBroker {
     BSCode: string;
     PLCode: string;
     productId: mongoose.Types.ObjectId;
+    baseInterestTotal: number;
     interestShare: number;
     adminShare: number;
     otherShare: number;
@@ -74,6 +75,7 @@ export declare const ProductBrokerSchema: mongoose.Schema<any, mongoose.Model<an
     BSCode: string;
     PLCode: string;
     productId: mongoose.Types.ObjectId;
+    baseInterestTotal: number;
     interestShare: number;
     adminShare: number;
     otherShare: number;
@@ -90,6 +92,7 @@ export declare const ProductBrokerSchema: mongoose.Schema<any, mongoose.Model<an
     BSCode: string;
     PLCode: string;
     productId: mongoose.Types.ObjectId;
+    baseInterestTotal: number;
     interestShare: number;
     adminShare: number;
     otherShare: number;
@@ -106,6 +109,7 @@ export declare const ProductBrokerSchema: mongoose.Schema<any, mongoose.Model<an
     BSCode: string;
     PLCode: string;
     productId: mongoose.Types.ObjectId;
+    baseInterestTotal: number;
     interestShare: number;
     adminShare: number;
     otherShare: number;

package/models/ProductBroker.model.js

@@ -17,6 +17,7 @@ exports.ProductBrokerValidationSchema = joi_1.default.object({
     BSCode: joi_1.default.string().required(),
     PLCode: joi_1.default.string().required(),
     productId: joi_1.default.string().required(),
+    baseInterestTotal: joi_1.default.number().required(),
     interestShare: joi_1.default.number().required(),
     adminShare: joi_1.default.number().required(),
     otherShare: joi_1.default.number().required(),
@@ -60,6 +61,10 @@ exports.ProductBrokerSchema = new mongoose_1.default.Schema({
         ref: _models_1.MODEL_NAMES.loanProducts,
         required: true,
     },
+    baseInterestTotal: {
+        type: Number,
+        required: true,
+    },
     interestShare: {
         type: Number,
         required: true,

package/models/ProductBroker.model.ts

@@ -14,6 +14,7 @@ export const ProductBrokerValidationSchema = Joi.object({
   BSCode: Joi.string().required(),
   PLCode: Joi.string().required(),
   productId: Joi.string().required(),
+  baseInterestTotal: Joi.number().required(),
   interestShare: Joi.number().required(),
   adminShare: Joi.number().required(),
   otherShare: Joi.number().required(),
@@ -28,6 +29,7 @@ export interface IProductBroker {
   BSCode: string;
   PLCode: string;
   productId: mongoose.Types.ObjectId;
+  baseInterestTotal: number;
   interestShare: number;
   adminShare: number;
   otherShare: number;
@@ -96,6 +98,10 @@ export const ProductBrokerSchema = new mongoose.Schema(
       ref: MODEL_NAMES.loanProducts,
       required: true,
     },
+    baseInterestTotal: {
+      type: Number,
+      required: true,
+    },
     interestShare: {
       type: Number,
       required: true,

package/package.json

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

package/services/brokers.service.js

@@ -18,6 +18,7 @@ const defaultBrokerList = [
         PLCode: '',
         productId: null,
         loanBrokerId: null,
+        baseInterestTotal: 0,
         adminShare: 0,
         interestShare: 0,
         otherShare: 0,
@@ -84,6 +85,7 @@ class BrokersService {
                 BSCode: null,
                 PLCode: null,
                 productId: product,
+                baseInterestTotal: null,
                 adminShare: shares.adminShare,
                 interestShare: shares.interestShare,
                 otherShare: shares.otherShare,
@@ -92,7 +94,7 @@ class BrokersService {
     }
     async checkTotalShares(borrowerId, brokers) {
         const productShares = await this.getTotalShares(borrowerId, brokers);
-        return !Object.values(productShares).some(values => values.adminShare > 1 || values.interestShare > 1 || values.otherShare > 1);
+        return !Object.values(productShares).some((values) => values.adminShare > 1 || values.interestShare > 1 || values.otherShare > 1);
     }
     async saveProductBrokers(borrowerId, brokers) {
         const existingBrokers = await (0, brokers_db_2.getBorrowerBrokers)(borrowerId);

package/services/brokers.service.ts

@@ -26,6 +26,7 @@ const defaultBrokerList: BrokerView[] = [
     PLCode: '',
     productId: null,
     loanBrokerId: null,
+    baseInterestTotal: 0,
     adminShare: 0,
     interestShare: 0,
     otherShare: 0,
@@ -111,6 +112,7 @@ export class BrokersService {
         BSCode: null,
         PLCode: null,
         productId: product,
+        baseInterestTotal: null,
         adminShare: shares.adminShare,
         interestShare: shares.interestShare,
         otherShare: shares.otherShare,
@@ -120,7 +122,7 @@ export class BrokersService {
 
   async checkTotalShares(borrowerId: string, brokers: IProductBrokerView[]) {
     const productShares = await this.getTotalShares(borrowerId, brokers);
-    return !Object.values(productShares).some(values => values.adminShare > 1 || values.interestShare > 1 || values.otherShare > 1);
+    return !Object.values(productShares).some((values) => values.adminShare > 1 || values.interestShare > 1 || values.otherShare > 1);
   }
 
   async saveProductBrokers(borrowerId: string, brokers: IProductBrokerView[]) {

package/services/quickbooks.service.d.ts

@@ -35,6 +35,7 @@ import { CashAllocationService } from './cash-allocation.service';
 import { CompaniesService } from './companies.service';
 import { LoanChargesService } from './loan-charges.service';
 import { LoanPaymentsService } from './loan-payments.service';
+import { FinancialIndexesService } from './financial-indexes.service';
 export type QuickBookReportType = 'accrual' | 'payment' | 'cash';
 interface IQBReportTransaction {
     service: string;
@@ -58,7 +59,8 @@ export declare class QuickbooksService {
     private readonly companiesService;
     private readonly loanChargesService;
     private readonly loanPaymentsService;
-    constructor(banksService: BanksService, bankUploadedTransactionsService: BankUploadedTransactionsService, borrowersDB: BorrowersDB, brokersService: BrokersService, cashAllocationService: CashAllocationService, companiesService: CompaniesService, loanChargesService: LoanChargesService, loanPaymentsService: LoanPaymentsService);
+    private readonly financialIndexesService;
+    constructor(banksService: BanksService, bankUploadedTransactionsService: BankUploadedTransactionsService, borrowersDB: BorrowersDB, brokersService: BrokersService, cashAllocationService: CashAllocationService, companiesService: CompaniesService, loanChargesService: LoanChargesService, loanPaymentsService: LoanPaymentsService, financialIndexesService: FinancialIndexesService);
     uploadAccounts(accounts: IQuickbooksUploadItem[], deleteOld: boolean): Promise<void>;
     getAllAccounts(): Promise<(mongoose.FlattenMaps<IQuickbooksAccount> & {
         _id: mongoose.Types.ObjectId;

package/services/quickbooks.service.js

@@ -16,6 +16,8 @@ const TermLoan_model_1 = require("../models/TermLoan.model");
 const reports_db_1 = require("../db/reports.db");
 const QuickbooksAccount_model_1 = require("../models/QuickbooksAccount.model");
 const date_helper_1 = require("../helpers/date.helper");
+const financial_indexes_service_1 = require("./financial-indexes.service");
+const brokers_db_1 = require("../db/brokers.db");
 const headersIIF = [
     {
         service: '!TRNS',
@@ -88,7 +90,8 @@ class QuickbooksService {
     companiesService;
     loanChargesService;
     loanPaymentsService;
-    constructor(banksService, bankUploadedTransactionsService, borrowersDB, brokersService, cashAllocationService, companiesService, loanChargesService, loanPaymentsService) {
+    financialIndexesService;
+    constructor(banksService, bankUploadedTransactionsService, borrowersDB, brokersService, cashAllocationService, companiesService, loanChargesService, loanPaymentsService, financialIndexesService) {
         this.banksService = banksService;
         this.bankUploadedTransactionsService = bankUploadedTransactionsService;
         this.borrowersDB = borrowersDB;
@@ -97,6 +100,7 @@ class QuickbooksService {
         this.companiesService = companiesService;
         this.loanChargesService = loanChargesService;
         this.loanPaymentsService = loanPaymentsService;
+        this.financialIndexesService = financialIndexesService;
     }
     async uploadAccounts(accounts, deleteOld) {
         const accountsWithId = accounts.map((account) => ({ _id: 'new_', ...account }));
@@ -325,6 +329,7 @@ class QuickbooksService {
             document: '',
             memo: '',
         };
+        const primeRate = await this.financialIndexesService.getFinancialIndexValue(financial_indexes_service_1.EFinancialIndex.PRIME_RATE, reportDate);
         await Promise.all(productIds.map(async (productId) => {
             const product = await this.loanChargesService.getLoanProductById(productId);
             const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
@@ -395,11 +400,18 @@ class QuickbooksService {
                                 }
                                 return;
                             }
+                            let brokerAmount;
+                            if (shareName === 'interestShare') {
+                                brokerAmount = (0, brokers_db_1.handleBrokerInterestFee)(-totalAmount, charges, broker.interestShare, broker.baseInterestTotal, primeRate);
+                            }
+                            else {
+                                brokerAmount = new decimal_js_1.default(-totalAmount).mul(broker[shareName]).toDP(2).toNumber();
+                            }
                             const tr = {
                                 ...trTemplate,
                                 productId,
                                 class: borrower.code,
-                                amount: new decimal_js_1.default(-totalAmount).mul(broker[shareName]).toDP(2).toNumber(),
+                                amount: brokerAmount,
                                 memo: `${borrower.code} ${reports_db_1.EChargeType[charge.chargeType].toUpperCase()} BROKER ${broker.order + 1}`,
                             };
                             tr.account = quickbooksAccountBrokerBS.fullName;

package/services/quickbooks.service.ts

@@ -23,6 +23,8 @@ import { CompaniesService } from './companies.service';
 import { LoanChargesService } from './loan-charges.service';
 import { LoanPaymentsService } from './loan-payments.service';
 import { isProductActive } from '../helpers/date.helper';
+import { EFinancialIndex, FinancialIndexesService } from './financial-indexes.service';
+import { handleBrokerInterestFee } from '../db/brokers.db';
 
 export type QuickBookReportType = 'accrual' | 'payment' | 'cash';
 
@@ -130,6 +132,7 @@ export class QuickbooksService {
     private readonly companiesService: CompaniesService,
     private readonly loanChargesService: LoanChargesService,
     private readonly loanPaymentsService: LoanPaymentsService,
+    private readonly financialIndexesService: FinancialIndexesService,
   ) {
   }
 
@@ -380,6 +383,8 @@ export class QuickbooksService {
       memo: '',
     };
 
+    const primeRate = await this.financialIndexesService.getFinancialIndexValue(EFinancialIndex.PRIME_RATE, reportDate)
+
     await Promise.all(productIds.map(async (productId) => {
       const product = await this.loanChargesService.getLoanProductById(productId);
       const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
@@ -460,11 +465,18 @@ export class QuickbooksService {
                 return;
               }
 
+              let brokerAmount: number;
+              if (shareName === 'interestShare') {
+                brokerAmount = handleBrokerInterestFee(-totalAmount, charges, broker.interestShare, broker.baseInterestTotal, primeRate);
+              } else {
+                brokerAmount = new Decimal(-totalAmount).mul(broker[shareName]).toDP(2).toNumber();
+              }
+
               const tr: IQBReportTransaction = {
                 ...trTemplate,
                 productId,
                 class: borrower.code,
-                amount: new Decimal(-totalAmount).mul(broker[shareName]).toDP(2).toNumber(),
+                amount: brokerAmount,
                 memo: `${borrower.code} ${EChargeType[charge.chargeType].toUpperCase()} BROKER ${broker.order + 1}`,
               };
 

package/services/reports.service.d.ts

@@ -36,6 +36,7 @@ import { LoanChargesService } from './loan-charges.service';
 import { LoanTransactionsService } from './loan-transactions.service';
 import { SignsService } from './signs.service';
 import { UploadsService } from './uploads.service';
+import { FinancialIndexesService } from './financial-indexes.service';
 export interface IBankReportData {
     borrowerId?: string;
     borrowerName: string;
@@ -97,8 +98,9 @@ export declare class ReportsService {
     private readonly signsService;
     private readonly uploadsService;
     private readonly investorSummaryService;
+    private readonly financialIndexesService;
     margin: number;
-    constructor(availabilityService: AvailabilityService, borrowerService: BorrowerService, collateralAdjustmentsService: CollateralAdjustmentsService, collateralsService: CollateralsService, equipmentService: EquipmentService, loanChargesService: LoanChargesService, loanTransactionsService: LoanTransactionsService, signsService: SignsService, uploadsService: UploadsService, investorSummaryService: InvestorSummaryService);
+    constructor(availabilityService: AvailabilityService, borrowerService: BorrowerService, collateralAdjustmentsService: CollateralAdjustmentsService, collateralsService: CollateralsService, equipmentService: EquipmentService, loanChargesService: LoanChargesService, loanTransactionsService: LoanTransactionsService, signsService: SignsService, uploadsService: UploadsService, investorSummaryService: InvestorSummaryService, financialIndexesService: FinancialIndexesService);
     getCollateralAdjustmentsForLastSignedBBC(borrowerId: string, date: Date): Promise<number>;
     private getProductBalances;
     getBorrowerAndProducts(borrowerId: string, date: Date, useSignedBBC?: boolean, requireBBC?: boolean): Promise<{