From c88f5e357045621e4e45734820a7797e3ff5dfd8 Mon Sep 17 00:00:00 2001 From: jiyunio Date: Thu, 20 Jun 2024 16:24:34 +0900 Subject: [PATCH] =?UTF-8?q?[Refactor]=20=ED=9A=8C=EC=9B=90=20=ED=83=88?= =?UTF-8?q?=ED=87=B4=20=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jiyunio/todolist/member/MemberController.java | 4 ++-- .../com/jiyunio/todolist/member/MemberService.java | 13 ++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/jiyunio/todolist/member/MemberController.java b/src/main/java/com/jiyunio/todolist/member/MemberController.java index 38d8ef1..e1ff515 100644 --- a/src/main/java/com/jiyunio/todolist/member/MemberController.java +++ b/src/main/java/com/jiyunio/todolist/member/MemberController.java @@ -67,8 +67,8 @@ public ResponseEntity updateUserPw(@AuthenticationPrincipal C @Operation(summary = "회원 탈퇴", description = "비밀번호 이용") @ApiResponse(responseCode = "200", description = "회원 탈퇴 성공", content = @Content(schema = @Schema(implementation = ResponseDTO.class))) @ApiResponse(responseCode = "404", description = "회원 비밀번호 불일치", content = @Content(schema = @Schema(implementation = ErrorDTO.class))) - public ResponseEntity deleteMember(@AuthenticationPrincipal CustomUserDetails user, @RequestParam String userPw) { - memberService.deleteMember(user.getUsername(), userPw); + public ResponseEntity deleteMember(@AuthenticationPrincipal CustomUserDetails user) { + memberService.deleteMember(user.getUsername()); return ResponseEntity.ok(ResponseDTO.builder() .msg("회원 탈퇴 성공") .build()); diff --git a/src/main/java/com/jiyunio/todolist/member/MemberService.java b/src/main/java/com/jiyunio/todolist/member/MemberService.java index 63edd35..7bd3396 100644 --- a/src/main/java/com/jiyunio/todolist/member/MemberService.java +++ b/src/main/java/com/jiyunio/todolist/member/MemberService.java @@ -97,17 +97,12 @@ public ResponseMemberDTO updateUserPw(String userId, @Valid ChangeUserPwDTO chan } } - public void deleteMember(String userId, String userPw) { + public void deleteMember(String userId) { Member member = memberRepository.findByUserId(userId).orElseThrow( () -> new CustomException(HttpStatus.NOT_FOUND, ErrorCode.NOT_EXIST_MEMBER) ); - if (passwordEncoder.matches(userPw, member.getUserPw())) { // 회원 탈퇴 성공 - todoService.deleteTodos(userId); - categoryService.deleteCategories(userId); - memberRepository.deleteById(member.getId()); - } else { - // 비밀번호 불일치 - throw new CustomException(HttpStatus.NOT_FOUND, ErrorCode.WRONG_USERID_PASSWORD); - } + todoService.deleteTodos(userId); + categoryService.deleteCategories(userId); + memberRepository.deleteById(member.getId()); } }