gemcap-be-common 1.4.8 → 1.4.10

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

@@ -5,7 +5,12 @@ export interface IUserBasic {
     firstName: string | null;
     lastName: string | null;
 }
-export interface IUser extends IUserBasic {
+export interface IUserAccess {
+    allBorrowers?: boolean;
+    borrowersAccess?: string[];
+    complianceBorrowersAccess?: string[];
+}
+export interface IUser extends IUserBasic, IUserAccess {
     createdAt?: Date;
     updatedAt?: Date;
     passwordResetTokenHash?: string | null;
@@ -15,14 +20,15 @@ export interface IUser extends IUserBasic {
     roles?: Record<string, string[]>;
     deletedAt?: Date | null;
     isEnabled?: boolean;
-    allBorrowers?: boolean;
-    borrowersAccess?: string[];
     lastLogin?: Date | null;
 }
-export interface IRole {
+export interface IUserRole {
     id: string;
     name: string;
     representation: string;
     createdAt?: Date;
     updatedAt?: Date;
 }
+export interface IGroupedUserRoles {
+    [module: string]: IUserRole[];
+}

package/interfaces/auth-user.interface.ts

@@ -6,7 +6,13 @@ export interface IUserBasic {
   lastName: string | null;
 }
 
-export interface IUser extends IUserBasic {
+export interface IUserAccess {
+  allBorrowers?: boolean;
+  borrowersAccess?: string[];
+  complianceBorrowersAccess?: string[];
+}
+
+export interface IUser extends IUserBasic, IUserAccess {
   createdAt?: Date;
   updatedAt?: Date;
   passwordResetTokenHash?: string | null;
@@ -16,15 +22,17 @@ export interface IUser extends IUserBasic {
   roles?: Record<string, string[]>;
   deletedAt?: Date | null;
   isEnabled?: boolean;
-  allBorrowers?: boolean;
-  borrowersAccess?: string[];
   lastLogin?: Date | null;
 }
 
-export interface IRole {
+export interface IUserRole {
   id: string;
   name: string;
   representation: string;
   createdAt?: Date;
   updatedAt?: Date;
 }
+
+export interface IGroupedUserRoles {
+  [module: string]: IUserRole[];
+}

package/models/ReceivableAvailability.model.d.ts

@@ -184,49 +184,49 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        creditNotes: number;
-        excludedCustomerDeduction: number;
         grossAR: number;
+        balanceAfterCrossAge: number;
         permittedOver: number;
-        preliminaryEligibleBalance: number;
-        creditNotesNegative: number;
+        creditNotes: number;
+        excludedCustomerDeduction: 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;
     };
-    actual?: boolean;
     userCalculatedId?: string;
     calculatedAt?: Date;
+    actual?: boolean;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        insuredCustomers: 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;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        creditNotes: number;
-        excludedCustomerDeduction: number;
         grossAR: number;
+        balanceAfterCrossAge: number;
         permittedOver: number;
-        preliminaryEligibleBalance: number;
-        creditNotesNegative: number;
+        creditNotes: number;
+        excludedCustomerDeduction: 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;
     };
-    actual?: boolean;
     userCalculatedId?: string;
     calculatedAt?: Date;
+    actual?: boolean;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        insuredCustomers: 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;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        creditNotes: number;
-        excludedCustomerDeduction: number;
         grossAR: number;
+        balanceAfterCrossAge: number;
         permittedOver: number;
-        preliminaryEligibleBalance: number;
-        creditNotesNegative: number;
+        creditNotes: number;
+        excludedCustomerDeduction: 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;
     };
-    actual?: boolean;
     userCalculatedId?: string;
     calculatedAt?: Date;
+    actual?: boolean;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        insuredCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;

package/package.json

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

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,14 +26,14 @@ 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 '../interfaces/auth-user.interface';
+import { IUser, IUserAccess } from '../interfaces/auth-user.interface';
 import { FileManagerService } from './file-manager.service';
 import { UploadsService } from './uploads.service';
 export declare class ComplianceBorrowersService {
     private readonly _fileManagerService;
     private readonly _uploadsService;
     constructor(_fileManagerService: FileManagerService, _uploadsService: UploadsService);
-    isComplianceBorrowerAllowed(userAccess: any, requestedBorrowerId: any): boolean;
+    isComplianceBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean;
     calculateInstanceStatuses(instance: any, item: any): {
         progress: {
             text: string;
@@ -45,7 +45,7 @@ export declare class ComplianceBorrowersService {
         };
     };
     getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<any>;
-    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "borrower" | "fundingStatus" | "items"> | {
+    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "items" | "borrower" | "fundingStatus"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;

package/services/compliance-borrowers.service.js

@@ -33,7 +33,7 @@ class ComplianceBorrowersService {
         this._uploadsService = _uploadsService;
     }
     isComplianceBorrowerAllowed(userAccess, requestedBorrowerId) {
-        const allowedBorrower = userAccess.complianceBorrowersAccess.some((b) => b.borrower === requestedBorrowerId);
+        const allowedBorrower = userAccess.complianceBorrowersAccess.includes(requestedBorrowerId);
         if (!allowedBorrower) {
             throw new Error('Non allowed compliance borrower');
         }

package/services/compliance-borrowers.service.ts

@@ -11,7 +11,7 @@ import {
   IComplianceBorrowerDocumentFull,
 } from '../models/BorrowerCompliance.model';
 import { BorrowerModel } from '../models/Borrower.model';
-import { IUser } from '../interfaces/auth-user.interface';
+import { IUser, IUserAccess } from '../interfaces/auth-user.interface';
 import FinancialComplianceBorrower from '../models/FinancialComplianceBorrower.model';
 import { FileManagerService } from './file-manager.service';
 import { UploadsService } from './uploads.service';
@@ -42,8 +42,8 @@ export class ComplianceBorrowersService {
   ) {
   }
 
-  isComplianceBorrowerAllowed(userAccess, requestedBorrowerId): boolean {
-    const allowedBorrower = userAccess.complianceBorrowersAccess.some((b) => b.borrower === requestedBorrowerId);
+  isComplianceBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean {
+    const allowedBorrower = userAccess.complianceBorrowersAccess.includes(requestedBorrowerId);
     if (!allowedBorrower) {
       throw new Error('Non allowed compliance borrower');
     }

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 | Date | string[])[];
+            [x: string]: (string | number | string[] | Date)[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{

package/services/users.service.d.ts

@@ -24,7 +24,7 @@
 /// <reference types="mongoose" />
 /// <reference types="mongoose/types/inferschematype" />
 import express from 'express';
-import { IRole, IUser } from '../interfaces/auth-user.interface';
+import { IUserRole, IUser, IUserAccess } from '../interfaces/auth-user.interface';
 interface IKeycloakConfig {
     keycloakHost: string;
     realm: string;
@@ -41,18 +41,12 @@ export declare class UsersService {
     getUserByToken(req: express.Request): Promise<IUser>;
     getUserIdByToken(req: express.Request): Promise<string>;
     getUserList(): Promise<IUser[]>;
-    getAllRoles(): Promise<IRole[]>;
+    getAllRoles(): Promise<IUserRole[]>;
     getUserRoles(userId: string): Promise<string[]>;
     updateMobileUser(userId: string, keyValue: {
         [key: string]: string | number | boolean;
     }): Promise<void>;
-    getUserAccess(userId: string): Promise<{
-        allBorrowers: boolean;
-        borrowersAccess: string[];
-        complianceBorrowersAccess: {
-            borrower: any;
-        }[];
-    }>;
+    getUserAccess(userId: string): Promise<IUserAccess>;
     createUserLoginLog(): Promise<void>;
     getUserLogByDate(userId: string, date: Date): Promise<import("mongoose").FlattenMaps<import("../models/UserLog.model").IUserLog> & Required<{
         _id: import("mongoose").Types.ObjectId;

package/services/users.service.js

@@ -72,7 +72,7 @@ class UsersService {
         const foundUser = await this.getUserById(userId);
         const borrowersAccess = foundUser.borrowersAccess;
         const complianceBorrowersAccess = (await BorrowerCompliance_model_1.BorrowerCompliance.find({ 'borrower': { $in: borrowersAccess } }))
-            .map((b) => ({ borrower: b._id.toString() }));
+            .map((b) => b._id.toString());
         return { allBorrowers: foundUser.allBorrowers, borrowersAccess, complianceBorrowersAccess };
     }
     async createUserLoginLog() {

package/services/users.service.ts

@@ -5,7 +5,7 @@ import axios from 'axios';
 import { BorrowerCompliance } from '../models/BorrowerCompliance.model';
 import { UserMobileAccess } from '../models/UserMobileAccess.model';
 import { UserLog } from '../models/UserLog.model';
-import { IRole, IUser } from '../interfaces/auth-user.interface';
+import { IUserRole, IUser, IUserAccess } from '../interfaces/auth-user.interface';
 
 interface IKeycloakConfig {
   keycloakHost: string;
@@ -68,7 +68,7 @@ export class UsersService {
   }
 
   async getAllRoles() {
-    const { data } = await axios.get<IRole[]>(`${this.config.baseUrl}/users/roles`);
+    const { data } = await axios.get<IUserRole[]>(`${this.config.baseUrl}/users/roles`);
     return data ?? null;
   }
 
@@ -85,12 +85,12 @@ export class UsersService {
     await UserMobileAccess.findOneAndUpdate({ keycloakUserId: userId }, keyValue, { upsert: true });
   }
 
-  async getUserAccess(userId: string) {
+  async getUserAccess(userId: string): Promise<IUserAccess> {
     const foundUser = await this.getUserById(userId);
     const borrowersAccess = foundUser.borrowersAccess;
     const complianceBorrowersAccess =
       (await BorrowerCompliance.find({ 'borrower': { $in: borrowersAccess } }))
-        .map((b) => ({ borrower: b._id.toString() }));
+        .map((b) => b._id.toString());
     return { allBorrowers: foundUser.allBorrowers, borrowersAccess, complianceBorrowersAccess };
   }