gemcap-be-common 1.4.17 → 1.4.19

package/package.json

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

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 '../interfaces/auth-user.interface';
+import { IUserAccess } from '../interfaces/auth-user.interface';
 export declare class BorrowersDB {
     getAllBorrowers(): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
         _id: import("mongoose").Types.ObjectId;
@@ -31,7 +31,7 @@ export declare class BorrowersDB {
     getActiveBorrowers(): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
         _id: import("mongoose").Types.ObjectId;
     })[]>;
-    getAllowedBorrowers(user: IUser): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
+    getAllowedBorrowers(user: IUserAccess): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
         _id: import("mongoose").Types.ObjectId;
     })[]>;
 }

package/services/borrowers.db.ts

@@ -1,5 +1,5 @@
 import { BorrowerModel } from '../models/Borrower.model';
-import { IUser } from '../interfaces/auth-user.interface';
+import { IUser, IUserAccess } from '../interfaces/auth-user.interface';
 
 export class BorrowersDB {
   async getAllBorrowers() {
@@ -10,7 +10,7 @@ export class BorrowersDB {
     return BorrowerModel.find({ active: true }).sort({ name: 1 }).lean();
   }
 
-  async getAllowedBorrowers(user: IUser) {
+  async getAllowedBorrowers(user: IUserAccess) {
     return BorrowerModel
       .find(user.allBorrowers ? {} : { '_id': { $in: user.borrowersAccess } })
       .collation({ locale: 'en' })

package/services/borrowers.service.d.ts

@@ -30,7 +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';
+import { IUser, IUserAccess } from '../interfaces/auth-user.interface';
 export declare const borrowerDataModels: {
     [modelName: string]: mongoose.Model<any>;
 };
@@ -40,7 +40,7 @@ export declare class BorrowerService {
     private readonly getLoanTransactionsService;
     private readonly getSignsService;
     constructor(getCollateralsService: () => CollateralsService, getLoanStatementStatusService: () => LoanStatementStatusService, getLoanTransactionsService: () => LoanTransactionsService, getSignsService: () => SignsService);
-    isBorrowerAllowed(user: IUser, requestedBorrowerId: string): boolean;
+    isBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean;
     checkBorrower(user: IUser, requestedBorrowerId: string): boolean;
     getBorrowerById(borrowerId: string): Promise<mongoose.FlattenMaps<IBorrowerDocument> & {
         _id: mongoose.Types.ObjectId;

package/services/borrowers.service.js

@@ -39,14 +39,14 @@ class BorrowerService {
         this.getLoanTransactionsService = getLoanTransactionsService;
         this.getSignsService = getSignsService;
     }
-    isBorrowerAllowed(user, requestedBorrowerId) {
-        if (!user) {
+    isBorrowerAllowed(userAccess, requestedBorrowerId) {
+        if (!userAccess) {
             return false;
         }
-        if (user.allBorrowers) {
+        if (userAccess.allBorrowers) {
             return true;
         }
-        return user.borrowersAccess?.includes(requestedBorrowerId);
+        return userAccess.borrowersAccess?.includes(requestedBorrowerId);
     }
     checkBorrower(user, requestedBorrowerId) {
         const allowedBorrower = this.isBorrowerAllowed(user, requestedBorrowerId);

package/services/borrowers.service.ts

@@ -24,7 +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';
+import { IUser, IUserAccess } from '../interfaces/auth-user.interface';
 
 export const borrowerDataModels: {
   [modelName: string]: mongoose.Model<any>
@@ -51,14 +51,14 @@ export class BorrowerService {
   }
 
 
-  isBorrowerAllowed(user: IUser, requestedBorrowerId: string): boolean {
-    if (!user) {
+  isBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean {
+    if (!userAccess) {
       return false;
     }
-    if (user.allBorrowers) {
+    if (userAccess.allBorrowers) {
       return true;
     }
-    return user.borrowersAccess?.includes(requestedBorrowerId);
+    return userAccess.borrowersAccess?.includes(requestedBorrowerId);
   }
 
   checkBorrower(user: IUser, requestedBorrowerId: string): boolean {

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<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
+    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (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

@@ -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, IUserAccess } from '../interfaces/auth-user.interface';
+import { IUserAccess } from '../interfaces/auth-user.interface';
 import { FileManagerService } from './file-manager.service';
 import { UploadsService } from './uploads.service';
 export declare class ComplianceBorrowersService {
@@ -148,5 +148,5 @@ export declare class ComplianceBorrowersService {
     toggleComplianceBorrowerVisibility(borrowerId: string, isVisible: boolean): Promise<void>;
     createComplianceBorrower(borrowerId: string, isVisible?: boolean): Promise<void>;
     removeIncorrectBorrowers(): Promise<void>;
-    getBorrowerListReport(user: IUser): Promise<any>;
+    getBorrowerListReport(user: IUserAccess): Promise<any>;
 }

package/services/compliance-borrowers.service.ts

@@ -579,7 +579,7 @@ export class ComplianceBorrowersService {
     }
   }
 
-  async getBorrowerListReport(user: IUser) {
+  async getBorrowerListReport(user: IUserAccess) {
     const userFilter = user.allBorrowers
       ? { isVisible: true }
       : { 'borrower': { $in: user.borrowersAccess }, isVisible: true };

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

@@ -155,7 +155,7 @@ export declare class LoanTransactionsService {
     getTransactionReport(transactionIds: string[], borrowerId: string, effectiveDate: Date): Promise<{
         transactionIdsToMark: any[];
         transactions: {
-            [x: string]: (string | number | string[] | Date)[];
+            [x: string]: (string | number | Date | string[])[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{

package/services/users.service.d.ts

@@ -31,7 +31,7 @@ interface IAuthConfig {
 export declare class UsersService {
     private readonly config;
     constructor(config: IAuthConfig);
-    getUserAccessByRequest(req: express.Request): Promise<IUser | null>;
+    getUserAccessByRequest(req: express.Request): Promise<IUserAccess | null>;
     getUserById(userId: string): Promise<IUser>;
     getUserByUsername(username: string): Promise<IUser>;
     getUserByToken(req: express.Request): Promise<IUser>;

package/services/users.service.js

@@ -20,11 +20,11 @@ class UsersService {
             return null;
         }
         const { sub } = (0, jwt_decode_1.jwtDecode)(authorization);
-        const user = await this.getUserById(sub);
-        if (!user) {
+        const userAccess = await this.getUserAccess(sub);
+        if (!userAccess) {
             return null;
         }
-        return user;
+        return userAccess;
     }
     async getUserById(userId) {
         const { data } = await axios_1.default.get(`${this.config.baseUrl}/users/by-id/${userId}`);

package/services/users.service.ts

@@ -18,17 +18,17 @@ export class UsersService {
     this.config = config;
   }
 
-  async getUserAccessByRequest(req: express.Request): Promise<IUser | null> {
+  async getUserAccessByRequest(req: express.Request): Promise<IUserAccess | null> {
     const authorization = req.get('Authorization');
     if (!authorization) {
       return null;
     }
     const { sub }: { sub: string } = jwtDecode(authorization);
-    const user = await this.getUserById(sub);
-    if (!user) {
+    const userAccess = await this.getUserAccess(sub);
+    if (!userAccess) {
       return null;
     }
-    return user;
+    return userAccess;
   }
 
   async getUserById(userId: string) {