gemcap-be-common 1.5.129 → 1.5.131

package/models/ProductBroker.model.js

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProductBrokerModel = exports.ProductBrokerSchema = exports.ProductBrokerValidationSchema = void 0;
+exports.ProductBroker = exports.ProductBrokerSchema = exports.ProductBrokerValidationSchema = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const joi_1 = __importDefault(require("joi"));
 const _models_1 = require("./_models");
 exports.ProductBrokerValidationSchema = joi_1.default.object({
-    _id: joi_1.default.string().required(),
+    _id: joi_1.default.string(),
+    uiId: joi_1.default.string().required(),
     order: joi_1.default.number(),
     borrowerId: joi_1.default.string().required(),
     active: joi_1.default.boolean().required(),
@@ -21,6 +22,11 @@ exports.ProductBrokerValidationSchema = joi_1.default.object({
     otherShare: joi_1.default.number().required(),
 });
 exports.ProductBrokerSchema = new mongoose_1.default.Schema({
+    uiId: {
+        type: String,
+        required: true,
+        trim: true,
+    },
     borrowerId: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: _models_1.MODEL_NAMES.borrowers,
@@ -68,4 +74,4 @@ exports.ProductBrokerSchema = new mongoose_1.default.Schema({
     },
     __v: { type: Number, select: false },
 }, { timestamps: true });
-exports.ProductBrokerModel = mongoose_1.default.model(_models_1.MODEL_NAMES.productBrokers, exports.ProductBrokerSchema);
+exports.ProductBroker = mongoose_1.default.model(_models_1.MODEL_NAMES.productBrokers, exports.ProductBrokerSchema);

package/models/ProductBroker.model.ts

@@ -2,10 +2,11 @@ import mongoose from 'mongoose';
 import Joi from 'joi';
 
 import { MODEL_NAMES } from './_models';
-import { ILoanBrokerWithId } from './LoanBroker.model';
+import { ILoanBrokerLean } from './LoanBroker.model';
 
 export const ProductBrokerValidationSchema = Joi.object({
-  _id: Joi.string().required(),
+  _id: Joi.string(),
+  uiId: Joi.string().required(),
   order: Joi.number(),
   borrowerId: Joi.string().required(),
   active: Joi.boolean().required(),
@@ -19,6 +20,7 @@ export const ProductBrokerValidationSchema = Joi.object({
 });
 
 export interface IProductBroker {
+  uiId: string;
   order: number;
   borrowerId: mongoose.Types.ObjectId;
   active: boolean;
@@ -31,11 +33,7 @@ export interface IProductBroker {
   otherShare: number;
 }
 
-export interface IProductBrokerDoc extends IProductBroker, mongoose.Document {
-  _id: mongoose.Types.ObjectId;
-  createdAt: Date;
-  updatedAt: Date;
-}
+export type TProductBrokerDoc = mongoose.HydratedDocument<IProductBroker>;
 
 export interface IProductBrokerLean extends IProductBroker {
   _id: mongoose.Types.ObjectId;
@@ -50,8 +48,8 @@ export interface IProductBrokerPlain extends Omit<IProductBroker, 'borrowerId' |
   productId: string;
 }
 
-export interface IProductBrokerDocWithBroker extends IProductBrokerDoc {
-  loanBroker: ILoanBrokerWithId;
+export interface IProductBrokerDocWithLoanBroker extends TProductBrokerDoc {
+  loanBroker: ILoanBrokerLean;
 }
 
 export type IProductBrokerView = Omit<IProductBrokerLean, 'borrowerId' | 'order'>
@@ -60,6 +58,11 @@ export type TProductBrokerModel = mongoose.Model<IProductBroker>;
 
 export const ProductBrokerSchema = new mongoose.Schema(
   {
+    uiId: {
+      type: String,
+      required: true,
+      trim: true,
+    },
     borrowerId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: MODEL_NAMES.borrowers,
@@ -110,4 +113,4 @@ export const ProductBrokerSchema = new mongoose.Schema(
   { timestamps: true },
 );
 
-export const ProductBrokerModel: mongoose.Model<IProductBrokerDoc> = mongoose.model<IProductBrokerDoc>(MODEL_NAMES.productBrokers, ProductBrokerSchema);
+export const ProductBroker = mongoose.model<IProductBroker, TProductBrokerModel>(MODEL_NAMES.productBrokers, ProductBrokerSchema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.5.129",
+  "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]: {
-            SELECTED_PERIOD?: boolean;
-            ENTIRE_LOAN?: boolean;
             LAST_MONTH?: boolean;
             CURRENT_MONTH?: boolean;
+            ENTIRE_LOAN?: boolean;
+            SELECTED_PERIOD?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

package/services/brokers.service.d.ts

@@ -1,13 +1,4 @@
 /// <reference types="mongoose/types/types" />
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/models" />
-/// <reference types="mongoose/types/collection" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose/types/query" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/populate" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/schemaoptions" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />
@@ -34,7 +25,7 @@
 /// <reference types="mongoose" />
 /// <reference types="mongoose/types/inferschematype" />
 import { IProductBrokerView } from '../models/ProductBroker.model';
-import { ILoanBrokerEmail, ILoanBrokerView } from '../models/LoanBroker.model';
+import { ILoanBrokerPlain, ILoanBrokerEmailPlain } from '../models/LoanBroker.model';
 import { LoanChargesService } from './loan-charges.service';
 type BrokerView = Omit<IProductBrokerView, '_id'> & {
     _id: string;
@@ -53,170 +44,25 @@ export declare class BrokersService {
     private readonly loanChargesService;
     constructor(loanChargesService: LoanChargesService);
     normalizeObjects(): Promise<void>;
-    getAllProductBrokers(): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & Required<{
-        _id: import("mongoose").Types.ObjectId;
-    }>)[]>;
-    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & Required<{
-        _id: import("mongoose").Types.ObjectId;
-    }>)[]>;
-    getProductBrokers(productId: string): Promise<import("../models/ProductBroker.model").IProductBrokerDocWithBroker[]>;
+    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<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: any;
-        __v?: any;
-        $assertPopulated: <Paths = {}>(path: string | string[], values?: Partial<Paths>) => Omit<import("../models/LoanBroker.model").ILoanBrokerDoc, keyof Paths> & Paths;
-        $clone: () => import("../models/LoanBroker.model").ILoanBrokerDoc;
-        $getAllSubdocs: () => import("mongoose").Document<any, any, any>[];
-        $ignore: (path: string) => void;
-        $isDefault: (path: string) => boolean;
-        $isDeleted: (val?: boolean) => boolean;
-        $getPopulatedDocs: () => import("mongoose").Document<any, any, any>[];
-        $inc: (path: string | string[], val?: number) => import("../models/LoanBroker.model").ILoanBrokerDoc;
-        $isEmpty: (path: string) => boolean;
-        $isValid: (path: string) => boolean;
-        $locals: import("mongoose").FlattenMaps<Record<string, unknown>>;
-        $markValid: (path: string) => void;
-        $model: {
-            <ModelType = import("mongoose").Model<unknown, {}, {}, {}, import("mongoose").Document<unknown, {}, unknown> & Required<{
-                _id: unknown;
-            }>, any>>(name: string): ModelType;
-            <ModelType_1 = import("mongoose").Model<any, {}, {}, {}, any, any>>(): ModelType_1;
-        };
-        $op: "save" | "validate" | "remove";
-        $session: (session?: import("mongodb").ClientSession) => import("mongodb").ClientSession;
-        $set: {
-            (path: string | Record<string, any>, val: any, type: any, options?: import("mongoose").DocumentSetOptions): import("../models/LoanBroker.model").ILoanBrokerDoc;
-            (path: string | Record<string, any>, val: any, options?: import("mongoose").DocumentSetOptions): import("../models/LoanBroker.model").ILoanBrokerDoc;
-            (value: string | Record<string, any>): import("../models/LoanBroker.model").ILoanBrokerDoc;
-        };
-        $where: import("mongoose").FlattenMaps<Record<string, unknown>>;
-        baseModelName?: string;
-        collection: import("mongoose").Collection<import("bson").Document>;
-        db: import("mongoose").FlattenMaps<import("mongoose").Connection>;
-        deleteOne: (options?: import("mongoose").QueryOptions<unknown>) => any;
-        depopulate: (path?: string | string[]) => import("../models/LoanBroker.model").ILoanBrokerDoc;
-        directModifiedPaths: () => string[];
-        equals: (doc: import("mongoose").Document<any, any, any>) => boolean;
-        errors?: import("mongoose").Error.ValidationError;
-        get: {
-            <T extends string | number | symbol>(path: T, type?: any, options?: any): any;
-            (path: string, type?: any, options?: any): any;
-        };
-        getChanges: () => import("mongoose").UpdateQuery<import("../models/LoanBroker.model").ILoanBrokerDoc>;
-        id?: any;
-        increment: () => import("../models/LoanBroker.model").ILoanBrokerDoc;
-        init: (obj: import("mongoose").AnyObject, opts?: import("mongoose").AnyObject) => import("../models/LoanBroker.model").ILoanBrokerDoc;
-        invalidate: {
-            <T_1 extends string | number | symbol>(path: T_1, errorMsg: string | NativeError, value?: any, kind?: string): NativeError;
-            (path: string, errorMsg: string | NativeError, value?: any, kind?: string): NativeError;
-        };
-        isDirectModified: {
-            <T_2 extends string | number | symbol>(path: T_2 | T_2[]): boolean;
-            (path: string | string[]): boolean;
-        };
-        isDirectSelected: {
-            <T_3 extends string | number | symbol>(path: T_3): boolean;
-            (path: string): boolean;
-        };
-        isInit: {
-            <T_4 extends string | number | symbol>(path: T_4): boolean;
-            (path: string): boolean;
-        };
-        isModified: {
-            <T_5 extends string | number | symbol>(path?: T_5 | T_5[], options?: {
-                ignoreAtomics?: boolean;
-            }): boolean;
-            (path?: string | string[], options?: {
-                ignoreAtomics?: boolean;
-            }): boolean;
-        };
-        isNew: boolean;
-        isSelected: {
-            <T_6 extends string | number | symbol>(path: T_6): boolean;
-            (path: string): boolean;
-        };
-        markModified: {
-            <T_7 extends string | number | symbol>(path: T_7, scope?: any): void;
-            (path: string, scope?: any): void;
-        };
-        model: {
-            <ModelType_2 = import("mongoose").Model<unknown, {}, {}, {}, import("mongoose").Document<unknown, {}, unknown> & Required<{
-                _id: unknown;
-            }>, any>>(name: string): ModelType_2;
-            <ModelType_3 = import("mongoose").Model<any, {}, {}, {}, any, any>>(): ModelType_3;
-        };
-        modifiedPaths: (options?: {
-            includeChildren?: boolean;
-        }) => string[];
-        overwrite: (obj: import("mongoose").AnyObject) => import("../models/LoanBroker.model").ILoanBrokerDoc;
-        $parent: () => import("mongoose").Document<any, any, any>;
-        populate: {
-            <Paths_1 = {}>(path: string | import("mongoose").PopulateOptions | (string | import("mongoose").PopulateOptions)[]): Promise<import("mongoose").MergeType<import("../models/LoanBroker.model").ILoanBrokerDoc, Paths_1>>;
-            <Paths_2 = {}>(path: string, select?: string | import("mongoose").AnyObject, model?: import("mongoose").Model<any, {}, {}, {}, any, any>, match?: import("mongoose").AnyObject, options?: import("mongoose").PopulateOptions): Promise<import("mongoose").MergeType<import("../models/LoanBroker.model").ILoanBrokerDoc, Paths_2>>;
-        };
-        populated: (path: string) => any;
-        replaceOne: (replacement?: import("mongoose").AnyObject, options?: import("mongoose").QueryOptions<unknown>) => import("mongoose").Query<any, import("../models/LoanBroker.model").ILoanBrokerDoc, {}, import("../models/LoanBroker.model").ILoanBrokerDoc, "find">;
-        save: (options?: import("mongoose").SaveOptions) => Promise<import("../models/LoanBroker.model").ILoanBrokerDoc>;
-        schema: import("mongoose").FlattenMaps<import("mongoose").Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
-            [x: string]: unknown;
-        }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
-            [x: string]: unknown;
-        }>> & import("mongoose").FlatRecord<{
-            [x: string]: unknown;
-        }> & Required<{
-            _id: unknown;
-        }>>>;
-        set: {
-            <T_8 extends string | number | symbol>(path: T_8, val: any, type: any, options?: import("mongoose").DocumentSetOptions): import("../models/LoanBroker.model").ILoanBrokerDoc;
-            (path: string | Record<string, any>, val: any, type: any, options?: import("mongoose").DocumentSetOptions): import("../models/LoanBroker.model").ILoanBrokerDoc;
-            (path: string | Record<string, any>, val: any, options?: import("mongoose").DocumentSetOptions): import("../models/LoanBroker.model").ILoanBrokerDoc;
-            (value: string | Record<string, any>): import("../models/LoanBroker.model").ILoanBrokerDoc;
-        };
-        toJSON: {
-            <T_9 = any>(options?: import("mongoose").ToObjectOptions<import("mongoose").Document<unknown, {}, unknown> & Required<{
-                _id: unknown;
-            }>> & {
-                flattenMaps?: true;
-            }): import("mongoose").FlattenMaps<T_9>;
-            <T_10 = any>(options: import("mongoose").ToObjectOptions<import("mongoose").Document<unknown, {}, unknown> & Required<{
-                _id: unknown;
-            }>> & {
-                flattenMaps: false;
-            }): T_10;
-        };
-        toObject: <T_11 = any>(options?: import("mongoose").ToObjectOptions<import("mongoose").Document<unknown, {}, unknown> & Required<{
-            _id: unknown;
-        }>>) => import("mongoose").Require_id<T_11>;
-        unmarkModified: {
-            <T_12 extends string | number | symbol>(path: T_12): void;
-            (path: string): void;
-        };
-        updateOne: (update?: import("mongoose").UpdateWithAggregationPipeline | import("mongoose").UpdateQuery<import("../models/LoanBroker.model").ILoanBrokerDoc>, options?: import("mongoose").QueryOptions<unknown>) => import("mongoose").Query<any, import("../models/LoanBroker.model").ILoanBrokerDoc, {}, import("../models/LoanBroker.model").ILoanBrokerDoc, "find">;
-        validate: {
-            <T_13 extends string | number | symbol>(pathsToValidate?: T_13 | T_13[], options?: import("mongoose").AnyObject): Promise<void>;
-            (pathsToValidate?: import("mongoose").PathsToValidate, options?: import("mongoose").AnyObject): Promise<void>;
-            (options: {
-                pathsToSkip?: import("mongoose").pathsToSkip;
-            }): Promise<void>;
-        };
-        validateSync: {
-            (options: {
-                [k: string]: any;
-                pathsToSkip?: import("mongoose").pathsToSkip;
-            }): import("mongoose").Error.ValidationError;
-            <T_14 extends string | number | symbol>(pathsToValidate?: T_14 | T_14[], options?: import("mongoose").AnyObject): import("mongoose").Error.ValidationError;
-            (pathsToValidate?: import("mongoose").PathsToValidate, options?: import("mongoose").AnyObject): import("mongoose").Error.ValidationError;
-        };
     }[]>;
-    saveLoanBrokers(brokers: ILoanBrokerView[]): Promise<void>;
-    saveLoanBroker(broker: Partial<ILoanBrokerView>, order: number): Promise<void>;
-    saveLoanBrokerEmails(loanBrokerId: string, emails: ILoanBrokerEmail[]): Promise<void>;
+    saveLoanBrokers(brokers: ILoanBrokerPlain[]): Promise<void>;
+    saveLoanBroker(broker: Partial<ILoanBrokerPlain>, order: number): Promise<void>;
+    saveLoanBrokerEmails(loanBrokerId: string, emails: ILoanBrokerEmailPlain[]): Promise<void>;
 }
 export {};

package/services/brokers.service.js

@@ -12,7 +12,8 @@ const brokers_db_2 = require("../db/brokers.db");
 const main_helper_1 = require("../helpers/main.helper");
 const defaultBrokerList = [
     {
-        _id: `new_${(0, main_helper_1.getUUID)()}`,
+        _id: (0, main_helper_1.getUUID)(),
+        uiId: (0, main_helper_1.getUUID)(),
         active: true,
         BSCode: '',
         PLCode: '',
@@ -32,7 +33,7 @@ class BrokersService {
     }
     async normalizeObjects() {
         try {
-            await LoanBroker_model_1.LoanBrokerModel.updateMany({}, { emails: [] });
+            await LoanBroker_model_1.LoanBroker.updateMany({}, { emails: [] });
         }
         catch (e) {
             console.error(e);
@@ -77,7 +78,7 @@ class BrokersService {
         return productShares;
     }
     async getTotals(borrowerId) {
-        const brokers = await ProductBroker_model_1.ProductBrokerModel.find({ borrowerId });
+        const brokers = await ProductBroker_model_1.ProductBroker.find({ borrowerId });
         const shortTotals = await this.getTotalShares(borrowerId, brokers, true);
         return Object.entries(shortTotals).map(([product, shares]) => {
             return {
@@ -100,9 +101,9 @@ class BrokersService {
         const existingBrokers = await (0, brokers_db_2.getBorrowerBrokers)(borrowerId);
         const existingBrokerIds = existingBrokers.map((broker) => broker._id.toString());
         const brokersToDelete = existingBrokerIds.filter((id) => !brokers.some((broker) => String(broker._id) === id));
-        await ProductBroker_model_1.ProductBrokerModel.deleteMany({ _id: { $in: brokersToDelete } });
+        await ProductBroker_model_1.ProductBroker.deleteMany({ _id: { $in: brokersToDelete } });
         const brokersToSave = brokers.map((broker) => {
-            if (broker._id.toString().startsWith('new_')) {
+            if (!broker._id) {
                 let { _id, ...brokerWithoutId } = broker;
                 return { ...brokerWithoutId, borrowerId: borrowerId };
             }
@@ -112,7 +113,7 @@ class BrokersService {
             return broker.hasOwnProperty('_id') ? { _id: broker._id } : { createdAt: Math.random() };
         };
         try {
-            return ProductBroker_model_1.ProductBrokerModel.bulkWrite(brokersToSave.map((broker, order) => ({
+            return ProductBroker_model_1.ProductBroker.bulkWrite(brokersToSave.map((broker, order) => ({
                 updateOne: {
                     filter: getFilters(broker),
                     update: { $set: { ...broker, order } },
@@ -131,15 +132,8 @@ class BrokersService {
         const existingBrokers = await (0, brokers_db_2.getAllLoanBrokers)();
         const existingBrokerIds = existingBrokers.map((broker) => broker._id.toString());
         const brokersToDelete = existingBrokerIds.filter((id) => !brokers.some((broker) => String(broker._id) === id));
-        await LoanBroker_model_1.LoanBrokerModel.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 LoanBroker_model_1.LoanBroker.deleteMany({ _id: { $in: brokersToDelete } });
+        await Promise.all(brokers.map(async (brokerToSave, order) => {
             await this.saveLoanBroker(brokerToSave, order);
         }));
     }
@@ -148,15 +142,15 @@ class BrokersService {
             return broker.hasOwnProperty('_id') ? { _id: broker._id } : { createdAt: Math.random() };
         };
         const { emails, ...update } = broker;
-        const updatedBroker = await LoanBroker_model_1.LoanBrokerModel.findOneAndUpdate(getFilters(broker), { ...update, order }, { upsert: true, new: true });
+        const updatedBroker = await LoanBroker_model_1.LoanBroker.findOneAndUpdate(getFilters(broker), { ...update, order }, { upsert: true, new: true });
         await this.saveLoanBrokerEmails(updatedBroker._id.toString(), emails);
     }
     async saveLoanBrokerEmails(loanBrokerId, emails) {
         const emailsWithoutId = emails.map((email) => {
             const { _id, ...rest } = email;
-            return _id.toString().includes('new_') ? rest : email;
+            return rest;
         });
-        await LoanBroker_model_1.LoanBrokerModel.findByIdAndUpdate(loanBrokerId, { emails: emailsWithoutId });
+        await LoanBroker_model_1.LoanBroker.findByIdAndUpdate(loanBrokerId, { emails: emailsWithoutId });
     }
 }
 exports.BrokersService = BrokersService;

package/services/brokers.service.ts

@@ -2,9 +2,13 @@ import Decimal from 'decimal.js';
 
 import {
   IProductBrokerView,
-  ProductBrokerModel,
+  ProductBroker,
 } from '../models/ProductBroker.model';
-import { ILoanBrokerEmail, ILoanBrokerView, LoanBrokerModel } from '../models/LoanBroker.model';
+import {
+  ILoanBrokerPlain,
+  ILoanBrokerEmailPlain,
+  LoanBroker,
+} from '../models/LoanBroker.model';
 import { getProductBrokers } from '../db/brokers.db';
 
 import { getAllLoanBrokers, getAllProductBrokers, getBorrowerBrokers } from '../db/brokers.db';
@@ -16,7 +20,8 @@ type BrokerTotalView = Omit<IProductBrokerView, 'productId'> & { productId: stri
 
 const defaultBrokerList: BrokerView[] = [
   {
-    _id: `new_${getUUID()}`,
+    _id: getUUID(),
+    uiId: getUUID(),
     active: true,
     BSCode: '',
     PLCode: '',
@@ -49,7 +54,7 @@ export class BrokersService {
 
   async normalizeObjects() {
     try {
-      await LoanBrokerModel.updateMany({}, { emails: [] });
+      await LoanBroker.updateMany({}, { emails: [] });
     } catch (e) {
       console.error(e);
     }
@@ -100,7 +105,7 @@ export class BrokersService {
   }
 
   async getTotals(borrowerId: string) {
-    const brokers = await ProductBrokerModel.find({ borrowerId }) as IProductBrokerView[];
+    const brokers = await ProductBroker.find({ borrowerId }) as IProductBrokerView[];
     const shortTotals = await this.getTotalShares(borrowerId, brokers, true);
     return Object.entries(shortTotals).map(([product, shares]) => {
       return <BrokerTotalView>{
@@ -126,10 +131,10 @@ export class BrokersService {
 
     const existingBrokerIds = existingBrokers.map((broker) => broker._id.toString());
     const brokersToDelete = existingBrokerIds.filter((id) => !brokers.some((broker) => String(broker._id) === id));
-    await ProductBrokerModel.deleteMany({ _id: { $in: brokersToDelete } });
+    await ProductBroker.deleteMany({ _id: { $in: brokersToDelete } });
 
     const brokersToSave = brokers.map((broker) => {
-      if (broker._id.toString().startsWith('new_')) {
+      if (!broker._id) {
         let { _id, ...brokerWithoutId } = broker;
         return { ...brokerWithoutId, borrowerId: borrowerId };
       }
@@ -141,7 +146,7 @@ export class BrokersService {
     };
 
     try {
-      return ProductBrokerModel.bulkWrite(
+      return ProductBroker.bulkWrite(
         brokersToSave.map((broker, order) => ({
           updateOne: {
             filter: getFilters(broker),
@@ -159,32 +164,25 @@ export class BrokersService {
     return getAllLoanBrokers();
   }
 
-  async saveLoanBrokers(brokers: ILoanBrokerView[]) {
+  async saveLoanBrokers(brokers: ILoanBrokerPlain[]) {
     const existingBrokers = await getAllLoanBrokers();
 
     const existingBrokerIds = existingBrokers.map((broker) => broker._id.toString());
     const brokersToDelete = existingBrokerIds.filter((id) => !brokers.some((broker) => String(broker._id) === id));
-    await LoanBrokerModel.deleteMany({ _id: { $in: brokersToDelete } });
-
-    const brokersToSave = brokers.map((broker) => {
-      if (broker._id.toString().startsWith('new_')) {
-        let { _id, ...brokerWithoutId } = broker;
-        return brokerWithoutId;
-      }
-      return broker;
-    });
+    await LoanBroker.deleteMany({ _id: { $in: brokersToDelete } });
 
-    await Promise.all(brokersToSave.map(async (brokerToSave, order) => {
+    await Promise.all(brokers.map(async (brokerToSave, order) => {
       await this.saveLoanBroker(brokerToSave, order);
     }));
   }
 
-  async saveLoanBroker(broker: Partial<ILoanBrokerView>, order: number) {
-    const getFilters = (broker: Partial<IProductBrokerView>) => {
+  async saveLoanBroker(broker: Partial<ILoanBrokerPlain>, order: number) {
+    const getFilters = (broker: Partial<ILoanBrokerPlain>) => {
       return broker.hasOwnProperty('_id') ? { _id: broker._id } : { createdAt: Math.random() };
     };
+
     const { emails, ...update } = broker;
-    const updatedBroker = await LoanBrokerModel.findOneAndUpdate(
+    const updatedBroker = await LoanBroker.findOneAndUpdate(
       getFilters(broker),
       { ...update, order },
       { upsert: true, new: true },
@@ -192,11 +190,11 @@ export class BrokersService {
     await this.saveLoanBrokerEmails(updatedBroker._id.toString(), emails);
   }
 
-  async saveLoanBrokerEmails(loanBrokerId: string, emails: ILoanBrokerEmail[]) {
+  async saveLoanBrokerEmails(loanBrokerId: string, emails: ILoanBrokerEmailPlain[]) {
     const emailsWithoutId = emails.map((email) => {
       const { _id, ...rest } = email;
-      return _id.toString().includes('new_') ? rest : email;
+      return rest;
     });
-    await LoanBrokerModel.findByIdAndUpdate(loanBrokerId, { emails: emailsWithoutId });
+    await LoanBroker.findByIdAndUpdate(loanBrokerId, { emails: emailsWithoutId });
   }
 }

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/quickbooks.service.js

@@ -261,14 +261,14 @@ class QuickbooksService {
         }
         const transactionsFilter = {
             productIds: productIds,
-            start: (0, dayjs_1.default)(reportDate).utcOffset(0).startOf('month').toDate(),
-            end: (0, dayjs_1.default)(reportDate).utcOffset(0).endOf('month').toDate(),
+            start: dayjs_1.default.utc(reportDate).startOf('month').toDate(),
+            end: dayjs_1.default.utc(reportDate).endOf('month').toDate(),
         };
         return await this.loanChargesService.getLoanStatementsForProduct(transactionsFilter);
     }
     async getChargeTransactionsForPayments(productIds, reportDate) {
-        const start = (0, dayjs_1.default)(reportDate).utcOffset(0).startOf('day').toDate();
-        const end = (0, dayjs_1.default)(reportDate).utcOffset(0).endOf('day').toDate();
+        const start = dayjs_1.default.utc(reportDate).startOf('day').toDate();
+        const end = dayjs_1.default.utc(reportDate).endOf('day').toDate();
         const payments = await this.loanPaymentsService.getPaymentsForPeriod(productIds, start, end);
         if (!payments.length) {
             return [];
@@ -278,8 +278,8 @@ class QuickbooksService {
         return await this.loanChargesService.getLoanStatementsForIdsAndCharge(transactionsFilter);
     }
     async getPrincipalTransactionsForPayments(productId, reportDate) {
-        const start = (0, dayjs_1.default)(reportDate).utcOffset(0).startOf('day').toDate();
-        const end = (0, dayjs_1.default)(reportDate).utcOffset(0).endOf('day').toDate();
+        const start = dayjs_1.default.utc(reportDate).startOf('day').toDate();
+        const end = dayjs_1.default.utc(reportDate).endOf('day').toDate();
         const payments = await this.loanPaymentsService.getPaymentsForPeriod([productId], start, end);
         if (!payments.length) {
             return {};
@@ -309,9 +309,9 @@ class QuickbooksService {
         }
         const companyFilter = { companyId: { $in: params.companyIds.map((id) => new mongoose_1.default.Types.ObjectId(id)) } };
         const { reportType, productIds, chargeTypes, reportDate } = params;
-        const reportDateFormatted = (0, dayjs_1.default)(reportDate).utcOffset(0).format('MM/DD/YYYY').toUpperCase();
-        const reportDateTrFormatted = (0, dayjs_1.default)(reportDate).utcOffset(0).format(transactionsDateFormat).toUpperCase();
-        const currentDateTrFormatted = (0, dayjs_1.default)(new Date).utcOffset(0).format(transactionsDateFormat).toUpperCase();
+        const reportDateFormatted = dayjs_1.default.utc(reportDate).format('MM/DD/YYYY').toUpperCase();
+        const reportDateTrFormatted = dayjs_1.default.utc(reportDate).format(transactionsDateFormat).toUpperCase();
+        const currentDateTrFormatted = dayjs_1.default.utc(new Date).format(transactionsDateFormat).toUpperCase();
         const isAccrual = reportType === 'accrual';
         const mainData = [];
         const trTemplate = {
@@ -483,10 +483,10 @@ class QuickbooksService {
     async getQuickbooksCashReport(params) {
         const reportErrorsSet = new Set();
         const { reportType, productIds, chargeTypes, reportDate } = params;
-        const reportDateFormatted = (0, dayjs_1.default)(reportDate).utcOffset(0).format('MM/DD/YYYY').toUpperCase();
-        const reportDateTrFormatted = (0, dayjs_1.default)(reportDate).utcOffset(0).format(transactionsDateFormat).toUpperCase();
-        const startDate = (0, dayjs_1.default)(reportDate).utcOffset(0).startOf('day').toDate();
-        const endDate = (0, dayjs_1.default)(reportDate).utcOffset(0).endOf('day').toDate();
+        const reportDateFormatted = dayjs_1.default.utc(reportDate).format('MM/DD/YYYY').toUpperCase();
+        const reportDateTrFormatted = dayjs_1.default.utc(reportDate).format(transactionsDateFormat).toUpperCase();
+        const startDate = dayjs_1.default.utc(reportDate).startOf('day').toDate();
+        const endDate = dayjs_1.default.utc(reportDate).endOf('day').toDate();
         const transactions = await this.bankUploadedTransactionsService.getUploadedBankTransactions(startDate, endDate);
         const { references, products } = await this.cashAllocationService.getAllCashAllocations();
         const allAccounts = await this.getAllAccounts();