gemcap-be-common 1.5.53 → 1.5.56

package/models/Borrower.model.d.ts

@@ -23,7 +23,6 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document, Model } from 'mongoose';
-import { IOrganization } from './Organization.model';
 interface ISchemaItem {
     column: string;
     databaseTitle: string;
@@ -39,7 +38,7 @@ export interface IBorrower {
     title: string;
     active: boolean;
     accrualStatus: boolean;
-    organizationId: IOrganization;
+    organizationId: mongoose.Types.ObjectId;
     schemas: IMapSchema[];
 }
 export interface IBorrowerDoc extends IBorrower, Document {
@@ -52,7 +51,7 @@ export interface IBorrowerLean extends IBorrower {
     createdAt: Date;
     updatedAt: Date;
 }
-export interface IBorrowerPlain extends IBorrower {
+export interface IBorrowerPlain extends Omit<IBorrower, 'organizationId'> {
     _id: string;
     createdAt: Date;
     updatedAt: Date;
@@ -64,59 +63,59 @@ export declare const BorrowerSchema: mongoose.Schema<any, mongoose.Model<any, an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    name: string;
-    active: boolean;
     code: string;
+    name: string;
     title: string;
+    active: boolean;
     accrualStatus: boolean;
-    __v?: number;
     organizationId?: mongoose.Types.ObjectId;
     schemas?: mongoose.Types.DocumentArray<{
-        type: string;
         name: string;
+        type: string;
         data: mongoose.Types.DocumentArray<{
             column: string;
             databaseTitle: string;
         }>;
     }>;
+    __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    name: string;
-    active: boolean;
     code: string;
+    name: string;
     title: string;
+    active: boolean;
     accrualStatus: boolean;
-    __v?: number;
     organizationId?: mongoose.Types.ObjectId;
     schemas?: mongoose.Types.DocumentArray<{
-        type: string;
         name: string;
+        type: string;
         data: mongoose.Types.DocumentArray<{
             column: string;
             databaseTitle: string;
         }>;
     }>;
+    __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    name: string;
-    active: boolean;
     code: string;
+    name: string;
     title: string;
+    active: boolean;
     accrualStatus: boolean;
-    __v?: number;
     organizationId?: mongoose.Types.ObjectId;
     schemas?: mongoose.Types.DocumentArray<{
-        type: string;
         name: string;
+        type: string;
         data: mongoose.Types.DocumentArray<{
             column: string;
             databaseTitle: string;
         }>;
     }>;
+    __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/Borrower.model.ts

@@ -21,7 +21,7 @@ export interface IBorrower {
   title: string;
   active: boolean;
   accrualStatus: boolean;
-  organizationId: IOrganization;
+  organizationId: mongoose.Types.ObjectId;
   schemas: IMapSchema[];
 }
 
@@ -37,7 +37,7 @@ export interface IBorrowerLean extends IBorrower {
   updatedAt: Date;
 }
 
-export interface IBorrowerPlain extends IBorrower {
+export interface IBorrowerPlain extends Omit<IBorrower, 'organizationId'> {
   _id: string;
   createdAt: Date;
   updatedAt: Date;

package/models/BorrowerCompliance.model.d.ts

@@ -91,13 +91,13 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         user?: string;
     }>;
     mainEmails: mongoose.Types.DocumentArray<{
-        email?: string;
         title?: string;
+        email?: string;
         isActive?: boolean;
     }>;
     financialEmails: mongoose.Types.DocumentArray<{
-        email?: string;
         title?: string;
+        email?: string;
         isActive?: boolean;
     }>;
     items: mongoose.Types.DocumentArray<{
@@ -105,8 +105,8 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         updatedAt: NativeDate;
     } & {
         emailAddresses: mongoose.Types.DocumentArray<{
-            email?: string;
             title?: string;
+            email?: string;
             isActive?: boolean;
         }>;
         instances: mongoose.Types.DocumentArray<{
@@ -124,8 +124,8 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
             submittedDate?: Date;
             status?: string;
         }>;
-        startDate?: Date;
         item?: mongoose.Types.ObjectId;
+        startDate?: Date;
         frequency?: string;
     }>;
     __v?: number;
@@ -152,13 +152,13 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         user?: string;
     }>;
     mainEmails: mongoose.Types.DocumentArray<{
-        email?: string;
         title?: string;
+        email?: string;
         isActive?: boolean;
     }>;
     financialEmails: mongoose.Types.DocumentArray<{
-        email?: string;
         title?: string;
+        email?: string;
         isActive?: boolean;
     }>;
     items: mongoose.Types.DocumentArray<{
@@ -166,8 +166,8 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         updatedAt: NativeDate;
     } & {
         emailAddresses: mongoose.Types.DocumentArray<{
-            email?: string;
             title?: string;
+            email?: string;
             isActive?: boolean;
         }>;
         instances: mongoose.Types.DocumentArray<{
@@ -185,8 +185,8 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
             submittedDate?: Date;
             status?: string;
         }>;
-        startDate?: Date;
         item?: mongoose.Types.ObjectId;
+        startDate?: Date;
         frequency?: string;
     }>;
     __v?: number;
@@ -213,13 +213,13 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         user?: string;
     }>;
     mainEmails: mongoose.Types.DocumentArray<{
-        email?: string;
         title?: string;
+        email?: string;
         isActive?: boolean;
     }>;
     financialEmails: mongoose.Types.DocumentArray<{
-        email?: string;
         title?: string;
+        email?: string;
         isActive?: boolean;
     }>;
     items: mongoose.Types.DocumentArray<{
@@ -227,8 +227,8 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         updatedAt: NativeDate;
     } & {
         emailAddresses: mongoose.Types.DocumentArray<{
-            email?: string;
             title?: string;
+            email?: string;
             isActive?: boolean;
         }>;
         instances: mongoose.Types.DocumentArray<{
@@ -246,8 +246,8 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
             submittedDate?: Date;
             status?: string;
         }>;
-        startDate?: Date;
         item?: mongoose.Types.ObjectId;
+        startDate?: Date;
         frequency?: string;
     }>;
     __v?: number;

package/models/FinancialComplianceBorrower.model.d.ts

@@ -53,11 +53,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, {
-    borrower: mongoose.Types.ObjectId;
     isDeleted: boolean;
+    borrower: mongoose.Types.ObjectId;
     __v?: number;
-    dueDate?: Date;
     invoiceSentDate?: Date;
+    dueDate?: Date;
     stopFundingDate?: Date;
     lastReminderSentAt?: Date;
     accountClearedDate?: Date;
@@ -69,11 +69,11 @@ export declare const FinancialComplianceBorrowerSchema: mongoose.Schema<any, mon
     balanceOutstanding?: number;
     reminderCounter?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
-    borrower: mongoose.Types.ObjectId;
     isDeleted: boolean;
+    borrower: mongoose.Types.ObjectId;
     __v?: number;
-    dueDate?: Date;
     invoiceSentDate?: Date;
+    dueDate?: Date;
     stopFundingDate?: Date;
     lastReminderSentAt?: Date;
     accountClearedDate?: Date;
@@ -85,11 +85,11 @@ export declare const FinancialComplianceBorrowerSchema: mongoose.Schema<any, mon
     balanceOutstanding?: number;
     reminderCounter?: number;
 }>> & mongoose.FlatRecord<{
-    borrower: mongoose.Types.ObjectId;
     isDeleted: boolean;
+    borrower: mongoose.Types.ObjectId;
     __v?: number;
-    dueDate?: Date;
     invoiceSentDate?: Date;
+    dueDate?: Date;
     stopFundingDate?: Date;
     lastReminderSentAt?: Date;
     accountClearedDate?: Date;

package/models/LoanProducts.model.d.ts

@@ -81,12 +81,12 @@ export declare const LoanProductSchema: mongoose.Schema<any, mongoose.Model<any,
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
-    type: string;
+    code: string;
     name: string;
-    order: number;
     active: boolean;
-    code: string;
+    type: string;
+    order: number;
+    borrowerId: mongoose.Types.ObjectId;
     startDate: Date;
     maturityDate: Date;
     commitment: number;
@@ -95,24 +95,24 @@ export declare const LoanProductSchema: mongoose.Schema<any, mongoose.Model<any,
     isParticipant: boolean;
     isDefaultPaymentOrder: boolean;
     __v?: number;
+    settlementCode?: string;
     masterCode?: string;
     payoffDate?: Date;
     minPercent?: number;
     maxPercent?: number;
     prepaymentDate?: Date;
     prepaymentTerms?: string;
-    settlementCode?: string;
     deactivationDate?: Date;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
-    type: string;
+    code: string;
     name: string;
-    order: number;
     active: boolean;
-    code: string;
+    type: string;
+    order: number;
+    borrowerId: mongoose.Types.ObjectId;
     startDate: Date;
     maturityDate: Date;
     commitment: number;
@@ -121,24 +121,24 @@ export declare const LoanProductSchema: mongoose.Schema<any, mongoose.Model<any,
     isParticipant: boolean;
     isDefaultPaymentOrder: boolean;
     __v?: number;
+    settlementCode?: string;
     masterCode?: string;
     payoffDate?: Date;
     minPercent?: number;
     maxPercent?: number;
     prepaymentDate?: Date;
     prepaymentTerms?: string;
-    settlementCode?: string;
     deactivationDate?: Date;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
-    type: string;
+    code: string;
     name: string;
-    order: number;
     active: boolean;
-    code: string;
+    type: string;
+    order: number;
+    borrowerId: mongoose.Types.ObjectId;
     startDate: Date;
     maturityDate: Date;
     commitment: number;
@@ -147,13 +147,13 @@ export declare const LoanProductSchema: mongoose.Schema<any, mongoose.Model<any,
     isParticipant: boolean;
     isDefaultPaymentOrder: boolean;
     __v?: number;
+    settlementCode?: string;
     masterCode?: string;
     payoffDate?: Date;
     minPercent?: number;
     maxPercent?: number;
     prepaymentDate?: Date;
     prepaymentTerms?: string;
-    settlementCode?: string;
     deactivationDate?: Date;
 }> & {
     _id: mongoose.Types.ObjectId;

package/models/Organization.model.d.ts

@@ -24,7 +24,6 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Model } from 'mongoose';
 export interface IOrganization {
-    _id?: mongoose.Types.ObjectId;
     name: string;
     subfolder: string;
     isDefault?: boolean;
@@ -32,9 +31,19 @@ export interface IOrganization {
 export type IOrganizationStringified = {
     [K in keyof IOrganization]: K extends '_id' | 'productId' ? string : IOrganization[K];
 };
-type OrganizationModel = Model<IOrganization>;
-export declare const OrganizationSchema: mongoose.Schema<IOrganization, OrganizationModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, IOrganization, mongoose.Document<unknown, {}, mongoose.FlatRecord<IOrganization>> & mongoose.FlatRecord<IOrganization> & Required<{
+export type TOrganizationModel = Model<IOrganization>;
+export type TOrganizationDoc = mongoose.HydratedDocument<IOrganization>;
+export interface IOrganizationLean extends IOrganization {
     _id: mongoose.Types.ObjectId;
-}>>;
-export declare const Organization: OrganizationModel;
-export {};
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface IOrganizationPlain extends IOrganization {
+    _id: string;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export declare const OrganizationSchema: mongoose.Schema<IOrganization, TOrganizationModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, IOrganization, mongoose.Document<unknown, {}, mongoose.FlatRecord<IOrganization>> & mongoose.FlatRecord<IOrganization> & {
+    _id: mongoose.Types.ObjectId;
+}>;
+export declare const Organization: TOrganizationModel;

package/models/Organization.model.js

@@ -19,7 +19,7 @@ exports.OrganizationSchema = new mongoose_1.default.Schema({
     },
     isDefault: {
         type: Boolean,
-    }
+    },
 }, {
     timestamps: { createdAt: true, updatedAt: false },
 });

package/models/Organization.model.ts

@@ -3,7 +3,6 @@ import mongoose, { Model } from 'mongoose';
 import { MODEL_NAMES } from './_models';
 
 export interface IOrganization {
-  _id?: mongoose.Types.ObjectId;
   name: string;
   subfolder: string;
   isDefault?: boolean;
@@ -13,9 +12,23 @@ export type IOrganizationStringified = {
   [K in keyof IOrganization]: K extends '_id' | 'productId' ? string : IOrganization[K];
 };
 
-type OrganizationModel = Model<IOrganization>;
+export type TOrganizationModel = Model<IOrganization>;
 
-export const OrganizationSchema = new mongoose.Schema<IOrganization, OrganizationModel>(
+export type TOrganizationDoc = mongoose.HydratedDocument<IOrganization>
+
+export interface IOrganizationLean extends IOrganization {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IOrganizationPlain extends IOrganization {
+  _id: string;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export const OrganizationSchema = new mongoose.Schema<IOrganization, TOrganizationModel>(
   {
     name: {
       type: String,
@@ -29,11 +42,11 @@ export const OrganizationSchema = new mongoose.Schema<IOrganization, Organizatio
     },
     isDefault: {
       type: Boolean,
-    }
+    },
   },
   {
     timestamps: { createdAt: true, updatedAt: false },
   },
 );
 
-export const Organization = mongoose.model<IOrganization, OrganizationModel>(MODEL_NAMES.organizations, OrganizationSchema);
+export const Organization = mongoose.model<IOrganization, TOrganizationModel>(MODEL_NAMES.organizations, OrganizationSchema);

package/models/PostponedTransactions.model.d.ts

@@ -52,18 +52,18 @@ export declare const PostponedTransactionSchema: mongoose.Schema<any, mongoose.M
     timestamps: false;
 }, {
     productId: mongoose.Types.ObjectId;
-    postponedToDate: string;
     transactionId: mongoose.Types.ObjectId;
+    postponedToDate: string;
     __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     productId: mongoose.Types.ObjectId;
-    postponedToDate: string;
     transactionId: mongoose.Types.ObjectId;
+    postponedToDate: string;
     __v?: number;
 }>> & mongoose.FlatRecord<{
     productId: mongoose.Types.ObjectId;
-    postponedToDate: string;
     transactionId: mongoose.Types.ObjectId;
+    postponedToDate: string;
     __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;

package/package.json

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

package/services/brokers.service.d.ts

@@ -46,9 +46,9 @@ export declare class BrokersService {
     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<{
+    getBorrowerBrokers(borrowerId: string): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & Required<{
         _id: import("mongoose").Types.ObjectId;
-    }>)[]>;
+    }>)[] | BrokerView[]>;
     getProductBrokers(productId: string): Promise<import("../models/ProductBroker.model").IProductBrokerDocWithBroker[]>;
     getTotalShares(borrowerId: string, brokers: IProductBrokerView[], replaceNames?: boolean): Promise<ProductTotal>;
     getTotals(borrowerId: string): Promise<BrokerTotalView[]>;

package/services/organizations.service.d.ts

@@ -1,34 +1,7 @@
-/// <reference types="mongoose/types/aggregate" />
-/// <reference types="mongoose/types/callback" />
-/// <reference types="mongoose/types/collection" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose/types/cursor" />
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/expressions" />
-/// <reference types="mongoose/types/helpers" />
-/// <reference types="mongoose/types/middlewares" />
-/// <reference types="mongoose/types/indexes" />
-/// <reference types="mongoose/types/models" />
-/// <reference types="mongoose/types/mongooseoptions" />
-/// <reference types="mongoose/types/pipelinestage" />
-/// <reference types="mongoose/types/populate" />
-/// <reference types="mongoose/types/query" />
-/// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
-/// <reference types="mongoose/types/session" />
-/// <reference types="mongoose/types/types" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/validation" />
-/// <reference types="mongoose/types/virtuals" />
-/// <reference types="mongoose" />
-/// <reference types="mongoose/types/inferschematype" />
-import { IOrganization } from '../models/Organization.model';
+import { IOrganization, IOrganizationLean } from '../models/Organization.model';
 export declare class OrganizationsService {
     getOrganizations(): Promise<IOrganization[]>;
     createInitialOrganizations(): Promise<void>;
-    getDefaultOrganization(): Promise<import("mongoose").FlattenMaps<IOrganization> & Required<{
-        _id: import("mongoose").Types.ObjectId;
-    }>>;
-    getOrganizationForBorrower(borrowerId: string): Promise<IOrganization>;
+    getDefaultOrganization(): Promise<IOrganizationLean>;
+    getOrganizationForBorrower(borrowerId: string): Promise<IOrganizationLean>;
 }

package/services/organizations.service.js

@@ -56,15 +56,15 @@ class OrganizationsService {
         }));
     }
     async getDefaultOrganization() {
-        return Organization_model_1.Organization.findOne({ isDefault: true }).lean();
+        return Organization_model_1.Organization.findOne({ isDefault: true }).lean().exec();
     }
     async getOrganizationForBorrower(borrowerId) {
-        const borrower = await Borrower_model_1.BorrowerModel.findById(borrowerId).lean();
+        const borrower = await Borrower_model_1.BorrowerModel.findById(borrowerId).lean().exec();
         const defaultOrganization = await this.getDefaultOrganization();
         if (!borrower) {
             return defaultOrganization;
         }
-        const organization = await Organization_model_1.Organization.findById(borrower.organizationId).lean();
+        const organization = await Organization_model_1.Organization.findById(borrower.organizationId).lean().exec();
         if (!organization) {
             return defaultOrganization;
         }

package/services/organizations.service.ts

@@ -1,5 +1,5 @@
-import { IOrganization, Organization } from '../models/Organization.model';
-import { BorrowerModel } from '../models/Borrower.model';
+import { IOrganization, IOrganizationLean, Organization } from '../models/Organization.model';
+import { BorrowerModel, IBorrowerLean } from '../models/Borrower.model';
 
 import { fieldsToUnset, removeFields } from '../helpers/main.helper';
 import { IOrganizationEmail, OrganizationEmail, OrganizationEmailsType } from '../models/OrganizationEmails.model';
@@ -66,16 +66,16 @@ export class OrganizationsService {
   }
 
   async getDefaultOrganization() {
-    return Organization.findOne({ isDefault: true }).lean();
+    return Organization.findOne({ isDefault: true }).lean<IOrganizationLean>().exec();
   }
 
-  async getOrganizationForBorrower(borrowerId: string): Promise<IOrganization> {
-    const borrower = await BorrowerModel.findById(borrowerId).lean();
+  async getOrganizationForBorrower(borrowerId: string) {
+    const borrower = await BorrowerModel.findById(borrowerId).lean<IBorrowerLean>().exec();
     const defaultOrganization = await this.getDefaultOrganization();
     if (!borrower) {
       return defaultOrganization;
     }
-    const organization = await Organization.findById(borrower.organizationId).lean();
+    const organization = await Organization.findById(borrower.organizationId).lean<IOrganizationLean>().exec();
     if (!organization) {
       return defaultOrganization;
     }