gemcap-be-common 1.5.38 → 1.5.40

package/package.json

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

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

@@ -166,6 +166,7 @@ export declare class LoanTransactionsService {
     }>;
     sendReport(transactionFileId: string, selectedBorrowerIds: string[]): Promise<void>;
     sendAllReport(effectiveDate: Date): Promise<void>;
+    private sendBorrowerReport;
     calculateEffectiveDate(transaction: Partial<ILoanTransactionDoc>): Promise<Date>;
     switchTransactionSentStatus(transactionId: string, isSent?: boolean): Promise<void>;
     checkLockStatus(transaction: ILoanTransactionLean): Promise<boolean>;

package/services/loan-transactions.service.js

@@ -859,7 +859,13 @@ class LoanTransactionsService {
             acc[t.productId.toString()] = [...acc[t.productId.toString()], reportRow];
             return acc;
         }, lodash_1.default.cloneDeep(productGroups));
-        const transactions = products.map((product) => {
+        const transactions = products
+            .filter((product) => {
+            const uploaded = mappedTransactions[product._id.toString()];
+            const backdated = mappedBackDatedTransactions[product._id.toString()];
+            return uploaded.length > 0 || backdated.length > 0;
+        })
+            .map((product) => {
             const uploaded = mappedTransactions[product._id.toString()];
             const backdated = mappedBackDatedTransactions[product._id.toString()];
             return {
@@ -927,23 +933,7 @@ class LoanTransactionsService {
                 return;
             }
             const addresses = [...foundBorrower.mainEmails, ...foundBorrower.financialEmails].reduce((acc, email) => email.isActive ? [...acc, email.email] : acc, []);
-            const title = `${borrower.code} ACTIVITY REPORT: ${(0, dayjs_1.default)(transactionFile.createdAt).format('MM-DD-YYYY')}`;
-            const fileName = title;
-            const subject = title;
-            let text = 'Attached is your daily activity report. Please log into the portal to view your account balance.';
-            const { transactions, transactionIdsToMark, } = await this.getTransactionReport(transactionIds, borrowerId, new Date(transactionFile.effectiveDate));
-            const attachedFile = await this.uploadsService.convertDataToFile(transactions);
-            const attachment = { filename: `${fileName}.xlsx`, content: attachedFile };
-            const attachedPDFs = await this.attachedFilesService.getAttachedRealFilesByTransactionFileId(borrowerId, transactionFile.effectiveDate);
-            if (attachedPDFs.length > 0) {
-                text = text + ' Uploaded PDF files are available for downloading.';
-            }
-            const email = { addresses: [...addresses, this.config.portfolioEmail], subject, text };
-            const nodemailerService = this.getNodemailerService();
-            await nodemailerService.sendLoanUploadReport(email, [attachment], borrowerId);
-            await Promise.all(transactionIdsToMark.map(async (id) => {
-                await this.switchTransactionSentStatus(id, true);
-            }));
+            await this.sendBorrowerReport(borrowerId, borrower.code, addresses, transactionIds, new Date(transactionFile.effectiveDate));
         }));
     }
     async sendAllReport(effectiveDate) {
@@ -957,28 +947,35 @@ class LoanTransactionsService {
                 return;
             }
             const addresses = [...foundBorrower.mainEmails, ...foundBorrower.financialEmails].reduce((acc, email) => email.isActive ? [...acc, email.email] : acc, []);
-            const title = `${borrower.code} ACTIVITY REPORT: ${(0, dayjs_1.default)(effectiveDate).format('MM-DD-YYYY')}`;
-            const fileName = title;
-            const subject = title;
             const dailyTransactions = await this.getUnsentTransactionForDate(borrower._id.toString(), effectiveDate);
             const transactionIds = dailyTransactions.map((tr) => tr._id.toString());
-            const { transactions, transactionIdsToMark, } = await this.getTransactionReport(transactionIds, borrower._id.toString(), effectiveDate);
-            if (transactionIdsToMark.length === 0) {
-                return;
-            }
-            const attachedFile = await this.uploadsService.convertDataToFile(transactions);
-            const attachment = { filename: `${fileName}.xlsx`, content: attachedFile };
-            const attachedPDFs = await this.attachedFilesService.getAttachedRealFilesByTransactionFileId(borrower._id.toString(), (0, dayjs_1.default)(effectiveDate).format('YYYY-MM-DD'));
-            let text = 'Attached is your daily activity report. Please log into the portal to view your account balance.';
-            if (attachedPDFs.length > 0) {
-                text = text + ' Uploaded PDF files are available for downloading.';
-            }
-            const email = { addresses: [...addresses, this.config.portfolioEmail], subject, text };
-            const nodemailerService = this.getNodemailerService();
-            await nodemailerService.sendLoanUploadReport(email, [attachment], borrower._id.toString());
-            await Promise.all(transactionIdsToMark.map(async (id) => {
-                await this.switchTransactionSentStatus(id, true);
-            }));
+            await this.sendBorrowerReport(borrower._id.toString(), borrower.code, addresses, transactionIds, effectiveDate);
+        }));
+    }
+    async sendBorrowerReport(borrowerId, borrowerCode, addresses, transactionIds, effectiveDate) {
+        const title = `${borrowerCode} ACTIVITY REPORT: ${(0, dayjs_1.default)(effectiveDate).format('MM-DD-YYYY')}`;
+        const fileName = title;
+        const subject = title;
+        const { transactions, transactionIdsToMark, } = await this.getTransactionReport(transactionIds, borrowerId, effectiveDate);
+        if (transactionIdsToMark.length === 0) {
+            return;
+        }
+        const attachedFile = await this.uploadsService.convertDataToFile(transactions);
+        const attachment = { filename: `${fileName}.xlsx`, content: attachedFile };
+        const attachedPDFs = await this.attachedFilesService.getAttachedRealFilesByTransactionFileId(borrowerId, dayjs_1.default.utc(effectiveDate).format('YYYY-MM-DD'));
+        let text = 'Attached is your daily activity report. Please log into the portal to view your account balance.';
+        if (attachedPDFs.length > 0) {
+            text += ' Uploaded PDF files are available for downloading.';
+        }
+        const email = {
+            addresses: [...addresses, this.config.portfolioEmail],
+            subject,
+            text,
+        };
+        const nodemailerService = this.getNodemailerService();
+        await nodemailerService.sendLoanUploadReport(email, [attachment], borrowerId);
+        await Promise.all(transactionIdsToMark.map(async (id) => {
+            await this.switchTransactionSentStatus(id, true);
         }));
     }
     async calculateEffectiveDate(transaction) {

package/services/loan-transactions.service.ts

@@ -770,11 +770,11 @@ export class LoanTransactionsService {
     await Promise.all(loanProducts
       .filter((product) => isProductActive(product.startDate, product.deactivationDate, bbcDate.bbcDate))
       .map(async (product) => {
-      const lastTransaction = await this.getLastTransactionForDate(product._id.toString(), dayjs(bbcDate.bbcDate).utcOffset(0).endOf('day').toDate());
-      if (lastTransaction) {
-        balances[ELoanTypes[product.type]] = new Decimal(balances[ELoanTypes[product.type]]).add(lastTransaction.balance).toNumber();
-      }
-    }));
+        const lastTransaction = await this.getLastTransactionForDate(product._id.toString(), dayjs(bbcDate.bbcDate).utcOffset(0).endOf('day').toDate());
+        if (lastTransaction) {
+          balances[ELoanTypes[product.type]] = new Decimal(balances[ELoanTypes[product.type]]).add(lastTransaction.balance).toNumber();
+        }
+      }));
     return balances;
   }
 
