gemcap-be-common 1.4.256 → 1.4.258

package/models/BBCSheet.model.d.ts

@@ -47,11 +47,11 @@ export declare const BBCSheetSchema: mongoose.Schema<any, mongoose.Model<any, an
     bbcDateId: mongoose.Types.ObjectId;
     dataType: string;
     __v?: number;
+    comment?: string;
     uploadUser?: string;
     fileHash?: string;
     fileName?: string;
     sheetName?: string;
-    comment?: string;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
@@ -59,11 +59,11 @@ export declare const BBCSheetSchema: mongoose.Schema<any, mongoose.Model<any, an
     bbcDateId: mongoose.Types.ObjectId;
     dataType: string;
     __v?: number;
+    comment?: string;
     uploadUser?: string;
     fileHash?: string;
     fileName?: string;
     sheetName?: string;
-    comment?: string;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
@@ -71,11 +71,11 @@ export declare const BBCSheetSchema: mongoose.Schema<any, mongoose.Model<any, an
     bbcDateId: mongoose.Types.ObjectId;
     dataType: string;
     __v?: number;
+    comment?: string;
     uploadUser?: string;
     fileHash?: string;
     fileName?: string;
     sheetName?: string;
-    comment?: string;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

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<{
@@ -128,6 +128,7 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
+    __v?: number;
     isVisible?: boolean;
     email?: string;
     isEmailingActive?: boolean;
@@ -135,7 +136,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
     plaidAccessToken?: string;
     fundingStatus?: string;
     lastEmailSentAt?: Date;
-    __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
@@ -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<{
@@ -189,6 +189,7 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
+    __v?: number;
     isVisible?: boolean;
     email?: string;
     isEmailingActive?: boolean;
@@ -196,7 +197,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
     plaidAccessToken?: string;
     fundingStatus?: string;
     lastEmailSentAt?: Date;
-    __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
@@ -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<{
@@ -250,6 +250,7 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
         startDate?: Date;
         frequency?: string;
     }>;
+    __v?: number;
     isVisible?: boolean;
     email?: string;
     isEmailingActive?: boolean;
@@ -257,7 +258,6 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
     plaidAccessToken?: string;
     fundingStatus?: string;
     lastEmailSentAt?: Date;
-    __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/BorrowerData.model.d.ts

@@ -27,6 +27,7 @@ export interface IBorrowerDataOption {
     order: number;
     name: string;
     type: string;
+    isActive: boolean;
 }
 interface IBorrowerDataOptionDoc extends IBorrowerDataOption, Document {
 }
@@ -37,14 +38,17 @@ export declare const BorrowerDataOptionSchema: mongoose.Schema<any, mongoose.Mod
     type: string;
     name: string;
     order: number;
+    isActive?: boolean;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     type: string;
     name: string;
     order: number;
+    isActive?: boolean;
 }>> & mongoose.FlatRecord<{
     type: string;
     name: string;
     order: number;
+    isActive?: boolean;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/BorrowerData.model.js

@@ -19,12 +19,15 @@ exports.BorrowerDataOptionSchema = new mongoose_1.default.Schema({
         type: String,
         required: true,
     },
+    isActive: {
+        type: Boolean,
+    },
 }, { timestamps: false, versionKey: false });
-exports.BorrowerDataOptionModel = mongoose_1.default.model('borrower_data_option', exports.BorrowerDataOptionSchema);
+exports.BorrowerDataOptionModel = mongoose_1.default.model(_models_1.MODEL_NAMES.borrowerDataOptions, exports.BorrowerDataOptionSchema);
 exports.BorrowerDataSchema = new mongoose_1.default.Schema({
     dataOption: {
         type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: 'borrower_data_option',
+        ref: _models_1.MODEL_NAMES.borrowerDataOptions,
         required: true,
     },
     dataValue: {

package/models/BorrowerData.model.ts

@@ -5,6 +5,7 @@ export interface IBorrowerDataOption {
   order: number;
   name: string;
   type: string;
+  isActive: boolean;
 }
 
 interface IBorrowerDataOptionDoc extends IBorrowerDataOption, Document {
@@ -24,11 +25,14 @@ export const BorrowerDataOptionSchema = new mongoose.Schema(
       type: String,
       required: true,
     },
+    isActive: {
+      type: Boolean,
+    },
   },
   { timestamps: false, versionKey: false },
 );
 
-export const BorrowerDataOptionModel: mongoose.Model<IBorrowerDataOptionDoc> = mongoose.model<IBorrowerDataOptionDoc>('borrower_data_option', BorrowerDataOptionSchema);
+export const BorrowerDataOptionModel: mongoose.Model<IBorrowerDataOptionDoc> = mongoose.model<IBorrowerDataOptionDoc>(MODEL_NAMES.borrowerDataOptions, BorrowerDataOptionSchema);
 
 export interface IBorrowerData {
   dataOption: mongoose.Types.ObjectId,
@@ -46,7 +50,7 @@ export const BorrowerDataSchema = new mongoose.Schema(
   {
     dataOption: {
       type: mongoose.Schema.Types.ObjectId,
-      ref: 'borrower_data_option',
+      ref: MODEL_NAMES.borrowerDataOptions,
       required: true,
     },
     dataValue: {

package/models/CustomerGroup.model.d.ts

@@ -32,25 +32,25 @@ export declare const CustomerGroupSchema: mongoose.Schema<any, mongoose.Model<an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    groupName: string;
     borrowerId: mongoose.Types.ObjectId;
     items: string[];
+    groupName: string;
     __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    groupName: string;
     borrowerId: mongoose.Types.ObjectId;
     items: string[];
+    groupName: string;
     __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    groupName: string;
     borrowerId: mongoose.Types.ObjectId;
     items: string[];
+    groupName: string;
     __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;

package/models/InventoryAvailabilityItem.model.d.ts

@@ -48,8 +48,8 @@ export declare const InventoryAvailabilityItemScheme: mongoose.Schema<any, mongo
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    unique: boolean;
     order: number;
+    unique: boolean;
     inventoryAvailabilityId: mongoose.Types.ObjectId;
     inventoryId: mongoose.Types.ObjectId;
     matched: boolean;
@@ -64,8 +64,8 @@ export declare const InventoryAvailabilityItemScheme: mongoose.Schema<any, mongo
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    unique: boolean;
     order: number;
+    unique: boolean;
     inventoryAvailabilityId: mongoose.Types.ObjectId;
     inventoryId: mongoose.Types.ObjectId;
     matched: boolean;
@@ -80,8 +80,8 @@ export declare const InventoryAvailabilityItemScheme: mongoose.Schema<any, mongo
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    unique: boolean;
     order: number;
+    unique: boolean;
     inventoryAvailabilityId: mongoose.Types.ObjectId;
     inventoryId: mongoose.Types.ObjectId;
     matched: boolean;

package/models/InventoryItem.model.d.ts

@@ -71,16 +71,17 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     value: number;
     skuDate: Date;
     category: string;
     sku: string;
     qty: number;
-    bbcSheetId: mongoose.Types.ObjectId;
-    order: number;
     __v?: number;
-    expiryDate?: Date;
     location?: string;
+    lotNumber?: string;
+    expiryDate?: Date;
     unitCost?: number;
     skuDescription1?: string;
     skuDescription2?: string;
@@ -88,21 +89,21 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     detail1?: string;
     detail2?: string;
     detail3?: string;
-    lotNumber?: string;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     value: number;
     skuDate: Date;
     category: string;
     sku: string;
     qty: number;
-    bbcSheetId: mongoose.Types.ObjectId;
-    order: number;
     __v?: number;
-    expiryDate?: Date;
     location?: string;
+    lotNumber?: string;
+    expiryDate?: Date;
     unitCost?: number;
     skuDescription1?: string;
     skuDescription2?: string;
@@ -110,21 +111,21 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     detail1?: string;
     detail2?: string;
     detail3?: string;
-    lotNumber?: string;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     value: number;
     skuDate: Date;
     category: string;
     sku: string;
     qty: number;
-    bbcSheetId: mongoose.Types.ObjectId;
-    order: number;
     __v?: number;
-    expiryDate?: Date;
     location?: string;
+    lotNumber?: string;
+    expiryDate?: Date;
     unitCost?: number;
     skuDescription1?: string;
     skuDescription2?: string;
@@ -132,7 +133,6 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     detail1?: string;
     detail2?: string;
     detail3?: string;
-    lotNumber?: string;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/ReceivableItem.model.d.ts

@@ -52,8 +52,8 @@ export declare const ReceivableItemSchema: mongoose.Schema<any, mongoose.Model<a
 } & {
     bbcSheetId: mongoose.Types.ObjectId;
     order: number;
-    invoiceDate: Date;
     invoiceNumber: string;
+    invoiceDate: Date;
     customerTitle: string;
     invoiceAmount: number;
     __v?: number;
@@ -68,8 +68,8 @@ export declare const ReceivableItemSchema: mongoose.Schema<any, mongoose.Model<a
 } & {
     bbcSheetId: mongoose.Types.ObjectId;
     order: number;
-    invoiceDate: Date;
     invoiceNumber: string;
+    invoiceDate: Date;
     customerTitle: string;
     invoiceAmount: number;
     __v?: number;
@@ -84,8 +84,8 @@ export declare const ReceivableItemSchema: mongoose.Schema<any, mongoose.Model<a
 } & {
     bbcSheetId: mongoose.Types.ObjectId;
     order: number;
-    invoiceDate: Date;
     invoiceNumber: string;
+    invoiceDate: Date;
     customerTitle: string;
     invoiceAmount: number;
     __v?: number;

package/models/_index.d.ts

@@ -31,10 +31,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        order: number;
-        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
+        order: number;
         apDate: Date;
+        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -45,10 +45,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        order: number;
-        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
+        order: number;
         apDate: Date;
+        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -59,10 +59,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        order: number;
-        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
+        order: number;
         apDate: Date;
+        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;

package/models/_models.d.ts

@@ -33,6 +33,7 @@ export declare const MODEL_NAMES: {
     borrowerDataInsurances: string;
     borrowerDataInventories: string;
     borrowerDataLocations: string;
+    borrowerDataOptions: string;
     borrowerDataReceivables: string;
     borrowerDataTerms: string;
     borrowerSettings: string;

package/models/_models.js

@@ -36,6 +36,7 @@ exports.MODEL_NAMES = {
     borrowerDataInsurances: 'borrower_data_insurances',
     borrowerDataInventories: 'borrower_data_inventories',
     borrowerDataLocations: 'borrower_data_locations',
+    borrowerDataOptions: 'borrower_data_options',
     borrowerDataReceivables: 'borrower_data_receivables',
     borrowerDataTerms: 'borrower_data_terms',
     borrowerSettings: 'borrowerSettings',

package/models/_models.ts

@@ -33,6 +33,7 @@ export const MODEL_NAMES = {
   borrowerDataInsurances: 'borrower_data_insurances',
   borrowerDataInventories: 'borrower_data_inventories',
   borrowerDataLocations: 'borrower_data_locations',
+  borrowerDataOptions: 'borrower_data_options',
   borrowerDataReceivables: 'borrower_data_receivables',
   borrowerDataTerms: 'borrower_data_terms',
   borrowerSettings: 'borrowerSettings',

package/package.json

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

package/services/borrowers.service.js

@@ -143,14 +143,16 @@ class BorrowerService {
             .populate('data.banks')
             .populate('data.insurance')
             .lean();
-        const options = await BorrowerData_model_1.BorrowerDataOptionModel.find({}).lean();
+        const options = await BorrowerData_model_1.BorrowerDataOptionModel.find({ isActive: true }).lean();
+        const optionsMap = new Map(options.map((opt) => [opt._id.toString(), opt]));
         if (borrowerSettings?.data?.options) {
-            borrowerSettings.data.options = borrowerSettings.data.options.sort((a, b) => {
-                const foundA = options.find((option) => option._id.toString() === a.dataOption.toString());
-                const foundB = options.find((option) => option._id.toString() === b.dataOption.toString());
-                if (!foundA || !foundB) {
+            borrowerSettings.data.options = borrowerSettings.data.options
+                .filter((item) => optionsMap.has(item.dataOption.toString()))
+                .sort((a, b) => {
+                const foundA = optionsMap.get(a.dataOption.toString());
+                const foundB = optionsMap.get(b.dataOption.toString());
+                if (!foundA || !foundB)
                     return 0;
-                }
                 return foundA.order - foundB.order;
             });
         }

package/services/borrowers.service.ts

@@ -162,16 +162,19 @@ export class BorrowerService {
       .populate('data.banks')
       .populate('data.insurance')
       .lean() as unknown as IBorrowerSettingsDocPopulated;
-    const options = await BorrowerDataOptionModel.find({}).lean();
+
+    const options = await BorrowerDataOptionModel.find({ isActive: true }).lean();
+    const optionsMap = new Map(options.map((opt) => [opt._id.toString(), opt]));
     if (borrowerSettings?.data?.options) {
-      borrowerSettings.data.options = borrowerSettings.data.options.sort((a, b) => {
-        const foundA = options.find((option) => option._id.toString() === a.dataOption.toString());
-        const foundB = options.find((option) => option._id.toString() === b.dataOption.toString());
-        if (!foundA || !foundB) {
-          return 0;
-        }
-        return foundA.order - foundB.order;
-      });
+      borrowerSettings.data.options = borrowerSettings.data.options
+        .filter((item) => optionsMap.has(item.dataOption.toString()))
+        .sort((a, b) => {
+          const foundA = optionsMap.get(a.dataOption.toString());
+          const foundB = optionsMap.get(b.dataOption.toString());
+
+          if (!foundA || !foundB) return 0;
+          return foundA.order - foundB.order;
+        });
     }
     const unmappedSettings = borrowerSettings ? borrowerSettings : await this.getDefaultSettings(borrowerId);
     return await this.addOptionNames(unmappedSettings as IBorrowerSettingsDocPopulated);