FIX: Update user accepting roleIds

src/modules/users/dtos/entities.ts

@@ -104,6 +104,8 @@ export class UpdateUserReq {
   department?: string;
   @ApiPropertyOptional()
   hierarchy?: number;
+  @ApiPropertyOptional()
+  roleNames?: string[];
 }
 
 export class UpdateUserRes {

src/modules/users/users.controller.ts

@@ -111,7 +111,7 @@ export class UsersController {
   @ApiOkResponse({ type: SetUserRolesRes })
   async setUserRoles(@User() user: RequestUser, @Body() body: SetUserRolesReq) {
     this.logger.info('createUser', { user });
-    return await this.userService.setRoles(body);
+    return await this.userService.setRoles(body, user.customer_id);
   }
 
   @Put('role')
@@ -143,6 +143,6 @@ export class UsersController {
     @Param('id') id: string,
   ) {
     this.logger.info('updateUser', { user });
-    return await this.userService.updateUser(body, id);
+    return await this.userService.updateUser(body, id, user.customer_id);
   }
 }

src/modules/users/users.service.ts

@@ -85,8 +85,11 @@ export class UsersService implements OnModuleInit {
     return { user };
   }
 
-  async updateUser(req: UpdateUserReq, id: string) {
-    const { department, hierarchy, jobTitle, name } = req;
+  async updateUser(req: UpdateUserReq, id: string, customerId: string) {
+    const { department, hierarchy, jobTitle, name, roleNames } = req;
+    if (roleNames) {
+      await this.setRoles({ roleNames, userId: id }, customerId);
+    }
     const { user } = await lastValueFrom(
       this.usersClientService.UserUpdate({
         name,
@@ -106,7 +109,7 @@ export class UsersService implements OnModuleInit {
     return { user };
   }
 
-  async setRoles(body: SetUserRolesReq) {
+  async setRoles(body: SetUserRolesReq, customerId: string) {
     const { roleNames, userId } = body;
     const clearRoles = roleNames && roleNames.length === 0;
     const { user } = await lastValueFrom(
@@ -115,6 +118,7 @@ export class UsersService implements OnModuleInit {
         roleIds: [],
         roleNames,
         clearRoles,
+        customerId,
       }),
     );
     if (user) {