gemcap-be-common 1.5.130 → 1.5.131

package/db/brokers.db.d.ts

@@ -26,23 +26,19 @@
 import mongoose from 'mongoose';
 import { ILedgerDataRow } from './reports.db';
 import { ILoanProductDoc } from '../models/LoanProducts.model';
-import { IProductBrokerDocWithLoanBroker } from '../models/ProductBroker.model';
+import { IProductBrokerDocWithLoanBroker, IProductBrokerLean } from '../models/ProductBroker.model';
 export declare const getProductBrokers: (productId: string) => Promise<IProductBrokerDocWithLoanBroker[]>;
 export declare const enrichWithBrokers: (transactions: ILedgerDataRow[], product: ILoanProductDoc) => Promise<ILedgerDataRow[]>;
-export declare const getBorrowerBrokers: (borrowerId: string) => Promise<(mongoose.FlattenMaps<import("../models/ProductBroker.model").IProductBroker> & {
-    _id: mongoose.Types.ObjectId;
-})[]>;
-export declare const getAllProductBrokers: () => Promise<(mongoose.FlattenMaps<import("../models/ProductBroker.model").IProductBroker> & {
-    _id: mongoose.Types.ObjectId;
-})[]>;
+export declare const getBorrowerBrokers: (borrowerId: string) => Promise<IProductBrokerLean[]>;
+export declare const getAllProductBrokers: () => Promise<IProductBrokerLean[]>;
 export declare const getAllLoanBrokers: () => Promise<{
-    emails: mongoose.FlattenMaps<import("../models/LoanBroker.model").ILoanBrokerEmail>[];
+    emails: import("../models/LoanBroker.model").ILoanBrokerEmail[];
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
     uiId: string;
     order: number;
     active: boolean;
     name: string;
-    _id: mongoose.Types.ObjectId;
 }[]>;
-export declare const getBrokerProducts: (loanBrokerId: string) => Promise<(mongoose.FlattenMaps<import("../models/ProductBroker.model").IProductBroker> & {
-    _id: mongoose.Types.ObjectId;
-})[]>;
+export declare const getBrokerProducts: (loanBrokerId: string) => Promise<IProductBrokerLean[]>;

package/db/brokers.db.ts

@@ -4,8 +4,8 @@ import mongoose from 'mongoose';
 import { MODEL_NAMES } from '../models/_models';
 import { EChargeType, ILedgerDataRow } from './reports.db';
 import { ILoanProductDoc } from '../models/LoanProducts.model';