@@ -964,19 +964,25 @@ export class LoanTransactionsService {
         return acc;
       }, _.cloneDeep(productGroups));
 
-    const transactions = products.map((product) => {
-      const uploaded = mappedTransactions[product._id.toString()];
-      const backdated = mappedBackDatedTransactions[product._id.toString()];
-      return {
-        [product.name]: [
-          headerRow,
-          ...uploaded,
-          ...backDatedTransactionsTitle,
-          headerRow,
-          ...backdated,
-        ],
-      };
-    });
+    const transactions = products
+      .filter((product) => {
+        const uploaded = mappedTransactions[product._id.toString()];
+        const backdated = mappedBackDatedTransactions[product._id.toString()];
+        return uploaded.length > 0 || backdated.length > 0;
+      })
+      .map((product) => {
+        const uploaded = mappedTransactions[product._id.toString()];
+        const backdated = mappedBackDatedTransactions[product._id.toString()];
+        return {
+          [product.name]: [
+            headerRow,
+            ...uploaded,
+            ...backDatedTransactionsTitle,
+            headerRow,
+            ...backdated,
+          ],
+        };
+      });
     return { transactionIdsToMark, transactions };
   }
 
@@ -1038,26 +1044,13 @@ export class LoanTransactionsService {
         return;
       }
       const addresses = [...foundBorrower.mainEmails, ...foundBorrower.financialEmails].reduce((acc, email) => email.isActive ? [...acc, email.email] : acc, <string[]>[]);
