[Refactor] 회원 정보 불가 오류 수정

inu-appcenter · Mar 31, 2024 · fec82fc · fec82fc
1 parent 1430631
commit fec82fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/kr/inuappcenterportal/inuportal/controller/MemberController.java b/src/main/java/kr/inuappcenterportal/inuportal/controller/MemberController.java
@@ -58,7 +58,7 @@ public ResponseEntity<ResponseDto<Long>> join(@Valid @RequestBody MemberSaveDto
     @PutMapping("/password")
     public ResponseEntity<ResponseDto<Long>> updatePassword(@Valid@RequestBody MemberUpdatePasswordDto memberUpdatePasswordDto, @AuthenticationPrincipal Member member){
         log.info("회원 비밀번호 변경 호출 id:{}",member.getId());
-        Long memberId = memberService.updateMemberPassword(member, memberUpdatePasswordDto);
+        Long memberId = memberService.updateMemberPassword(member.getId(), memberUpdatePasswordDto);
         return new ResponseEntity<>(new ResponseDto<>(memberId,"회원 비밀번호 변경 성공"),HttpStatus.OK);
     }
 
@@ -71,7 +71,7 @@ public ResponseEntity<ResponseDto<Long>> updatePassword(@Valid@RequestBody Membe
     @PutMapping("")
     public ResponseEntity<ResponseDto<Long>> updateNicknameFireId(@Valid@RequestBody MemberUpdateNicknameDto memberUpdateNicknameDto, @AuthenticationPrincipal Member member){
         log.info("회원 닉네임 변경 호출 id:{}",member.getId());
-        Long memberId = memberService.updateMemberNicknameFireId(member, memberUpdateNicknameDto);
+        Long memberId = memberService.updateMemberNicknameFireId(member.getId(), memberUpdateNicknameDto);
         return new ResponseEntity<>(new ResponseDto<>(memberId,"회원 닉네임/횃불이 이미지 변경 성공"),HttpStatus.OK);
     }
 

diff --git a/src/main/java/kr/inuappcenterportal/inuportal/service/MemberService.java b/src/main/java/kr/inuappcenterportal/inuportal/service/MemberService.java
@@ -47,7 +47,8 @@ public Long join(MemberSaveDto memberSaveDto){
     }
 
     @Transactional
-    public Long updateMemberPassword(Member member, MemberUpdatePasswordDto memberUpdatePasswordDto){
+    public Long updateMemberPassword(Long id, MemberUpdatePasswordDto memberUpdatePasswordDto){
+        Member member = memberRepository.findById(id).orElseThrow(()->new MyException(MyErrorCode.USER_NOT_FOUND));
        if(!passwordEncoder.matches(memberUpdatePasswordDto.getPassword(),member.getPassword())){
            throw new MyException(MyErrorCode.PASSWORD_NOT_MATCHED);
        }
@@ -57,7 +58,8 @@ public Long updateMemberPassword(Member member, MemberUpdatePasswordDto memberUp
     }
 
     @Transactional
-    public Long updateMemberNicknameFireId(Member member, MemberUpdateNicknameDto memberUpdateNicknameDto){
+    public Long updateMemberNicknameFireId(Long id, MemberUpdateNicknameDto memberUpdateNicknameDto){
+        Member member = memberRepository.findById(id).orElseThrow(()->new MyException(MyErrorCode.USER_NOT_FOUND));
         if(memberUpdateNicknameDto.getNickname()!=null) {
             if (memberUpdateNicknameDto.getNickname().equals(member.getNickname())) {
                 throw new MyException(MyErrorCode.SAME_NICKNAME_UPDATE);