-import { IProductBrokerDocWithLoanBroker, ProductBroker } from '../models/ProductBroker.model';
-import { LoanBroker } from '../models/LoanBroker.model';
+import { IProductBrokerDocWithLoanBroker, IProductBrokerLean, ProductBroker } from '../models/ProductBroker.model';
+import { ILoanBrokerLean, LoanBroker } from '../models/LoanBroker.model';
 
 export const getProductBrokers = async (productId: string) => {
   return ProductBroker.aggregate<IProductBrokerDocWithLoanBroker>([
@@ -65,21 +65,21 @@ export const getBorrowerBrokers = async (borrowerId: string) => {
   return ProductBroker
     .find({ borrowerId }, { createdAt: 0, updatedAt: 0, __v: 0 })
     .sort({ order: 1 })
-    .lean();
+    .lean<IProductBrokerLean[]>();
 };
 
 export const getAllProductBrokers = async () => {
   return ProductBroker
     .find({}, { createdAt: 0, updatedAt: 0, __v: 0 })
     .sort({ order: 1 })
-    .lean();
+    .lean<IProductBrokerLean[]>();
 };
 
 export const getAllLoanBrokers = async () => {
   const results = await LoanBroker
     .find({}, { createdAt: 0, updatedAt: 0, __v: 0 })
     .sort({ order: 1 })
-    .lean();
+    .lean<ILoanBrokerLean[]>();
   return results.map((result) => ({
     ...result,
     emails: result.emails ?? [],
@@ -90,5 +90,5 @@ export const getBrokerProducts = async (loanBrokerId: string) => {
   return ProductBroker
     .find({ loanBrokerId }, { createdAt: 0, updatedAt: 0, __v: 0 })
     .sort({ order: 1, BSCode: 1, PLCode: 1 })
-    .lean();
+    .lean<IProductBrokerLean[]>();
 };

package/package.json

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

package/services/borrowers.service.d.ts

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

package/services/brokers.service.d.ts

@@ -44,24 +44,22 @@ export declare class BrokersService {
     private readonly loanChargesService;
     constructor(loanChargesService: LoanChargesService);
     normalizeObjects(): Promise<void>;
-    getAllProductBrokers(): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBroker> & {
-        _id: import("mongoose").Types.ObjectId;
-    })[]>;
-    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBroker> & {
-        _id: import("mongoose").Types.ObjectId;
-    })[]>;
+    getAllProductBrokers(): Promise<import("../models/ProductBroker.model").IProductBrokerLean[]>;
+    getBorrowerBrokers(borrowerId: string): Promise<import("../models/ProductBroker.model").IProductBrokerLean[] | BrokerView[]>;
     getProductBrokers(productId: string): Promise<import("../models/ProductBroker.model").IProductBrokerDocWithLoanBroker[]>;
     getTotalShares(borrowerId: string, brokers: IProductBrokerView[], replaceNames?: boolean): Promise<ProductTotal>;
     getTotals(borrowerId: string): Promise<BrokerTotalView[]>;
     checkTotalShares(borrowerId: string, brokers: IProductBrokerView[]): Promise<boolean>;
     saveProductBrokers(borrowerId: string, brokers: IProductBrokerView[]): Promise<import("mongodb").BulkWriteResult>;
     getAllLoanBrokers(): Promise<{
-        emails: import("mongoose").FlattenMaps<import("../models/LoanBroker.model").ILoanBrokerEmail>[];
+        emails: import("../models/LoanBroker.model").ILoanBrokerEmail[];
+        _id: import("mongoose").Types.ObjectId;
+        createdAt: Date;
+        updatedAt: Date;
         uiId: string;
         order: number;
         active: boolean;
         name: string;
-        _id: import("mongoose").Types.ObjectId;
     }[]>;
     saveLoanBrokers(brokers: ILoanBrokerPlain[]): Promise<void>;
     saveLoanBroker(broker: Partial<ILoanBrokerPlain>, order: number): Promise<void>;

package/services/brokers.service.js

@@ -133,14 +133,7 @@ class BrokersService {
         const existingBrokerIds = existingBrokers.map((broker) => broker._id.toString());
         const brokersToDelete = existingBrokerIds.filter((id) => !brokers.some((broker) => String(broker._id) === id));
         await LoanBroker_model_1.LoanBroker.deleteMany({ _id: { $in: brokersToDelete } });
-        const brokersToSave = brokers.map((broker) => {
-            if (broker._id.toString().startsWith('new_')) {
-                let { _id, ...brokerWithoutId } = broker;
-                return brokerWithoutId;
-            }
-            return broker;
-        });
-        await Promise.all(brokersToSave.map(async (brokerToSave, order) => {
+        await Promise.all(brokers.map(async (brokerToSave, order) => {
             await this.saveLoanBroker(brokerToSave, order);
         }));
     }

package/services/brokers.service.ts

@@ -171,15 +171,7 @@ export class BrokersService {
     const brokersToDelete = existingBrokerIds.filter((id) => !brokers.some((broker) => String(broker._id) === id));
     await LoanBroker.deleteMany({ _id: { $in: brokersToDelete } });
 
-    const brokersToSave = brokers.map((broker) => {
-      if (broker._id.toString().startsWith('new_')) {
-        let { _id, ...brokerWithoutId } = broker;
-        return brokerWithoutId;
-      }
-      return broker;
-    });
-
-    await Promise.all(brokersToSave.map(async (brokerToSave, order) => {
+    await Promise.all(brokers.map(async (brokerToSave, order) => {
       await this.saveLoanBroker(brokerToSave, order);
     }));
   }

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

@@ -60,7 +60,7 @@ export declare class ComplianceBorrowersService {
     isComplianceBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean;
     calculateInstanceStatuses(instance: IBorrowerItemInstance, item: IBorrowerItemLean): IInstanceStatus;
     getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<IComplianceBorrowerDocumentFullWithStatuses>;
-    getAllBorrowersShortened(userAccess: IUserAccess): Promise<Pick<IComplianceBorrowerWithBorrower, "borrower" | "fundingStatus" | "items">[]>;
+    getAllBorrowersShortened(userAccess: IUserAccess): Promise<Pick<IComplianceBorrowerWithBorrower, "borrower" | "items" | "fundingStatus">[]>;
     generateInstances(complianceBorrowerId: any): Promise<IComplianceBorrowerDocumentFullWithStatuses>;
     calculateAndUpdateFundingStatus(complianceBorrowerId: string): Promise<void>;
     calculateFundingStatus(complianceBorrower: IComplianceBorrowerDocumentFull): string;

package/services/loan-transactions.service.d.ts

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