gemcap-be-common 1.4.236 → 1.4.239

package/db/new-summary.ts

@@ -14,7 +14,7 @@ import { EReserveTypes } from '../enums/reserve-types.enum';
 import { EComplianceItemStatus } from '../models/ComplianceItem.model';
 import { IExcelJsCell, NUMBER_FORMATS } from '../helpers/excel.helper';
 import { ILoanChargeDoc, LoanCharge } from '../models/LoanCharges.model';
-import { BorrowerCompliance, IComplianceBorrowerDocument } from '../models/BorrowerCompliance.model';
+import { BorrowerCompliance, IComplianceBorrowerDoc } from '../models/BorrowerCompliance.model';
 import { ELoanTransactionTypes } from '../models/LoanTransaction.model';
 import { ELoanTypes } from '../enums/loan-types.enum';
 import { EEquipmentTypes } from '../enums/equipment-types.enum';
@@ -152,7 +152,7 @@ const productsDataMap = new Map<string, ReportRow>();
 const borrowersMap = new Map<string, IBorrowerDoc>();
 const productsMap = new Map<string, ILoanProductDoc>();
 const chargesMap = new Map<string, ILoanChargeDoc>();
-const complianceBorrowersMap = new Map<string, IComplianceBorrowerDocument>();
+const complianceBorrowersMap = new Map<string, IComplianceBorrowerDoc>();
 
 const allBorrowerSummaryRowFields = {
   commitmentAmount: {

package/models/BorrowerCompliance.model.d.ts

@@ -22,16 +22,17 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import mongoose, { Document } from 'mongoose';
+import mongoose, { Model } from 'mongoose';
 import { IBorrowerItemDocument, IEmailRecipient } from './ComplianceItem.model';
+import { IBorrowerDoc } from './Borrower.model';
 export interface IComplianceNote {
     note: string;
     date: Date;
     user?: string;
 }
-export interface IComplianceBorrowerDocument extends Document {
+export interface IComplianceBorrower {
     isVisible: boolean;
-    borrower: any;
+    borrower: mongoose.Types.ObjectId;
     complianceNotes?: IComplianceNote[];
     borrowerNotes?: IComplianceNote[];
     email?: string;
@@ -44,7 +45,29 @@ export interface IComplianceBorrowerDocument extends Document {
     lastEmailSentAt?: Date;
     items?: IBorrowerItemDocument[];
 }
-export interface IComplianceBorrowerDocumentFull extends Omit<IComplianceBorrowerDocument, 'items'> {
+export interface IComplianceBorrowerDoc extends IComplianceBorrower, mongoose.Document {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface IComplianceBorrowerLean extends IComplianceBorrower {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface IComplianceBorrowerPlain extends Omit<IComplianceBorrower, 'borrower'> {
+    _id: string;
+    borrower: string;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface IComplianceBorrowerWithBorrower extends Omit<IComplianceBorrowerLean, 'borrower'> {
+    borrower: IBorrowerDoc;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export type ComplianceBorrowerModel = Model<IComplianceBorrowerDoc>;
+export interface IComplianceBorrowerDocumentFull extends Omit<IComplianceBorrowerWithBorrower, 'items'> {
     items: IBorrowerItemDocument[];
 }
 export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
@@ -65,13 +88,13 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         user?: string;
     }>;
     mainEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
     financialEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
     items: mongoose.Types.DocumentArray<{
@@ -79,8 +102,8 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         updatedAt: NativeDate;
     } & {
         emailAddresses: mongoose.Types.DocumentArray<{
-            title?: string;
             email?: string;
+            title?: string;
             isActive?: boolean;
         }>;
         instances: mongoose.Types.DocumentArray<{
@@ -102,7 +125,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
-    __v?: number;
     isVisible?: boolean;
     email?: string;
     isEmailingActive?: boolean;
@@ -110,6 +132,7 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
     plaidAccessToken?: string;
     fundingStatus?: string;
     lastEmailSentAt?: Date;
+    __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
@@ -126,13 +149,13 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         user?: string;
     }>;
     mainEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
     financialEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
     items: mongoose.Types.DocumentArray<{
@@ -140,8 +163,8 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         updatedAt: NativeDate;
     } & {
         emailAddresses: mongoose.Types.DocumentArray<{
-            title?: string;
             email?: string;
+            title?: string;
             isActive?: boolean;
         }>;
         instances: mongoose.Types.DocumentArray<{
@@ -163,7 +186,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
-    __v?: number;
     isVisible?: boolean;
     email?: string;
     isEmailingActive?: boolean;
@@ -171,6 +193,7 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
     plaidAccessToken?: string;
     fundingStatus?: string;
     lastEmailSentAt?: Date;
+    __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
@@ -187,13 +210,13 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         user?: string;
     }>;
     mainEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
     financialEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
     items: mongoose.Types.DocumentArray<{
@@ -201,8 +224,8 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         updatedAt: NativeDate;
     } & {
         emailAddresses: mongoose.Types.DocumentArray<{
-            title?: string;
             email?: string;
+            title?: string;
             isActive?: boolean;
         }>;
         instances: mongoose.Types.DocumentArray<{
@@ -224,7 +247,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
-    __v?: number;
     isVisible?: boolean;
     email?: string;
     isEmailingActive?: boolean;
@@ -232,9 +254,10 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
     plaidAccessToken?: string;
     fundingStatus?: string;
     lastEmailSentAt?: Date;
+    __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;
-export declare const BorrowerCompliance: mongoose.Model<IComplianceBorrowerDocument, {}, {}, {}, mongoose.Document<unknown, {}, IComplianceBorrowerDocument> & IComplianceBorrowerDocument & {
+export declare const BorrowerCompliance: mongoose.Model<IComplianceBorrowerDoc, {}, {}, {}, mongoose.Document<unknown, {}, IComplianceBorrowerDoc> & IComplianceBorrowerDoc & Required<{
     _id: mongoose.Types.ObjectId;
-}, any>;
+}>, any>;

package/models/BorrowerCompliance.model.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BorrowerCompliance = exports.BorrowerComplianceSchema = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
-const mongooseLeanId = require('../plugins/id.plugin');
 const BorrowerComplianceInstanceSchema = new mongoose_1.default.Schema({
     nextDate: {
         type: Date,
@@ -45,7 +44,7 @@ const BorrowerComplianceInstanceSchema = new mongoose_1.default.Schema({
                 type: String,
                 required: false,
             },
-        }]
+        }],
 }, { timestamps: true });
 const BorrowerComplianceItemSchema = new mongoose_1.default.Schema({
     item: {
@@ -78,7 +77,7 @@ const BorrowerComplianceItemSchema = new mongoose_1.default.Schema({
                 required: false,
             },
         }],
-    instances: [BorrowerComplianceInstanceSchema]
+    instances: [BorrowerComplianceInstanceSchema],
 }, { timestamps: true });
 exports.BorrowerComplianceSchema = new mongoose_1.default.Schema({
     isVisible: {
@@ -186,5 +185,4 @@ exports.BorrowerComplianceSchema = new mongoose_1.default.Schema({
     items: [BorrowerComplianceItemSchema],
     __v: { type: Number, select: false },
 }, { timestamps: true });
-exports.BorrowerComplianceSchema.plugin(mongooseLeanId);
 exports.BorrowerCompliance = mongoose_1.default.model(_models_1.MODEL_NAMES.complianceBorrowers, exports.BorrowerComplianceSchema);

package/models/BorrowerCompliance.model.ts

@@ -1,12 +1,11 @@
-import mongoose, { Document } from 'mongoose';
+import mongoose, { Model } from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
 import {
   IBorrowerItemDocument,
   IEmailRecipient,
 } from './ComplianceItem.model';
-
-const mongooseLeanId = require('../plugins/id.plugin');
+import { IBorrowerDoc } from './Borrower.model';
 
 export interface IComplianceNote {
   note: string;
@@ -14,23 +13,50 @@ export interface IComplianceNote {
   user?: string;
 }
 
-export interface IComplianceBorrowerDocument extends Document {
+export interface IComplianceBorrower {
   isVisible: boolean;
-  borrower: any;
+  borrower: mongoose.Types.ObjectId;
   complianceNotes?: IComplianceNote[];
   borrowerNotes?: IComplianceNote[];
   email?: string;
   mainEmails?: IEmailRecipient[];
   financialEmails?: IEmailRecipient[];
   isEmailingActive?: boolean;
-  isDailyTransactionsEmailingActive? :boolean;
+  isDailyTransactionsEmailingActive?: boolean;
   plaidAccessToken?: string;
   fundingStatus?: string;
   lastEmailSentAt?: Date;
   items?: IBorrowerItemDocument[];
 }
 
-export interface IComplianceBorrowerDocumentFull extends Omit<IComplianceBorrowerDocument, 'items'> {
+export interface IComplianceBorrowerDoc extends IComplianceBorrower, mongoose.Document {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IComplianceBorrowerLean extends IComplianceBorrower {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IComplianceBorrowerPlain extends Omit<IComplianceBorrower, 'borrower'> {
+  _id: string;
+  borrower: string;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IComplianceBorrowerWithBorrower extends Omit<IComplianceBorrowerLean, 'borrower'> {
+  borrower: IBorrowerDoc;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export type ComplianceBorrowerModel = Model<IComplianceBorrowerDoc>;
+
+export interface IComplianceBorrowerDocumentFull extends Omit<IComplianceBorrowerWithBorrower, 'items'> {
   items: IBorrowerItemDocument[];
 }
 
@@ -72,7 +98,7 @@ const BorrowerComplianceInstanceSchema = new mongoose.Schema({
       type: String,
       required: false,
     },
-  }]
+  }],
 }, { timestamps: true });
 
 const BorrowerComplianceItemSchema = new mongoose.Schema({
@@ -106,7 +132,7 @@ const BorrowerComplianceItemSchema = new mongoose.Schema({
       required: false,
     },
   }],
-  instances: [BorrowerComplianceInstanceSchema]
+  instances: [BorrowerComplianceInstanceSchema],
 }, { timestamps: true });
 
 export const BorrowerComplianceSchema = new mongoose.Schema(
@@ -219,6 +245,4 @@ export const BorrowerComplianceSchema = new mongoose.Schema(
   { timestamps: true },
 );
 
-BorrowerComplianceSchema.plugin(mongooseLeanId);
-
-export const BorrowerCompliance = mongoose.model<IComplianceBorrowerDocument>(MODEL_NAMES.complianceBorrowers, BorrowerComplianceSchema);
+export const BorrowerCompliance = mongoose.model<IComplianceBorrowerDoc>(MODEL_NAMES.complianceBorrowers, BorrowerComplianceSchema);

package/models/_index.d.ts

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

package/package.json

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

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

@@ -25,7 +25,7 @@
 import mongoose from 'mongoose';
 import { IEmailRecipient } from '../models/ComplianceItem.model';
 import { IGroupedEmailsUpdate } from '../interfaces/email-addresses.interface';
-import { IComplianceBorrowerDocument, IComplianceBorrowerDocumentFull } from '../models/BorrowerCompliance.model';
+import { IComplianceBorrowerWithBorrower, IComplianceBorrowerDocumentFull } from '../models/BorrowerCompliance.model';
 import { IUserAccess } from '../interfaces/auth-user.interface';
 import { FileManagerService } from './file-manager.service';
 import { UploadsService } from './uploads.service';
@@ -45,7 +45,7 @@ export declare class ComplianceBorrowersService {
         };
     };
     getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<any>;
-    getAllBorrowersShortened(userAccess: IUserAccess): Promise<(Pick<IComplianceBorrowerDocument, "borrower" | "fundingStatus" | "items"> | {
+    getAllBorrowersShortened(userAccess: IUserAccess): Promise<(Pick<IComplianceBorrowerWithBorrower, "borrower" | "fundingStatus" | "items"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;
@@ -73,39 +73,39 @@ export declare class ComplianceBorrowersService {
                 _id: unknown;
             }>>;
         }[];
-        borrower: any;
+        borrower: import("../models/Borrower.model").IBorrowerDoc;
         fundingStatus?: string;
     })[]>;
     generateInstances(complianceBorrowerId: any): Promise<any>;
     calculateAndUpdateFundingStatus(complianceBorrowerId: string): Promise<void>;
     calculateFundingStatus(complianceBorrower: IComplianceBorrowerDocumentFull): string;
-    updateComplianceBorrower(complianceBorrower: IComplianceBorrowerDocumentFull): Promise<mongoose.Document<unknown, {}, IComplianceBorrowerDocument> & IComplianceBorrowerDocument & {
+    updateComplianceBorrower(complianceBorrower: IComplianceBorrowerDocumentFull): Promise<mongoose.Document<unknown, {}, import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc> & import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc & Required<{
         _id: mongoose.Types.ObjectId;
-    }>;
-    updateFundingStatus(complianceBorrowerId: string, fundingStatus: string): Promise<mongoose.Document<unknown, {}, IComplianceBorrowerDocument> & IComplianceBorrowerDocument & {
+    }>>;
+    updateFundingStatus(complianceBorrowerId: string, fundingStatus: string): Promise<mongoose.Document<unknown, {}, import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc> & import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc & Required<{
         _id: mongoose.Types.ObjectId;
-    }>;
-    updateLastEmailSent(complianceBorrowerId: string, lastEmailSentAt: Date): Promise<mongoose.Document<unknown, {}, IComplianceBorrowerDocument> & IComplianceBorrowerDocument & {
+    }>>;
+    updateLastEmailSent(complianceBorrowerId: string, lastEmailSentAt: Date): Promise<mongoose.Document<unknown, {}, import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc> & import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc & Required<{
         _id: mongoose.Types.ObjectId;
-    }>;
+    }>>;
     getAllBorrowersIds(onlyActive?: boolean): Promise<any[]>;
-    getBorrowerListByItemId(complianceItemId: string): Promise<Omit<mongoose.Document<unknown, {}, IComplianceBorrowerDocument> & IComplianceBorrowerDocument & {
+    getBorrowerListByItemId(complianceItemId: string): Promise<Omit<mongoose.Document<unknown, {}, import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc> & import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc & Required<{
         _id: mongoose.Types.ObjectId;
-    }, never>[]>;
+    }>, never>[]>;
     deleteInstanceById(complianceBorrowerId: string, complianceInstanceId: string): Promise<void>;
-    getBorrowerByInstanceId(complianceInstanceId: string): Promise<mongoose.Document<unknown, {}, IComplianceBorrowerDocument> & IComplianceBorrowerDocument & {
+    getBorrowerByInstanceId(complianceInstanceId: string): Promise<mongoose.Document<unknown, {}, import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc> & import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc & Required<{
         _id: mongoose.Types.ObjectId;
-    }>;
-    markInstanceFilesAsOld(complianceInstanceId: string): Promise<mongoose.Document<unknown, {}, IComplianceBorrowerDocument> & IComplianceBorrowerDocument & {
+    }>>;
+    markInstanceFilesAsOld(complianceInstanceId: string): Promise<mongoose.Document<unknown, {}, import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc> & import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc & Required<{
         _id: mongoose.Types.ObjectId;
-    }>;
-    getBorrowerWithPlaidToken(): Promise<(mongoose.Document<unknown, {}, IComplianceBorrowerDocument> & IComplianceBorrowerDocument & {
+    }>>;
+    getBorrowerWithPlaidToken(): Promise<(mongoose.Document<unknown, {}, import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc> & import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc & Required<{
         _id: mongoose.Types.ObjectId;
-    })[]>;
+    }>)[]>;
     getBorrowerEmails(userAccess: IUserAccess): Promise<{
         borrower: {
-            _id: any;
-            name: any;
+            _id: string;
+            name: string;
             borrowerId: any;
         };
         email: string;
@@ -122,9 +122,9 @@ export declare class ComplianceBorrowersService {
     }[]>;
     getOneBorrowerEmails(userAccess: any, borrowerId: any): Promise<{
         borrower: {
-            _id: any;
-            name: any;
-            borrowerId: any;
+            _id: string;
+            name: string;
+            borrowerId: string;
         };
         email: string;
         mainEmails: IEmailRecipient[];
@@ -142,9 +142,9 @@ export declare class ComplianceBorrowersService {
         mainEmails: IEmailRecipient[];
         financialEmails: IEmailRecipient[];
     }>;
-    updateBorrowerEmailAddresses(emailUpdate: IGroupedEmailsUpdate): Promise<mongoose.Document<unknown, {}, IComplianceBorrowerDocument> & IComplianceBorrowerDocument & {
+    updateBorrowerEmailAddresses(emailUpdate: IGroupedEmailsUpdate): Promise<mongoose.Document<unknown, {}, import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc> & import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc & Required<{
         _id: mongoose.Types.ObjectId;
-    }>;
+    }>>;
     toggleComplianceBorrowerVisibility(borrowerId: string, isVisible: boolean): Promise<void>;
     createComplianceBorrower(borrowerId: string, isVisible?: boolean): Promise<void>;
     removeIncorrectBorrowers(): Promise<void>;

package/services/compliance-borrowers.service.js

@@ -393,7 +393,8 @@ class ComplianceBorrowersService {
             .find(userAccess.allBorrowers ? {} : { 'borrower': { $in: userAccess.borrowersAccess } })
             .populate('borrower items.item')
             .collation({ locale: 'en' })
-            .sort({ 'borrower.name': 1 });
+            .sort({ 'borrower.name': 1 })
+            .lean();
         return allComplianceBorrower.map((b) => {
             const items = b.items.map((item) => {
                 return {
@@ -412,7 +413,7 @@ class ComplianceBorrowersService {
                 return;
             }
             return {
-                borrower: { _id: b.id, name: b.borrower?.name ?? '', borrowerId: b.borrower?.id ?? '' },
+                borrower: { _id: b._id.toString(), name: b.borrower?.name ?? '', borrowerId: b.borrower?.id ?? '' },
                 email: b.email,
                 mainEmails: b.mainEmails ?? [],
                 financialEmails: b.financialEmails ?? [],
@@ -429,7 +430,8 @@ class ComplianceBorrowersService {
             .findOne({ _id: borrowerId })
             .populate('borrower items.item')
             .collation({ locale: 'en' })
-            .sort({ 'borrower.name': 1 });
+            .sort({ 'borrower.name': 1 })
+            .lean();
         const items = borrower.items.map((item) => {
             return {
                 value: item.item?.id ?? null,
@@ -447,7 +449,7 @@ class ComplianceBorrowersService {
             return;
         }
         return {
-            borrower: { _id: borrower.id, name: borrower.borrower?.name ?? '', borrowerId: borrower.borrower?.id ?? '' },
+            borrower: { _id: borrower._id.toString(), name: borrower.borrower?.name ?? '', borrowerId: borrower.borrower?._id.toString() ?? '' },
             email: borrower.email,
             mainEmails: borrower.mainEmails ?? [],
             financialEmails: borrower.financialEmails ?? [],
@@ -540,7 +542,8 @@ class ComplianceBorrowersService {
         const borrowers = await BorrowerCompliance_model_1.BorrowerCompliance
             .find(userFilter)
             .populate('borrower')
-            .populate('items.item');
+            .populate('items.item')
+            .lean();
         const finalList = [
             ['borrower', 'due date', 'item', 'status'],
         ];
@@ -555,7 +558,7 @@ class ComplianceBorrowersService {
                     if (instance.status !== 'ACCEPTED') {
                         finalList.push([
                             borrower.borrower.name.trim(),
-                            instance.nextDate,
+                            instance.nextDate.toString(),
                             item.item.name.trim(),
                             instance.status,
                         ]);

package/services/compliance-borrowers.service.ts

@@ -7,7 +7,7 @@ import { IGroupedEmailsUpdate } from '../interfaces/email-addresses.interface';
 import { EItemProgressStatus } from '../enums/item-progress-status.enum';
 import {
   BorrowerCompliance,
-  IComplianceBorrowerDocument,
+  IComplianceBorrowerWithBorrower,
   IComplianceBorrowerDocumentFull,
 } from '../models/BorrowerCompliance.model';
 import { BorrowerModel } from '../models/Borrower.model';
@@ -130,7 +130,7 @@ export class ComplianceBorrowersService {
   }
 
   async getAllBorrowersShortened(userAccess: IUserAccess) {
-    type BorrowerComplianceShort = Pick<IComplianceBorrowerDocument, 'borrower' | 'fundingStatus' | 'items'>;
+    type BorrowerComplianceShort = Pick<IComplianceBorrowerWithBorrower, 'borrower' | 'fundingStatus' | 'items'>;
 
     const allComplianceBorrower: BorrowerComplianceShort[] = await BorrowerCompliance
       .find(userAccess.allBorrowers ? { isVisible: true } : {
@@ -426,11 +426,12 @@ export class ComplianceBorrowersService {
   }
 
   async getBorrowerEmails(userAccess: IUserAccess) {
-    const allComplianceBorrower: IComplianceBorrowerDocument[] = await BorrowerCompliance
+    const allComplianceBorrower = await BorrowerCompliance
       .find(userAccess.allBorrowers ? {} : { 'borrower': { $in: userAccess.borrowersAccess } })
       .populate('borrower items.item')
       .collation({ locale: 'en' })
-      .sort({ 'borrower.name': 1 });
+      .sort({ 'borrower.name': 1 })
+      .lean<IComplianceBorrowerWithBorrower[]>();
     return allComplianceBorrower.map((b) => {
       const items = b.items.map((item) => {
         return {
@@ -449,7 +450,7 @@ export class ComplianceBorrowersService {
         return;
       }
       return {
-        borrower: { _id: b.id, name: b.borrower?.name ?? '', borrowerId: b.borrower?.id ?? '' },
+        borrower: { _id: b._id.toString(), name: b.borrower?.name ?? '', borrowerId: b.borrower?.id ?? '' },
         email: b.email,
         mainEmails: b.mainEmails ?? [],
         financialEmails: b.financialEmails ?? [],
@@ -463,11 +464,12 @@ export class ComplianceBorrowersService {
   }
 
   async getOneBorrowerEmails(userAccess, borrowerId) {
-    const borrower: IComplianceBorrowerDocument = await BorrowerCompliance
+    const borrower = await BorrowerCompliance
       .findOne({ _id: borrowerId })
       .populate('borrower items.item')
       .collation({ locale: 'en' })
-      .sort({ 'borrower.name': 1 });
+      .sort({ 'borrower.name': 1 })
+      .lean<IComplianceBorrowerWithBorrower>();
     const items = borrower.items.map((item) => {
       return {
         value: item.item?.id ?? null,
@@ -485,7 +487,7 @@ export class ComplianceBorrowersService {
       return;
     }
     return {
-      borrower: { _id: borrower.id, name: borrower.borrower?.name ?? '', borrowerId: borrower.borrower?.id ?? '' },
+      borrower: { _id: borrower._id.toString(), name: borrower.borrower?.name ?? '', borrowerId: borrower.borrower?._id.toString() ?? '' },
       email: borrower.email,
       mainEmails: borrower.mainEmails ?? [],
       financialEmails: borrower.financialEmails ?? [],
@@ -587,6 +589,7 @@ export class ComplianceBorrowersService {
       .find(userFilter)
       .populate('borrower')
       .populate('items.item')
+      .lean<IComplianceBorrowerWithBorrower[]>()
     ;
     const finalList = [
       ['borrower', 'due date', 'item', 'status'],
@@ -602,7 +605,7 @@ export class ComplianceBorrowersService {
               if (instance.status !== 'ACCEPTED') {
                 finalList.push([
                   borrower.borrower.name.trim(),
-                  instance.nextDate,
+                  instance.nextDate.toString(),
                   item.item.name.trim(),
                   instance.status,
                 ]);

package/services/financial-compliance.service.ts

@@ -5,7 +5,7 @@ import { IEmail } from '../interfaces/email.interface';
 import { BorrowerModel } from '../models/Borrower.model';
 import { createMicroserviceTasks } from '../db/microservice-tasks.db';
 import { EMicroserviceTask } from '../enums/microservice-task.enum';
-import { BorrowerCompliance, IComplianceBorrowerDocument } from '../models/BorrowerCompliance.model';
+import { BorrowerCompliance, IComplianceBorrowerDoc } from '../models/BorrowerCompliance.model';
 
 import FinancialComplianceBorrower, {
   IFinancialComplianceBorrowerDocument,
@@ -122,7 +122,7 @@ export class FinancialComplianceService {
       fullBorrower.invoiceSentDate = fullBorrower.invoiceSentDate ?? financialSettings.invoiceSentDate;
       fullBorrower.stopFundingDate = fullBorrower.stopFundingDate ?? financialSettings.stopFundingDate;
       fullBorrower.dueDate = fullBorrower.dueDate ?? financialSettings.dueDate;
-      const foundBorrower: IComplianceBorrowerDocument = await BorrowerCompliance.findOne({ borrower: fullBorrower.borrower._id });
+      const foundBorrower: IComplianceBorrowerDoc = await BorrowerCompliance.findOne({ borrower: fullBorrower.borrower._id });
       if (!foundBorrower.isEmailingActive) {
         return;
       }
@@ -236,7 +236,7 @@ export class FinancialComplianceService {
       if (!borrower.borrower.active) {
         return;
       }
-      const foundBorrower: IComplianceBorrowerDocument = await BorrowerCompliance.findOne({ borrower: borrower.borrower._id });
+      const foundBorrower: IComplianceBorrowerDoc = await BorrowerCompliance.findOne({ borrower: borrower.borrower._id });
       return {
         ...borrower,
         isEmailingActive: foundBorrower?.isEmailingActive ?? true,