feat: improve user patch (#393)

chaynHQ · Jan 25, 2024 · 87d4dd3 · 87d4dd3
1 parent 2dfd39e
commit 87d4dd3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/user/user.controller.ts b/src/user/user.controller.ts
@@ -4,8 +4,8 @@ import {
  Delete,
  Get,
  Param,
+ Patch,
  Post,
- Put,
  Query,
  Req,
  UseGuards,
@@ -85,7 +85,7 @@ export class UserController {
  }
 
  @ApiBearerAuth()
- @Put()
+ @Patch()
  @UseGuards(FirebaseAuthGuard)
  async updateUser(@Body() updateUserDto: UpdateUserDto, @Req() req: Request) {
  return await this.userService.updateUser(updateUserDto, req['user'] as GetUserDto);

diff --git a/src/user/user.service.ts b/src/user/user.service.ts
@@ -364,14 +364,12 @@ export class UserService {
  throw new HttpException('USER NOT FOUND', HttpStatus.NOT_FOUND);
  }
 
- user.name = updateUserDto?.name ?? user.name;
- user.contactPermission = updateUserDto?.contactPermission ?? user.contactPermission;
- user.serviceEmailsPermission =
-  updateUserDto?.serviceEmailsPermission ?? user.serviceEmailsPermission;
+ const updatedUser: UserEntity = {
+  ...user,
+  ...updateUserDto,
+ };
 
- await this.userRepository.save(user);
-
- return user;
+ return await this.userRepository.save(updatedUser);
  }
 
  public async deleteCypressTestUsers(clean = false): Promise<UserEntity[]> {