gemcap-be-common 1.5.17 → 1.5.19

package/models/TermLoanCalculated.model.d.ts

@@ -74,18 +74,21 @@ export declare const TermLoanCalculatedSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    interestRate: number;
     termLoanId: mongoose.Types.ObjectId;
+    payments: mongoose.Types.DocumentArray<{
+        amount: number;
+        paymentId: mongoose.Types.ObjectId;
+    }>;
     relevantStatement: string;
     openingBalance: number;
     monthlyInterest: number;
     monthlyPrincipal: number;
     closingBalance: number;
     adminFee: number;
+    interestRate: number;
     interestDaily: number;
     gracePeriod: boolean;
     amortization: boolean;
-    payments: any[];
     disbursements: number;
     dailyResults: mongoose.Types.DocumentArray<{
         interestRate: number;
@@ -93,24 +96,27 @@ export declare const TermLoanCalculatedSchema: mongoose.Schema<any, mongoose.Mod
         interest: number;
         paymentDate: boolean;
     }>;
-    __v?: number;
     paymentDueDate?: Date;
+    __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    interestRate: number;
     termLoanId: mongoose.Types.ObjectId;
+    payments: mongoose.Types.DocumentArray<{
+        amount: number;
+        paymentId: mongoose.Types.ObjectId;
+    }>;
     relevantStatement: string;
     openingBalance: number;
     monthlyInterest: number;
     monthlyPrincipal: number;
     closingBalance: number;
     adminFee: number;
+    interestRate: number;
     interestDaily: number;
     gracePeriod: boolean;
     amortization: boolean;
-    payments: any[];
     disbursements: number;
     dailyResults: mongoose.Types.DocumentArray<{
         interestRate: number;
@@ -118,24 +124,27 @@ export declare const TermLoanCalculatedSchema: mongoose.Schema<any, mongoose.Mod
         interest: number;
         paymentDate: boolean;
     }>;
-    __v?: number;
     paymentDueDate?: Date;
+    __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    interestRate: number;
     termLoanId: mongoose.Types.ObjectId;
+    payments: mongoose.Types.DocumentArray<{
+        amount: number;
+        paymentId: mongoose.Types.ObjectId;
+    }>;
     relevantStatement: string;
     openingBalance: number;
     monthlyInterest: number;
     monthlyPrincipal: number;
     closingBalance: number;
     adminFee: number;
+    interestRate: number;
     interestDaily: number;
     gracePeriod: boolean;
     amortization: boolean;
-    payments: any[];
     disbursements: number;
     dailyResults: mongoose.Types.DocumentArray<{
         interestRate: number;
@@ -143,8 +152,8 @@ export declare const TermLoanCalculatedSchema: mongoose.Schema<any, mongoose.Mod
         interest: number;
         paymentDate: boolean;
     }>;
-    __v?: number;
     paymentDueDate?: Date;
+    __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/TermLoanCalculated.model.js

