gemcap-be-common 1.5.195 → 1.5.196

package/package.json

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

package/services/loan-statement-effects.service.js

@@ -16,13 +16,13 @@ class LoanStatementEffectsService {
         this.monthEndDataService = monthEndDataService;
     }
     async saveMonthData(productId, statementDate) {
-        if ((0, dayjs_1.default)(statementDate).date() !== 1) {
+        const date = dayjs_1.default.utc(statementDate);
+        if (date.date() !== 1) {
             return;
         }
-        const balance = await (0, loan_products_db_1.getLoanProductBalance)(productId, statementDate);
-        const lastTransaction = await this.loanStatementBalanceService.getLastStatementTransactionForDate(productId, statementDate);
-        const month = (0, dayjs_1.default)(statementDate).subtract(1, 'd').month() + 1;
-        const year = (0, dayjs_1.default)(statementDate).subtract(1, 'd').year();
+        const monthEndDate = date.subtract(1, 'day').endOf('day');
+        const balance = await (0, loan_products_db_1.getLoanProductBalance)(productId, monthEndDate.toDate());
+        const lastTransaction = await this.loanStatementBalanceService.getLastStatementTransactionForDate(productId, monthEndDate.toDate());
         const keptData = {
             [MonthEndData_Model_1.EMonthEndDataType.BALANCE]: balance?.balance ?? 0,
             [MonthEndData_Model_1.EMonthEndDataType.FLOATED_BALANCE]: balance?.floatedBalance ?? 0,
@@ -31,8 +31,8 @@ class LoanStatementEffectsService {
         await Promise.all(Object.entries(keptData).map(async ([dataType, dataValue]) => {
             await this.monthEndDataService.upsertMonthEndData({
                 productId: new mongoose_1.default.Types.ObjectId(productId),
-                year,
-                month,
+                year: monthEndDate.year(),
+                month: monthEndDate.month() + 1,
                 dataType: dataType,
                 dataValue,
             });

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

@@ -15,13 +15,13 @@ export class LoanStatementEffectsService {
   }
 
   async saveMonthData(productId: string, statementDate: Date) {
-    if (dayjs(statementDate).date() !== 1) {
+    const date = dayjs.utc(statementDate);
+    if (date.date() !== 1) {
       return;
     }
-    const balance = await getLoanProductBalanceDB(productId, statementDate);
-    const lastTransaction = await this.loanStatementBalanceService.getLastStatementTransactionForDate(productId, statementDate);
-    const month = dayjs(statementDate).subtract(1, 'd').month() + 1;
-    const year = dayjs(statementDate).subtract(1, 'd').year();
+    const monthEndDate = date.subtract(1, 'day').endOf('day');
+    const balance = await getLoanProductBalanceDB(productId, monthEndDate.toDate());
+    const lastTransaction = await this.loanStatementBalanceService.getLastStatementTransactionForDate(productId, monthEndDate.toDate());
 
     const keptData = {
       [EMonthEndDataType.BALANCE]: balance?.balance ?? 0,
@@ -31,8 +31,8 @@ export class LoanStatementEffectsService {
     await Promise.all(Object.entries(keptData).map(async ([dataType, dataValue]) => {
       await this.monthEndDataService.upsertMonthEndData({
         productId: new mongoose.Types.ObjectId(productId),
-        year,
-        month,
+        year: monthEndDate.year(),
+        month: monthEndDate.month() + 1,
         dataType: dataType as EMonthEndDataType,
         dataValue,
       });