gemcap-be-common 1.4.70 → 1.4.71

package/db/loan-products.db.d.ts

@@ -30,7 +30,7 @@ export declare const fieldsToUnset: string[];
 export declare const getLoanProductById: (productId: string) => Promise<mongoose.FlattenMaps<import("../models/LoanProducts.model").ILoanProductDoc> & {
     _id: mongoose.Types.ObjectId;
 }>;
-export declare const getLoanProductBalance: (productId: string, forDate?: Date) => Promise<{
+export declare const getLoanProductBalance: (productId: string, asOfDate?: Date) => Promise<{
     balance: number;
     floatedBalance: number;
 }>;

package/db/loan-products.db.js

@@ -21,12 +21,12 @@ const getLoanProductById = async (productId) => {
     return LoanProducts_model_1.LoanProduct.findById(productId).lean();
 };
 exports.getLoanProductById = getLoanProductById;
-const getLoanProductBalance = async (productId, forDate = new Date()) => {
+const getLoanProductBalance = async (productId, asOfDate = new Date()) => {
     const simpleTransactions = await LoanTransaction_model_1.LoanTransaction.aggregate([
         {
             $match: {
                 'productId': new mongoose_1.default.Types.ObjectId(productId),
-                'date': { $lte: (0, dayjs_1.default)(forDate).startOf('day').subtract(1, 'seconds').toDate() },
+                'date': { $lte: asOfDate },
             },
         }, {
             $sort: {
@@ -42,7 +42,7 @@ const getLoanProductBalance = async (productId, forDate = new Date()) => {
         {
             $match: {
                 'productId': new mongoose_1.default.Types.ObjectId(productId),
-                'effectiveDate': { $lte: forDate },
+                'effectiveDate': { $lte: asOfDate },
                 $expr: { $ne: ['$date', '$effectiveDate'] },
             },
         }, {
@@ -59,7 +59,7 @@ const getLoanProductBalance = async (productId, forDate = new Date()) => {
         {
             $match: {
                 'productId': new mongoose_1.default.Types.ObjectId(productId),
-                'effectiveDate': { $lte: forDate },
+                'effectiveDate': { $lte: asOfDate },
                 $expr: { $eq: ['$date', '$effectiveDate'] },
             },
         }, {
@@ -97,7 +97,7 @@ const getLoanProductBalance = async (productId, forDate = new Date()) => {
     if (normalTransaction && !collectionsTransaction) {
         floatedBalance = normalTransaction.floatedBalance;
     }
-    const totalPostponed = await (0, exports.getPostponedTransactions)(forDate, productId);
+    const totalPostponed = await (0, exports.getPostponedTransactions)(asOfDate, productId);
     if (transactions.length === 0) {
         return { balance: 0, floatedBalance: totalPostponed };
     }

package/db/loan-products.db.ts

@@ -21,13 +21,13 @@ export const getLoanProductById = async (productId: string) => {
   return LoanProduct.findById(productId).lean();
 };
 
-export const getLoanProductBalance = async (productId: string, forDate = new Date()) => {
+export const getLoanProductBalance = async (productId: string, asOfDate = new Date()) => {
 
   const simpleTransactions = await LoanTransaction.aggregate<ILoanTransactionDoc>([
     {
       $match: {
         'productId': new mongoose.Types.ObjectId(productId),
-        'date': { $lte: dayjs(forDate).startOf('day').subtract(1, 'seconds').toDate() },
+        'date': { $lte: asOfDate },
       },
     }, {
       $sort: {
@@ -44,7 +44,7 @@ export const getLoanProductBalance = async (productId: string, forDate = new Dat
     {
       $match: {
         'productId': new mongoose.Types.ObjectId(productId),
-        'effectiveDate': { $lte: forDate },
+        'effectiveDate': { $lte: asOfDate },
         $expr: { $ne: ['$date', '$effectiveDate'] },
       },
     }, {
@@ -62,7 +62,7 @@ export const getLoanProductBalance = async (productId: string, forDate = new Dat
     {
       $match: {
         'productId': new mongoose.Types.ObjectId(productId),
-        'effectiveDate': { $lte: forDate },
+        'effectiveDate': { $lte: asOfDate },
         $expr: { $eq: ['$date', '$effectiveDate'] },
       },
     }, {
@@ -103,7 +103,7 @@ export const getLoanProductBalance = async (productId: string, forDate = new Dat
   if (normalTransaction && !collectionsTransaction) {
     floatedBalance = normalTransaction.floatedBalance;
   }
-  const totalPostponed = await getPostponedTransactions(forDate, productId);
+  const totalPostponed = await getPostponedTransactions(asOfDate, productId);
   if (transactions.length === 0) {
     return { balance: 0, floatedBalance: totalPostponed };
   }

package/package.json

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

package/services/loan-statement.service.js

@@ -173,7 +173,8 @@ class LoanStatementService {
             return;
         }
         await this.cleanProductStatement(productId, statementDate);
-        const balance = await this.loanChargesService.getLoanProductBalance(productId, dayjs_1.default.utc(statementDate).add(1, 'day').toDate());
+        const balanceDate = dayjs_1.default.utc(statementDate).add(1, 'day').subtract(1, 'second').toDate();
+        const balance = await this.loanChargesService.getLoanProductBalance(productId, balanceDate);
         const loanStatementEffectsService = this.getLoanStatementEffectsService();
         await loanStatementEffectsService.saveMonthData(productId, statementDate);
         const charges = await this.loanChargesService.getLoanChargeForProduct(productId);

package/services/loan-statement.service.ts

@@ -208,7 +208,8 @@ export class LoanStatementService {
       return;
     }
     await this.cleanProductStatement(productId, statementDate);
-    const balance = await this.loanChargesService.getLoanProductBalance(productId, dayjs.utc(statementDate).add(1, 'day').toDate());
+    const balanceDate = dayjs.utc(statementDate).add(1, 'day').subtract(1, 'second').toDate();
+    const balance = await this.loanChargesService.getLoanProductBalance(productId, balanceDate);
 
     const loanStatementEffectsService = this.getLoanStatementEffectsService();
     await loanStatementEffectsService.saveMonthData(productId, statementDate);

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

@@ -155,7 +155,7 @@ export declare class LoanTransactionsService {
     getTransactionReport(transactionIds: string[], borrowerId: string, effectiveDate: Date): Promise<{
         transactionIdsToMark: any[];
         transactions: {
-            [x: string]: (string | number | Date | string[])[];
+            [x: string]: (string | number | string[] | Date)[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{