gemcap-be-common 1.4.237 → 1.4.240

package/models/BorrowerCompliance.model.d.ts

@@ -24,6 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Model } from 'mongoose';
 import { IBorrowerItemDocument, IEmailRecipient } from './ComplianceItem.model';
+import { IBorrowerDoc } from './Borrower.model';
 export interface IComplianceNote {
     note: string;
     date: Date;
@@ -31,7 +32,7 @@ export interface IComplianceNote {
 }
 export interface IComplianceBorrower {
     isVisible: boolean;
-    borrower: any;
+    borrower: mongoose.Types.ObjectId;
     complianceNotes?: IComplianceNote[];
     borrowerNotes?: IComplianceNote[];
     email?: string;
@@ -54,13 +55,19 @@ export interface IComplianceBorrowerLean extends IComplianceBorrower {
     createdAt: Date;
     updatedAt: Date;
 }
-export interface IComplianceBorrowerPlain extends IComplianceBorrower {
+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<IComplianceBorrowerDoc, 'items'> {
+export interface IComplianceBorrowerDocumentFull extends Omit<IComplianceBorrowerWithBorrower, 'items'> {
     items: IBorrowerItemDocument[];
 }
 export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
@@ -69,6 +76,27 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    borrower: mongoose.Types.ObjectId;
+    complianceNotes: mongoose.Types.DocumentArray<{
+        date: Date;
+        note: string;
+        user?: string;
+    }>;
+    borrowerNotes: mongoose.Types.DocumentArray<{
+        date: Date;
+        note: string;
+        user?: string;
+    }>;
+    mainEmails: mongoose.Types.DocumentArray<{
+        email?: string;
+        title?: string;
+        isActive?: boolean;
+    }>;
+    financialEmails: mongoose.Types.DocumentArray<{
+        email?: string;
+        title?: string;
+        isActive?: boolean;
+    }>;
     items: mongoose.Types.DocumentArray<{
         createdAt: NativeDate;
         updatedAt: NativeDate;
@@ -97,6 +125,18 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
+    isVisible?: boolean;
+    email?: string;
+    isEmailingActive?: boolean;
+    isDailyTransactionsEmailingActive?: boolean;
+    plaidAccessToken?: string;
+    fundingStatus?: string;
+    lastEmailSentAt?: Date;
+    __v?: number;
+}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
     borrower: mongoose.Types.ObjectId;
     complianceNotes: mongoose.Types.DocumentArray<{
         date: Date;
@@ -118,18 +158,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         title?: string;
         isActive?: boolean;
     }>;
-    isVisible?: boolean;
-    email?: string;
-    isEmailingActive?: boolean;
-    isDailyTransactionsEmailingActive?: boolean;
-    plaidAccessToken?: string;
-    fundingStatus?: string;
-    lastEmailSentAt?: Date;
-    __v?: number;
-}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
     items: mongoose.Types.DocumentArray<{
         createdAt: NativeDate;
         updatedAt: NativeDate;
@@ -158,6 +186,18 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
+    isVisible?: boolean;
+    email?: string;
+    isEmailingActive?: boolean;
+    isDailyTransactionsEmailingActive?: boolean;
+    plaidAccessToken?: string;
+    fundingStatus?: string;
+    lastEmailSentAt?: Date;
+    __v?: number;
+}>> & mongoose.FlatRecord<{
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
     borrower: mongoose.Types.ObjectId;
     complianceNotes: mongoose.Types.DocumentArray<{
         date: Date;
@@ -179,18 +219,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         title?: string;
         isActive?: boolean;
     }>;
-    isVisible?: boolean;
-    email?: string;
-    isEmailingActive?: boolean;
-    isDailyTransactionsEmailingActive?: boolean;
-    plaidAccessToken?: string;
-    fundingStatus?: string;
-    lastEmailSentAt?: Date;
-    __v?: number;
-}>> & mongoose.FlatRecord<{
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
     items: mongoose.Types.DocumentArray<{
         createdAt: NativeDate;
         updatedAt: NativeDate;
@@ -219,27 +247,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
-    borrower: mongoose.Types.ObjectId;
-    complianceNotes: mongoose.Types.DocumentArray<{
-        date: Date;
-        note: string;
-        user?: string;
-    }>;
-    borrowerNotes: mongoose.Types.DocumentArray<{
-        date: Date;
-        note: string;
-        user?: string;
-    }>;
-    mainEmails: mongoose.Types.DocumentArray<{
-        email?: string;
-        title?: string;
-        isActive?: boolean;
-    }>;
-    financialEmails: mongoose.Types.DocumentArray<{
-        email?: string;
-        title?: string;
-        isActive?: boolean;
-    }>;
     isVisible?: boolean;
     email?: string;
     isEmailingActive?: boolean;

package/models/BorrowerCompliance.model.ts

@@ -5,6 +5,7 @@ import {
   IBorrowerItemDocument,
   IEmailRecipient,
 } from './ComplianceItem.model';
+import { IBorrowerDoc } from './Borrower.model';
 
 export interface IComplianceNote {
   note: string;
@@ -14,7 +15,7 @@ export interface IComplianceNote {
 
 export interface IComplianceBorrower {
   isVisible: boolean;
-  borrower: any;
+  borrower: mongoose.Types.ObjectId;
   complianceNotes?: IComplianceNote[];
   borrowerNotes?: IComplianceNote[];
   email?: string;
@@ -40,15 +41,22 @@ export interface IComplianceBorrowerLean extends IComplianceBorrower {
   updatedAt: Date;
 }
 
-export interface IComplianceBorrowerPlain extends IComplianceBorrower {
+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<IComplianceBorrowerDoc, 'items'> {
+export interface IComplianceBorrowerDocumentFull extends Omit<IComplianceBorrowerWithBorrower, 'items'> {
   items: IBorrowerItemDocument[];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.4.237",
+  "version": "1.4.240",
   "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 { IComplianceBorrowerDoc, 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<IComplianceBorrowerDoc, "items" | "borrower" | "fundingStatus"> | {
+    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, {}, IComplianceBorrowerDoc> & IComplianceBorrowerDoc & Required<{
+    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, {}, IComplianceBorrowerDoc> & IComplianceBorrowerDoc & Required<{
+    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, {}, IComplianceBorrowerDoc> & IComplianceBorrowerDoc & Required<{
+    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, {}, IComplianceBorrowerDoc> & IComplianceBorrowerDoc & Required<{
+    getBorrowerListByItemId(complianceItemId: string): Promise<Omit<mongoose.Document<unknown, {}, import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc> & import("../models/BorrowerCompliance.model").IComplianceBorrowerDoc & Required<{
         _id: mongoose.Types.ObjectId;
     }>, never>[]>;
     deleteInstanceById(complianceBorrowerId: string, complianceInstanceId: string): Promise<void>;
-    getBorrowerByInstanceId(complianceInstanceId: string): Promise<mongoose.Document<unknown, {}, IComplianceBorrowerDoc> & IComplianceBorrowerDoc & Required<{
+    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, {}, IComplianceBorrowerDoc> & IComplianceBorrowerDoc & Required<{
+    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, {}, IComplianceBorrowerDoc> & IComplianceBorrowerDoc & Required<{
+    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,7 +142,7 @@ export declare class ComplianceBorrowersService {
         mainEmails: IEmailRecipient[];
         financialEmails: IEmailRecipient[];
     }>;
-    updateBorrowerEmailAddresses(emailUpdate: IGroupedEmailsUpdate): Promise<mongoose.Document<unknown, {}, IComplianceBorrowerDoc> & IComplianceBorrowerDoc & Required<{
+    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>;

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,
-  IComplianceBorrowerDoc,
+  IComplianceBorrowerWithBorrower,
   IComplianceBorrowerDocumentFull,
 } from '../models/BorrowerCompliance.model';
 import { BorrowerModel } from '../models/Borrower.model';
@@ -92,7 +92,7 @@ export class ComplianceBorrowersService {
       //   populate: { path: 'instances.files.uploadedBy', model: MODEL_NAMES.users },
       // }) // TODO remove this when we have a better way to handle users
       .transform((borrower) => ({ ...borrower, plaidAccessToken: borrower?.plaidAccessToken ?? false }))
-      .lean() as IComplianceBorrowerDocumentFull;
+      .lean<IComplianceBorrowerDocumentFull>();
     if (!ourBorrower.borrower) {
       return Promise.resolve({ ...ourBorrower });
     }
@@ -130,9 +130,9 @@ export class ComplianceBorrowersService {
   }
 
   async getAllBorrowersShortened(userAccess: IUserAccess) {
-    type BorrowerComplianceShort = Pick<IComplianceBorrowerDoc, 'borrower' | 'fundingStatus' | 'items'>;
+    type BorrowerComplianceShort = Pick<IComplianceBorrowerWithBorrower, 'borrower' | 'fundingStatus' | 'items'>;
 
-    const allComplianceBorrower: BorrowerComplianceShort[] = await BorrowerCompliance
+    const allComplianceBorrower = await BorrowerCompliance
       .find(userAccess.allBorrowers ? { isVisible: true } : {
         'borrower': { $in: userAccess.borrowersAccess },
         isVisible: true,
@@ -143,7 +143,7 @@ export class ComplianceBorrowersService {
         populate: { path: 'item', model: 'complianceItems' },
       })
       .collation({ locale: 'en' })
-      .lean();
+      .lean<BorrowerComplianceShort[]>();
     const borrowers = await Promise.all(allComplianceBorrower.map(async (borrower) => {
       if (!borrower.borrower) {
         return borrower;
@@ -426,11 +426,12 @@ export class ComplianceBorrowersService {
   }
 
   async getBorrowerEmails(userAccess: IUserAccess) {
-    const allComplianceBorrower: IComplianceBorrowerDoc[] = 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: IComplianceBorrowerDoc = 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/loan-transactions.service.d.ts

@@ -155,7 +155,7 @@ export declare class LoanTransactionsService {
     getTransactionReport(transactionIds: string[], borrowerId: string, effectiveDate: Date): Promise<{
         transactionIdsToMark: string[];
         transactions: {
-            [x: string]: (string | number | Date | string[])[];
+            [x: string]: (string | number | string[] | Date)[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{