refactor: simplify user accessible nodes retrieval by removing userUuid parameter

Author: kastov

src/modules/users/interfaces/get-user-accessible-nodes.interface.ts

@@ -14,7 +14,6 @@ export interface IGetUserAccessibleNodes {
 }
 
 export interface IGetUserAccessibleNodesResponse {
-    userUuid: string;
     activeNodes: {
         uuid: string;
         nodeName: string;

src/modules/users/models/get-user-accessible-nodes.response.model.ts

@@ -14,8 +14,8 @@ export class GetUserAccessibleNodesResponseModel {
         }[];
     }[];
 
-    constructor(data: IGetUserAccessibleNodesResponse) {
-        this.userUuid = data.userUuid;
+    constructor(data: IGetUserAccessibleNodesResponse, userUuid: string) {
+        this.userUuid = userUuid;
         this.activeNodes = data.activeNodes;
     }
 }

src/modules/users/repositories/users.repository.ts

@@ -1123,10 +1123,7 @@ export class UsersRepository {
         return new UserWithResolvedInboundEntity(result);
     }
 
-    public async getUserAccessibleNodes(
-        userId: bigint,
-        userUuid: string,
-    ): Promise<IGetUserAccessibleNodesResponse> {
+    public async getUserAccessibleNodes(userId: bigint): Promise<IGetUserAccessibleNodesResponse> {
         const flatResults = await this.qb.kysely
             .selectFrom('nodes as n')
             .innerJoin('configProfiles as cp', 'n.activeConfigProfileUuid', 'cp.uuid')
@@ -1186,7 +1183,6 @@ export class UsersRepository {
         });
 
         const result: IGetUserAccessibleNodesResponse = {
-            userUuid,
             activeNodes: Array.from(nodesMap.values()).map((node) => ({
                 ...node,
                 activeSquads: Array.from(node.activeSquads.values()),

src/modules/users/users.service.ts

@@ -317,7 +317,7 @@ export class UsersService {
             }
 
             const userWithInbounds = await this.userRepository.findUniqueByCriteria(
-                { uuid: result.uuid },
+                { tId: result.tId },
                 {
                     activeInternalSquads: true,
                 },
@@ -981,21 +981,18 @@ export class UsersService {
                 };
             }
 
-            const result = await this.userRepository.getUserAccessibleNodes(user.tId, userUuid);
+            const result = await this.userRepository.getUserAccessibleNodes(user.tId);
 
             if (!result) {
                 return {
                     isOk: true,
-                    response: new GetUserAccessibleNodesResponseModel({
-                        userUuid,
-                        activeNodes: [],
-                    }),
+                    response: new GetUserAccessibleNodesResponseModel(result, userUuid),
                 };
             }
 
             return {
                 isOk: true,
-                response: new GetUserAccessibleNodesResponseModel(result),
+                response: new GetUserAccessibleNodesResponseModel(result, userUuid),
             };
         } catch (error) {
             this.logger.error(error);