gemcap-be-common 1.5.72 → 1.5.74

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,19 @@ 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 interface IComplianceBorrowerDocumentFullWithStatuses extends Omit<IComplianceBorrowerDocumentFull, 'items'> {
+  items: IBorrowerItemWithStatusesLean[];
+}
+
 export class ComplianceBorrowersService {
 
   constructor(
@@ -67,7 +80,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 +106,7 @@ export class ComplianceBorrowersService {
     return { progress, score };
   }
 
-  async getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<IComplianceBorrowerDocumentFull & { items: IBorrowerItemDocument[] }> {
+  async getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<IComplianceBorrowerDocumentFullWithStatuses> {
     if (!complianceBorrowerId) {
       return null;
     }
@@ -111,7 +124,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 +138,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 +153,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 +200,7 @@ export class ComplianceBorrowersService {
             } catch (e) {
               return acc;
             }
-          }, []),
+          }, [] as IBorrowerItemInstanceWithStatusesLean[]),
         };
       });
 
@@ -204,7 +214,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;
       }

package/services/file-manager.service.d.ts

@@ -40,6 +40,6 @@ export declare class FileManagerService {
     findItemByInstanceId(instanceId: any): Promise<any[]>;
     getFilesNewerThanDate(date: Date): Promise<BorrowerWithFiles[]>;
     deleteFile(complianceBorrowerId: string, fileId: string): Promise<void>;
-    getFilesByBorrowerId(borrowerId: string): Promise<import("../models/ComplianceItem.model").IBorrowerItemDocument[]>;
+    getFilesByBorrowerId(borrowerId: string): Promise<import("../models/ComplianceItem.model").IBorrowerItemLean[]>;
     updateAWSID(itemId: any, instanceId: any, fileId: any, awsFileId: any): Promise<void>;
 }

package/services/quickbooks.service.d.ts

@@ -1,5 +1,5 @@
-/// <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" />

package/services/users.service.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />