gemcap-be-common 1.3.156 → 1.3.158

package/db/reports.db.js

@@ -229,7 +229,7 @@ const getLedgerData = async (params, options = defaultReportLedgerOptions) => {
                         floatedBalance: statement.floatedBalance,
                         createdAt: statement['createdAt'],
                         info: statement.memo,
-                        paymentDate: (0, date_helper_1.formatDate)(payment.date),
+                        paymentDate: (0, date_helper_1.convertDateToFormat)(payment.date),
                     });
                 }
             }
@@ -270,7 +270,7 @@ const getLedgerData = async (params, options = defaultReportLedgerOptions) => {
         const fullTransactions = sortedTransactions
             .map((row) => ({
             borrowerCode: borrowerCodesMap[productId],
-            date: (0, date_helper_1.formatDate)(row.date, 'MM/DD/YYYY'),
+            date: (0, date_helper_1.convertDateToFormat)(row.date, 'MM/DD/YYYY'),
             type: row.isBrokerFee ? `${EChargeType[row.type]} BROKER` : EChargeType[row.type],
             chargeCode: row.chargeCode,
             PLCode: row.PLCode,
@@ -282,18 +282,18 @@ const getLedgerData = async (params, options = defaultReportLedgerOptions) => {
             balance: row.balance,
             floatedBalance: row.floatedBalance,
             info: row.info,
-            paymentDate: row.paymentDate ? (0, date_helper_1.formatDate)(row.paymentDate) : '',
+            paymentDate: row.paymentDate ? (0, date_helper_1.convertDateToFormat)(row.paymentDate) : '',
         }));
         const termLoan = await TermLoan_model_1.TermLoanModel.findOne({ productId, actual: true });
         if (termLoan) {
             const calculatedTermLoan = await TermLoanCalculated_model_1.TermLoanCalculatedModel.findOne({
                 termLoanId: termLoan._id.toString(),
-                relevantStatement: (0, date_helper_1.formatDate)(endDate),
+                relevantStatement: (0, date_helper_1.convertDateToFormat)(endDate),
             });
             if (calculatedTermLoan) {
                 const expectedPayment = {
                     borrowerCode: borrowerCodesMap[productId],
-                    date: (0, date_helper_1.formatDate)(endDate, 'MM/DD/YYYY'),
+                    date: (0, date_helper_1.convertDateToFormat)(endDate, 'MM/DD/YYYY'),
                     type: EChargeType.EXPECTED_PRINCIPAL,
                     chargeCode: null,
                     PLCode: null,
@@ -313,7 +313,7 @@ const getLedgerData = async (params, options = defaultReportLedgerOptions) => {
                         if (paymentDoc) {
                             const expectedPayment = {
                                 borrowerCode: borrowerCodesMap[productId],
-                                date: (0, date_helper_1.formatDate)(endDate, 'MM/DD/YYYY'),
+                                date: (0, date_helper_1.convertDateToFormat)(endDate, 'MM/DD/YYYY'),
                                 type: EChargeType.EXPECTED_PRINCIPAL_PAID,
                                 chargeCode: null,
                                 PLCode: null,
@@ -324,7 +324,7 @@ const getLedgerData = async (params, options = defaultReportLedgerOptions) => {
                                 balance: null,
                                 floatedBalance: null,
                                 info: EChargeType.EXPECTED_PRINCIPAL_PAID,
-                                paymentDate: (0, date_helper_1.formatDate)(paymentDoc.date, 'MM/DD/YYYY'),
+                                paymentDate: (0, date_helper_1.convertDateToFormat)(paymentDoc.date, 'MM/DD/YYYY'),
                             };
                             fullTransactions.unshift(expectedPayment);
                         }

package/db/reports.db.ts

@@ -15,7 +15,7 @@ import {
   ILoanStatementTransactionDocWithCharge,
   LoanStatementTransactionModel,
 } from '../models/LoanStatementTransaction.model';
-import { defaultDateFormat, formatDate } from '../helpers/date.helper';
+import { convertDateToFormat } from '../helpers/date.helper';
 import dayjs from 'dayjs';
 import { getLoanChargeForProduct } from './loan-charges.db';
 import { getLoanProductBalance } from './loan-products.db';
@@ -309,7 +309,7 @@ const getLedgerData = async (params: ReportLedgerParams, options = defaultReport
             floatedBalance: statement.floatedBalance,
             createdAt: statement['createdAt'],
             info: statement.memo,
-            paymentDate: formatDate(payment.date),
+            paymentDate: convertDateToFormat(payment.date),
           });
         }
       }
@@ -351,7 +351,7 @@ const getLedgerData = async (params: ReportLedgerParams, options = defaultReport
     const fullTransactions = sortedTransactions
       .map((row): ILedgerReportRow => ({
         borrowerCode: borrowerCodesMap[productId],
-        date: formatDate(row.date, 'MM/DD/YYYY'),
+        date: convertDateToFormat(row.date, 'MM/DD/YYYY'),
         type: row.isBrokerFee ? `${EChargeType[row.type]} BROKER` : EChargeType[row.type],
         chargeCode: row.chargeCode,
         PLCode: row.PLCode,
@@ -363,19 +363,19 @@ const getLedgerData = async (params: ReportLedgerParams, options = defaultReport
         balance: row.balance,
         floatedBalance: row.floatedBalance,
         info: row.info,
-        paymentDate: row.paymentDate ? formatDate(row.paymentDate) : '',
+        paymentDate: row.paymentDate ? convertDateToFormat(row.paymentDate) : '',
       }));
 
     const termLoan = await TermLoanModel.findOne({ productId, actual: true });
     if (termLoan) {
       const calculatedTermLoan = await TermLoanCalculatedModel.findOne({
         termLoanId: termLoan._id.toString(),
-        relevantStatement: formatDate(endDate),
+        relevantStatement: convertDateToFormat(endDate),
       });
       if (calculatedTermLoan) {
         const expectedPayment = <ILedgerReportRow>{
           borrowerCode: borrowerCodesMap[productId],
-          date: formatDate(endDate, 'MM/DD/YYYY'),
+          date: convertDateToFormat(endDate, 'MM/DD/YYYY'),
           type: EChargeType.EXPECTED_PRINCIPAL,
           chargeCode: null,
           PLCode: null,
@@ -395,7 +395,7 @@ const getLedgerData = async (params: ReportLedgerParams, options = defaultReport
             if (paymentDoc) {
               const expectedPayment = <ILedgerReportRow>{
                 borrowerCode: borrowerCodesMap[productId],
-                date: formatDate(endDate, 'MM/DD/YYYY'),
+                date: convertDateToFormat(endDate, 'MM/DD/YYYY'),
                 type: EChargeType.EXPECTED_PRINCIPAL_PAID,
                 chargeCode: null,
                 PLCode: null,
@@ -406,7 +406,7 @@ const getLedgerData = async (params: ReportLedgerParams, options = defaultReport
                 balance: null,
                 floatedBalance: null,
                 info: EChargeType.EXPECTED_PRINCIPAL_PAID,
-                paymentDate: formatDate(paymentDoc.date, 'MM/DD/YYYY'),
+                paymentDate: convertDateToFormat(paymentDoc.date, 'MM/DD/YYYY'),
               };
               fullTransactions.unshift(expectedPayment);
             }

package/helpers/date.helper.d.ts

@@ -1,4 +1,4 @@
-import dayjs, { OpUnitType, QUnitType } from 'dayjs';
+import dayjs, { Dayjs, OpUnitType, QUnitType } from 'dayjs';
 export interface ISelectedMonth {
     year: number;
     month: number;
@@ -7,11 +7,10 @@ export declare const defaultDateFormat = "MM-DD-YYYY";
 export declare const normalizeDate: (date: Date, type: 'start' | 'end') => Date;
 export declare const convertAnyToDate: (date: any) => Date | null;
 export declare const dateLessThan: (date: Date, compare: number, unit: QUnitType | OpUnitType) => boolean;
-export declare const formatDate: (date: Date, format?: string) => string;
+export declare const convertDayjsToFormat: (date: Dayjs, format?: string) => string;
+export declare const convertDateToFormat: (date: Date, format?: string) => string;
 export declare const calculateTimeZone: (date: Date) => Date;
-export declare const convertToDefaultFormat: (date: Date) => string;
 export declare const excelDateToJSDate: (serial: number) => Date;
-export declare const convertToFormat: (date: Date, format: string) => string;
 export declare const convertSelectedMonthToDate: (selectedMonth: ISelectedMonth) => Date;
 export declare const getStartOfMonthsBetweenDates: (startDate: Date, endDate: Date) => {
     [dateView: string]: {

package/helpers/date.helper.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getShiftedMonth = exports.getDays = exports.getStartOfMonthsBetweenDates = exports.convertSelectedMonthToDate = exports.convertToFormat = exports.excelDateToJSDate = exports.convertToDefaultFormat = exports.calculateTimeZone = exports.formatDate = exports.dateLessThan = exports.convertAnyToDate = exports.normalizeDate = exports.defaultDateFormat = void 0;
+exports.getShiftedMonth = exports.getDays = exports.getStartOfMonthsBetweenDates = exports.convertSelectedMonthToDate = exports.excelDateToJSDate = exports.calculateTimeZone = exports.convertDateToFormat = exports.convertDayjsToFormat = exports.dateLessThan = exports.convertAnyToDate = exports.normalizeDate = exports.defaultDateFormat = void 0;
 const dayjs_1 = __importDefault(require("dayjs"));
 const utc_1 = __importDefault(require("dayjs/plugin/utc"));
 const timezone_1 = __importDefault(require("dayjs/plugin/timezone"));
@@ -33,27 +33,27 @@ const convertAnyToDate = (date) => {
 };
 exports.convertAnyToDate = convertAnyToDate;
 const dateLessThan = (date, compare, unit) => {
-    const currentDate = (0, dayjs_1.default)();
-    const nextDate = (0, dayjs_1.default)(new Date(date));
+    const currentDate = (0, dayjs_1.default)().utc();
+    const nextDate = (0, dayjs_1.default)(date).utc();
     const difference = currentDate.diff(nextDate, unit);
     return difference < compare;
 };
 exports.dateLessThan = dateLessThan;
-const formatDate = (date, format = exports.defaultDateFormat) => {
-    return (0, dayjs_1.default)(date).format(format);
+const convertDayjsToFormat = (date, format = exports.defaultDateFormat) => {
+    return date.format(format);
 };
-exports.formatDate = formatDate;
+exports.convertDayjsToFormat = convertDayjsToFormat;
+const convertDateToFormat = (date, format = exports.defaultDateFormat) => {
+    return (0, exports.convertDayjsToFormat)((0, dayjs_1.default)(date).utc(), format);
+};
+exports.convertDateToFormat = convertDateToFormat;
 const calculateTimeZone = (date) => {
     if (date instanceof Date) {
-        return (0, dayjs_1.default)(date).subtract(date.getTimezoneOffset(), 'minute').toDate();
+        return (0, dayjs_1.default)(date).utc().subtract(date.getTimezoneOffset(), 'minute').toDate();
     }
     return date;
 };
 exports.calculateTimeZone = calculateTimeZone;
-const convertToDefaultFormat = (date) => {
-    return (0, dayjs_1.default)(date).format(exports.defaultDateFormat);
-};
-exports.convertToDefaultFormat = convertToDefaultFormat;
 const excelDateToJSDate = (serial) => {
     const utcDays = Math.floor(serial - 25569);
     const utcValue = utcDays * 86400;
@@ -67,17 +67,13 @@ const excelDateToJSDate = (serial) => {
     return new Date(dateInfo.getFullYear(), dateInfo.getMonth(), dateInfo.getDate(), hours, minutes, seconds);
 };
 exports.excelDateToJSDate = excelDateToJSDate;
-const convertToFormat = (date, format) => {
-    return (0, dayjs_1.default)(date).format(format);
-};
-exports.convertToFormat = convertToFormat;
 const convertSelectedMonthToDate = (selectedMonth) => {
     return dayjs_1.default.utc({ year: selectedMonth.year, month: selectedMonth.month - 1, day: 1 }).toDate();
 };
 exports.convertSelectedMonthToDate = convertSelectedMonthToDate;
 const getStartOfMonthsBetweenDates = (startDate, endDate) => {
-    let start = (0, dayjs_1.default)(startDate).utcOffset(0).startOf('month');
-    const end = (0, dayjs_1.default)(endDate).utcOffset(0).startOf('month');
+    let start = (0, dayjs_1.default)(startDate).utc().startOf('month');
+    const end = (0, dayjs_1.default)(endDate).utc().startOf('month');
     const dates = {};
     while (start.isBefore(end) || start.isSame(end)) {
         dates[start.format('YYYY-MM')] = { year: start.year(), month: start.month() + 1 };
@@ -95,7 +91,7 @@ const getDays = (period) => {
 };
 exports.getDays = getDays;
 const getShiftedMonth = (month, shift) => {
-    const nextMonth = (0, dayjs_1.default)().utcOffset(0).year(month.year).month(month.month - 1).add(shift, 'month');
+    const nextMonth = (0, dayjs_1.default)().utc().year(month.year).month(month.month - 1).add(shift, 'month');
     return { year: nextMonth.year(), month: nextMonth.month() + 1 };
 };
 exports.getShiftedMonth = getShiftedMonth;

package/helpers/date.helper.ts

@@ -1,4 +1,4 @@
-import dayjs, { OpUnitType, QUnitType } from 'dayjs';
+import dayjs, { Dayjs, OpUnitType, QUnitType } from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import timezone from 'dayjs/plugin/timezone';
 import objectSupport from 'dayjs/plugin/objectSupport';
@@ -35,27 +35,27 @@ export const convertAnyToDate = (date: any): Date | null => {
 };
 
 export const dateLessThan = (date: Date, compare: number, unit: QUnitType | OpUnitType) => {
-  const currentDate = dayjs();
-  const nextDate = dayjs(new Date(date));
+  const currentDate = dayjs().utc();
+  const nextDate = dayjs(date).utc();
   const difference = currentDate.diff(nextDate, unit);
   return difference < compare;
 };
 
-export const formatDate = (date: Date, format = defaultDateFormat): string => {
-  return dayjs(date).format(format);
+export const convertDayjsToFormat = (date: Dayjs, format = defaultDateFormat): string => {
+  return date.format(format);
+};
+
+export const convertDateToFormat = (date: Date, format = defaultDateFormat) => {
+  return convertDayjsToFormat(dayjs(date).utc(), format);
 };
 
 export const calculateTimeZone = (date: Date): Date => {
   if (date instanceof Date) {
-    return dayjs(date).subtract(date.getTimezoneOffset(), 'minute').toDate();
+    return dayjs(date).utc().subtract(date.getTimezoneOffset(), 'minute').toDate();
   }
   return date;
 };
 
-export const convertToDefaultFormat = (date: Date) => {
-  return dayjs(date).format(defaultDateFormat);
-};
-
 export const excelDateToJSDate = (serial: number) => {
   const utcDays = Math.floor(serial - 25569);
   const utcValue = utcDays * 86400;
@@ -69,10 +69,6 @@ export const excelDateToJSDate = (serial: number) => {
   return new Date(dateInfo.getFullYear(), dateInfo.getMonth(), dateInfo.getDate(), hours, minutes, seconds);
 };
 
-export const convertToFormat = (date: Date, format: string) => {
-  return dayjs(date).format(format);
-};
-
 export const convertSelectedMonthToDate = (selectedMonth: ISelectedMonth) => {
   return dayjs.utc({ year: selectedMonth.year, month: selectedMonth.month - 1, day: 1 }).toDate();
 };
@@ -80,8 +76,8 @@ export const convertSelectedMonthToDate = (selectedMonth: ISelectedMonth) => {
 export const getStartOfMonthsBetweenDates = (startDate: Date, endDate: Date): {
   [dateView: string]: { year: number; month: number }
 } => {
-  let start = dayjs(startDate).utcOffset(0).startOf('month');
-  const end = dayjs(endDate).utcOffset(0).startOf('month');
+  let start = dayjs(startDate).utc().startOf('month');
+  const end = dayjs(endDate).utc().startOf('month');
   const dates = {};
 
   while (start.isBefore(end) || start.isSame(end)) {
@@ -101,6 +97,6 @@ export const getDays = (period: { start: dayjs.Dayjs, end: dayjs.Dayjs }) => {
 };
 
 export const getShiftedMonth = (month: ISelectedMonth, shift: number) => {
-  const nextMonth = dayjs().utcOffset(0).year(month.year).month(month.month - 1).add(shift, 'month');
+  const nextMonth = dayjs().utc().year(month.year).month(month.month - 1).add(shift, 'month');
   return { year: nextMonth.year(), month: nextMonth.month() + 1 };
 };

package/interfaces/task.interface.d.ts

@@ -2,6 +2,5 @@ export declare const TaskStatus: {
     readonly PENDING: "PENDING";
     readonly SUCCESS: "SUCCESS";
     readonly FAILED: "FAILED";
-    readonly ERROR: "ERROR";
 };
 export type TTaskStatus = typeof TaskStatus[keyof typeof TaskStatus];

package/interfaces/task.interface.js

@@ -5,5 +5,4 @@ exports.TaskStatus = {
     PENDING: 'PENDING',
     SUCCESS: 'SUCCESS',
     FAILED: 'FAILED',
-    ERROR: 'ERROR',
 };

package/interfaces/task.interface.ts

@@ -2,7 +2,6 @@ export const TaskStatus = {
   PENDING: 'PENDING',
   SUCCESS: 'SUCCESS',
   FAILED: 'FAILED',
-  ERROR: 'ERROR',
 } as const;
 
 export type TTaskStatus = typeof TaskStatus[keyof typeof TaskStatus];

package/models/LoanStatementStatus.model.d.ts

@@ -38,35 +38,35 @@ export declare const LoanStatementStatusSchema: mongoose.Schema<any, mongoose.Mo
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    productId: mongoose.Types.ObjectId;
-    year: number;
     month: number;
+    year: number;
+    productId: mongoose.Types.ObjectId;
     __v?: number;
     actual?: boolean;
-    locked?: boolean;
     lastCalculated?: Date;
+    locked?: boolean;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    productId: mongoose.Types.ObjectId;
-    year: number;
     month: number;
+    year: number;
+    productId: mongoose.Types.ObjectId;
     __v?: number;
     actual?: boolean;
-    locked?: boolean;
     lastCalculated?: Date;
+    locked?: boolean;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    productId: mongoose.Types.ObjectId;
-    year: number;
     month: number;
+    year: number;
+    productId: mongoose.Types.ObjectId;
     __v?: number;
     actual?: boolean;
-    locked?: boolean;
     lastCalculated?: Date;
+    locked?: boolean;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/_index.d.ts

@@ -31,10 +31,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
-        apDate: Date;
         amount: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
+        apDate: Date;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -45,10 +45,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
-        apDate: Date;
         amount: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
+        apDate: Date;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -59,10 +59,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
-        apDate: Date;
         amount: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
+        apDate: Date;
         __v?: number;
         poNumber?: string;
         customerName?: string;

package/package.json

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

package/services/borrower-summary.service.js

@@ -230,7 +230,7 @@ class BorrowerSummaryService {
                         });
                         const revolverData = allProductsData.find((p) => p.productType === loan_types_enum_1.ELoanTypes.REVOLVER);
                         chartData.push({
-                            bbc: (0, date_helper_1.formatDate)(bbc.bbcDate),
+                            bbc: (0, date_helper_1.convertDateToFormat)(bbc.bbcDate),
                             revolverCollateralTotal: revolverData ? revolverData.totalCollateral : 0,
                             revolverLoanBalance: lastTransaction ? lastTransaction.balance : 0,
                         });

package/services/borrower-summary.service.ts

@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
 
 import { ILoanTransactionDoc, LoanTransaction } from '../models/LoanTransaction.model';
-import { defaultDateFormat, formatDate } from '../helpers/date.helper';
+import { defaultDateFormat, convertDateToFormat } from '../helpers/date.helper';
 import { formatNumbers } from '../helpers/numbers.helper';
 import { BorrowerCompliance } from '../models/BorrowerCompliance.model';
 import { EComplianceItemStatus } from '../models/ComplianceItem.model';
@@ -253,7 +253,7 @@ export class BorrowerSummaryService {
             });
             const revolverData = allProductsData.find((p) => p.productType === ELoanTypes.REVOLVER);
             chartData.push({
-              bbc: formatDate(bbc.bbcDate),
+              bbc: convertDateToFormat(bbc.bbcDate),
               revolverCollateralTotal: revolverData ? revolverData.totalCollateral : 0,
               revolverLoanBalance: lastTransaction ? lastTransaction.balance : 0,
             });

package/services/borrowers.service.d.ts

@@ -83,10 +83,10 @@ export declare class BorrowerService {
     getBorrowerCodesMap(): Promise<Map<string, string>>;
     getBorrowerStatementDetails(borrowers: IBorrowerDocument[]): Promise<{
         [x: number]: {
+            SELECTED_PERIOD?: boolean;
+            ENTIRE_LOAN?: boolean;
             LAST_MONTH?: boolean;
             CURRENT_MONTH?: boolean;
-            ENTIRE_LOAN?: boolean;
-            SELECTED_PERIOD?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

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, "items" | "borrower" | "fundingStatus"> | {
+    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "borrower" | "fundingStatus" | "items"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;

package/services/reports.service.js

@@ -280,12 +280,12 @@ class ReportsService {
         const emptyRow = [['']];
         const reportHeader = [
             ['PORTFOLIO LOAN BALANCE AND COLLATERAL REPORT'],
-            [`RUN DATE ${(0, date_helper_1.formatDate)(date)}`],
+            [`RUN DATE ${(0, date_helper_1.convertDateToFormat)(date)}`],
             [''],
         ];
         const reportToCovert = Object.values(report).reduce((acc, borrowerData) => {
             const headers = [
-                [`LOAN BALANCE AND COLLATERAL REPORT ${borrowerData.borrowerName}, Last BBC date - ${(0, date_helper_1.formatDate)(borrowerData.bbcDate)}`],
+                [`LOAN BALANCE AND COLLATERAL REPORT ${borrowerData.borrowerName}, Last BBC date - ${(0, date_helper_1.convertDateToFormat)(borrowerData.bbcDate)}`],
                 ['', 'Gross Value', 'Advance Rate', 'Net Value'],
             ];
             const convertToExcel = (dataGroup) => {
@@ -436,7 +436,7 @@ class ReportsService {
     async getBalancesCollateralReportExcel(borrowerIds, date) {
         const reportHeader = [
             ['PORTFOLIO LOAN BALANCE AND COLLATERAL REPORT'],
-            [`RUN DATE ${(0, date_helper_1.formatDate)(date)}`],
+            [`RUN DATE ${(0, date_helper_1.convertDateToFormat)(date)}`],
             [''],
         ];
         const keyOrder = [

package/services/reports.service.ts

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
 
 import { BorrowerModel } from '../models/Borrower.model';
-import { defaultDateFormat, formatDate } from '../helpers/date.helper';
+import { defaultDateFormat, convertDateToFormat } from '../helpers/date.helper';
 import { IInventoryAvailabilitySummary } from '../models/InventoryAvailability.model';
 import { IReserveSummary, IReserveSummaryItem } from '../models/Reserve.model';
 import { IAvailabilitySummary } from '../models/ReceivableAvailability.model';
@@ -375,12 +375,12 @@ export class ReportsService {
     const emptyRow = [['']];
     const reportHeader = [
       ['PORTFOLIO LOAN BALANCE AND COLLATERAL REPORT'],
-      [`RUN DATE ${formatDate(date)}`],
+      [`RUN DATE ${convertDateToFormat(date)}`],
       [''],
     ];
     const reportToCovert = Object.values(report).reduce((acc, borrowerData) => {
       const headers = [
-        [`LOAN BALANCE AND COLLATERAL REPORT ${borrowerData.borrowerName}, Last BBC date - ${formatDate(borrowerData.bbcDate)}`],
+        [`LOAN BALANCE AND COLLATERAL REPORT ${borrowerData.borrowerName}, Last BBC date - ${convertDateToFormat(borrowerData.bbcDate)}`],
         ['', 'Gross Value', 'Advance Rate', 'Net Value'],
       ];
       const convertToExcel = (dataGroup: ISummaryReportDataGroup) => {
@@ -546,7 +546,7 @@ export class ReportsService {
   public async getBalancesCollateralReportExcel(borrowerIds: string[], date: Date) {
     const reportHeader = [
       ['PORTFOLIO LOAN BALANCE AND COLLATERAL REPORT'],
-      [`RUN DATE ${formatDate(date)}`],
+      [`RUN DATE ${convertDateToFormat(date)}`],
       [''],
     ];