gemcap-be-common 1.5.20 → 1.5.22

package/package.json

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

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) {

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}`);
       }
     }
   }

package/services/loan-statement.service.js

@@ -166,7 +166,7 @@ class LoanStatementService {
     }
     async calculateStatement(productId, period, statementDate) {
         if (!statementDate) {
-            statementDate = (0, dayjs_1.default)().utc().startOf('day').toDate();
+            statementDate = dayjs_1.default.utc().startOf('day').toDate();
         }
         const primeRate = await this.financialIndexesService.getFinancialIndexValue(financial_indexes_service_1.EFinancialIndex.PRIME_RATE, statementDate);
         if (!primeRate) {

package/services/loan-statement.service.ts

@@ -201,7 +201,7 @@ export class LoanStatementService {
 
   async calculateStatement(productId: string, period: IStatementPeriod, statementDate?: Date) {
     if (!statementDate) {
-      statementDate = dayjs().utc().startOf('day').toDate();
+      statementDate = dayjs.utc().startOf('day').toDate();
     }
 
     const primeRate = await this.financialIndexesService.getFinancialIndexValue(EFinancialIndex.PRIME_RATE, statementDate);

package/services/loan-transactions.service.js

@@ -176,8 +176,10 @@ class LoanTransactionsService {
         }));
     }
     async getDisbursementTransactions(productId, date) {
+        const startOfDay = dayjs_1.default.utc(date).startOf('day').toDate();
+        const endOfDay = dayjs_1.default.utc(date).endOf('day').toDate();
         return LoanTransaction_model_1.LoanTransaction.countDocuments({
-            date: date,
+            date: { $gte: startOfDay, $lte: endOfDay },
             productId: new mongoose_1.default.Types.ObjectId(productId),
             transactionType: LoanTransaction_model_1.ELoanTransactionTypes.DISBURSEMENT,
             bankId: { $ne: null },

package/services/loan-transactions.service.ts

@@ -218,9 +218,11 @@ export class LoanTransactionsService {
   }
 
   async getDisbursementTransactions(productId: string, date: Date) {
+    const startOfDay = dayjs.utc(date).startOf('day').toDate();
+    const endOfDay = dayjs.utc(date).endOf('day').toDate();
     return LoanTransaction.countDocuments(
       {
-        date: date,
+        date: { $gte: startOfDay, $lte: endOfDay },
         productId: new mongoose.Types.ObjectId(productId),
         transactionType: ELoanTransactionTypes.DISBURSEMENT,
         bankId: { $ne: null },