gemcap-be-common 1.5.19 → 1.5.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.5.19",
+  "version": "1.5.21",
   "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

@@ -248,6 +248,7 @@ class LoanPaymentsService {
     }
     async recalculateProduct(productId, userId) {
         const loanCharges = await this.loanChargesService.getLoanChargeForProduct(productId);
+        const product = await this.loanChargesService.getLoanProductById(productId);
         const chargesIds = loanCharges.map((charge) => charge._id);
         await LoanStatementTransaction_model_1.LoanStatementTransactionModel.updateMany({ 'chargeId': { $in: chargesIds } }, { amountPaid: 0 });
         const firstStatements = await LoanStatementTransaction_model_1.LoanStatementTransactionModel.aggregate([
@@ -281,7 +282,7 @@ class LoanPaymentsService {
         ]);
         for (const [index, payment] of payments.entries()) {
             try {
-                console.log(`updating payment ${index + 1}/${payments.length}`, (0, dayjs_1.default)(payment.date).format('DD-MM-YYYY'), payment.amount);
+                console.log(`updating payment (for ${product.name}) ${index + 1}/${payments.length}`, (0, dayjs_1.default)(payment.date).format('DD-MM-YYYY'), payment.amount);
                 for (const loanTransaction of payment.loanTransactions) {
                     await LoanTransaction_model_1.LoanTransaction.findByIdAndDelete(loanTransaction.transactionId);
                 }
@@ -292,6 +293,9 @@ class LoanPaymentsService {
                 console.error({ productId, payments });
                 console.error(e);
             }
+            finally {
+                console.log(`finished updating payment (for ${product.name}) ${index + 1}/${payments.length}`);
+            }
         }
     }
     async getPaymentsForPeriod(productIds, startDate, endDate) {
@@ -400,7 +404,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 +415,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 +446,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

@@ -285,6 +285,7 @@ export class LoanPaymentsService {
 
   async recalculateProduct(productId: string, userId: string) {
     const loanCharges = await this.loanChargesService.getLoanChargeForProduct(productId);
+    const product = await this.loanChargesService.getLoanProductById(productId);
     const chargesIds = loanCharges.map((charge) => charge._id);
     await LoanStatementTransactionModel.updateMany({ 'chargeId': { $in: chargesIds } }, { amountPaid: 0 });
 
@@ -321,7 +322,7 @@ export class LoanPaymentsService {
     ]);
     for (const [index, payment] of payments.entries()) {
       try {
-        console.log(`updating payment ${index + 1}/${payments.length}`, dayjs(payment.date).format('DD-MM-YYYY'), payment.amount);
+        console.log(`updating payment (for ${product.name}) ${index + 1}/${payments.length}`, dayjs(payment.date).format('DD-MM-YYYY'), payment.amount);
         for (const loanTransaction of payment.loanTransactions) {
           await LoanTransaction.findByIdAndDelete(loanTransaction.transactionId);
         }
@@ -330,6 +331,8 @@ export class LoanPaymentsService {
       } catch (e) {
         console.error({ productId, payments });
         console.error(e);
+      } finally {
+        console.log(`finished updating payment (for ${product.name}) ${index + 1}/${payments.length}`);
       }
     }
   }
@@ -447,7 +450,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 +461,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 +496,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[]) {