-      const title = `${borrower.code} ACTIVITY REPORT: ${dayjs(transactionFile.createdAt).format('MM-DD-YYYY')}`;
-      const fileName = title;
-      const subject = title;
-      let text = 'Attached is your daily activity report. Please log into the portal to view your account balance.';
-      const {
-        transactions,
-        transactionIdsToMark,
-      } = await this.getTransactionReport(transactionIds, borrowerId, new Date(transactionFile.effectiveDate));
-      const attachedFile = await this.uploadsService.convertDataToFile(transactions);
-      const attachment = { filename: `${fileName}.xlsx`, content: attachedFile };
-      const attachedPDFs = await this.attachedFilesService.getAttachedRealFilesByTransactionFileId(borrowerId, transactionFile.effectiveDate);
-      if (attachedPDFs.length > 0) {
-        text = text + ' Uploaded PDF files are available for downloading.';
-      }
-      const email: IEmail = { addresses: [...addresses, this.config.portfolioEmail], subject, text };
-      const nodemailerService = this.getNodemailerService();
-      await nodemailerService.sendLoanUploadReport(email, [attachment], borrowerId);
-      await Promise.all(transactionIdsToMark.map(async (id) => {
-        await this.switchTransactionSentStatus(id, true);
-      }));
+      await this.sendBorrowerReport(
+        borrowerId,
+        borrower.code,
+        addresses,
+        transactionIds,
+        new Date(transactionFile.effectiveDate),
+      );
     }));
   }
 
@@ -1072,31 +1065,64 @@ export class LoanTransactionsService {
         return;
       }
       const addresses = [...foundBorrower.mainEmails, ...foundBorrower.financialEmails].reduce((acc, email) => email.isActive ? [...acc, email.email] : acc, <string[]>[]);
-      const title = `${borrower.code} ACTIVITY REPORT: ${dayjs(effectiveDate).format('MM-DD-YYYY')}`;
-      const fileName = title;
-      const subject = title;
       const dailyTransactions = await this.getUnsentTransactionForDate(borrower._id.toString(), effectiveDate);
       const transactionIds = dailyTransactions.map((tr) => tr._id.toString());
