gemcap-be-common 1.3.128 → 1.3.129

package/package.json

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

package/services/compliance-borrowers.service.d.ts

@@ -45,7 +45,7 @@ export declare class ComplianceBorrowersService {
         };
     };
     getFullComplianceBorrowerById(complianceBorrowerId: any): Promise<any>;
-    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "borrower" | "fundingStatus" | "items"> | {
+    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "items" | "borrower" | "fundingStatus"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;

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

@@ -90,7 +90,9 @@ export declare class LoanPaymentsService {
         }[];
         isCalculated: boolean;
     }>;
-    payExpectedPayments(userId: string, borrowerIds: string[]): Promise<{
+    payExpectedPayments(userId: string, borrowers: {
+        [borrowerId: string]: boolean;
+    }): Promise<{
         message: string;
     }>;
 }

package/services/loan-payments.service.js

@@ -421,20 +421,20 @@ class LoanPaymentsService {
         }));
         return { borrowers: borrowersData, isCalculated: !!isCalculated };
     }
-    async payExpectedPayments(userId, borrowerIds) {
+    async payExpectedPayments(userId, borrowers) {
         const arrayOfStringsSchema = joi_1.default.array().items(joi_1.default.string()).required();
+        const borrowerIds = Object.keys(borrowers);
         const { error } = arrayOfStringsSchema.validate(borrowerIds, { abortEarly: false });
         if (error) {
             return { message: 'Incorrect list of borrowers IDs' };
         }
-        const addToRevolver = true;
         await this.redisClient.set(CALCULATION_VAR, 1);
         const user = await User_model_1.UserModel.findById(userId).lean();
         if (!user) {
             return { message: 'Cannot find user with this id' };
         }
-        const borrowers = await this.borrowersDB.getAllowedBorrowers(user);
-        const paymentPromises = borrowers.map(async (borrower) => {
+        const allowedBorrowers = await this.borrowersDB.getAllowedBorrowers(user);
+        const paymentPromises = allowedBorrowers.map(async (borrower) => {
             if (borrowerIds.includes(borrower._id.toString())) {
                 try {
                     const loanStatementService = this.getLoanStatementService();
@@ -449,13 +449,13 @@ class LoanPaymentsService {
                             return {
                                 productId: productId,
                                 payableSum: amount,
-                                settlementCode: addToRevolver ? product.code : product.settlementCode,
+                                settlementCode: borrowers[borrower._id.toString()] ? product.code : product.settlementCode,
                                 paymentOrder: null,
                             };
                         }
                     }));
                     const combinedPayment = {
-                        addToRevolver,
+                        addToRevolver: borrowers[borrower._id.toString()],
                         borrowerId: borrower._id.toString(),
                         date: new Date(),
                         linkedProducts: [],

package/services/loan-payments.service.ts

@@ -470,23 +470,22 @@ export class LoanPaymentsService {
     return { borrowers: borrowersData, isCalculated: !!isCalculated };
   }
 
-  async payExpectedPayments(userId: string, borrowerIds: string[]) {
+  async payExpectedPayments(userId: string, borrowers: { [borrowerId: string]: boolean }) {
 
     const arrayOfStringsSchema = Joi.array().items(Joi.string()).required();
+    const borrowerIds = Object.keys(borrowers);
     const { error } = arrayOfStringsSchema.validate(borrowerIds, { abortEarly: false });
     if (error) {
       return { message: 'Incorrect list of borrowers IDs' };
     }
 
-    const addToRevolver = true;
-
     await this.redisClient.set(CALCULATION_VAR, 1);
     const user = await UserModel.findById(userId).lean();
     if (!user) {
       return { message: 'Cannot find user with this id' };
     }
-    const borrowers = await this.borrowersDB.getAllowedBorrowers(user);
-    const paymentPromises = borrowers.map(async (borrower) => {
+    const allowedBorrowers = await this.borrowersDB.getAllowedBorrowers(user);
+    const paymentPromises = allowedBorrowers.map(async (borrower) => {
       if (borrowerIds.includes(borrower._id.toString())) {
         try {
           const loanStatementService = this.getLoanStatementService();
@@ -502,7 +501,7 @@ export class LoanPaymentsService {
                 return {
                   productId: productId,
                   payableSum: amount,
-                  settlementCode: addToRevolver ? product.code : product.settlementCode,
+                  settlementCode: borrowers[borrower._id.toString()] ? product.code : product.settlementCode,
                   paymentOrder: null,
                 };
               }
@@ -510,7 +509,7 @@ export class LoanPaymentsService {
           );
 
           const combinedPayment: ICombinedPayment = {
-            addToRevolver,
+            addToRevolver: borrowers[borrower._id.toString()],
             borrowerId: borrower._id.toString(),
             date: new Date(),
             linkedProducts: [],

package/services/nodemailer.service.js

@@ -98,7 +98,6 @@ class NodemailerService {
         this.transporter = nodemailer_1.default.createTransport(this.config.mailerConfig);
     }
     getSender(senderType, senderExtraName) {
-        console.log({ senderExtraName, typeof: typeof senderExtraName });
         switch (senderType) {
             case ESenderType.REGULAR:
                 return `${this.senders[senderType].senderName} <${this.senders[senderType].senderEmail}>`;

package/services/nodemailer.service.ts

@@ -111,7 +111,6 @@ export class NodemailerService {
   }
 
   private getSender(senderType: ESenderType, senderExtraName?: string) {
-    console.log({ senderExtraName, typeof: typeof senderExtraName });
     switch (senderType) {
       case ESenderType.REGULAR:
         return `${this.senders[senderType].senderName} <${this.senders[senderType].senderEmail}>`;