gemcap-be-common 1.4.2 → 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;
@@ -211,7 +211,7 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         ARAvailability: number;
     };
     actual?: boolean;
-    userCalculatedId?: mongoose.Types.ObjectId;
+    userCalculatedId?: string;
     calculatedAt?: Date;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
@@ -271,7 +271,7 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         ARAvailability: number;
     };
     actual?: boolean;
-    userCalculatedId?: mongoose.Types.ObjectId;
+    userCalculatedId?: string;
     calculatedAt?: Date;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
@@ -331,7 +331,7 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         ARAvailability: number;
     };
     actual?: boolean;
-    userCalculatedId?: mongoose.Types.ObjectId;
+    userCalculatedId?: string;
     calculatedAt?: Date;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{

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.2",
+  "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;
     }

package/services/brokers.service.d.ts

@@ -46,9 +46,9 @@ export declare class BrokersService {
     getAllProductBrokers(): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _id: import("mongoose").Types.ObjectId;
     })[]>;
-    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
+    getBorrowerBrokers(borrowerId: string): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _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/compliance-borrowers.service.d.ts

@@ -44,7 +44,7 @@ export declare class ComplianceBorrowersService {
             tooltip: string;
         };
     };
-    getFullComplianceBorrowerById(complianceBorrowerId: any): Promise<any>;
+    getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<any>;
     getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "borrower" | "fundingStatus" | "items"> | {
         items: {
             instances: any[];

package/services/compliance-borrowers.service.js

@@ -75,10 +75,10 @@ class ComplianceBorrowersService {
             path: 'items',
             populate: { path: 'item', model: 'complianceItems' },
         })
-            .populate({
-            path: 'items',
-            populate: { path: 'instances.files.uploadedBy', model: 'users' },
-        })
+            // .populate({
+            //   path: 'items',
+            //   populate: { path: 'instances.files.uploadedBy', model: MODEL_NAMES.users },
+            // }) // TODO remove this when we have a better way to handle users
             .transform((borrower) => ({ ...borrower, plaidAccessToken: borrower?.plaidAccessToken ?? false }))
             .lean();
         if (!ourBorrower.borrower) {

package/services/compliance-borrowers.service.ts

@@ -76,7 +76,7 @@ export class ComplianceBorrowersService {
     return { progress, score };
   }
 
-  async getFullComplianceBorrowerById(complianceBorrowerId): Promise<any> {
+  async getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<any> {
     if (!complianceBorrowerId) {
       return null;
     }
@@ -87,10 +87,10 @@ export class ComplianceBorrowersService {
         path: 'items',
         populate: { path: 'item', model: 'complianceItems' },
       })
-      .populate({
-        path: 'items',
-        populate: { path: 'instances.files.uploadedBy', model: 'users' },
-      })
+      // .populate({
+      //   path: 'items',
+      //   populate: { path: 'instances.files.uploadedBy', model: MODEL_NAMES.users },
+      // }) // TODO remove this when we have a better way to handle users
       .transform((borrower) => ({ ...borrower, plaidAccessToken: borrower?.plaidAccessToken ?? false }))
       .lean() as IComplianceBorrowerDocumentFull;
     if (!ourBorrower.borrower) {

package/services/loan-payments.service.js

@@ -214,7 +214,7 @@ class LoanPaymentsService {
                 productId: new mongoose_1.default.Types.ObjectId(productId),
                 reference: `${borrower.code} - STATEMENT PAID`,
                 transactionType: LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION,
-                userId: new mongoose_1.default.Types.ObjectId(userId),
+                userId,
             };
             transaction.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(transaction);
             const newTransaction = await this.loanTransactionsService.createLoanTransaction(transaction);
@@ -355,7 +355,7 @@ class LoanPaymentsService {
                             productId: revolverProduct._id,
                             reference: `${product.type} STATEMENT ADDED TO LOAN`,
                             transactionType: LoanTransaction_model_1.ELoanTransactionTypes.DISBURSEMENT,
-                            userId: new mongoose_1.default.Types.ObjectId(userId),
+                            userId,
                         };
                         newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
                         await this.loanTransactionsService.createLoanTransaction(newTransactions);
@@ -373,7 +373,7 @@ class LoanPaymentsService {
                     productId: revolverProduct._id,
                     reference: `OVERPAYMENT OF STATEMENT`,
                     transactionType: LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION,
-                    userId: new mongoose_1.default.Types.ObjectId(userId),
+                    userId,
                 };
                 newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
                 await this.loanTransactionsService.createLoanTransaction(newTransactions);
@@ -388,7 +388,7 @@ class LoanPaymentsService {
                     productId: new mongoose_1.default.Types.ObjectId(p.productId),
                     reference: `EXTRA PAYMENT REF`,
                     transactionType: LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION,
-                    userId: new mongoose_1.default.Types.ObjectId(userId),
+                    userId,
                 };
                 newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
                 await this.loanTransactionsService.createLoanTransaction(newTransactions);

package/services/loan-payments.service.ts

@@ -249,7 +249,7 @@ export class LoanPaymentsService {
         productId: new mongoose.Types.ObjectId(productId),
         reference: `${borrower.code} - STATEMENT PAID`,
         transactionType: ELoanTransactionTypes.COLLECTION,
-        userId: new mongoose.Types.ObjectId(userId),
+        userId,
       };
       transaction.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(transaction);
       const newTransaction = await this.loanTransactionsService.createLoanTransaction(transaction);
@@ -399,7 +399,7 @@ export class LoanPaymentsService {
               productId: revolverProduct._id,
               reference: `${product.type} STATEMENT ADDED TO LOAN`,
               transactionType: ELoanTransactionTypes.DISBURSEMENT,
-              userId: new mongoose.Types.ObjectId(userId),
+              userId,
             };
             newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
             await this.loanTransactionsService.createLoanTransaction(newTransactions);
@@ -418,7 +418,7 @@ export class LoanPaymentsService {
           productId: revolverProduct._id,
           reference: `OVERPAYMENT OF STATEMENT`,
           transactionType: ELoanTransactionTypes.COLLECTION,
-          userId: new mongoose.Types.ObjectId(userId),
+          userId,
         };
         newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
         await this.loanTransactionsService.createLoanTransaction(newTransactions);
@@ -434,7 +434,7 @@ export class LoanPaymentsService {
           productId: new mongoose.Types.ObjectId(p.productId),
           reference: `EXTRA PAYMENT REF`,
           transactionType: ELoanTransactionTypes.COLLECTION,
-          userId: new mongoose.Types.ObjectId(userId),
+          userId,
         };
         newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
         await this.loanTransactionsService.createLoanTransaction(newTransactions);

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

@@ -112,7 +112,7 @@ export declare class LoanStatementService {
         isSystem: boolean;
         memo: string;
         settlementCode?: string;
-        userId?: import("mongoose").Types.ObjectId;
+        userId?: string;
         isEditable?: boolean;
         _id?: any;
         __v?: any;