gemcap-be-common 1.3.187 → 1.4.2

package/interfaces/auth-user.interface.d.ts

@@ -0,0 +1,21 @@
+export interface IUserBasic {
+    id: string;
+    username: string;
+    email: string | null;
+    firstName: string | null;
+    lastName: string | null;
+}
+export interface IUser extends IUserBasic {
+    createdAt?: Date;
+    updatedAt?: Date;
+    passwordResetTokenHash?: string | null;
+    passwordResetExpires?: Date | null;
+    refreshTokenHash?: string | null;
+    refreshTokenExpires?: Date | null;
+    roles?: Record<string, string[]>;
+    deletedAt?: Date | null;
+    isEnabled?: boolean;
+    allBorrowers?: boolean;
+    borrowersAccess?: string[];
+    lastLogin?: Date | null;
+}

package/interfaces/auth-user.interface.ts

@@ -0,0 +1,22 @@
+export interface IUserBasic {
+  id: string;
+  username: string;
+  email: string | null;
+  firstName: string | null;
+  lastName: string | null;
+}
+
+export interface IUser extends IUserBasic {
+  createdAt?: Date;
+  updatedAt?: Date;
+  passwordResetTokenHash?: string | null;
+  passwordResetExpires?: Date | null;
+  refreshTokenHash?: string | null;
+  refreshTokenExpires?: Date | null;
+  roles?: Record<string, string[]>;
+  deletedAt?: Date | null;
+  isEnabled?: boolean;
+  allBorrowers?: boolean;
+  borrowersAccess?: string[];
+  lastLogin?: Date | null;
+}

package/models/AvailabilitySigns.model.d.ts

