gemcap-be-common 1.5.167 → 1.5.169

package/models/Borrower.model.ts

@@ -1,6 +1,5 @@
 import mongoose, { Document, Model } from 'mongoose';
 import { MODEL_NAMES } from './_models';
-import { IOrganization } from './Organization.model';
 
 const mongooseLeanId = require('gemcap-be-common/plugins/id.plugin');
 

package/models/ProductBroker.model.d.ts

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose from 'mongoose';
 import Joi from 'joi';
-import { ILoanBrokerLean } from './LoanBroker.model';
+import { ILoanBrokerLean, ILoanBrokerPlain } from './LoanBroker.model';
 export declare const ProductBrokerValidationSchema: Joi.ObjectSchema<any>;
 export interface IProductBroker {
     uiId: string;
@@ -32,8 +32,10 @@ export interface IProductBroker {
     borrowerId: mongoose.Types.ObjectId;
     active: boolean;
     loanBrokerId: mongoose.Types.ObjectId;
-    BSCode: string;
-    PLCode: string;
+    BSCode?: string;
+    BSCodeId: mongoose.Types.ObjectId;
+    PLCode?: string;
+    PLCodeId: mongoose.Types.ObjectId;
     productId: mongoose.Types.ObjectId;
     baseInterestTotal: number;
     interestShare: number;
@@ -46,15 +48,20 @@ export interface IProductBrokerLean extends IProductBroker {
     createdAt: Date;
     updatedAt: Date;
 }
-export interface IProductBrokerPlain extends Omit<IProductBroker, 'borrowerId' | 'loanBrokerId' | 'productId'> {
+export interface IProductBrokerPlain extends Omit<IProductBroker, 'borrowerId' | 'loanBrokerId' | 'productId' | 'BSCodeId' | 'PLCodeId'> {
     _id: string;
     borrowerId: string;
     loanBrokerId: string;
     productId: string;
+    BSCodeId: string;
+    PLCodeId: string;
 }
 export interface IProductBrokerDocWithLoanBroker extends TProductBrokerDoc {
     loanBroker: ILoanBrokerLean;
 }
+export interface IProductBrokerWithLoanBrokerPlain extends IProductBrokerPlain {
+    loanBroker: ILoanBrokerPlain;
+}
 export type IProductBrokerView = Omit<IProductBrokerLean, 'borrowerId' | 'order'>;
 export type TProductBrokerModel = mongoose.Model<IProductBroker>;
 export declare const ProductBrokerSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
@@ -63,52 +70,58 @@ export declare const ProductBrokerSchema: mongoose.Schema<any, mongoose.Model<an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
-    productId: mongoose.Types.ObjectId;
+    uiId: string;
     order: number;
+    borrowerId: mongoose.Types.ObjectId;
     active: boolean;
-    PLCode: string;
-    uiId: string;
     loanBrokerId: mongoose.Types.ObjectId;
-    BSCode: string;
+    BSCodeId: mongoose.Types.ObjectId;
+    PLCodeId: mongoose.Types.ObjectId;
+    productId: mongoose.Types.ObjectId;
     baseInterestTotal: number;
     interestShare: number;
     adminShare: number;
     otherShare: number;
+    BSCode?: string;
+    PLCode?: string;
     __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
-    productId: mongoose.Types.ObjectId;
+    uiId: string;
     order: number;
+    borrowerId: mongoose.Types.ObjectId;
     active: boolean;
-    PLCode: string;
-    uiId: string;
     loanBrokerId: mongoose.Types.ObjectId;
-    BSCode: string;
+    BSCodeId: mongoose.Types.ObjectId;
+    PLCodeId: mongoose.Types.ObjectId;
+    productId: mongoose.Types.ObjectId;
     baseInterestTotal: number;
     interestShare: number;
     adminShare: number;
     otherShare: number;
+    BSCode?: string;
+    PLCode?: string;
     __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
-    productId: mongoose.Types.ObjectId;
+    uiId: string;
     order: number;
+    borrowerId: mongoose.Types.ObjectId;
     active: boolean;
-    PLCode: string;
-    uiId: string;
     loanBrokerId: mongoose.Types.ObjectId;
-    BSCode: string;
+    BSCodeId: mongoose.Types.ObjectId;
+    PLCodeId: mongoose.Types.ObjectId;
+    productId: mongoose.Types.ObjectId;
     baseInterestTotal: number;
     interestShare: number;
     adminShare: number;
     otherShare: number;
+    BSCode?: string;
+    PLCode?: string;
     __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;

package/models/ProductBroker.model.js

@@ -14,8 +14,10 @@ exports.ProductBrokerValidationSchema = joi_1.default.object({
     borrowerId: joi_1.default.string().required(),
     active: joi_1.default.boolean().required(),
     loanBrokerId: joi_1.default.string().required(),
-    BSCode: joi_1.default.string().required(),
-    PLCode: joi_1.default.string().required(),
+    BSCode: joi_1.default.string().optional(),
+    BSCodeId: joi_1.default.string().required(),
+    PLCode: joi_1.default.string().optional(),
+    PLCodeId: joi_1.default.string().required(),
     productId: joi_1.default.string().required(),
     baseInterestTotal: joi_1.default.number().required(),
     interestShare: joi_1.default.number().required(),
@@ -48,14 +50,24 @@ exports.ProductBrokerSchema = new mongoose_1.default.Schema({
     },
     BSCode: {
         type: String,
-        required: true,
+        required: false,
         trim: true,
     },
+    BSCodeId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: _models_1.MODEL_NAMES.quickbooksAccounts,
+        required: true,
+    },
     PLCode: {
         type: String,
-        required: true,
+        required: false,
         trim: true,
     },
+    PLCodeId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: _models_1.MODEL_NAMES.quickbooksAccounts,
+        required: true,
+    },
     productId: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: _models_1.MODEL_NAMES.loanProducts,

package/models/ProductBroker.model.ts

@@ -2,7 +2,7 @@ import mongoose from 'mongoose';
 import Joi from 'joi';
 
 import { MODEL_NAMES } from './_models';
-import { ILoanBrokerLean } from './LoanBroker.model';
+import { ILoanBrokerLean, ILoanBrokerPlain } from './LoanBroker.model';
 
 export const ProductBrokerValidationSchema = Joi.object({
   _id: Joi.string(),
@@ -11,8 +11,10 @@ export const ProductBrokerValidationSchema = Joi.object({
   borrowerId: Joi.string().required(),
   active: Joi.boolean().required(),
   loanBrokerId: Joi.string().required(),
-  BSCode: Joi.string().required(),
-  PLCode: Joi.string().required(),
+  BSCode: Joi.string().optional(),
+  BSCodeId: Joi.string().required(),
+  PLCode: Joi.string().optional(),
+  PLCodeId: Joi.string().required(),
   productId: Joi.string().required(),
   baseInterestTotal: Joi.number().required(),
   interestShare: Joi.number().required(),
@@ -26,8 +28,10 @@ export interface IProductBroker {
   borrowerId: mongoose.Types.ObjectId;
   active: boolean;
   loanBrokerId: mongoose.Types.ObjectId;
-  BSCode: string;
-  PLCode: string;
+  BSCode?: string;
+  BSCodeId: mongoose.Types.ObjectId;
+  PLCode?: string;
+  PLCodeId: mongoose.Types.ObjectId;
   productId: mongoose.Types.ObjectId;
   baseInterestTotal: number;
   interestShare: number;
@@ -43,17 +47,23 @@ export interface IProductBrokerLean extends IProductBroker {
   updatedAt: Date;
 }
 
-export interface IProductBrokerPlain extends Omit<IProductBroker, 'borrowerId' | 'loanBrokerId' | 'productId'> {
+export interface IProductBrokerPlain extends Omit<IProductBroker, 'borrowerId' | 'loanBrokerId' | 'productId' | 'BSCodeId' | 'PLCodeId'> {
   _id: string;
   borrowerId: string;
   loanBrokerId: string;
   productId: string;
+  BSCodeId: string;
+  PLCodeId: string;
 }
 
 export interface IProductBrokerDocWithLoanBroker extends TProductBrokerDoc {
   loanBroker: ILoanBrokerLean;
 }
 
+export interface IProductBrokerWithLoanBrokerPlain extends IProductBrokerPlain {
+  loanBroker: ILoanBrokerPlain;
+}
+
 export type IProductBrokerView = Omit<IProductBrokerLean, 'borrowerId' | 'order'>
 
 export type TProductBrokerModel = mongoose.Model<IProductBroker>;
@@ -85,14 +95,24 @@ export const ProductBrokerSchema = new mongoose.Schema(
     },
     BSCode: {
       type: String,
-      required: true,
+      required: false,
       trim: true,
     },
+    BSCodeId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: MODEL_NAMES.quickbooksAccounts,
+      required: true,
+    },
     PLCode: {
       type: String,
-      required: true,
+      required: false,
       trim: true,
     },
+    PLCodeId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: MODEL_NAMES.quickbooksAccounts,
+      required: true,
+    },
     productId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: MODEL_NAMES.loanProducts,

package/package.json

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

package/services/borrowers.service.d.ts

@@ -84,10 +84,10 @@ export declare class BorrowerService {
     getBorrowerCodesMap(): Promise<Map<string, string>>;
     getBorrowerStatementDetails(borrowers: IBorrowerDoc[]): Promise<{
         [x: string]: {
-            SELECTED_PERIOD?: boolean;
             ENTIRE_LOAN?: boolean;
-            LAST_MONTH?: boolean;
+            SELECTED_PERIOD?: boolean;
             CURRENT_MONTH?: boolean;
+            LAST_MONTH?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

package/services/brokers.service.js

@@ -16,6 +16,8 @@ const defaultBrokerList = [
         active: true,
         BSCode: '',
         PLCode: '',
+        BSCodeId: null,
+        PLCodeId: null,
         productId: null,
         loanBrokerId: null,
         baseInterestTotal: 0,

package/services/brokers.service.ts

@@ -24,6 +24,8 @@ const defaultBrokerList: BrokerView[] = [
     active: true,
     BSCode: '',
     PLCode: '',
+    BSCodeId: null,
+    PLCodeId: null,
     productId: null,
     loanBrokerId: null,
     baseInterestTotal: 0,
@@ -31,7 +33,7 @@ const defaultBrokerList: BrokerView[] = [
     interestShare: 0,
     otherShare: 0,
   },
-];
+] satisfies BrokerView[];
 
 type ShareType = 'adminShare' | 'interestShare' | 'otherShare';
 

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

@@ -164,7 +164,7 @@ export declare class LoanTransactionsService {
     getTransactionReport(transactionIds: string[], borrowerId: string, effectiveDate: Date): Promise<{
         transactionIdsToMark: string[];
         transactions: {
-            [x: string]: (string | number | Date | string[])[];
+            [x: string]: (string | number | string[] | Date)[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{

package/services/quickbooks.service.js

@@ -311,12 +311,13 @@ class QuickbooksService {
         if (reportErrorsSet.size > 0) {
             return { reportData: [], reportErrors: Array.from(reportErrorsSet) };
         }
+        const accounts = await QuickbooksAccount_model_1.QuickbooksAccount.find({}).lean().exec();
         const companyFilter = { companyId: { $in: params.companyIds.map((id) => new mongoose_1.default.Types.ObjectId(id)) } };
         const { reportType, productIds, chargeTypes, reportDate } = params;
         const reportDateFormatted = dayjs_1.default.utc(reportDate).format('MM/DD/YYYY').toUpperCase();
         const reportDateTrFormatted = dayjs_1.default.utc(reportDate).format(transactionsDateFormat).toUpperCase();
         const currentDateTrFormatted = dayjs_1.default.utc(new Date).format(transactionsDateFormat).toUpperCase();
-        const isAccrual = reportType === 'accrual';
+        const isAccrualReport = reportType === 'accrual';
         const mainData = [];
         const trTemplate = {
             service: 'SPL',
@@ -336,7 +337,7 @@ class QuickbooksService {
             const filteredCharges = charges.filter((charge) => chargeTypes.includes(charge.chargeType));
             const productBrokers = await this.brokersService.getProductBrokers(productId);
             const borrower = await Borrower_model_1.BorrowerModel.findById(product.borrowerId).lean();
-            const allTransactions = isAccrual
+            const allTransactions = isAccrualReport
                 ? await this.getChargeTransactionsForAccrual([productId], reportDate)
                 : await this.getChargeTransactionsForPayments([productId], reportDate);
             await Promise.all(filteredCharges.map(async (charge) => {
@@ -344,7 +345,7 @@ class QuickbooksService {
                 if (!chargeTransactions.length) {
                     return;
                 }
-                const totalAmountGroups = isAccrual
+                const totalAmountGroups = isAccrualReport
                     ? { [charge.PLCode]: chargeTransactions.reduce((acc, tr) => new decimal_js_1.default(acc).add(tr.amount).toNumber(), 0) }
                     : chargeTransactions.reduce((acc, tr) => {
                         if (tr.settlementCode) {
@@ -363,7 +364,7 @@ class QuickbooksService {
                         return;
                     }
                     let totalAmount = product.masterLoanProductId != null ? -totalAmountValue : totalAmountValue;
-                    totalAmount = isAccrual ? totalAmount : -totalAmount;
+                    totalAmount = isAccrualReport ? totalAmount : -totalAmount;
                     const quickbooksAccountBS = await QuickbooksAccount_model_1.QuickbooksAccount.findOne({ accountCode: charge.code, ...companyFilter }).lean();
                     const quickbooksAccountPL = await QuickbooksAccount_model_1.QuickbooksAccount.findOne({ accountCode: PLCode, ...companyFilter }).lean();
                     if (!quickbooksAccountBS || !quickbooksAccountPL) {
@@ -387,16 +388,18 @@ class QuickbooksService {
                     tr.account = quickbooksAccountPL.fullName;
                     tr.amount = -totalAmount;
                     mainData.push({ ...tr });
-                    if (chargeTypes.includes('BROKERS') && isAccrual) {
+                    if (chargeTypes.includes('BROKERS') && isAccrualReport) {
                         const handleFee = async (broker, shareName) => {
-                            const quickbooksAccountBrokerBS = await QuickbooksAccount_model_1.QuickbooksAccount.findOne({ accountCode: broker.BSCode, ...companyFilter }).lean();
-                            const quickbooksAccountBrokerPL = await QuickbooksAccount_model_1.QuickbooksAccount.findOne({ accountCode: broker.PLCode, ...companyFilter }).lean();
+                            const quickbooksAccountBrokerBS = await QuickbooksAccount_model_1.QuickbooksAccount.findOne({ _id: broker.BSCodeId, ...companyFilter }).lean();
+                            const quickbooksAccountBrokerPL = await QuickbooksAccount_model_1.QuickbooksAccount.findOne({ _id: broker.PLCodeId, ...companyFilter }).lean();
                             if (!quickbooksAccountBrokerBS || !quickbooksAccountBrokerPL) {
                                 if (!quickbooksAccountBrokerBS) {
-                                    reportErrorsSet.add(broker.BSCode);
+                                    const foundAccount = accounts.find((a) => a._id === broker.BSCodeId);
+                                    reportErrorsSet.add(foundAccount?.accountCode ?? broker.BSCode);
                                 }
                                 if (!quickbooksAccountBrokerPL) {
-                                    reportErrorsSet.add(broker.PLCode);
+                                    const foundAccount = accounts.find((a) => a._id === broker.PLCodeId);
+                                    reportErrorsSet.add(foundAccount?.accountCode ?? broker.PLCode);
                                 }
                                 return;
                             }
@@ -433,7 +436,7 @@ class QuickbooksService {
                     }
                 }));
             }));
-            const principalPayments = isAccrual || product.type === loan_types_enum_1.ELoanTypes.REVOLVER
+            const principalPayments = isAccrualReport || product.type === loan_types_enum_1.ELoanTypes.REVOLVER
                 ? {}
                 : await this.getPrincipalTransactionsForPayments(productId, reportDate);
             await Promise.all(Object.entries(principalPayments).map(async ([settlementCode, amount]) => {

package/services/quickbooks.service.ts

@@ -362,13 +362,15 @@ export class QuickbooksService {
       return { reportData: [], reportErrors: Array.from(reportErrorsSet) };
     }
 
+    const accounts = await QuickbooksAccount.find({}).lean().exec();
+
     const companyFilter = { companyId: { $in: params.companyIds.map((id) => new mongoose.Types.ObjectId(id)) } };
 
     const { reportType, productIds, chargeTypes, reportDate } = params;
     const reportDateFormatted = dayjs.utc(reportDate).format('MM/DD/YYYY').toUpperCase();
     const reportDateTrFormatted = dayjs.utc(reportDate).format(transactionsDateFormat).toUpperCase();
     const currentDateTrFormatted = dayjs.utc(new Date).format(transactionsDateFormat).toUpperCase();
-    const isAccrual = reportType === 'accrual';
+    const isAccrualReport = reportType === 'accrual';
     const mainData: IQBReportTransaction[] = [];
 
     const trTemplate: IQBReportTransaction = {
@@ -392,7 +394,7 @@ export class QuickbooksService {
       const productBrokers = await this.brokersService.getProductBrokers(productId);
       const borrower = await BorrowerModel.findById(product.borrowerId).lean();
 
-      const allTransactions = isAccrual
+      const allTransactions = isAccrualReport
         ? await this.getChargeTransactionsForAccrual([productId], reportDate)
         : await this.getChargeTransactionsForPayments([productId], reportDate);
 
@@ -402,7 +404,7 @@ export class QuickbooksService {
           return;
         }
 
-        const totalAmountGroups = isAccrual
+        const totalAmountGroups = isAccrualReport
           ? { [charge.PLCode]: chargeTransactions.reduce((acc, tr) => new Decimal(acc).add(tr.amount).toNumber(), 0) }
           : chargeTransactions.reduce((acc, tr) => {
             if (tr.settlementCode) {
@@ -422,7 +424,7 @@ export class QuickbooksService {
             return;
           }
           let totalAmount = product.masterLoanProductId != null ? -totalAmountValue : totalAmountValue;
-          totalAmount = isAccrual ? totalAmount : -totalAmount;
+          totalAmount = isAccrualReport ? totalAmount : -totalAmount;
           const quickbooksAccountBS = await QuickbooksAccount.findOne({ accountCode: charge.code, ...companyFilter }).lean();
           const quickbooksAccountPL = await QuickbooksAccount.findOne({ accountCode: PLCode, ...companyFilter }).lean();
           if (!quickbooksAccountBS || !quickbooksAccountPL) {
@@ -449,18 +451,20 @@ export class QuickbooksService {
           tr.amount = -totalAmount;
           mainData.push({ ...tr });
 
-          if (chargeTypes.includes('BROKERS') && isAccrual) {
+          if (chargeTypes.includes('BROKERS') && isAccrualReport) {
 
             const handleFee = async (broker: IProductBrokerDocWithLoanBroker, shareName: 'adminShare' | 'interestShare' | 'otherShare') => {
 
-              const quickbooksAccountBrokerBS = await QuickbooksAccount.findOne({ accountCode: broker.BSCode, ...companyFilter }).lean();
-              const quickbooksAccountBrokerPL = await QuickbooksAccount.findOne({ accountCode: broker.PLCode, ...companyFilter }).lean();
+              const quickbooksAccountBrokerBS = await QuickbooksAccount.findOne({ _id: broker.BSCodeId, ...companyFilter }).lean();
+              const quickbooksAccountBrokerPL = await QuickbooksAccount.findOne({ _id: broker.PLCodeId, ...companyFilter }).lean();
               if (!quickbooksAccountBrokerBS || !quickbooksAccountBrokerPL) {
                 if (!quickbooksAccountBrokerBS) {
-                  reportErrorsSet.add(broker.BSCode);
+                  const foundAccount = accounts.find((a) => a._id === broker.BSCodeId);
+                  reportErrorsSet.add(foundAccount?.accountCode ?? broker.BSCode);
                 }
                 if (!quickbooksAccountBrokerPL) {
-                  reportErrorsSet.add(broker.PLCode);
+                  const foundAccount = accounts.find((a) => a._id === broker.PLCodeId);
+                  reportErrorsSet.add(foundAccount?.accountCode ?? broker.PLCode);
                 }
                 return;
               }
@@ -503,7 +507,7 @@ export class QuickbooksService {
         }));
       }));
 
-      const principalPayments = isAccrual || product.type === ELoanTypes.REVOLVER
+      const principalPayments = isAccrualReport || product.type === ELoanTypes.REVOLVER
         ? {}
         : await this.getPrincipalTransactionsForPayments(productId, reportDate);