Skip to content

Commit d1b8b9d

Browse files
authored
Merge pull request #46 from HaRu-Developers/fix/#45-users-info-update-fix
fix/#45: 회원 정보 수정 시 jwt token에서 userId 가져오도록 수정
2 parents a92bb66 + ebfc434 commit d1b8b9d

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/main/java/com/haru/api/domain/user/controller/UserController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,12 @@ public ApiResponse<UserResponseDTO.User> getUserInfo() {
8585
"# 회원 정보 수정 API 입니다. \n" +
8686
"현재는 jwt token을 구현하지 않아 pathvariable로 userId를 넣어주세요.추후 jwt token이 구현되면 수정하겠습니다."
8787
)
88-
@PatchMapping("/{userId}/info")
88+
@PatchMapping("/info")
8989
public ApiResponse<UserResponseDTO.User> updateUserInfo(
90-
@PathVariable Long userId,
9190
@RequestBody @Valid UserRequestDTO.UserInfoUpdateRequest request
9291
) {
92+
Long userId = SecurityUtil.getCurrentUserId();
93+
9394
UserResponseDTO.User user = userCommandService.updateUserInfo(userId, request);
9495

9596
return ApiResponse.onSuccess(user);

src/main/java/com/haru/api/domain/user/service/UserCommandServiceImpl.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,17 @@ public void logout(String accessToken) {
9595
}
9696

9797

98-
@Override
9998
@Transactional
99+
@Override
100100
public UserResponseDTO.User updateUserInfo(Long userId, UserRequestDTO.UserInfoUpdateRequest request) {
101101
String name = request.getName();
102-
Users user = userRepository.findById(userId)
102+
103+
Users foundUser = userRepository.findById(userId)
103104
.orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
104-
user.setName(name);
105105

106-
return UserConverter.toUserDTO(user);
106+
foundUser.setName(name);
107+
108+
return UserConverter.toUserDTO(foundUser);
107109
}
108110

109111
private String generateAccessToken(Long userId, int accessExpTime) {

0 commit comments

Comments
 (0)