diff --git a/src/main/java/com/haru/api/domain/user/controller/UserController.java b/src/main/java/com/haru/api/domain/user/controller/UserController.java index dcf6cdf3..fb5d811b 100644 --- a/src/main/java/com/haru/api/domain/user/controller/UserController.java +++ b/src/main/java/com/haru/api/domain/user/controller/UserController.java @@ -85,11 +85,12 @@ public ApiResponse getUserInfo() { "# 회원 정보 수정 API 입니다. \n" + "현재는 jwt token을 구현하지 않아 pathvariable로 userId를 넣어주세요.추후 jwt token이 구현되면 수정하겠습니다." ) - @PatchMapping("/{userId}/info") + @PatchMapping("/info") public ApiResponse updateUserInfo( - @PathVariable Long userId, @RequestBody @Valid UserRequestDTO.UserInfoUpdateRequest request ) { + Long userId = SecurityUtil.getCurrentUserId(); + UserResponseDTO.User user = userCommandService.updateUserInfo(userId, request); return ApiResponse.onSuccess(user); diff --git a/src/main/java/com/haru/api/domain/user/service/UserCommandServiceImpl.java b/src/main/java/com/haru/api/domain/user/service/UserCommandServiceImpl.java index 7916e8b7..13acfd77 100644 --- a/src/main/java/com/haru/api/domain/user/service/UserCommandServiceImpl.java +++ b/src/main/java/com/haru/api/domain/user/service/UserCommandServiceImpl.java @@ -95,15 +95,17 @@ public void logout(String accessToken) { } - @Override @Transactional + @Override public UserResponseDTO.User updateUserInfo(Long userId, UserRequestDTO.UserInfoUpdateRequest request) { String name = request.getName(); - Users user = userRepository.findById(userId) + + Users foundUser = userRepository.findById(userId) .orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND)); - user.setName(name); - return UserConverter.toUserDTO(user); + foundUser.setName(name); + + return UserConverter.toUserDTO(foundUser); } private String generateAccessToken(Long userId, int accessExpTime) {