gemcap-be-common 1.5.19 → 1.5.20

package/package.json

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

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

@@ -79,7 +79,7 @@ export declare class LoanPaymentsService {
         success: boolean;
         message: string;
     }>;
-    getExpectedPayments(userId: string, forDate: Date): Promise<any[] | {
+    getExpectedPayments(userId: string): 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, forDate) {
+    async getExpectedPayments(userId) {
         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(), forDate);
+            const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
             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(), selectedDate);
+                    const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
                     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, forDate: Date) {
+  async getExpectedPayments(userId: string) {
     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(), forDate);
+        const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
         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(), selectedDate);
+          const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
           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, forDate: Date): Promise<{
+    getBorrowerProductTotals(borrowerId: string): Promise<{
         productTotals: {
             [productId: string]: number;
         };

package/services/loan-statement.service.js

@@ -723,7 +723,7 @@ class LoanStatementService {
         return (0, loan_statement_db_1.getStatementBorrowersTransactions)(start, end, selectedPeriod, selectedBorrowerIds, ledgerType);
     }
     async getBorrowerComplianceData(borrowerId, date) {
-        const end = (0, dayjs_1.default)(date).utcOffset(0).subtract(1, 'month').endOf('month');
+        const end = dayjs_1.default.utc(date).subtract(1, 'month').endOf('month');
         const start = end.startOf('month');
         const products = await this.loanChargesService.getLoanProducts(borrowerId);
         const data = {
@@ -889,8 +889,8 @@ class LoanStatementService {
         });
         return await this.uploadsService.convertDataToFile([{ data: [...header, ...onlyData] }]);
     }
-    async getBorrowerProductTotals(borrowerId, forDate) {
-        return await this.getBorrowerComplianceData(borrowerId, forDate);
+    async getBorrowerProductTotals(borrowerId) {
+        return await this.getBorrowerComplianceData(borrowerId, new Date());
     }
     async getProductsTotals(productIds) {
         const totals = {};

package/services/loan-statement.service.ts

@@ -817,7 +817,7 @@ export class LoanStatementService {
   }
 
   async getBorrowerComplianceData(borrowerId: string, date: Date) {
-    const end = dayjs(date).utcOffset(0).subtract(1, 'month').endOf('month');
+    const end = dayjs.utc(date).subtract(1, 'month').endOf('month');
     const start = end.startOf('month');
     const products = await this.loanChargesService.getLoanProducts(borrowerId);
     const data = {
@@ -992,8 +992,8 @@ export class LoanStatementService {
     return await this.uploadsService.convertDataToFile([{ data: [...header, ...onlyData] }]);
   }
 
-  async getBorrowerProductTotals(borrowerId: string, forDate: Date) {
-    return await this.getBorrowerComplianceData(borrowerId, forDate);
+  async getBorrowerProductTotals(borrowerId: string) {
+    return await this.getBorrowerComplianceData(borrowerId, new Date());
   }
 
   async getProductsTotals(productIds: string[]) {