gemcap-be-common 1.5.71 → 1.5.73

package/models/BorrowerCompliance.model.d.ts

@@ -1,3 +1,7 @@
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />
@@ -23,7 +27,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Model } from 'mongoose';
-import { IBorrowerItemDocument, IEmailRecipient } from './ComplianceItem.model';
+import { IBorrowerItemLean, IEmailRecipient } from './ComplianceItem.model';
 import { IBorrowerDoc } from './Borrower.model';
 export interface IComplianceNote {
     note: string;
@@ -43,7 +47,7 @@ export interface IComplianceBorrower {
     plaidAccessToken?: string;
     fundingStatus?: string;
     lastEmailSentAt?: Date;
-    items?: IBorrowerItemDocument[];
+    items?: IBorrowerItemLean[];
 }
 export interface IComplianceBorrowerDoc extends IComplianceBorrower, mongoose.Document {
     _id: mongoose.Types.ObjectId;
@@ -71,7 +75,7 @@ export interface IComplianceBorrowerWithBorrower extends Omit<IComplianceBorrowe
 }
 export type ComplianceBorrowerModel = Model<IComplianceBorrowerDoc>;
 export interface IComplianceBorrowerDocumentFull extends Omit<IComplianceBorrowerWithBorrower, 'items'> {
-    items: IBorrowerItemDocument[];
+    items: IBorrowerItemLean[];
 }
 export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     timestamps: true;
@@ -91,13 +95,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<{
@@ -105,8 +109,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<{
@@ -128,7 +132,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
-    __v?: number;
     isVisible?: boolean;
     email?: string;
     isEmailingActive?: boolean;
@@ -136,6 +139,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;
@@ -152,13 +156,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<{
@@ -166,8 +170,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<{
@@ -189,7 +193,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
-    __v?: number;
     isVisible?: boolean;
     email?: string;
     isEmailingActive?: boolean;
@@ -197,6 +200,7 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
     plaidAccessToken?: string;
     fundingStatus?: string;
     lastEmailSentAt?: Date;
+    __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
@@ -213,13 +217,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<{
@@ -227,8 +231,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<{
@@ -250,7 +254,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
-    __v?: number;
     isVisible?: boolean;
     email?: string;
     isEmailingActive?: boolean;
@@ -258,6 +261,7 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
     plaidAccessToken?: string;
     fundingStatus?: string;
     lastEmailSentAt?: Date;
+    __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/BorrowerCompliance.model.ts

@@ -2,7 +2,7 @@ import mongoose, { Model } from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
 import {
-  IBorrowerItemDocument,
+  IBorrowerItemLean,
   IEmailRecipient,
 } from './ComplianceItem.model';
 import { IBorrowerDoc } from './Borrower.model';
@@ -26,7 +26,7 @@ export interface IComplianceBorrower {
   plaidAccessToken?: string;
   fundingStatus?: string;
   lastEmailSentAt?: Date;
-  items?: IBorrowerItemDocument[];
+  items?: IBorrowerItemLean[];
 }
 
 export interface IComplianceBorrowerDoc extends IComplianceBorrower, mongoose.Document {
@@ -61,7 +61,7 @@ export interface IComplianceBorrowerWithBorrower extends Omit<IComplianceBorrowe
 export type ComplianceBorrowerModel = Model<IComplianceBorrowerDoc>;
 
 export interface IComplianceBorrowerDocumentFull extends Omit<IComplianceBorrowerWithBorrower, 'items'> {
-  items: IBorrowerItemDocument[];
+  items: IBorrowerItemLean[];
 }
 
 const BorrowerComplianceInstanceSchema = new mongoose.Schema({

package/models/ComplianceItem.model.d.ts

@@ -1,3 +1,7 @@
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />
@@ -34,6 +38,9 @@ export interface IEmailRecipient {
     title?: string;
     isActive: boolean;
 }
+export interface IEmailRecipientLean extends IEmailRecipient {
+    _id?: mongoose.Types.ObjectId;
+}
 export interface IEmailRecipientDocument extends IEmailRecipient, Document {
 }
 export interface IComplianceItem {
@@ -63,12 +70,24 @@ export interface IBorrowerItemInstance {
     status: EComplianceItemStatus;
     files?: IComplianceFile[];
 }
+export interface IBorrowerItemInstanceLean extends IBorrowerItemInstance {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
 export interface IBorrowerItemInstanceDocument extends IBorrowerItemInstance, Document {
 }
 export interface IComplianceItemDocument extends IComplianceItem, Document {
 }
 export interface IBorrowerItemDocument extends IBorrowerItem, Document {
 }
+export interface IBorrowerItemLean extends Omit<IBorrowerItem, 'instances' | 'emailAddresses'> {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+    instances: IBorrowerItemInstanceLean[];
+    emailAddresses: IEmailRecipientLean[];
+}
 export declare const ComplianceItemSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     timestamps: true;
 }, {

package/models/ComplianceItem.model.ts

@@ -1,6 +1,7 @@
 import mongoose, { Document } from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
+import { IComplianceBorrower } from './BorrowerCompliance.model';
 
 const mongooseLeanId = require('../plugins/id.plugin');
 
@@ -17,6 +18,10 @@ export interface IEmailRecipient {
   isActive: boolean;
 }
 
+export interface IEmailRecipientLean extends IEmailRecipient {
+  _id?: mongoose.Types.ObjectId;
+}
+
 export interface IEmailRecipientDocument extends IEmailRecipient, Document {
 }
 
@@ -51,6 +56,12 @@ export interface IBorrowerItemInstance {
   files?: IComplianceFile[];
 }
 
+export interface IBorrowerItemInstanceLean extends IBorrowerItemInstance {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
 export interface IBorrowerItemInstanceDocument extends IBorrowerItemInstance, Document {
 }
 
@@ -60,6 +71,14 @@ export interface IComplianceItemDocument extends IComplianceItem, Document {
 export interface IBorrowerItemDocument extends IBorrowerItem, Document {
 }
 
+export interface IBorrowerItemLean extends Omit<IBorrowerItem, 'instances' | 'emailAddresses'> {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+  instances: IBorrowerItemInstanceLean[];
+  emailAddresses: IEmailRecipientLean[];
+}
+
 export const ComplianceItemSchema = new mongoose.Schema(
   {
     name: {
@@ -81,7 +100,7 @@ export const ComplianceItemSchema = new mongoose.Schema(
     },
     __v: { type: Number, select: false },
   },
-  { timestamps: true }
+  { timestamps: true },
 );
 
 ComplianceItemSchema.plugin(mongooseLeanId);

package/models/FinancialCompliance.model.d.ts

@@ -1,3 +1,8 @@
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />
@@ -34,52 +39,52 @@ export interface IFinancialComplianceSettings {
 export interface IFinancialComplianceSettingsDocument extends IFinancialComplianceSettings, Document {
 }
 export declare const FinancialComplianceSettingsSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, {
-    isDeleted: boolean;
     financialEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
+    isDeleted: boolean;
     managementEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
     __v?: number;
-    invoiceSentDate?: Date;
     dueDate?: Date;
+    invoiceSentDate?: Date;
     stopFundingDate?: Date;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
-    isDeleted: boolean;
     financialEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
+    isDeleted: boolean;
     managementEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
     __v?: number;
-    invoiceSentDate?: Date;
     dueDate?: Date;
+    invoiceSentDate?: Date;
     stopFundingDate?: Date;
 }>> & mongoose.FlatRecord<{
-    isDeleted: boolean;
     financialEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
+    isDeleted: boolean;
     managementEmails: mongoose.Types.DocumentArray<{
-        title?: string;
         email?: string;
+        title?: string;
         isActive?: boolean;
     }>;
     __v?: number;
-    invoiceSentDate?: Date;
     dueDate?: Date;
+    invoiceSentDate?: Date;
     stopFundingDate?: Date;
 }> & {
     _id: mongoose.Types.ObjectId;

package/models/FinancialComplianceBorrower.model.d.ts

@@ -1,3 +1,8 @@
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />
@@ -53,11 +58,11 @@ export interface IFinancialComplianceBorrowerDocumentWithMails extends IFinancia
     financialEmails: IEmailRecipient[];
 }
 export declare const FinancialComplianceBorrowerSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, {
-    isDeleted: boolean;
     borrower: mongoose.Types.ObjectId;
+    isDeleted: boolean;
     __v?: number;
-    invoiceSentDate?: Date;
     dueDate?: Date;
+    invoiceSentDate?: Date;
     stopFundingDate?: Date;
     lastReminderSentAt?: Date;
     accountClearedDate?: Date;
@@ -69,11 +74,11 @@ export declare const FinancialComplianceBorrowerSchema: mongoose.Schema<any, mon
     balanceOutstanding?: number;
     reminderCounter?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
-    isDeleted: boolean;
     borrower: mongoose.Types.ObjectId;
+    isDeleted: boolean;
     __v?: number;
-    invoiceSentDate?: Date;
     dueDate?: Date;
+    invoiceSentDate?: Date;
     stopFundingDate?: Date;
     lastReminderSentAt?: Date;
     accountClearedDate?: Date;
@@ -85,11 +90,11 @@ export declare const FinancialComplianceBorrowerSchema: mongoose.Schema<any, mon
     balanceOutstanding?: number;
     reminderCounter?: number;
 }>> & mongoose.FlatRecord<{
-    isDeleted: boolean;
     borrower: mongoose.Types.ObjectId;
+    isDeleted: boolean;
     __v?: number;
-    invoiceSentDate?: Date;
     dueDate?: Date;
+    invoiceSentDate?: Date;
     stopFundingDate?: Date;
     lastReminderSentAt?: Date;
     accountClearedDate?: Date;

package/models/_index.d.ts

@@ -35,44 +35,44 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        apDate: Date;
+        order: number;
         amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
-        order: number;
+        apDate: Date;
+        __v?: number;
         poNumber?: string;
         customerName?: string;
         otherInformation1?: string;
         otherInformation2?: string;
         otherInformation3?: string;
-        __v?: number;
     }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        apDate: Date;
+        order: number;
         amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
-        order: number;
+        apDate: Date;
+        __v?: number;
         poNumber?: string;
         customerName?: string;
         otherInformation1?: string;
         otherInformation2?: string;
         otherInformation3?: string;
-        __v?: number;
     }>> & import("mongoose").FlatRecord<{
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        apDate: Date;
+        order: number;
         amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
-        order: number;
+        apDate: Date;
+        __v?: number;
         poNumber?: string;
         customerName?: string;
         otherInformation1?: string;
         otherInformation2?: string;
         otherInformation3?: string;
-        __v?: number;
     }> & {
         _id: import("mongoose").Types.ObjectId;
     }>;

package/package.json

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

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

@@ -1,11 +1,5 @@
-/// <reference types="mongoose/types/collection" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/models" />
-/// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/document" />
 /// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/document" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />
@@ -31,7 +25,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose from 'mongoose';
-import { IBorrowerItemDocument, IBorrowerItemInstanceDocument, IEmailRecipient } from '../models/ComplianceItem.model';
+import { IBorrowerItemLean, IBorrowerItemInstance, IComplianceFile, IEmailRecipient, IBorrowerItemInstanceLean } from '../models/ComplianceItem.model';
 import { IGroupedEmailsUpdate } from '../interfaces/email-addresses.interface';
 import { IComplianceBorrowerWithBorrower, IComplianceBorrowerDocumentFull, IComplianceBorrowerWithPlaidToken } from '../models/BorrowerCompliance.model';
 import { IUserAccess } from '../interfaces/auth-user.interface';
@@ -47,48 +41,27 @@ export interface IInstanceStatus {
         tooltip: string;
     };
 }
+export interface IBorrowerItemInstanceWithStatusesLean extends IBorrowerItemInstanceLean, IInstanceStatus {
+    itemId: mongoose.Types.ObjectId;
+    files: (IComplianceFile & {
+        uploadedByUser: string | null;
+    })[];
+}
+export interface IBorrowerItemWithStatusesLean extends Omit<IBorrowerItemLean, 'instances'> {
+    instances: IBorrowerItemInstanceWithStatusesLean[];
+}
 export declare class ComplianceBorrowersService {
     private readonly _fileManagerService;
     private readonly _uploadsService;
     constructor(_fileManagerService: FileManagerService, _uploadsService: UploadsService);
     isComplianceBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean;
-    calculateInstanceStatuses(instance: IBorrowerItemInstanceDocument, item: IBorrowerItemDocument): IInstanceStatus;
+    calculateInstanceStatuses(instance: IBorrowerItemInstance, item: IBorrowerItemLean): IInstanceStatus;
     getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<IComplianceBorrowerDocumentFull & {
-        items: IBorrowerItemDocument[];
+        items: IBorrowerItemWithStatusesLean[];
     }>;
-    getAllBorrowersShortened(userAccess: IUserAccess): Promise<(Pick<IComplianceBorrowerWithBorrower, "items" | "borrower" | "fundingStatus"> | {
-        items: {
-            instances: any[];
-            item: import("../models/ComplianceItem.model").IComplianceItemDocument;
-            startDate: Date;
-            frequency: string;
-            emailAddresses: import("../models/ComplianceItem.model").IEmailRecipientDocument[];
-            _id?: any;
-            __v?: any;
-            $locals: Record<string, unknown>;
-            $op: "save" | "validate" | "remove";
-            $where: Record<string, unknown>;
-            baseModelName?: string;
-            collection: mongoose.Collection<mongoose.mongo.BSON.Document>;
-            db: mongoose.Connection;
-            errors?: mongoose.Error.ValidationError;
-            id?: any;
-            isNew: boolean;
-            schema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, {
-                [x: string]: unknown;
-            }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
-                [x: string]: unknown;
-            }>> & mongoose.FlatRecord<{
-                [x: string]: unknown;
-            }> & Required<{
-                _id: unknown;
-            }>>;
-        }[];
-        borrower: import("../models/Borrower.model").IBorrowerDoc;
-        fundingStatus?: string;
-    })[]>;
+    getAllBorrowersShortened(userAccess: IUserAccess): Promise<Pick<IComplianceBorrowerWithBorrower, "borrower" | "fundingStatus" | "items">[]>;
     generateInstances(complianceBorrowerId: any): Promise<IComplianceBorrowerDocumentFull & {
-        items: IBorrowerItemDocument[];
+        items: IBorrowerItemWithStatusesLean[];
     }>;
     calculateAndUpdateFundingStatus(complianceBorrowerId: string): Promise<void>;
     calculateFundingStatus(complianceBorrower: IComplianceBorrowerDocumentFull): string;

package/services/compliance-borrowers.service.js

@@ -82,7 +82,7 @@ class ComplianceBorrowersService {
             .transform((borrower) => ({ ...borrower, plaidAccessToken: borrower?.plaidAccessToken ?? false }))
             .lean();
         if (!ourBorrower.borrower) {
-            return Promise.resolve({ ...ourBorrower });
+            return Promise.resolve({ ...ourBorrower, items: [] });
         }
         const financeBorrower = await FinancialComplianceBorrower_model_1.default.findOne({ borrower: ourBorrower.borrower?._id });
         if (financeBorrower) {
@@ -114,7 +114,7 @@ class ComplianceBorrowersService {
                 }, []),
             };
         });
-        return Promise.resolve({ ...ourBorrower, ...items });
+        return Promise.resolve({ ...ourBorrower, items });
     }
     async getAllBorrowersShortened(userAccess) {
         const allComplianceBorrower = await BorrowerCompliance_model_1.BorrowerCompliance

package/services/compliance-borrowers.service.ts

@@ -3,10 +3,10 @@ import _ from 'lodash';
 import mongoose from 'mongoose';
 
 import {
-  IBorrowerItemDocument,
-  IBorrowerItemInstanceDocument,
+  IBorrowerItemLean,
+  IBorrowerItemInstance,
   IComplianceFile,
-  IEmailRecipient,
+  IEmailRecipient, IBorrowerItemInstanceLean,
 } from '../models/ComplianceItem.model';
 import { IGroupedEmailsUpdate } from '../interfaces/email-addresses.interface';
 import { EItemProgressStatus } from '../enums/item-progress-status.enum';
@@ -51,6 +51,15 @@ export interface IInstanceStatus {
   };
 }
 
+export interface IBorrowerItemInstanceWithStatusesLean extends IBorrowerItemInstanceLean, IInstanceStatus {
+  itemId: mongoose.Types.ObjectId;
+  files: (IComplianceFile & { uploadedByUser: string | null; })[];
+}
+
+export interface IBorrowerItemWithStatusesLean extends Omit<IBorrowerItemLean, 'instances'> {
+  instances: IBorrowerItemInstanceWithStatusesLean[];
+}
+
 export class ComplianceBorrowersService {
 
   constructor(
@@ -67,7 +76,7 @@ export class ComplianceBorrowersService {
     return true;
   }
 
-  calculateInstanceStatuses(instance: IBorrowerItemInstanceDocument, item: IBorrowerItemDocument): IInstanceStatus {
+  calculateInstanceStatuses(instance: IBorrowerItemInstance, item: IBorrowerItemLean): IInstanceStatus {
     let progress: { text: string, status: string };
     let score: { value: number, tooltip: string } = null;
     if (instance.submittedDate) {
@@ -93,7 +102,9 @@ export class ComplianceBorrowersService {
     return { progress, score };
   }
 
-  async getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<IComplianceBorrowerDocumentFull & { items: IBorrowerItemDocument[] }> {
+  async getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<IComplianceBorrowerDocumentFull & {
+    items: IBorrowerItemWithStatusesLean[];
+  }> {
     if (!complianceBorrowerId) {
       return null;
     }
@@ -111,7 +122,7 @@ export class ComplianceBorrowersService {
       .transform((borrower) => ({ ...borrower, plaidAccessToken: borrower?.plaidAccessToken ?? false }))
       .lean<IComplianceBorrowerDocumentFull>();
     if (!ourBorrower.borrower) {
-      return Promise.resolve({ ...ourBorrower });
+      return Promise.resolve({ ...ourBorrower, items: [] });
     }
     const financeBorrower = await FinancialComplianceBorrower.findOne({ borrower: ourBorrower.borrower?._id });
     if (financeBorrower) {
@@ -125,7 +136,7 @@ export class ComplianceBorrowersService {
       return Promise.resolve(null);
     }
 
-    const items = { items: [] as IBorrowerItemDocument[], ...ourBorrower }.items.map((item) => {
+    const items = { items: [] as IBorrowerItemLean[], ...ourBorrower }.items.map((item) => {
       return {
         ...item,
         instances: item.instances.reduce((acc, instance) => {
@@ -140,13 +151,10 @@ export class ComplianceBorrowersService {
             console.error({ e });
             return acc;
           }
-        }, <(IBorrowerItemInstanceDocument & IInstanceStatus & {
-          itemId: mongoose.Types.ObjectId,
-          files: IComplianceFile[]
-        })[]>[]),
+        }, [] as IBorrowerItemInstanceWithStatusesLean[]),
       };
     });
-    return Promise.resolve({ ...ourBorrower, ...items });
+    return Promise.resolve({ ...ourBorrower, items });
   }
 
   async getAllBorrowersShortened(userAccess: IUserAccess) {
@@ -190,7 +198,7 @@ export class ComplianceBorrowersService {
             } catch (e) {
               return acc;
             }
-          }, []),
+          }, [] as IBorrowerItemInstanceWithStatusesLean[]),
         };
       });
 
@@ -204,7 +212,7 @@ export class ComplianceBorrowersService {
   async generateInstances(complianceBorrowerId) {
     const complianceBorrower = await this.getFullComplianceBorrowerById(complianceBorrowerId);
 
-    const getLatestInstanceDate = (item: IBorrowerItemDocument) => {
+    const getLatestInstanceDate = (item: IBorrowerItemLean) => {
       if (!item.instances || !item.instances.length) {
         return null;
       }