gemcap-be-common 1.4.3 → 1.4.4

package/models/MicroserviceTask.model.d.ts

@@ -28,7 +28,7 @@ import { EMicroserviceTaskStatuses } from '../enums/microservice-task-statuses.e
 export interface IMicroserviceTask {
     cmd: EMicroserviceTask;
     params: any;
-    userId: mongoose.Types.ObjectId;
+    userId: string;
     status: EMicroserviceTaskStatuses;
     executeAt: Date;
 }
@@ -42,9 +42,9 @@ export declare const MicroserviceTaskSchema: mongoose.Schema<any, mongoose.Model
 } & {
     cmd: string;
     params: any;
+    userId?: string;
     __v?: number;
     status?: string;
-    userId?: mongoose.Types.ObjectId;
     executeAt?: Date;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
@@ -52,9 +52,9 @@ export declare const MicroserviceTaskSchema: mongoose.Schema<any, mongoose.Model
 } & {
     cmd: string;
     params: any;
+    userId?: string;
     __v?: number;
     status?: string;
-    userId?: mongoose.Types.ObjectId;
     executeAt?: Date;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
@@ -62,9 +62,9 @@ export declare const MicroserviceTaskSchema: mongoose.Schema<any, mongoose.Model
 } & {
     cmd: string;
     params: any;
+    userId?: string;
     __v?: number;
     status?: string;
-    userId?: mongoose.Types.ObjectId;
     executeAt?: Date;
 }> & {
     _id: mongoose.Types.ObjectId;

package/models/MicroserviceTask.model.js

@@ -17,8 +17,7 @@ exports.MicroserviceTaskSchema = new mongoose_1.default.Schema({
         required: true,
     },
     userId: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
     },
     status: {
         type: String,

package/models/MicroserviceTask.model.ts

@@ -9,7 +9,7 @@ const mongooseLeanId = require('../plugins/id.plugin');
 export interface IMicroserviceTask {
   cmd: EMicroserviceTask;
   params: any;
-  userId: mongoose.Types.ObjectId;
+  userId: string;
   status: EMicroserviceTaskStatuses;
   executeAt: Date;
 }
@@ -28,8 +28,7 @@ export const MicroserviceTaskSchema = new mongoose.Schema(
       required: true,
     },
     userId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
     },
     status: {
       type: String,

package/models/QueryResult.model.d.ts

@@ -102,7 +102,7 @@ export declare const QUERY_GROUPS: TQueryGroups;
 export interface IQueryResult {
     query: string;
     filter: Object;
-    userId?: mongoose.Types.ObjectId;
+    userId?: string;
     result: Object;
 }
 export interface IQueryResultDoc extends IQueryResult, Document {

package/models/QueryResult.model.js

@@ -187,8 +187,7 @@ exports.QueryResultSchema = new mongoose_1.default.Schema({
     },
     filter: mongoose_1.default.Schema.Types.Mixed,
     userId: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
         required: false,
     },
     result: mongoose_1.default.Schema.Types.Mixed,

package/models/QueryResult.model.ts

@@ -215,7 +215,7 @@ export const QUERY_GROUPS: TQueryGroups = {
 export interface IQueryResult {
   query: string;
   filter: Object;
-  userId?: mongoose.Types.ObjectId;
+  userId?: string;
   result: Object;
 }
 
@@ -232,8 +232,7 @@ export const QueryResultSchema = new mongoose.Schema<IQueryResult, TQueryResultM
     },
     filter: mongoose.Schema.Types.Mixed,
     userId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
       required: false,
     },
     result: mongoose.Schema.Types.Mixed,

package/models/ReceivableAvailability.model.d.ts

@@ -79,7 +79,7 @@ export interface IReceivableManualSummary {
 export interface IReceivableAvailability {
     borrowerId: mongoose.Types.ObjectId;
     bbcDateId: mongoose.Types.ObjectId;
-    userCalculatedId: mongoose.Types.ObjectId;
+    userCalculatedId: string;
     calculatedAt: Date;
     actual: boolean;
     settings?: IAvailabilitySettings;
@@ -184,49 +184,49 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
     bbcDateId: mongoose.Types.ObjectId;
+    borrowerId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        grossAR: number;
-        balanceAfterCrossAge: number;
-        permittedOver: number;
         creditNotes: number;
         excludedCustomerDeduction: number;
+        grossAR: number;
+        permittedOver: number;
+        preliminaryEligibleBalance: number;
+        creditNotesNegative: number;
         deduction: number;
         partiallyPaidDeduction: number;
         contraDeduction: number;
         crossAgeDeduction: number;
         waivedDeduction: number;
+        balanceAfterCrossAge: number;
         finalResult: number;
         insuredComponent: number;
-        preliminaryEligibleBalance: number;
         uninsuredComponent: number;
         insuredAvailability: number;
         uninsuredAvailability: number;
-        creditNotesNegative: number;
         ARReserves: number;
         ARAvailability: number;
     };
-    userCalculatedId?: mongoose.Types.ObjectId;
-    calculatedAt?: Date;
     actual?: boolean;
+    userCalculatedId?: string;
+    calculatedAt?: Date;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        insuredCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
@@ -244,49 +244,49 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
     bbcDateId: mongoose.Types.ObjectId;
+    borrowerId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        grossAR: number;
-        balanceAfterCrossAge: number;
-        permittedOver: number;
         creditNotes: number;
         excludedCustomerDeduction: number;
+        grossAR: number;
+        permittedOver: number;
+        preliminaryEligibleBalance: number;
+        creditNotesNegative: number;
         deduction: number;
         partiallyPaidDeduction: number;
         contraDeduction: number;
         crossAgeDeduction: number;
         waivedDeduction: number;
+        balanceAfterCrossAge: number;
         finalResult: number;
         insuredComponent: number;
-        preliminaryEligibleBalance: number;
         uninsuredComponent: number;
         insuredAvailability: number;
         uninsuredAvailability: number;
-        creditNotesNegative: number;
         ARReserves: number;
         ARAvailability: number;
     };
-    userCalculatedId?: mongoose.Types.ObjectId;
-    calculatedAt?: Date;
     actual?: boolean;
+    userCalculatedId?: string;
+    calculatedAt?: Date;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        insuredCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
@@ -304,49 +304,49 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
     bbcDateId: mongoose.Types.ObjectId;
+    borrowerId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        grossAR: number;
-        balanceAfterCrossAge: number;
-        permittedOver: number;
         creditNotes: number;
         excludedCustomerDeduction: number;
+        grossAR: number;
+        permittedOver: number;
+        preliminaryEligibleBalance: number;
+        creditNotesNegative: number;
         deduction: number;
         partiallyPaidDeduction: number;
         contraDeduction: number;
         crossAgeDeduction: number;
         waivedDeduction: number;
+        balanceAfterCrossAge: number;
         finalResult: number;
         insuredComponent: number;
-        preliminaryEligibleBalance: number;
         uninsuredComponent: number;
         insuredAvailability: number;
         uninsuredAvailability: number;
-        creditNotesNegative: number;
         ARReserves: number;
         ARAvailability: number;
     };
-    userCalculatedId?: mongoose.Types.ObjectId;
-    calculatedAt?: Date;
     actual?: boolean;
+    userCalculatedId?: string;
+    calculatedAt?: Date;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        insuredCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;

package/models/ReceivableAvailability.model.js

@@ -108,8 +108,7 @@ exports.AvailabilitySchema = new mongoose_1.default.Schema({
         required: true,
     },
     userCalculatedId: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
         required: false,
     },
     calculatedAt: {

package/models/ReceivableAvailability.model.ts

@@ -66,7 +66,7 @@ export interface IReceivableManualSummary {
 export interface IReceivableAvailability {
   borrowerId: mongoose.Types.ObjectId;
   bbcDateId: mongoose.Types.ObjectId;
-  userCalculatedId: mongoose.Types.ObjectId;
+  userCalculatedId: string;
   calculatedAt: Date;
   actual: boolean;
   settings?: IAvailabilitySettings;
@@ -182,8 +182,7 @@ export const AvailabilitySchema = new mongoose.Schema(
       required: true,
     },
     userCalculatedId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
       required: false,
     },
     calculatedAt: {

package/models/TransactionAttachedFile.Model.d.ts

@@ -28,7 +28,7 @@ export interface ITransactionAttachedFile {
     filename: string;
     originalName: string;
     effectiveDate: string;
-    userId: mongoose.Types.ObjectId;
+    userId: string;
 }
 export interface ITransactionAttachedFileDoc extends ITransactionAttachedFile, mongoose.Document {
 }
@@ -38,32 +38,32 @@ export declare const TransactionAttachedFileSchema: mongoose.Schema<any, mongoos
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
     effectiveDate: string;
+    borrowerId: mongoose.Types.ObjectId;
     filename: string;
     originalName: string;
+    userId?: string;
     __v?: number;
-    userId?: mongoose.Types.ObjectId;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
     effectiveDate: string;
+    borrowerId: mongoose.Types.ObjectId;
     filename: string;
     originalName: string;
+    userId?: string;
     __v?: number;
-    userId?: mongoose.Types.ObjectId;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    borrowerId: mongoose.Types.ObjectId;
     effectiveDate: string;
+    borrowerId: mongoose.Types.ObjectId;
     filename: string;
     originalName: string;
+    userId?: string;
     __v?: number;
-    userId?: mongoose.Types.ObjectId;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/TransactionAttachedFile.Model.js

@@ -28,8 +28,7 @@ exports.TransactionAttachedFileSchema = new mongoose_1.default.Schema({
         trim: true,
     },
     userId: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
         required: false,
     },
     __v: { type: Number, select: false },

package/models/TransactionAttachedFile.Model.ts

@@ -7,7 +7,7 @@ export interface ITransactionAttachedFile {
   filename: string;
   originalName: string;
   effectiveDate: string;
-  userId: mongoose.Types.ObjectId;
+  userId: string;
 }
 
 export interface ITransactionAttachedFileDoc extends ITransactionAttachedFile, mongoose.Document {
@@ -36,8 +36,7 @@ export const TransactionAttachedFileSchema = new mongoose.Schema(
       trim: true,
     },
     userId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
       required: false,
     },
     __v: { type: Number, select: false },

package/models/Underwriter.model.d.ts

@@ -29,7 +29,7 @@ export interface IUnderwriter {
     name: string;
     email: string;
     order?: number;
-    userId?: mongoose.Types.ObjectId;
+    userId?: string;
 }
 export interface IUnderwriterWithId extends IUnderwriter {
     _id: string;

package/models/Underwriter.model.js

@@ -32,8 +32,7 @@ exports.UnderwriterSchema = new mongoose_1.default.Schema({
         type: String,
     },
     userId: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
         required: false,
     },
 }, {

package/models/Underwriter.model.ts

@@ -8,7 +8,7 @@ export interface IUnderwriter {
   name: string;
   email: string;
   order?: number;
-  userId?: mongoose.Types.ObjectId;
+  userId?: string;
 }
 
 export interface IUnderwriterWithId extends IUnderwriter {
@@ -47,8 +47,7 @@ export const UnderwriterSchema = new mongoose.Schema<IUnderwriter, UnderwriterMo
       type: String,
     },
     userId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
       required: false,
     },
   },

package/models/UploadedFile.model.d.ts

@@ -28,7 +28,7 @@ export interface IUploadedFile {
     filename: string;
     originalName: string;
     borrowerId: mongoose.Types.ObjectId;
-    userId: mongoose.Types.ObjectId;
+    userId: string;
     converted?: boolean;
     type: EUploadTypes;
 }
@@ -42,9 +42,9 @@ export declare const UploadedFileSchema: mongoose.Schema<any, mongoose.Model<any
 } & {
     type: string;
     converted: boolean;
+    userId?: string;
     __v?: number;
     borrowerId?: mongoose.Types.ObjectId;
-    userId?: mongoose.Types.ObjectId;
     filename?: string;
     originalName?: string;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
@@ -53,9 +53,9 @@ export declare const UploadedFileSchema: mongoose.Schema<any, mongoose.Model<any
 } & {
     type: string;
     converted: boolean;
+    userId?: string;
     __v?: number;
     borrowerId?: mongoose.Types.ObjectId;
-    userId?: mongoose.Types.ObjectId;
     filename?: string;
     originalName?: string;
 }>> & mongoose.FlatRecord<{
@@ -64,9 +64,9 @@ export declare const UploadedFileSchema: mongoose.Schema<any, mongoose.Model<any
 } & {
     type: string;
     converted: boolean;
+    userId?: string;
     __v?: number;
     borrowerId?: mongoose.Types.ObjectId;
-    userId?: mongoose.Types.ObjectId;
     filename?: string;
     originalName?: string;
 }> & {

package/models/UploadedFile.model.js

@@ -24,8 +24,7 @@ exports.UploadedFileSchema = new mongoose_1.default.Schema({
         required: false,
     },
     userId: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
         required: false,
     },
     converted: {

package/models/UploadedFile.model.ts

@@ -9,7 +9,7 @@ export interface IUploadedFile {
   filename: string;
   originalName: string;
   borrowerId: mongoose.Types.ObjectId;
-  userId: mongoose.Types.ObjectId;
+  userId: string;
   converted?: boolean;
   type: EUploadTypes;
 }
@@ -35,8 +35,7 @@ export const UploadedFileSchema = new mongoose.Schema(
       required: false,
     },
     userId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
       required: false,
     },
     converted: {

package/models/UserLog.model.d.ts

@@ -46,7 +46,7 @@ export declare enum ELogActionType {
 export interface IUserLog {
     _id?: mongoose.Types.ObjectId;
     logType: ELogType;
-    userId: mongoose.Types.ObjectId;
+    userId: string;
     timestamp: Date;
     action: ELogActionType;
     recordId: mongoose.Types.ObjectId;

package/models/UserLog.model.js

@@ -35,8 +35,7 @@ exports.UserLogSchema = new mongoose_1.default.Schema({
         required: true,
     },
     userId: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
         required: true,
     },
     timestamp: {

package/models/UserLog.model.ts

@@ -27,7 +27,7 @@ export enum ELogActionType {
 export interface IUserLog {
   _id?: mongoose.Types.ObjectId;
   logType: ELogType;
-  userId: mongoose.Types.ObjectId;
+  userId: string;
   timestamp: Date;
   action: ELogActionType;
   recordId: mongoose.Types.ObjectId;
@@ -49,8 +49,7 @@ export const UserLogSchema = new mongoose.Schema<IUserLog, UserLogModel>(
       required: true,
     },
     userId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
       required: true,
     },
     timestamp: {

package/package.json

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

package/services/attached-files.service.js

@@ -68,7 +68,7 @@ class AttachedFilesService {
     }
     async createAttachedFile(file, userId, effectiveDate, borrowerId) {
         const newFile = {
-            userId: new mongoose_1.default.Types.ObjectId(userId),
+            userId,
             filename: file.filename,
             originalName: file.originalName,
             effectiveDate,

package/services/attached-files.service.ts

@@ -89,7 +89,7 @@ export class AttachedFilesService {
     originalName: string
   }, userId: string, effectiveDate: string, borrowerId: string) {
     const newFile: ITransactionAttachedFile = {
-      userId: new mongoose.Types.ObjectId(userId),
+      userId,
       filename: file.filename,
       originalName: file.originalName,
       effectiveDate,

package/services/availability.service.js

@@ -17,7 +17,6 @@ const ReceivableAvailabilityItem_model_1 = require("../models/ReceivableAvailabi
 const collaterals_db_1 = require("../db/collaterals.db");
 const _models_1 = require("../models/_models");
 const receivables_db_1 = require("../db/receivables.db");
-const availability_db_1 = require("../db/availability.db");
 const bbcSheets_db_1 = require("../db/bbcSheets.db");
 const CustomerGroup_model_1 = require("../models/CustomerGroup.model");
 const partially_paid_restated_1 = require("../queries/receivable/partially-paid-restated");
@@ -91,7 +90,7 @@ class AvailabilityService {
         const calculation = {
             borrowerId: null,
             bbcDateId: new mongoose_1.default.Types.ObjectId(bbcDateId),
-            userCalculatedId: user?.id ? new mongoose_1.default.Types.ObjectId(String(user.id)) : null,
+            userCalculatedId: user?.id ? user.id : null,
             calculatedAt: new Date(),
             actual: true,
             settings: calculationsSettings,
@@ -589,7 +588,7 @@ class AvailabilityService {
             },
             {
                 $lookup: {
-                    from: 'users',
+                    from: _models_1.MODEL_NAMES.users,
                     localField: 'userCalculatedId',
                     foreignField: '_id',
                     as: 'userCalculated',
@@ -883,7 +882,7 @@ class AvailabilityService {
         };
     }
     async isBBCEditable(bbcDateId) {
-        const availabilitiesSigns = await (0, availability_db_1.getAvailabilitySigns)([bbcDateId]);
+        const availabilitiesSigns = await this.signsService.getAvailabilitiesSigns([bbcDateId]);
         if (!availabilitiesSigns.length) {
             return true;
         }

package/services/availability.service.ts

@@ -29,7 +29,6 @@ import { getCollateralDocsByBBC, ITEMS_PAGINATION } from '../db/collaterals.db';
 import { IAvailabilitySignView } from '../models/AvailabilitySigns.model';
 import { MODEL_NAMES } from '../models/_models';
 import { setReceivableManualInputsToggle } from '../db/receivables.db';
-import { getAvailabilitySigns } from '../db/availability.db';
 import { IInventoryAvailabilitySummary, InventoryAvailabilityPaginators } from '../models/InventoryAvailability.model';
 import { getBBCSheetsByType } from '../db/bbcSheets.db';
 import { CustomerGroupModel } from '../models/CustomerGroup.model';
@@ -160,7 +159,7 @@ export class AvailabilityService {
     const calculation: IReceivableAvailability = {
       borrowerId: null,
       bbcDateId: new mongoose.Types.ObjectId(bbcDateId),
-      userCalculatedId: user?.id ? new mongoose.Types.ObjectId(String(user.id)) : null,
+      userCalculatedId: user?.id ? user.id : null,
       calculatedAt: new Date(),
       actual: true,
       settings: calculationsSettings,
@@ -704,7 +703,7 @@ export class AvailabilityService {
       },
       {
         $lookup: {
-          from: 'users',
+          from: MODEL_NAMES.users,
           localField: 'userCalculatedId',
           foreignField: '_id',
           as: 'userCalculated',
@@ -1019,7 +1018,7 @@ export class AvailabilityService {
   }
 
   async isBBCEditable(bbcDateId: string): Promise<boolean> {
-    const availabilitiesSigns = await getAvailabilitySigns([bbcDateId]);
+    const availabilitiesSigns = await this.signsService.getAvailabilitiesSigns([bbcDateId]);
     if (!availabilitiesSigns.length) {
       return true;
     }