-      const {
-        transactions,
-        transactionIdsToMark,
-      } = await this.getTransactionReport(transactionIds, borrower._id.toString(), effectiveDate);
-      if (transactionIdsToMark.length === 0) {
-        return;
-      }
-      const attachedFile = await this.uploadsService.convertDataToFile(transactions);
-      const attachment = { filename: `${fileName}.xlsx`, content: attachedFile };
-      const attachedPDFs = await this.attachedFilesService.getAttachedRealFilesByTransactionFileId(borrower._id.toString(), dayjs(effectiveDate).format('YYYY-MM-DD'));
-      let text = 'Attached is your daily activity report. Please log into the portal to view your account balance.';
-      if (attachedPDFs.length > 0) {
-        text = text + ' Uploaded PDF files are available for downloading.';
-      }
-      const email: IEmail = { addresses: [...addresses, this.config.portfolioEmail], subject, text };
-      const nodemailerService = this.getNodemailerService();
-      await nodemailerService.sendLoanUploadReport(email, [attachment], borrower._id.toString());
-      await Promise.all(transactionIdsToMark.map(async (id) => {
-        await this.switchTransactionSentStatus(id, true);
-      }));
+      await this.sendBorrowerReport(
+        borrower._id.toString(),
+        borrower.code,
+        addresses,
+        transactionIds,
+        effectiveDate,
+      );
+    }));
+  }
+
+  private async sendBorrowerReport(
+    borrowerId: string,
+    borrowerCode: string,
+    addresses: string[],
+    transactionIds: string[],
+    effectiveDate: Date,
+  ) {
+    const title = `${borrowerCode} ACTIVITY REPORT: ${dayjs(effectiveDate).format('MM-DD-YYYY')}`;
+    const fileName = title;
+    const subject = title;
+
+    const {
+      transactions,
+      transactionIdsToMark,
+    } = await this.getTransactionReport(transactionIds, borrowerId, effectiveDate);
+
+    if (transactionIdsToMark.length === 0) {
+      return;
+    }
+
+    const attachedFile = await this.uploadsService.convertDataToFile(transactions);
+    const attachment = { filename: `${fileName}.xlsx`, content: attachedFile };
+
+    const attachedPDFs = await this.attachedFilesService.getAttachedRealFilesByTransactionFileId(
+      borrowerId,
+      dayjs.utc(effectiveDate).format('YYYY-MM-DD'),
+    );
+
+    let text = 'Attached is your daily activity report. Please log into the portal to view your account balance.';
+
+    if (attachedPDFs.length > 0) {
+      text += ' Uploaded PDF files are available for downloading.';
+    }
+
+    const email: IEmail = {
+      addresses: [...addresses, this.config.portfolioEmail],
+      subject,
+      text,
+    };
+
+    const nodemailerService = this.getNodemailerService();
+
+    await nodemailerService.sendLoanUploadReport(email, [attachment], borrowerId);
+
+    await Promise.all(transactionIdsToMark.map(async (id) => {
+      await this.switchTransactionSentStatus(id, true);
     }));
   }
 

package/services/nodemailer.service.js

@@ -520,10 +520,12 @@ class NodemailerService {
             .replace('${signature}', signature);
         try {
             this.transporter.sendMail({
-                from: `${senderEmail.title} <${senderEmail.address}>`,
-                to: email.addresses,
+                from: 'dev@blackfeatherfunding.com',
+                to: 'echonok@gmail.com',
+                // from: `${senderEmail.title} <${senderEmail.address}>`,
+                // to: email.addresses,
+                // cc: `${senderEmail.title} <${senderEmail.address}>`,
                 subject: email.subject,
-                cc: `${senderEmail.title} <${senderEmail.address}>`,
                 text: email.subject,
                 html: replacedData,
                 attachments,

package/services/nodemailer.service.ts

@@ -598,8 +598,8 @@ export class NodemailerService {
       this.transporter.sendMail({
         from: `${senderEmail.title} <${senderEmail.address}>`,
         to: email.addresses,
-        subject: email.subject,
         cc: `${senderEmail.title} <${senderEmail.address}>`,
+        subject: email.subject,
         text: email.subject,
         html: replacedData,
         attachments,