@@ -56,11 +56,8 @@ exports.TermLoanCalculatedSchema = new mongoose_1.default.Schema({
         type: Date,
         required: false,
     },
-    payments: [{
-            type: mongoose_1.default.Schema.Types.Mixed,
-            required: function () {
-                return this.payment && this.payment.amount && this.payment.paymentId;
-            },
+    payments: [
+        {
             amount: {
                 type: Number,
                 required: true,
@@ -70,7 +67,8 @@ exports.TermLoanCalculatedSchema = new mongoose_1.default.Schema({
                 ref: _models_1.MODEL_NAMES.loanTransactions,
                 required: true,
             },
-        }],
+        },
+    ],
     disbursements: {
         type: Number,
         required: true,

package/models/TermLoanCalculated.model.ts

@@ -104,21 +104,19 @@ export const TermLoanCalculatedSchema = new mongoose.Schema(
       type: Date,
       required: false,
     },
-    payments: [{
-      type: mongoose.Schema.Types.Mixed,
-      required: function() {
-        return this.payment && this.payment.amount && this.payment.paymentId;
+    payments: [
+      {
+        amount: {
+          type: Number,
+          required: true,
+        },
+        paymentId: {
+          type: mongoose.Schema.Types.ObjectId,
+          ref: MODEL_NAMES.loanTransactions,
+          required: true,
+        },
       },
-      amount: {
-        type: Number,
-        required: true,
-      },
-      paymentId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: MODEL_NAMES.loanTransactions,
-        required: true,
-      },
-    }],
+    ],
     disbursements: {
       type: Number,
       required: true,

package/models/_index.d.ts

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

package/package.json

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

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

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

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

@@ -79,7 +79,7 @@ export declare class LoanPaymentsService {
         success: boolean;
         message: string;
     }>;
-    getExpectedPayments(userId: string): Promise<any[] | {
+    getExpectedPayments(userId: string, forDate: Date): Promise<any[] | {
         borrowers: {
             borrowerId: string;
             borrowerTitle: string;

package/services/loan-payments.service.js

@@ -400,7 +400,7 @@ class LoanPaymentsService {
             console.error(e);
         }
     }
-    async getExpectedPayments(userId) {
+    async getExpectedPayments(userId, forDate) {
         const user = await this.usersService.getUserById(userId);
         if (!user) {
             return [];
@@ -411,7 +411,7 @@ class LoanPaymentsService {
             .filter((borrower) => borrower.active)
             .map(async (borrower) => {
             const loanStatementService = this.getLoanStatementService();
-            const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
+            const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString(), forDate);
             return {
                 borrowerId: borrower._id.toString(),
                 borrowerTitle: borrower.name,
@@ -442,7 +442,7 @@ class LoanPaymentsService {
                     const borrowerProducts = await this.loanChargesService.getLoanProducts(borrower._id.toString());
                     const revolverProduct = borrowerProducts.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.startDate, product.deactivationDate, selectedDate));
                     const loanStatementService = this.getLoanStatementService();
-                    const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
+                    const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString(), selectedDate);
                     if (dueAmounts.total === 0) {
                         console.log('no payment for this borrower');
                         return;

package/services/loan-payments.service.ts

@@ -447,7 +447,7 @@ export class LoanPaymentsService {
     }
   }
 
-  async getExpectedPayments(userId: string) {
+  async getExpectedPayments(userId: string, forDate: Date) {
     const user = await this.usersService.getUserById(userId);
     if (!user) {
       return [];
@@ -458,7 +458,7 @@ export class LoanPaymentsService {
       .filter((borrower) => borrower.active)
       .map(async (borrower) => {
         const loanStatementService = this.getLoanStatementService();
-        const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
+        const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString(), forDate);
         return {
           borrowerId: borrower._id.toString(),
           borrowerTitle: borrower.name,
@@ -493,7 +493,7 @@ export class LoanPaymentsService {
           const borrowerProducts = await this.loanChargesService.getLoanProducts(borrower._id.toString());
           const revolverProduct = borrowerProducts.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.startDate, product.deactivationDate, selectedDate));
           const loanStatementService = this.getLoanStatementService();
-          const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
+          const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString(), selectedDate);
           if (dueAmounts.total === 0) {
             console.log('no payment for this borrower');
             return;

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

@@ -173,7 +173,7 @@ export declare class LoanStatementService {
     }>;
     private getOutstandingStatements;
     getOutstandingStatementsExcel(borrowerIds: string[], selectedDate: Date, fullMonth: boolean): Promise<any>;
-    getBorrowerProductTotals(borrowerId: string): Promise<{
+    getBorrowerProductTotals(borrowerId: string, forDate: Date): Promise<{
         productTotals: {
             [productId: string]: number;
         };

package/services/loan-statement.service.js

@@ -889,8 +889,8 @@ class LoanStatementService {
         });
         return await this.uploadsService.convertDataToFile([{ data: [...header, ...onlyData] }]);
     }
-    async getBorrowerProductTotals(borrowerId) {
-        return await this.getBorrowerComplianceData(borrowerId, new Date());
+    async getBorrowerProductTotals(borrowerId, forDate) {
+        return await this.getBorrowerComplianceData(borrowerId, forDate);
     }
     async getProductsTotals(productIds) {
         const totals = {};

package/services/loan-statement.service.ts

@@ -992,8 +992,8 @@ export class LoanStatementService {
     return await this.uploadsService.convertDataToFile([{ data: [...header, ...onlyData] }]);
   }
 
-  async getBorrowerProductTotals(borrowerId: string) {
-    return await this.getBorrowerComplianceData(borrowerId, new Date());
+  async getBorrowerProductTotals(borrowerId: string, forDate: Date) {
+    return await this.getBorrowerComplianceData(borrowerId, forDate);
   }
 
   async getProductsTotals(productIds: string[]) {