Feat : DIG-103 회원 탈퇴 기능 추가

- soft delete 방식 - 일부 서비스 메서드 이름 수정 - 누락된 import 수정, 변수명 수정
Goorm-OGJG · Nov 13, 2023 · f502d8a · f502d8a
1 parent 420b1a7
commit f502d8a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/src/main/java/com/ogjg/daitgym/domain/User.java b/src/main/java/com/ogjg/daitgym/domain/User.java
@@ -1,5 +1,6 @@
 package com.ogjg.daitgym.domain;
 
+import com.ogjg.daitgym.domain.routine.Routine;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.Email;
 import lombok.Builder;
@@ -11,7 +12,7 @@
 import java.time.LocalDate;
 
 import static jakarta.persistence.EnumType.STRING;
-import static jakarta.persistence.FetchType.*;
+import static jakarta.persistence.FetchType.LAZY;
 import static lombok.AccessLevel.PROTECTED;
 
 @Getter
@@ -81,6 +82,10 @@ public String changeNickname(String newNickname) {
         return this.nickname;
     }
 
+    public void withdraw() {
+        this.isDeleted = true;
+    }
+
     public void changeHealthClub(HealthClub newHealthClub) {
         if (this.healthClub != null) {
             this.healthClub.getUsers().remove(this);

diff --git a/src/main/java/com/ogjg/daitgym/follow/repository/FollowRepositoryImpl.java b/src/main/java/com/ogjg/daitgym/follow/repository/FollowRepositoryImpl.java
@@ -23,7 +23,7 @@ public List<FollowListDto> followingList(String nickname) {
                         new QFollowListDto(
                                 user.imageUrl,
                                 user.nickname,
-                                user.intro,
+                                user.introduction,
                                 inbody.score
                         ))
                 .from(follow)
@@ -40,7 +40,7 @@ public List<FollowListDto> followerList(String nickname) {
                         new QFollowListDto(
                                 user.imageUrl,
                                 user.nickname,
-                                user.intro,
+                                user.introduction,
                                 inbody.score
                         )
                 ).from(follow)

diff --git a/src/main/java/com/ogjg/daitgym/user/controller/UserController.java b/src/main/java/com/ogjg/daitgym/user/controller/UserController.java
@@ -65,6 +65,19 @@ public ApiResponse<EditInitialNicknameResponse> editInitialNickname(
         );
     }
 
+    /**
+     * 회원 탈퇴
+     */
+    @PatchMapping("/withdraw")
+    public ApiResponse<?> withdraw(
+            @AuthenticationPrincipal OAuth2JwtUserDetails userDetails
+    ) {
+        String loginEmail = userDetails.getEmail();
+
+        userService.updateUserDeleted(loginEmail);
+        return new ApiResponse<>(ErrorCode.SUCCESS.changeMessage("회원탈퇴 성공"));
+    }
+
     /**
      * 프로필 불러오기
      */

diff --git a/src/main/java/com/ogjg/daitgym/user/service/UserService.java b/src/main/java/com/ogjg/daitgym/user/service/UserService.java
@@ -56,7 +56,7 @@ public GetUserProfileGetResponse getUserProfile(String loginEmail, String nickna
 
         return GetUserProfileGetResponse.builder()
                 .healthClubName(user.getHealthClub().getName())
-                .journalCount(exerciseJournalRepository.countByUserEmail(user.getEmail()))
+//                .journalCount(exerciseJournalRepository.countByUserEmail(user.getEmail()))
                 .followerCount(followRepository.countByFollowPKTargetEmail(user.getEmail()))
                 .followingCount(followRepository.countByFollowPKFollowerEmail(user.getEmail()))
                 .build();
@@ -173,7 +173,7 @@ public EditInitialNicknameResponse editInitialNickname(String loginEmail, EditNi
         }
 
         // 해당 메시지를 사용해야하는데 기존 에러코드를 수정할 수는 없어서 임시 사용
-        if (isUserNotFound(loginEmail)) {
+        if (isUserNotFoundByEmail(loginEmail)) {
             throw new NotFoundUser("존재하지 않는 회원입니다.");
         }
 
@@ -199,6 +199,20 @@ private boolean isNicknameAlreadyExist(String newNickname) {
         return userRepository.findByNickname(newNickname).isPresent();
     }
 
+    @Transactional(readOnly = true)
+    public void updateUserDeleted(String loginEmail) {
+        if (isUserNotFoundByEmail(loginEmail)) {
+            throw new NotFoundUser("존재하지 않는 회원입니다.");
+        }
+
+        User findUser = findUserByEmail(loginEmail);
+        findUser.withdraw();
+    }
+
+    private boolean isUserNotFoundByEmail(String loginEmail) {
+        return !userRepository.findByEmail(loginEmail).isPresent();
+    }
+
     private User findUserByNickname(String nickname) {
         return userRepository.findByNickname(nickname)
                 .orElseThrow(NotFoundUser::new);