gemcap-be-common 1.5.129 → 1.5.131

package/services/quickbooks.service.ts

@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
 import _ from 'lodash';
 
-import { IProductBrokerDocWithBroker } from '../models/ProductBroker.model';
+import { IProductBrokerDocWithLoanBroker } from '../models/ProductBroker.model';
 import { ELoanChargeType } from '../enums/loan-charge-type.enum';
 import { ELoanTypes } from '../enums/loan-types.enum';
 import { LoanProduct } from '../models/LoanProducts.model';
@@ -302,15 +302,15 @@ export class QuickbooksService {
     }
     const transactionsFilter = {
       productIds: productIds,
-      start: dayjs(reportDate).utcOffset(0).startOf('month').toDate(),
-      end: dayjs(reportDate).utcOffset(0).endOf('month').toDate(),
+      start: dayjs.utc(reportDate).startOf('month').toDate(),
+      end: dayjs.utc(reportDate).endOf('month').toDate(),
     };
     return await this.loanChargesService.getLoanStatementsForProduct(transactionsFilter);
   }
 
   async getChargeTransactionsForPayments(productIds: string[], reportDate: Date) {
-    const start = dayjs(reportDate).utcOffset(0).startOf('day').toDate();
-    const end = dayjs(reportDate).utcOffset(0).endOf('day').toDate();
+    const start = dayjs.utc(reportDate).startOf('day').toDate();
+    const end = dayjs.utc(reportDate).endOf('day').toDate();
     const payments = await this.loanPaymentsService.getPaymentsForPeriod(productIds, start, end);
     if (!payments.length) {
       return [];
@@ -321,8 +321,8 @@ export class QuickbooksService {
   }
 
   async getPrincipalTransactionsForPayments(productId: string, reportDate: Date) {
-    const start = dayjs(reportDate).utcOffset(0).startOf('day').toDate();
-    const end = dayjs(reportDate).utcOffset(0).endOf('day').toDate();
+    const start = dayjs.utc(reportDate).startOf('day').toDate();
+    const end = dayjs.utc(reportDate).endOf('day').toDate();
     const payments = await this.loanPaymentsService.getPaymentsForPeriod([productId], start, end);
     if (!payments.length) {
       return <{ [settlementCode: string]: number }>{};
@@ -362,9 +362,9 @@ export class QuickbooksService {
     const companyFilter = { companyId: { $in: params.companyIds.map((id) => new mongoose.Types.ObjectId(id)) } };
 
     const { reportType, productIds, chargeTypes, reportDate } = params;
-    const reportDateFormatted = dayjs(reportDate).utcOffset(0).format('MM/DD/YYYY').toUpperCase();
-    const reportDateTrFormatted = dayjs(reportDate).utcOffset(0).format(transactionsDateFormat).toUpperCase();
-    const currentDateTrFormatted = dayjs(new Date).utcOffset(0).format(transactionsDateFormat).toUpperCase();
+    const reportDateFormatted = dayjs.utc(reportDate).format('MM/DD/YYYY').toUpperCase();
+    const reportDateTrFormatted = dayjs.utc(reportDate).format(transactionsDateFormat).toUpperCase();
+    const currentDateTrFormatted = dayjs.utc(new Date).format(transactionsDateFormat).toUpperCase();
     const isAccrual = reportType === 'accrual';
     const mainData: IQBReportTransaction[] = [];
 
@@ -446,7 +446,7 @@ export class QuickbooksService {
 
           if (chargeTypes.includes('BROKERS') && isAccrual) {
 
-            const handleFee = async (broker: IProductBrokerDocWithBroker, shareName: 'adminShare' | 'interestShare' | 'otherShare') => {
+            const handleFee = async (broker: IProductBrokerDocWithLoanBroker, shareName: 'adminShare' | 'interestShare' | 'otherShare') => {
 
               const quickbooksAccountBrokerBS = await QuickbooksAccount.findOne({ accountCode: broker.BSCode, ...companyFilter }).lean();
               const quickbooksAccountBrokerPL = await QuickbooksAccount.findOne({ accountCode: broker.PLCode, ...companyFilter }).lean();
@@ -477,9 +477,9 @@ export class QuickbooksService {
             };
 
             const handlers = {
-              [ELoanChargeType.ADMIN_FEE]: async (broker: IProductBrokerDocWithBroker) => await handleFee(broker, 'adminShare'),
-              [ELoanChargeType.INTEREST_FEE]: async (broker: IProductBrokerDocWithBroker) => await handleFee(broker, 'interestShare'),
-              [ELoanChargeType.OTHER]: async (broker: IProductBrokerDocWithBroker) => await handleFee(broker, 'otherShare'),
+              [ELoanChargeType.ADMIN_FEE]: async (broker: IProductBrokerDocWithLoanBroker) => await handleFee(broker, 'adminShare'),
+              [ELoanChargeType.INTEREST_FEE]: async (broker: IProductBrokerDocWithLoanBroker) => await handleFee(broker, 'interestShare'),
+              [ELoanChargeType.OTHER]: async (broker: IProductBrokerDocWithLoanBroker) => await handleFee(broker, 'otherShare'),
             };
             await Promise.all(productBrokers.map(async (broker) => {
               if (handlers[charge.chargeType]) {
@@ -569,11 +569,11 @@ export class QuickbooksService {
   }) {
     const reportErrorsSet = new Set<string>();
     const { reportType, productIds, chargeTypes, reportDate } = params;
-    const reportDateFormatted = dayjs(reportDate).utcOffset(0).format('MM/DD/YYYY').toUpperCase();
-    const reportDateTrFormatted = dayjs(reportDate).utcOffset(0).format(transactionsDateFormat).toUpperCase();
+    const reportDateFormatted = dayjs.utc(reportDate).format('MM/DD/YYYY').toUpperCase();
+    const reportDateTrFormatted = dayjs.utc(reportDate).format(transactionsDateFormat).toUpperCase();
 
-    const startDate = dayjs(reportDate).utcOffset(0).startOf('day').toDate();
-    const endDate = dayjs(reportDate).utcOffset(0).endOf('day').toDate();
+    const startDate = dayjs.utc(reportDate).startOf('day').toDate();
+    const endDate = dayjs.utc(reportDate).endOf('day').toDate();
     const transactions = await this.bankUploadedTransactionsService.getUploadedBankTransactions(startDate, endDate);
     const { references, products } = await this.cashAllocationService.getAllCashAllocations();
     const allAccounts = await this.getAllAccounts();