gemcap-be-common 1.5.65 → 1.5.67

package/db/reports.db.js

@@ -207,7 +207,7 @@ const getLedgerData = async (params, options = defaultReportLedgerOptions) => {
                 };
             }))
             : statementTransactions.slice();
-        const isParticipant = group.product.masterLoanProductId != null;
+        const isParticipant = group.product.masteredLoanProductId != null;
         const groupedMappedStatementTransactions = await Promise.all(statementTransactionsWithBalance.map(async (statement) => {
             const transactions = [];
             if (statement.amountPaid > 0) {

package/db/reports.db.ts

@@ -285,7 +285,7 @@ const getLedgerData = async (params: ReportLedgerParams, options = defaultReport
       }))
       : statementTransactions.slice();
 
-    const isParticipant = group.product.masterLoanProductId != null;
+    const isParticipant = group.product.masteredLoanProductId != null;
     const groupedMappedStatementTransactions = await Promise.all(statementTransactionsWithBalance.map(async (statement) => {
 
       const transactions = [];

package/models/LoanProducts.model.d.ts

@@ -40,7 +40,7 @@ export interface ILoanProduct {
     isBalanceActual: boolean;
     isFloatedBalanceActual: boolean;
     isParticipant?: boolean;
-    masterLoanProductId: mongoose.Types.ObjectId;
+    masteredLoanProductId: mongoose.Types.ObjectId;
     minPercent: number;
     maxPercent: number;
     prepaymentDate?: Date;
@@ -60,10 +60,10 @@ export interface ILoanProductLean extends ILoanProduct {
     createdAt: Date;
     updatedAt: Date;
 }
-export interface ILoanProductPlain extends Omit<ILoanProduct, 'borrowerId' | 'masterLoanProductId'> {
+export interface ILoanProductPlain extends Omit<ILoanProduct, 'borrowerId' | 'masteredLoanProductId'> {
     _id: string;
     borrowerId: string;
-    masterLoanProductId: string;
+    masteredLoanProductId: string;
 }
 export interface ILoanProductWithId extends ILoanProduct {
     _id: mongoose.Types.ObjectId;
@@ -83,21 +83,19 @@ export declare const LoanProductSchema: mongoose.Schema<any, mongoose.Model<any,
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    type: string;
-    name: string;
+    borrowerId: mongoose.Types.ObjectId;
+    masteredLoanProductId: mongoose.Types.ObjectId;
     order: number;
     active: boolean;
-    borrowerId: mongoose.Types.ObjectId;
     code: string;
+    name: string;
+    type: string;
     startDate: Date;
     maturityDate: Date;
     commitment: number;
     isBalanceActual: boolean;
     isFloatedBalanceActual: boolean;
-    masterLoanProductId: mongoose.Types.ObjectId;
     isDefaultPaymentOrder: boolean;
-    __v?: number;
-    settlementCode?: string;
     masterCode?: string;
     payoffDate?: Date;
     isParticipant?: boolean;
@@ -105,26 +103,26 @@ export declare const LoanProductSchema: mongoose.Schema<any, mongoose.Model<any,
     maxPercent?: number;
     prepaymentDate?: Date;
     prepaymentTerms?: string;
+    settlementCode?: string;
     deactivationDate?: Date;
+    __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    type: string;
-    name: string;
+    borrowerId: mongoose.Types.ObjectId;
+    masteredLoanProductId: mongoose.Types.ObjectId;
     order: number;
     active: boolean;
-    borrowerId: mongoose.Types.ObjectId;
     code: string;
+    name: string;
+    type: string;
     startDate: Date;
     maturityDate: Date;
     commitment: number;
     isBalanceActual: boolean;
     isFloatedBalanceActual: boolean;
-    masterLoanProductId: mongoose.Types.ObjectId;
     isDefaultPaymentOrder: boolean;
-    __v?: number;
-    settlementCode?: string;
     masterCode?: string;
     payoffDate?: Date;
     isParticipant?: boolean;
@@ -132,26 +130,26 @@ export declare const LoanProductSchema: mongoose.Schema<any, mongoose.Model<any,
     maxPercent?: number;
     prepaymentDate?: Date;
     prepaymentTerms?: string;
+    settlementCode?: string;
     deactivationDate?: Date;
+    __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    type: string;
-    name: string;
+    borrowerId: mongoose.Types.ObjectId;
+    masteredLoanProductId: mongoose.Types.ObjectId;
     order: number;
     active: boolean;
-    borrowerId: mongoose.Types.ObjectId;
     code: string;
+    name: string;
+    type: string;
     startDate: Date;
     maturityDate: Date;
     commitment: number;
     isBalanceActual: boolean;
     isFloatedBalanceActual: boolean;
-    masterLoanProductId: mongoose.Types.ObjectId;
     isDefaultPaymentOrder: boolean;
-    __v?: number;
-    settlementCode?: string;
     masterCode?: string;
     payoffDate?: Date;
     isParticipant?: boolean;
@@ -159,7 +157,9 @@ export declare const LoanProductSchema: mongoose.Schema<any, mongoose.Model<any,
     maxPercent?: number;
     prepaymentDate?: Date;
     prepaymentTerms?: string;
+    settlementCode?: string;
     deactivationDate?: Date;
+    __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/LoanProducts.model.js

@@ -68,7 +68,7 @@ exports.LoanProductSchema = new mongoose_1.default.Schema({
         type: Boolean,
         required: false,
     },
-    masterLoanProductId: {
+    masteredLoanProductId: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: _models_1.MODEL_NAMES.loanProducts,
         default: null,

package/models/LoanProducts.model.ts

@@ -19,7 +19,7 @@ export interface ILoanProduct {
   isBalanceActual: boolean;
   isFloatedBalanceActual: boolean;
   isParticipant?: boolean;
-  masterLoanProductId: mongoose.Types.ObjectId;
+  masteredLoanProductId: mongoose.Types.ObjectId;
   minPercent: number;
   maxPercent: number;
   prepaymentDate?: Date;
@@ -42,10 +42,10 @@ export interface ILoanProductLean extends ILoanProduct {
   updatedAt: Date;
 }
 
-export interface ILoanProductPlain extends Omit<ILoanProduct, 'borrowerId' | 'masterLoanProductId'> {
+export interface ILoanProductPlain extends Omit<ILoanProduct, 'borrowerId' | 'masteredLoanProductId'> {
   _id: string;
   borrowerId: string;
-  masterLoanProductId: string;
+  masteredLoanProductId: string;
 }
 
 export interface ILoanProductWithId extends ILoanProduct {
@@ -128,7 +128,7 @@ export const LoanProductSchema = new mongoose.Schema(
       type: Boolean,
       required: false,
     },
-    masterLoanProductId: {
+    masteredLoanProductId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: MODEL_NAMES.loanProducts,
       default: null,

package/models/_index.d.ts

@@ -31,8 +31,8 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
         amount: number;
         __v?: number;
@@ -45,8 +45,8 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
         amount: number;
         __v?: number;
@@ -59,8 +59,8 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
         amount: number;
         __v?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.5.65",
+  "version": "1.5.67",
   "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;
             CURRENT_MONTH?: boolean;
-            ENTIRE_LOAN?: boolean;
-            SELECTED_PERIOD?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

package/services/loan-charges.service.js

@@ -85,7 +85,7 @@ class LoanChargesService {
         if (!masterProduct) {
             return 0;
         }
-        const participationProduct = await LoanProducts_model_1.LoanProduct.findOne({ masterLoanProductId: masterProduct._id }).lean();
+        const participationProduct = await LoanProducts_model_1.LoanProduct.findOne({ masteredLoanProductId: masterProduct._id }).lean();
         if (!participationProduct) {
             return 0;
         }
@@ -155,7 +155,9 @@ class LoanChargesService {
                 }
             }
             else {
-                await LoanProducts_model_1.LoanProduct.findByIdAndUpdate(product._id, product);
+                console.debug({ product });
+                const updated = await LoanProducts_model_1.LoanProduct.findByIdAndUpdate(product._id, product, { new: true });
+                console.debug({ updated });
                 if (updateChargesForProduct) {
                     await this.updatedChargeCodes(product._id.toString());
                 }

package/services/loan-charges.service.ts

@@ -112,7 +112,7 @@ export class LoanChargesService {
     if (!masterProduct) {
       return 0;
     }
-    const participationProduct = await LoanProduct.findOne({ masterLoanProductId: masterProduct._id }).lean();
+    const participationProduct = await LoanProduct.findOne({ masteredLoanProductId: masterProduct._id }).lean();
     if (!participationProduct) {
       return 0;
     }
@@ -184,7 +184,9 @@ export class LoanChargesService {
           await this.saveLoanCharges(borrowerId, charges, true);
         }
       } else {
-        await LoanProduct.findByIdAndUpdate(product._id, product);
+        console.debug({ product });
+        const updated = await LoanProduct.findByIdAndUpdate(product._id, product, { new: true });
+        console.debug({ updated });
         if (updateChargesForProduct) {
           await this.updatedChargeCodes(product._id.toString());
         }

package/services/loan-products.service.js

@@ -25,7 +25,7 @@ class LoanProductsService {
         const masterProducts = await LoanProducts_model_1.LoanProduct.find({ code: { $in: codes } });
         const masterProductIds = masterProducts.map((product) => product._id);
         const loanProducts = await LoanProducts_model_1.LoanProduct
-            .find({ masterLoanProductId: { $in: masterProductIds } })
+            .find({ masteredLoanProductId: { $in: masterProductIds } })
             .sort({ code: 1 })
             .lean();
         return loanProducts.reduce((acc, loanProduct) => ({ ...acc, [loanProduct.code]: loanProduct._id.toString() }), {});

package/services/loan-products.service.ts

@@ -29,7 +29,7 @@ export class LoanProductsService {
     const masterProducts = await LoanProduct.find({ code: { $in: codes } });
     const masterProductIds = masterProducts.map((product) => product._id);
     const loanProducts = await LoanProduct
-      .find({ masterLoanProductId: { $in: masterProductIds } })
+      .find({ masteredLoanProductId: { $in: masterProductIds } })
       .sort({ code: 1 })
       .lean();
     return loanProducts.reduce((acc, loanProduct) => ({ ...acc, [loanProduct.code]: loanProduct._id.toString() }), {});

package/services/quickbooks.service.js

@@ -357,7 +357,7 @@ class QuickbooksService {
                     if (totalAmountValue === 0) {
                         return;
                     }
-                    let totalAmount = product.masterLoanProductId != null ? -totalAmountValue : totalAmountValue;
+                    let totalAmount = product.masteredLoanProductId != null ? -totalAmountValue : totalAmountValue;
                     totalAmount = isAccrual ? 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();
@@ -374,7 +374,7 @@ class QuickbooksService {
                         ...trTemplate,
                         productId,
                         class: borrower.code,
-                        memo: `${borrower.code} ${product.masterLoanProductId != null ? 'PARTICIPANT' : ''} ${reports_db_1.EChargeType[charge.chargeType].toUpperCase()} ${product.type.toUpperCase()} - TRANS: ${reportDateTrFormatted} - POST: ${currentDateTrFormatted}`,
+                        memo: `${borrower.code} ${product.masteredLoanProductId != null ? 'PARTICIPANT' : ''} ${reports_db_1.EChargeType[charge.chargeType].toUpperCase()} ${product.type.toUpperCase()} - TRANS: ${reportDateTrFormatted} - POST: ${currentDateTrFormatted}`,
                     };
                     tr.account = quickbooksAccountBS.fullName;
                     tr.amount = totalAmount;
@@ -429,8 +429,8 @@ class QuickbooksService {
                     ...trTemplate,
                     productId,
                     class: borrower.code,
-                    amount: product.masterLoanProductId != null ? +amount : -+amount,
-                    memo: `${borrower.code} ${product.masterLoanProductId != null ? 'PARTICIPANT' : ''} PRINCIPAL PAID TERM - TRANS: ${reportDateTrFormatted} - POST: ${currentDateTrFormatted}`,
+                    amount: product.masteredLoanProductId != null ? +amount : -+amount,
+                    memo: `${borrower.code} ${product.masteredLoanProductId != null ? 'PARTICIPANT' : ''} PRINCIPAL PAID TERM - TRANS: ${reportDateTrFormatted} - POST: ${currentDateTrFormatted}`,
                 };
                 if (settlementCode === 'null') {
                     const products = await this.loanChargesService.getLoanProducts(borrower._id.toString());

package/services/quickbooks.service.ts

@@ -416,7 +416,7 @@ export class QuickbooksService {
           if (totalAmountValue === 0) {
             return;
           }
-          let totalAmount = product.masterLoanProductId != null ? -totalAmountValue : totalAmountValue;
+          let totalAmount = product.masteredLoanProductId != null ? -totalAmountValue : totalAmountValue;
           totalAmount = isAccrual ? totalAmount : -totalAmount;
           const quickbooksAccountBS = await QuickbooksAccount.findOne({ accountCode: charge.code, ...companyFilter }).lean();
           const quickbooksAccountPL = await QuickbooksAccount.findOne({ accountCode: PLCode, ...companyFilter }).lean();
@@ -433,7 +433,7 @@ export class QuickbooksService {
             ...trTemplate,
             productId,
             class: borrower.code,
-            memo: `${borrower.code} ${product.masterLoanProductId != null ? 'PARTICIPANT' : ''} ${EChargeType[charge.chargeType].toUpperCase()} ${product.type.toUpperCase()} - TRANS: ${reportDateTrFormatted} - POST: ${currentDateTrFormatted}`,
+            memo: `${borrower.code} ${product.masteredLoanProductId != null ? 'PARTICIPANT' : ''} ${EChargeType[charge.chargeType].toUpperCase()} ${product.type.toUpperCase()} - TRANS: ${reportDateTrFormatted} - POST: ${currentDateTrFormatted}`,
           };
 
           tr.account = quickbooksAccountBS.fullName;
@@ -500,8 +500,8 @@ export class QuickbooksService {
           ...trTemplate,
           productId,
           class: borrower.code,
-          amount: product.masterLoanProductId != null ? +amount : -+amount,
-          memo: `${borrower.code} ${product.masterLoanProductId != null ? 'PARTICIPANT' : ''} PRINCIPAL PAID TERM - TRANS: ${reportDateTrFormatted} - POST: ${currentDateTrFormatted}`,
+          amount: product.masteredLoanProductId != null ? +amount : -+amount,
+          memo: `${borrower.code} ${product.masteredLoanProductId != null ? 'PARTICIPANT' : ''} PRINCIPAL PAID TERM - TRANS: ${reportDateTrFormatted} - POST: ${currentDateTrFormatted}`,
         };
 
         if (settlementCode === 'null') {

package/services/reports/investor-summary.service.js

@@ -76,7 +76,7 @@ class InvestorSummaryService {
         await Promise.all(borrowerIds.map(async (borrowerId) => {
             const borrower = await Borrower_model_1.BorrowerModel.findById(borrowerId).lean();
             const borrowerProducts = await this.loanChargesService.getLoanProducts(borrowerId);
-            await Promise.all(borrowerProducts.filter((product) => product.masterLoanProductId == null).map(async (product) => {
+            await Promise.all(borrowerProducts.filter((product) => product.masteredLoanProductId == null).map(async (product) => {
                 const productId = product._id.toString();
                 const isRevolver = product.type === loan_types_enum_1.ELoanTypes.REVOLVER;
                 const { balance: balanceEnd } = await this.loanChargesService.getLoanProductBalance(productId, end);

package/services/reports/investor-summary.service.ts

@@ -100,7 +100,7 @@ export class InvestorSummaryService {
     await Promise.all(borrowerIds.map(async (borrowerId) => {
       const borrower = await BorrowerModel.findById(borrowerId).lean();
       const borrowerProducts = await this.loanChargesService.getLoanProducts(borrowerId);
-      await Promise.all(borrowerProducts.filter((product) => product.masterLoanProductId == null).map(async (product) => {
+      await Promise.all(borrowerProducts.filter((product) => product.masteredLoanProductId == null).map(async (product) => {
         const productId = product._id.toString();
         const isRevolver = product.type === ELoanTypes.REVOLVER;
         const { balance: balanceEnd } = await this.loanChargesService.getLoanProductBalance(productId, end);

package/services/reports.service.js

@@ -323,7 +323,7 @@ class ReportsService {
             const hasTermProduct = products.some((product) => product.type === loan_types_enum_1.ELoanTypes.TERM);
             const manyTermProduct = products.filter((product) => product.type === loan_types_enum_1.ELoanTypes.TERM).length > 1;
             return await Promise.all(products.map(async (product) => {
-                if (product.masterLoanProductId != null) {
+                if (product.masteredLoanProductId != null) {
                     return null;
                 }
                 if ((0, dayjs_1.default)(product.deactivationDate).isBefore((0, dayjs_1.default)(date))) {

package/services/reports.service.ts

@@ -426,7 +426,7 @@ export class ReportsService {
       const manyTermProduct = products.filter((product) => product.type === ELoanTypes.TERM).length > 1;
 
       return await Promise.all(products.map(async (product) => {
-        if (product.masterLoanProductId != null) {
+        if (product.masteredLoanProductId != null) {
           return null as IBankReportData;
         }
         if (dayjs(product.deactivationDate).isBefore(dayjs(date))) {