gemcap-be-common 1.3.184 → 1.3.185

package/package.json

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

package/services/loan-statement.service.js

@@ -152,7 +152,7 @@ class LoanStatementService {
         await Promise.all(periods.map(async (period) => {
             const days = this.getDays(period);
             for (const day of days) {
-                await this.calculateStatement(productId, period, new Date(day));
+                await this.calculateStatement(productId, period, dayjs_1.default.utc(day).toDate());
             }
             const statementDate = this.loanStatementStatusService.getStatementDateFromPeriod(period);
             await this.loanStatementStatusService.updateStatementStatus(productId, statementDate, true);
@@ -166,14 +166,14 @@ class LoanStatementService {
     }
     async calculateStatement(productId, period, statementDate) {
         if (!statementDate) {
-            statementDate = (0, dayjs_1.default)(new Date()).startOf('day').toDate();
+            statementDate = (0, dayjs_1.default)().utc().startOf('day').toDate();
         }
         const primeRate = await this.financialIndexesService.getFinancialIndexValue(financial_indexes_service_1.EFinancialIndex.PRIME_RATE, statementDate);
         if (!primeRate) {
             return;
         }
         await this.cleanProductStatement(productId, statementDate);
-        const balance = await this.loanChargesService.getLoanProductBalance(productId, statementDate);
+        const balance = await this.loanChargesService.getLoanProductBalance(productId, dayjs_1.default.utc(statementDate).add(1, 'day').toDate());
         const loanStatementEffectsService = this.getLoanStatementEffectsService();
         await loanStatementEffectsService.saveMonthData(productId, statementDate);
         const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
@@ -181,12 +181,10 @@ class LoanStatementService {
         const daysPerYear = 360;
         const dayInMonth = (0, dayjs_1.default)(period.end).diff(period.start, 'days') + 1;
         let orderIndex = 0;
-        console.log({ statementDate, balance });
         for (const charge of charges) {
             if (charge.applyFrom.getTime() > statementDate.getTime()) {
                 return;
             }
-            console.log('applying');
             const statementDateFormat = (0, dayjs_1.default)(statementDate).format('YYYY-MM-DD');
             let calculateFee = false;
             switch (charge.frequency) {
@@ -230,7 +228,6 @@ class LoanStatementService {
             const getBalance = () => {
                 return Math.max(0, useFloating ? balance.floatedBalance : balance.balance);
             };
-            console.log({ calculateFee });
             if (calculateFee) {
                 let fee = 0;
                 let calculatedFee = 0;
@@ -242,7 +239,6 @@ class LoanStatementService {
                     percentFee = Math.min(Math.max(percentFee, minPercent), maxPercent);
                 }
                 const dailyPercent = new decimal_js_1.default(percentFee).div(daysPerYear).toNumber();
-                console.log(charge);
                 switch (charge.calculationBasis) {
                     case loan_types_enum_1.EChargeCalculationBasis.DAILY_BALANCE:
                         if ((0, dayjs_1.default)(statementDate).isAfter((0, dayjs_1.default)(charge.applyFrom)) || (0, dayjs_1.default)(statementDate).isSame((0, dayjs_1.default)(charge.applyFrom))) {
@@ -290,9 +286,7 @@ class LoanStatementService {
                     }
                     return fee;
                 };
-                console.log({ fee });
                 fee = checkMinAmount(fee);
-                console.log({ fee });
                 if (fee !== null && fee > 0) {
                     const newStatement = {
                         order: orderIndex,
@@ -338,7 +332,7 @@ class LoanStatementService {
     async getBalancesDaily(productId, period) {
         const days = this.getDays({ start: (0, dayjs_1.default)(period.start).utcOffset(0), end: (0, dayjs_1.default)(period.end).utcOffset(0) });
         return Promise.all(days.map(async (day) => {
-            const balance = await this.loanChargesService.getLoanProductBalance(productId, new Date(day));
+            const balance = await this.loanChargesService.getLoanProductBalance(productId, dayjs_1.default.utc(day).toDate());
             return { day, ...balance };
         }));
     }

package/services/loan-statement.service.ts

@@ -185,7 +185,7 @@ export class LoanStatementService {
     await Promise.all(periods.map(async (period) => {
       const days = this.getDays(period);
       for (const day of days) {
-        await this.calculateStatement(productId, period, new Date(day));
+        await this.calculateStatement(productId, period, dayjs.utc(day).toDate());
       }
       const statementDate = this.loanStatementStatusService.getStatementDateFromPeriod(period);
       await this.loanStatementStatusService.updateStatementStatus(productId, statementDate, true);
@@ -201,14 +201,14 @@ export class LoanStatementService {
 
   async calculateStatement(productId: string, period: IStatementPeriod, statementDate?: Date) {
     if (!statementDate) {
-      statementDate = dayjs(new Date()).startOf('day').toDate();
+      statementDate = dayjs().utc().startOf('day').toDate();
     }
     const primeRate = await this.financialIndexesService.getFinancialIndexValue(EFinancialIndex.PRIME_RATE, statementDate);
     if (!primeRate) {
       return;
     }
     await this.cleanProductStatement(productId, statementDate);
-    const balance = await this.loanChargesService.getLoanProductBalance(productId, statementDate);
+    const balance = await this.loanChargesService.getLoanProductBalance(productId, dayjs.utc(statementDate).add(1, 'day').toDate());
 
     const loanStatementEffectsService = this.getLoanStatementEffectsService();
     await loanStatementEffectsService.saveMonthData(productId, statementDate);
@@ -219,12 +219,10 @@ export class LoanStatementService {
     const daysPerYear = 360;
     const dayInMonth = dayjs(period.end).diff(period.start, 'days') + 1;
     let orderIndex = 0;
-    console.log({ statementDate, balance });
     for (const charge of charges) {
       if (charge.applyFrom.getTime() > statementDate.getTime()) {
         return;
       }
-      console.log('applying');
       const statementDateFormat = dayjs(statementDate).format('YYYY-MM-DD');
       let calculateFee = false;
       switch (charge.frequency) {
@@ -271,8 +269,6 @@ export class LoanStatementService {
         return Math.max(0, useFloating ? balance.floatedBalance : balance.balance);
       };
 
-      console.log({ calculateFee });
-
       if (calculateFee) {
         let fee = 0;
         let calculatedFee = 0;
@@ -284,7 +280,6 @@ export class LoanStatementService {
           percentFee = Math.min(Math.max(percentFee, minPercent), maxPercent);
         }
         const dailyPercent = new Decimal(percentFee).div(daysPerYear).toNumber();
-        console.log(charge);
         switch (charge.calculationBasis) {
           case EChargeCalculationBasis.DAILY_BALANCE:
             if (dayjs(statementDate).isAfter(dayjs(charge.applyFrom)) || dayjs(statementDate).isSame(dayjs(charge.applyFrom))) {
@@ -334,12 +329,8 @@ export class LoanStatementService {
           return fee;
         };
 
-        console.log({ fee });
-
         fee = checkMinAmount(fee);
 
-        console.log({ fee });
-
         if (fee !== null && fee > 0) {
           const newStatement: ILoanStatementTransaction = {
             order: orderIndex,
@@ -388,7 +379,7 @@ export class LoanStatementService {
   async getBalancesDaily(productId: string, period: { start: Date, end: Date }) {
     const days = this.getDays({ start: dayjs(period.start).utcOffset(0), end: dayjs(period.end).utcOffset(0) });
     return Promise.all(days.map(async (day) => {
-      const balance = await this.loanChargesService.getLoanProductBalance(productId, new Date(day));
+      const balance = await this.loanChargesService.getLoanProductBalance(productId, dayjs.utc(day).toDate());
       return { day, ...balance };
     }));
   }