gemcap-be-common 1.4.2 → 1.4.4

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/loan-transactions.service.js

@@ -215,7 +215,7 @@ class LoanTransactionsService {
                     balance: 0,
                     floatedBalance: 0,
                     effectiveDate: await this.calculateEffectiveDate(item),
-                    userId: new mongoose_1.default.Types.ObjectId(userId),
+                    userId,
                 };
                 const newLoanTransaction = new LoanTransaction_model_1.LoanTransaction({
                     order: item.order,
@@ -283,7 +283,7 @@ class LoanTransactionsService {
                 transaction.amount = new decimal_js_1.default(transaction.amount).abs().neg().toNumber();
                 break;
         }
-        transaction.userId = new mongoose_1.default.Types.ObjectId(userId);
+        transaction.userId = userId;
         return transaction;
     }
     async createLoanTransaction(transaction) {

package/services/loan-transactions.service.ts

@@ -264,7 +264,7 @@ export class LoanTransactionsService {
           balance: 0,
           floatedBalance: 0,
           effectiveDate: await this.calculateEffectiveDate(item),
-          userId: new mongoose.Types.ObjectId(userId),
+          userId,
         };
         const newLoanTransaction = new LoanTransaction({
           order: item.order,
@@ -337,7 +337,7 @@ export class LoanTransactionsService {
         transaction.amount = new Decimal(transaction.amount).abs().neg().toNumber();
         break;
     }
-    transaction.userId = new mongoose.Types.ObjectId(userId);
+    transaction.userId = userId;
     return transaction;
   }
 

package/services/signs.service.d.ts

@@ -51,6 +51,7 @@ export declare class SignsService {
     users: IUser[];
     fulfillUserList(): Promise<void>;
     clearUserList(): void;
+    getAvailabilitiesSigns(bbcDateIds: string[]): Promise<IAvailabilitySignView[]>;
     getAvailabilitySigns(bbcDateId: string): Promise<IAvailabilitySignView>;
     revokeAvailability(bbcDateId: string, userId: string, userIdRevoked: string): Promise<void>;
     signAvailability(bbcDateId: string, user: IUser): Promise<IResult>;

package/services/signs.service.js

@@ -39,8 +39,25 @@ class SignsService {
     clearUserList() {
         this.users = null;
     }
+    async getAvailabilitiesSigns(bbcDateIds) {
+        const availabilitySigns = await (0, availability_db_1.getAvailabilitySigns)(bbcDateIds);
+        const users = await this.usersService.getUserList();
+        const usersMap = users.reduce((acc, user) => {
+            return { ...acc, [user.id]: user };
+        }, {});
+        return availabilitySigns.map((availabilitySign) => {
+            return {
+                ...availabilitySign,
+                signs: availabilitySign.signs.map((sign) => ({
+                    ...sign,
+                    userSigned: usersMap[sign.userSignedId],
+                    userRevoked: usersMap[sign.userRevokedId],
+                }))
+            };
+        });
+    }
     async getAvailabilitySigns(bbcDateId) {
-        const availabilitiesSigns = await (0, availability_db_1.getAvailabilitySigns)([bbcDateId]);
+        const availabilitiesSigns = await this.getAvailabilitiesSigns([bbcDateId]);
         if (!availabilitiesSigns.length) {
             return {
                 _id: null,
@@ -202,7 +219,7 @@ class SignsService {
             },
             ...(0, collaterals_db_1.ITEMS_PAGINATION)(paginatorOptions),
         ]);
-        const availabilitiesSigns = await (0, availability_db_1.getAvailabilitySigns)(BBCDates.map((bbcDate) => bbcDate._id.toString()));
+        const availabilitiesSigns = await this.getAvailabilitiesSigns(BBCDates.map((bbcDate) => bbcDate._id.toString()));
         await Promise.all(BBCDates.slice().map(async (bbcDate) => {
             const foundAvailabilitySigns = availabilitiesSigns.find((aSigns) => aSigns.bbcDateId.toString() === bbcDate._id.toString());
             if (!foundAvailabilitySigns) {

package/services/signs.service.ts

@@ -60,8 +60,26 @@ export class SignsService {
     this.users = null;
   }
 
+  async getAvailabilitiesSigns(bbcDateIds: string[]): Promise<IAvailabilitySignView[]> {
+    const availabilitySigns = await getAvailabilitySigns(bbcDateIds);
+    const users = await this.usersService.getUserList();
+    const usersMap = users.reduce((acc, user) => {
+      return { ...acc, [user.id]: user };
+    }, <Record<string, IUser>>{});
+    return availabilitySigns.map((availabilitySign) => {
+      return {
+        ...availabilitySign,
+        signs: availabilitySign.signs.map((sign) => ({
+          ...sign,
+          userSigned: usersMap[sign.userSignedId],
+          userRevoked: usersMap[sign.userRevokedId],
+        }))
+      }
+    }) as unknown as IAvailabilitySignView[];
+  }
+
   async getAvailabilitySigns(bbcDateId: string): Promise<IAvailabilitySignView> {
-    const availabilitiesSigns = await getAvailabilitySigns([bbcDateId]);
+    const availabilitiesSigns = await this.getAvailabilitiesSigns([bbcDateId]);
     if (!availabilitiesSigns.length) {
       return <IAvailabilitySignView>{
         _id: null,
@@ -233,7 +251,7 @@ export class SignsService {
       ...ITEMS_PAGINATION(paginatorOptions),
     ]);
 
-    const availabilitiesSigns = await getAvailabilitySigns(BBCDates.map((bbcDate) => bbcDate._id.toString()));
+    const availabilitiesSigns = await this.getAvailabilitiesSigns(BBCDates.map((bbcDate) => bbcDate._id.toString()));
     await Promise.all(BBCDates.slice().map(async (bbcDate) => {
       const foundAvailabilitySigns = availabilitiesSigns.find((aSigns) => aSigns.bbcDateId.toString() ===bbcDate._id.toString());
       if (!foundAvailabilitySigns) {

package/services/uploads.service.js

@@ -118,7 +118,7 @@ class UploadsService {
             borrowerId: borrowerIdToWrite,
             filename: file.filename,
             originalName: file.originalname,
-            userId: new mongoose_1.default.Types.ObjectId(userId),
+            userId,
             type: uploadType,
         };
         return await UploadedFile_model_1.default.create(newFile);

package/services/uploads.service.ts

@@ -139,7 +139,7 @@ export class UploadsService {
       borrowerId: borrowerIdToWrite,
       filename: file.filename,
       originalName: file.originalname,
-      userId: new mongoose.Types.ObjectId(userId),
+      userId,
       type: uploadType,
     };
     return await UploadedFile.create(newFile);

package/services/users.service.d.ts

@@ -21,10 +21,10 @@
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose" />
 /// <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;
@@ -36,12 +36,13 @@ export declare class UsersService {
     private readonly config;
     constructor(config: IKeycloakConfig);
     getUserAccessByRequest(req: express.Request): Promise<IUser | null>;
-    getUserById(userId: string): Promise<IUser | null>;
-    getUserByUsername(username: string): Promise<IUser | null>;
-    getUserByToken(req: express.Request): Promise<IUser | null>;
-    getUserIdByToken(req: express.Request): Promise<string | null>;
+    getUserById(userId: string): Promise<IUser>;
+    getUserByUsername(username: string): Promise<IUser>;
+    getUserByToken(req: express.Request): Promise<IUser>;
+    getUserIdByToken(req: express.Request): Promise<string>;
     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>;
@@ -53,8 +54,8 @@ export declare class UsersService {
         }[];
     }>;
     createUserLoginLog(): Promise<void>;
-    getUserLogByDate(userId: string, date: Date): Promise<mongoose.FlattenMaps<import("../models/UserLog.model").IUserLog> & Required<{
-        _id: mongoose.Types.ObjectId;
+    getUserLogByDate(userId: string, date: Date): Promise<import("mongoose").FlattenMaps<import("../models/UserLog.model").IUserLog> & Required<{
+        _id: import("mongoose").Types.ObjectId;
     }>>;
 }
 export {};

package/services/users.service.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsersService = void 0;
 const jwt_decode_1 = require("jwt-decode");
 const axios_1 = __importDefault(require("axios"));
-const mongoose_1 = __importDefault(require("mongoose"));
 const BorrowerCompliance_model_1 = require("../models/BorrowerCompliance.model");
 const UserMobileAccess_model_1 = require("../models/UserMobileAccess.model");
 const UserLog_model_1 = require("../models/UserLog.model");
@@ -54,9 +53,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 });
@@ -121,7 +128,7 @@ class UsersService {
         // }
     }
     async getUserLogByDate(userId, date) {
-        return UserLog_model_1.UserLog.findOne({ userId: new mongoose_1.default.Types.ObjectId(userId), timestamp: date }).lean();
+        return UserLog_model_1.UserLog.findOne({ userId, timestamp: date }).lean();
     }
 }
 exports.UsersService = UsersService;

package/services/users.service.ts

@@ -1,12 +1,11 @@
 import { jwtDecode } from 'jwt-decode';
 import express from 'express';
 import axios from 'axios';
-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;
@@ -36,17 +35,17 @@ export class UsersService {
     return user;
   }
 
-  async getUserById(userId: string): Promise<IUser | null> {
-    const { data } = await axios.get(`${this.config.baseUrl}/users/by-id/${userId}`);
+  async getUserById(userId: string) {
+    const { data } = await axios.get<IUser>(`${this.config.baseUrl}/users/by-id/${userId}`);
     return data ?? null;
   }
 
-  async getUserByUsername(username: string): Promise<IUser | null> {
-    const { data } = await axios.get(`${this.config.baseUrl}/users/by-username/${username}`);
+  async getUserByUsername(username: string) {
+    const { data } = await axios.get<IUser>(`${this.config.baseUrl}/users/by-username/${username}`);
     return data ?? null;
   }
 
-  async getUserByToken(req: express.Request): Promise<IUser | null> {
+  async getUserByToken(req: express.Request) {
     const authorization = req.get('Authorization');
     if (!authorization) {
       return null;
@@ -55,7 +54,7 @@ export class UsersService {
     return this.getUserById(keycloakUserId);
   }
 
-  async getUserIdByToken(req: express.Request): Promise<string | null> {
+  async getUserIdByToken(req: express.Request) {
     const user = await this.getUserByToken(req);
     if (user) {
       return user.id;
@@ -63,14 +62,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 }) {
@@ -140,6 +148,6 @@ export class UsersService {
   }
 
   async getUserLogByDate(userId: string, date: Date) {
-    return UserLog.findOne({ userId: new mongoose.Types.ObjectId(userId), timestamp: date }).lean();
+    return UserLog.findOne({ userId, timestamp: date }).lean();
   }
 }