@@ -23,19 +23,19 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose from 'mongoose';
-import { IUserDocument } from './User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 export declare const REQUIRED_SIGNS = 2;
 export interface IAvailabilitySignItem {
-    userSignedId: mongoose.Types.ObjectId;
+    userSignedId: string;
     signedAt: Date;
-    userRevokedId?: mongoose.Types.ObjectId;
+    userRevokedId?: string;
     revokedAt?: Date;
 }
 export interface IAvailabilitySignItemView {
     _id: mongoose.Types.ObjectId;
-    userSigned: IUserDocument;
+    userSigned: IUser;
     signedAt: Date;
-    userRevoked?: IUserDocument;
+    userRevoked?: IUser;
     revokedAt?: Date;
 }
 export interface IAvailabilitySign {
@@ -60,9 +60,9 @@ export declare const IAvailabilitySignSchema: mongoose.Schema<any, mongoose.Mode
     bbcDateId: mongoose.Types.ObjectId;
     requiredSigns: number;
     signs: mongoose.Types.DocumentArray<{
-        userSignedId: mongoose.Types.ObjectId;
+        userSignedId: string;
         signedAt: Date;
-        userRevokedId?: mongoose.Types.ObjectId;
+        userRevokedId?: string;
         revokedAt?: Date;
     }>;
     __v?: number;
@@ -73,9 +73,9 @@ export declare const IAvailabilitySignSchema: mongoose.Schema<any, mongoose.Mode
     bbcDateId: mongoose.Types.ObjectId;
     requiredSigns: number;
     signs: mongoose.Types.DocumentArray<{
-        userSignedId: mongoose.Types.ObjectId;
+        userSignedId: string;
         signedAt: Date;
-        userRevokedId?: mongoose.Types.ObjectId;
+        userRevokedId?: string;
         revokedAt?: Date;
     }>;
     __v?: number;
@@ -86,9 +86,9 @@ export declare const IAvailabilitySignSchema: mongoose.Schema<any, mongoose.Mode
     bbcDateId: mongoose.Types.ObjectId;
     requiredSigns: number;
     signs: mongoose.Types.DocumentArray<{
-        userSignedId: mongoose.Types.ObjectId;
+        userSignedId: string;
         signedAt: Date;
-        userRevokedId?: mongoose.Types.ObjectId;
+        userRevokedId?: string;
         revokedAt?: Date;
     }>;
     __v?: number;

package/models/AvailabilitySigns.model.js

@@ -22,8 +22,7 @@ exports.IAvailabilitySignSchema = new mongoose_1.default.Schema({
     signs: [
         {
             userSignedId: {
-                type: mongoose_1.default.Schema.Types.ObjectId,
-                ref: _models_1.MODEL_NAMES.users,
+                type: String,
                 required: true,
             },
             signedAt: {
@@ -31,8 +30,7 @@ exports.IAvailabilitySignSchema = new mongoose_1.default.Schema({
                 required: true,
             },
             userRevokedId: {
-                type: mongoose_1.default.Schema.Types.ObjectId,
-                ref: _models_1.MODEL_NAMES.users,
+                type: String,
                 required: false,
             },
             revokedAt: {

package/models/AvailabilitySigns.model.ts

@@ -1,6 +1,6 @@
 import mongoose from 'mongoose';
 
-import { IUserDocument } from './User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { MODEL_NAMES } from './_models';
 
 const mongooseLeanId = require('../plugins/id.plugin');
@@ -8,17 +8,17 @@ const mongooseLeanId = require('../plugins/id.plugin');
 export const REQUIRED_SIGNS = 2;
 
 export interface IAvailabilitySignItem {
-  userSignedId: mongoose.Types.ObjectId;
+  userSignedId: string;
   signedAt: Date;
-  userRevokedId?: mongoose.Types.ObjectId;
+  userRevokedId?: string;
   revokedAt?: Date;
 }
 
 export interface IAvailabilitySignItemView {
   _id: mongoose.Types.ObjectId;
-  userSigned: IUserDocument;
+  userSigned: IUser;
   signedAt: Date;
-  userRevoked?: IUserDocument;
+  userRevoked?: IUser;
   revokedAt?: Date;
 }
 
@@ -53,8 +53,7 @@ export const IAvailabilitySignSchema = new mongoose.Schema(
     signs: [
       {
         userSignedId: {
-          type: mongoose.Schema.Types.ObjectId,
-          ref: MODEL_NAMES.users,
+          type: String,
           required: true,
         },
         signedAt: {
@@ -62,8 +61,7 @@ export const IAvailabilitySignSchema = new mongoose.Schema(
           required: true,
         },
         userRevokedId: {
-          type: mongoose.Schema.Types.ObjectId,
-          ref: MODEL_NAMES.users,
+          type: String,
           required: false,
         },
         revokedAt: {

package/models/ReceivableAvailability.model.d.ts

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from 'mongoose';
 import { IReceivableAvailabilityItem, IReceivableAvailabilityItemView } from './ReceivableAvailabilityItem.model';
-import { IUserDocument } from './User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { SummaryMultipliers } from './ReceivableAvailabilityManualSummary.model';
 export declare enum ELimitSettings {
     EXCLUDED_CUSTOMERS = "excludedCustomers",
@@ -94,7 +94,7 @@ export interface IReceivableAvailabilityView extends IReceivableAvailabilityDoc
     items: IReceivableAvailabilityItemView[];
     uniqueCustomers: string[];
     totalItems: number;
-    userCalculated?: IUserDocument;
+    userCalculated?: IUser;
 }
 export declare const summarySchemeDesc: {
     invoiceAmount: {

package/models/ReceivableAvailability.model.ts

@@ -1,7 +1,7 @@
 import mongoose, { Document } from 'mongoose';
 
 import { IReceivableAvailabilityItem, IReceivableAvailabilityItemView } from './ReceivableAvailabilityItem.model';
-import { IUserDocument } from './User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { MODEL_NAMES } from './_models';
 import { SummaryMultipliers } from './ReceivableAvailabilityManualSummary.model';
 
@@ -83,7 +83,7 @@ export interface IReceivableAvailabilityView extends IReceivableAvailabilityDoc
   items: IReceivableAvailabilityItemView[];
   uniqueCustomers: string[];
   totalItems: number;
-  userCalculated?: IUserDocument;
+  userCalculated?: IUser;
 }
 
 export const summarySchemeDesc = {

package/models/User.model.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from 'mongoose';
-export interface IUser {
+export interface IUserLegacy {
     isDeleted?: boolean;
     firstName?: string;
     lastName?: string;
@@ -34,7 +34,7 @@ export interface IUser {
         borrower: string;
     }[];
 }
-export interface IUserDocument extends IUser, Document {
+export interface IUserLegacyDoc extends IUserLegacy, Document {
 }
 export declare const UserSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     timestamps: true;
@@ -83,4 +83,4 @@ export declare const UserSchema: mongoose.Schema<any, mongoose.Model<any, any, a
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;
-export declare const UserModel: mongoose.Model<IUserDocument>;
+export declare const UserModel: mongoose.Model<IUserLegacyDoc>;

package/models/User.model.ts

@@ -4,7 +4,7 @@ import { MODEL_NAMES } from './_models';
 
 const mongooseLeanId = require('../plugins/id.plugin');
 
-export interface IUser {
+export interface IUserLegacy {
   isDeleted?: boolean;
   firstName?: string;
   lastName?: string;
@@ -16,7 +16,7 @@ export interface IUser {
   }[];
 }
 
-export interface IUserDocument extends IUser, Document {
+export interface IUserLegacyDoc extends IUserLegacy, Document {
 }
 
 export const UserSchema = new mongoose.Schema(
@@ -63,4 +63,4 @@ export const UserSchema = new mongoose.Schema(
 
 UserSchema.plugin(mongooseLeanId);
 
-export const UserModel: mongoose.Model<IUserDocument> = mongoose.model<IUserDocument>(MODEL_NAMES.users, UserSchema);
+export const UserModel: mongoose.Model<IUserLegacyDoc> = mongoose.model<IUserLegacyDoc>(MODEL_NAMES.users, UserSchema);

package/models/_index.d.ts

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

package/package.json

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

package/services/availability.service.d.ts

@@ -1,5 +1,5 @@
 import { ELimitSettings, IReceivableAvailability, IAvailabilityLimits, IAvailabilitySettings, IAvailabilitySummary, IReceivableAvailabilityView } from '../models/ReceivableAvailability.model';
-import { IUserDocument } from '../models/User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { IReceivableAvailabilityItemView } from '../models/ReceivableAvailabilityItem.model';
 import { IPaginatorOptions } from '../interfaces/collaterals.interface';
 import { IInventoryAvailabilitySummary, InventoryAvailabilityPaginators } from '../models/InventoryAvailability.model';
@@ -49,14 +49,14 @@ export declare class AvailabilityService {
     private readonly signsService;
     constructor(collateralAdjustmentsService: CollateralAdjustmentsService, collateralsService: CollateralsService, equipmentService: EquipmentService, inventoryAvailabilityService: InventoryAvailabilityService, loanStatementService: LoanStatementService, loanTransactionsService: LoanTransactionsService, manualEntryService: ManualEntryService, reserveService: ReserveService, signsService: SignsService);
     recombineGroups(calculationsSettings: IAvailabilitySettings): Promise<IMappedSettings>;
-    calculateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserDocument): Promise<IReceivableAvailabilityView>;
-    getAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserDocument): Promise<IReceivableAvailabilityView>;
+    calculateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser): Promise<IReceivableAvailabilityView>;
+    getAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser): Promise<IReceivableAvailabilityView>;
     getAvailabilityItemsWithFilter(bbcDateId: string, itemsFilter: string): Promise<{
         itemsFilter: any;
         invoiceItems: any[];
         customerItems: any[];
     }>;
-    foundOrCreateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserDocument): Promise<IReceivableAvailabilityView>;
+    foundOrCreateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser): Promise<IReceivableAvailabilityView>;
     findCalculatedAvailability(bbcDateId: string): Promise<IReceivableAvailabilityView>;
     saveCalculatedAvailabilitySettings(bbcDateId: string, settings: IAvailabilitySettings): Promise<void>;
     saveLimitSettings(bbcDateId: string, limitSettings: {
@@ -70,7 +70,7 @@ export declare class AvailabilityService {
     getUniqueCustomers(availabilityId: string): Promise<{
         customerTitle: string;
     }[]>;
-    getAllSummaries(bbcDateId: string, user: IUserDocument): Promise<IAvailabilityFullSummary>;
+    getAllSummaries(bbcDateId: string, user: IUser): Promise<IAvailabilityFullSummary>;
     isBBCEditable(bbcDateId: string): Promise<boolean>;
     toggleManualReceivableAvailability(bbcDateId: string, useManualInputs: boolean): Promise<void>;
 }

package/services/availability.service.js

@@ -91,7 +91,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 ? new mongoose_1.default.Types.ObjectId(String(user.id)) : null,
             calculatedAt: new Date(),
             actual: true,
             settings: calculationsSettings,

package/services/availability.service.ts

@@ -14,7 +14,7 @@ import {
   IAvailabilitySummary,
   IReceivableAvailabilityView,
 } from '../models/ReceivableAvailability.model';
-import { IUserDocument } from '../models/User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { roundToXDigits } from '../helpers/numbers.helper';
 import { AccountPayableItemModel } from '../models/AccountPayableItem.model';
 import { ECollaterals } from '../enums/collaterals.enum';
@@ -34,7 +34,6 @@ import { IInventoryAvailabilitySummary, InventoryAvailabilityPaginators } from '
 import { getBBCSheetsByType } from '../db/bbcSheets.db';
 import { CustomerGroupModel } from '../models/CustomerGroup.model';
 import { getPartialPaid } from '../queries/receivable/partially-paid-restated';
-
 import MappedGroup from '../models/MappedGroup.model';
 import CustomerAPGroup from '../models/CustomerAPGroup.model';
 import { getReserveDocs } from '../db/reserve.db';
@@ -151,7 +150,7 @@ export class AvailabilityService {
     return groupedSettings;
   }
 
-  async calculateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserDocument): Promise<IReceivableAvailabilityView> {
+  async calculateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser): Promise<IReceivableAvailabilityView> {
 
     const calculationsSettings = await this.getCalculationSettings(bbcDateId);
 
@@ -161,7 +160,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 ? new mongoose.Types.ObjectId(String(user.id)) : null,
       calculatedAt: new Date(),
       actual: true,
       settings: calculationsSettings,
@@ -560,7 +559,7 @@ export class AvailabilityService {
     return await this.getAvailability(bbcDateId, paginatorOptions, user);
   }
 
-  async getAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserDocument) {
+  async getAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser) {
     return await this.foundOrCreateAvailability(bbcDateId, paginatorOptions, user);
   }
 
@@ -655,7 +654,7 @@ export class AvailabilityService {
     return { itemsFilter: filterField, invoiceItems, customerItems: customerItemsWithTotal };
   }
 
-  async foundOrCreateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserDocument) {
+  async foundOrCreateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser) {
     const foundAvailability = await this.findCalculatedAvailability(bbcDateId);
     if (foundAvailability) {
       foundAvailability.items = await this.getAvailabilityItems(foundAvailability._id.toString(), paginatorOptions);
@@ -989,7 +988,7 @@ export class AvailabilityService {
     ]);
   }
 
-  async getAllSummaries(bbcDateId: string, user: IUserDocument): Promise<IAvailabilityFullSummary> {
+  async getAllSummaries(bbcDateId: string, user: IUser): Promise<IAvailabilityFullSummary> {
     const equipment = await this.equipmentService.getEquipmentForBBC(bbcDateId);
     const reserve = await this.reserveService.getReserve(bbcDateId);
     const loanBalances = await this.loanTransactionsService.getLoanBalanceForBBCDateId(bbcDateId);

package/services/borrowers.db.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose" />
 /// <reference types="mongoose/types/inferschematype" />
-import { IUser } from '../models/User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 export declare class BorrowersDB {
     getAllBorrowers(): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
         _id: import("mongoose").Types.ObjectId;

package/services/borrowers.db.js

@@ -11,7 +11,7 @@ class BorrowersDB {
     }
     async getAllowedBorrowers(user) {
         return Borrower_model_1.BorrowerModel
-            .find(user.allBorrowers ? {} : { '_id': { $in: user.borrowersAccess.map((b) => b.borrower) } })
+            .find(user.allBorrowers ? {} : { '_id': { $in: user.borrowersAccess } })
             .collation({ locale: 'en' })
             .sort({ code: 1 })
             .lean();

package/services/borrowers.db.ts

@@ -1,5 +1,5 @@
 import { BorrowerModel } from '../models/Borrower.model';
-import { IUser } from '../models/User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 
 export class BorrowersDB {
   async getAllBorrowers() {
@@ -12,7 +12,7 @@ export class BorrowersDB {
 
   async getAllowedBorrowers(user: IUser) {
     return BorrowerModel
-      .find(user.allBorrowers ? {} : { '_id': { $in: user.borrowersAccess.map((b) => b.borrower) } })
+      .find(user.allBorrowers ? {} : { '_id': { $in: user.borrowersAccess } })
       .collation({ locale: 'en' })
       .sort({ code: 1 })
       .lean();

package/services/borrowers.service.d.ts

@@ -30,6 +30,7 @@ import { CollateralsService } from './collaterals.service';
 import { LoanStatementStatusService } from './loan-statement-status.service';
 import { LoanTransactionsService } from './loan-transactions.service';
 import { SignsService } from './signs.service';
+import { IUser } from '../interfaces/auth-user.interface';
 export declare const borrowerDataModels: {
     [modelName: string]: mongoose.Model<any>;
 };
@@ -39,8 +40,8 @@ export declare class BorrowerService {
     private readonly getLoanTransactionsService;
     private readonly getSignsService;
     constructor(getCollateralsService: () => CollateralsService, getLoanStatementStatusService: () => LoanStatementStatusService, getLoanTransactionsService: () => LoanTransactionsService, getSignsService: () => SignsService);
-    isBorrowerAllowed(userAccess: any, requestedBorrowerId: string): boolean;
-    checkBorrower(userAccess: any, requestedBorrowerId: string): boolean;
+    isBorrowerAllowed(user: IUser, requestedBorrowerId: string): boolean;
+    checkBorrower(user: IUser, requestedBorrowerId: string): boolean;
     getBorrowerById(borrowerId: string): Promise<mongoose.FlattenMaps<IBorrowerDocument> & {
         _id: mongoose.Types.ObjectId;
     }>;
@@ -83,10 +84,10 @@ export declare class BorrowerService {
     getBorrowerCodesMap(): Promise<Map<string, string>>;
     getBorrowerStatementDetails(borrowers: IBorrowerDocument[]): Promise<{
         [x: number]: {
-            SELECTED_PERIOD?: boolean;
-            ENTIRE_LOAN?: boolean;
             LAST_MONTH?: boolean;
             CURRENT_MONTH?: boolean;
+            ENTIRE_LOAN?: boolean;
+            SELECTED_PERIOD?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

package/services/borrowers.service.js

@@ -39,14 +39,17 @@ class BorrowerService {
         this.getLoanTransactionsService = getLoanTransactionsService;
         this.getSignsService = getSignsService;
     }
-    isBorrowerAllowed(userAccess, requestedBorrowerId) {
-        if (userAccess.allBorrowers) {
+    isBorrowerAllowed(user, requestedBorrowerId) {
+        if (!user) {
+            return false;
+        }
+        if (user.allBorrowers) {
             return true;
         }
-        return userAccess.borrowersAccess.some((b) => b.borrower === requestedBorrowerId);
+        return user.borrowersAccess?.includes(requestedBorrowerId);
     }
-    checkBorrower(userAccess, requestedBorrowerId) {
-        const allowedBorrower = this.isBorrowerAllowed(userAccess, requestedBorrowerId);
+    checkBorrower(user, requestedBorrowerId) {
+        const allowedBorrower = this.isBorrowerAllowed(user, requestedBorrowerId);
         if (!allowedBorrower) {
             throw new Error('Non allowed borrower');
         }

package/services/borrowers.service.ts

@@ -24,6 +24,7 @@ import { CollateralsService } from './collaterals.service';
 import { LoanStatementStatusService } from './loan-statement-status.service';
 import { LoanTransactionsService } from './loan-transactions.service';
 import { SignsService } from './signs.service';
+import { IUser } from '../interfaces/auth-user.interface';
 
 export const borrowerDataModels: {
   [modelName: string]: mongoose.Model<any>
@@ -50,15 +51,18 @@ export class BorrowerService {
   }
 
 
-  isBorrowerAllowed(userAccess, requestedBorrowerId: string): boolean {
-    if (userAccess.allBorrowers) {
+  isBorrowerAllowed(user: IUser, requestedBorrowerId: string): boolean {
+    if (!user) {
+      return false;
+    }
+    if (user.allBorrowers) {
       return true;
     }
-    return userAccess.borrowersAccess.some((b) => b.borrower === requestedBorrowerId);
+    return user.borrowersAccess?.includes(requestedBorrowerId);
   }
 
-  checkBorrower(userAccess, requestedBorrowerId: string): boolean {
-    const allowedBorrower = this.isBorrowerAllowed(userAccess, requestedBorrowerId);
+  checkBorrower(user: IUser, requestedBorrowerId: string): boolean {
+    const allowedBorrower = this.isBorrowerAllowed(user, requestedBorrowerId);
     if (!allowedBorrower) {
       throw new Error('Non allowed borrower');
     }

package/services/compliance-borrowers.service.d.ts

@@ -26,7 +26,7 @@ import mongoose from 'mongoose';
 import { IEmailRecipient } from '../models/ComplianceItem.model';
 import { IGroupedEmailsUpdate } from '../interfaces/email-addresses.interface';
 import { IComplianceBorrowerDocument, IComplianceBorrowerDocumentFull } from '../models/BorrowerCompliance.model';
-import { IUser } from '../models/User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { FileManagerService } from './file-manager.service';
 import { UploadsService } from './uploads.service';
 export declare class ComplianceBorrowersService {

package/services/compliance-borrowers.service.js

@@ -536,7 +536,7 @@ class ComplianceBorrowersService {
     async getBorrowerListReport(user) {
         const userFilter = user.allBorrowers
             ? { isVisible: true }
-            : { 'borrower': { $in: user.borrowersAccess.map((b) => b.borrower) }, isVisible: true };
+            : { 'borrower': { $in: user.borrowersAccess }, isVisible: true };
         const borrowers = await BorrowerCompliance_model_1.BorrowerCompliance
             .find(userFilter)
             .populate('borrower')

package/services/compliance-borrowers.service.ts

@@ -11,8 +11,7 @@ import {
   IComplianceBorrowerDocumentFull,
 } from '../models/BorrowerCompliance.model';
 import { BorrowerModel } from '../models/Borrower.model';
-import { IUser } from '../models/User.model';
-
+import { IUser } from '../interfaces/auth-user.interface';
 import FinancialComplianceBorrower from '../models/FinancialComplianceBorrower.model';
 import { FileManagerService } from './file-manager.service';
 import { UploadsService } from './uploads.service';
@@ -583,7 +582,7 @@ export class ComplianceBorrowersService {
   async getBorrowerListReport(user: IUser) {
     const userFilter = user.allBorrowers
       ? { isVisible: true }
-      : { 'borrower': { $in: user.borrowersAccess.map((b) => b.borrower) }, isVisible: true };
+      : { 'borrower': { $in: user.borrowersAccess }, isVisible: true };
     const borrowers = await BorrowerCompliance
       .find(userFilter)
       .populate('borrower')

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

@@ -37,6 +37,7 @@ import { LoanStatementStatusService } from './loan-statement-status.service';
 import { LoanTransactionsService } from './loan-transactions.service';
 import { TermLoanService } from './term-loan.service';
 import { LockService } from './lock.service';
+import { UsersService } from './users.service';
 export declare const paymentOrder: ELoanChargeType[];
 export declare class LoanPaymentsService {
     private readonly redisClient;
@@ -50,7 +51,8 @@ export declare class LoanPaymentsService {
     private readonly loanTransactionsService;
     private readonly lockService;
     private readonly termLoanService;
-    constructor(redisClient: RedisClientType, borrowersDB: BorrowersDB, financialComplianceService: FinancialComplianceService, loanChargesService: LoanChargesService, loanProductsService: LoanProductsService, loanStatementBalanceService: LoanStatementBalanceService, getLoanStatementService: () => LoanStatementService, loanStatementStatusService: LoanStatementStatusService, loanTransactionsService: LoanTransactionsService, lockService: LockService, termLoanService: TermLoanService);
+    private readonly usersService;
+    constructor(redisClient: RedisClientType, borrowersDB: BorrowersDB, financialComplianceService: FinancialComplianceService, loanChargesService: LoanChargesService, loanProductsService: LoanProductsService, loanStatementBalanceService: LoanStatementBalanceService, getLoanStatementService: () => LoanStatementService, loanStatementStatusService: LoanStatementStatusService, loanTransactionsService: LoanTransactionsService, lockService: LockService, termLoanService: TermLoanService, usersService: UsersService);
     getLoanPayment(paymentId: string): Promise<mongoose.FlattenMaps<ILoanPaymentDoc> & {
         _id: mongoose.Types.ObjectId;
     }>;

package/services/loan-payments.service.js

@@ -16,7 +16,6 @@ const collaterals_db_1 = require("../db/collaterals.db");
 const LoanTransaction_model_1 = require("../models/LoanTransaction.model");
 const LoanProducts_model_1 = require("../models/LoanProducts.model");
 const Borrower_model_1 = require("../models/Borrower.model");
-const User_model_1 = require("../models/User.model");
 const LoanPayment_model_1 = require("../models/LoanPayment.model");
 exports.paymentOrder = [
     loan_charge_type_enum_1.ELoanChargeType.RECOVERABLE,
@@ -40,7 +39,8 @@ class LoanPaymentsService {
     loanTransactionsService;
     lockService;
     termLoanService;
-    constructor(redisClient, borrowersDB, financialComplianceService, loanChargesService, loanProductsService, loanStatementBalanceService, getLoanStatementService, loanStatementStatusService, loanTransactionsService, lockService, termLoanService) {
+    usersService;
+    constructor(redisClient, borrowersDB, financialComplianceService, loanChargesService, loanProductsService, loanStatementBalanceService, getLoanStatementService, loanStatementStatusService, loanTransactionsService, lockService, termLoanService, usersService) {
         this.redisClient = redisClient;
         this.borrowersDB = borrowersDB;
         this.financialComplianceService = financialComplianceService;
@@ -52,6 +52,7 @@ class LoanPaymentsService {
         this.loanTransactionsService = loanTransactionsService;
         this.lockService = lockService;
         this.termLoanService = termLoanService;
+        this.usersService = usersService;
     }
     async getLoanPayment(paymentId) {
         return LoanPayment_model_1.LoanPaymentModel.findById(paymentId).lean();
@@ -399,7 +400,7 @@ class LoanPaymentsService {
         }
     }
     async getExpectedPayments(userId) {
-        const user = await User_model_1.UserModel.findById(userId).lean();
+        const user = await this.usersService.getUserById(userId);
         if (!user) {
             return [];
         }
@@ -429,7 +430,7 @@ class LoanPaymentsService {
             return { message: 'Incorrect list of borrowers IDs' };
         }
         await this.redisClient.set(CALCULATION_VAR, 1);
-        const user = await User_model_1.UserModel.findById(userId).lean();
+        const user = await this.usersService.getUserById(userId);
         if (!user) {
             return { message: 'Cannot find user with this id' };
         }