gemcap-be-common 1.4.2 → 1.4.3

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

@@ -19,3 +19,10 @@ export interface IUser extends IUserBasic {
     borrowersAccess?: string[];
     lastLogin?: Date | null;
 }
+export interface IRole {
+    id: string;
+    name: string;
+    representation: string;
+    createdAt?: Date;
+    updatedAt?: Date;
+}

package/interfaces/auth-user.interface.ts

@@ -20,3 +20,11 @@ export interface IUser extends IUserBasic {
   borrowersAccess?: string[];
   lastLogin?: Date | null;
 }
+
+export interface IRole {
+  id: string;
+  name: string;
+  representation: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+}

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?: mongoose.Types.ObjectId;
     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?: mongoose.Types.ObjectId;
     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?: mongoose.Types.ObjectId;
     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.2",
+  "version": "1.4.3",
   "description": "",
   "main": "index.js",
   "scripts": {

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

@@ -45,7 +45,7 @@ export declare class ComplianceBorrowersService {
         };
     };
     getFullComplianceBorrowerById(complianceBorrowerId: any): 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/users.service.d.ts

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import express from 'express';
 import mongoose from 'mongoose';
-import { IUser } from '../interfaces/auth-user.interface';
+import { IRole, IUser } from '../interfaces/auth-user.interface';
 interface IKeycloakConfig {
     keycloakHost: string;
     realm: string;
@@ -41,7 +41,8 @@ export declare class UsersService {
     getUserByToken(req: express.Request): Promise<IUser | null>;
     getUserIdByToken(req: express.Request): Promise<string | null>;
     getUserList(): Promise<IUser[]>;
-    getUserRoles(userId: string): Promise<Record<string, string[]>>;
+    getAllRoles(): Promise<IRole[]>;
+    getUserRoles(userId: string): Promise<string[]>;
     updateMobileUser(userId: string, keyValue: {
         [key: string]: string | number | boolean;
     }): Promise<void>;

package/services/users.service.js

@@ -54,9 +54,17 @@ class UsersService {
         const { data } = await axios_1.default.get(`${this.config.baseUrl}/users/users`);
         return data ?? null;
     }
+    async getAllRoles() {
+        const { data } = await axios_1.default.get(`${this.config.baseUrl}/users/roles`);
+        return data ?? null;
+    }
     async getUserRoles(userId) {
         const user = await this.getUserById(userId);
-        return user.roles;
+        const roles = await this.getAllRoles();
+        const userRoleIds = Object.values(user.roles).reduce((acc, roleIds) => [...acc, ...roleIds], []);
+        return roles
+            .filter((role) => userRoleIds.includes(role.id))
+            .map((role) => role.name);
     }
     async updateMobileUser(userId, keyValue) {
         await UserMobileAccess_model_1.UserMobileAccess.findOneAndUpdate({ keycloakUserId: userId }, keyValue, { upsert: true });

package/services/users.service.ts

@@ -6,7 +6,7 @@ import mongoose from 'mongoose';
 import { BorrowerCompliance } from '../models/BorrowerCompliance.model';
 import { UserMobileAccess } from '../models/UserMobileAccess.model';
 import { UserLog } from '../models/UserLog.model';
-import { IUser } from '../interfaces/auth-user.interface';
+import { IRole, IUser } from '../interfaces/auth-user.interface';
 
 interface IKeycloakConfig {
   keycloakHost: string;
@@ -63,14 +63,23 @@ export class UsersService {
     return null;
   }
 
-  async getUserList(): Promise<IUser[]> {
-    const { data } = await axios.get(`${this.config.baseUrl}/users/users`);
+  async getUserList() {
+    const { data } = await axios.get<IUser[]>(`${this.config.baseUrl}/users/users`);
     return data ?? null;
   }
 
-  async getUserRoles(userId: string) { // TODO add full description
+  async getAllRoles() {
+    const { data } = await axios.get<IRole[]>(`${this.config.baseUrl}/users/roles`);
+    return data ?? null;
+  }
+
+  async getUserRoles(userId: string) {
     const user = await this.getUserById(userId);
-    return user.roles;
+    const roles = await this.getAllRoles();
+    const userRoleIds = Object.values(user.roles).reduce((acc, roleIds) => [...acc, ...roleIds], []);
+    return roles
+      .filter((role) => userRoleIds.includes(role.id))
+      .map((role) => role.name);
   }
 
   async updateMobileUser(userId: string, keyValue: { [key: string]: string | number | boolean }) {