🔀 Merge pull request #95 from Boggle-Boggle/feature/#59

🐛 여러번 탈퇴했을 경우의 버그 해결

Author: cheshireHYUN

src/main/java/com/boggle_boggle/bbegok/repository/user/UserRepository.java

@@ -8,9 +8,9 @@
 
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
-    User findByUserId(String userId);
     User findByUserIdAndIsDeleted(String userId, boolean isDeleted);
 
     Optional<User> findByUserName(String nickname);
 
+    long countByUserIdAndIsDeleted(String userId, boolean b);
 }

src/main/java/com/boggle_boggle/bbegok/service/LibraryService.java

@@ -41,8 +41,12 @@ public class LibraryService {
     private final ReadingRecordRepository readingRecordRepository;
 
     public User getUser(String userId) {
-        User user = userRepository.findByUserId(userId);
-        if(user.getIsDeleted()) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+        User user = userRepository.findByUserIdAndIsDeleted(userId, false);
+        if(user == null) {
+            //탈퇴한 적 있는 회원
+            if(userRepository.countByUserIdAndIsDeleted(userId, true) > 0) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+            else throw new GeneralException(Code.USER_NOT_FOUND);
+        }
         return user;
     }
 

src/main/java/com/boggle_boggle/bbegok/service/MyPageService.java

@@ -24,8 +24,12 @@ public class MyPageService {
     private final NoteRepository noteRepository;
 
     public User getUser(String userId) {
-        User user = userRepository.findByUserId(userId);
-        if(user.getIsDeleted()) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+        User user = userRepository.findByUserIdAndIsDeleted(userId, false);
+        if(user == null) {
+            //탈퇴한 적 있는 회원
+            if(userRepository.countByUserIdAndIsDeleted(userId, true) > 0) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+            else throw new GeneralException(Code.USER_NOT_FOUND);
+        }
         return user;
     }
 

src/main/java/com/boggle_boggle/bbegok/service/NoteService.java

@@ -105,10 +105,13 @@ public void deleteNote(Long recordId, Long noteId, String userId) {
 
 
     //== 사용할 기타 메소드
-
     public User getUser(String userId) {
-        User user = userRepository.findByUserId(userId);
-        if(user.getIsDeleted()) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+        User user = userRepository.findByUserIdAndIsDeleted(userId, false);
+        if(user == null) {
+            //탈퇴한 적 있는 회원
+            if(userRepository.countByUserIdAndIsDeleted(userId, true) > 0) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+            else throw new GeneralException(Code.USER_NOT_FOUND);
+        }
         return user;
     }
 

src/main/java/com/boggle_boggle/bbegok/service/ReadingRecordService.java

@@ -36,8 +36,12 @@ public class ReadingRecordService {
     private final BookService bookService;
 
     public User getUser(String userId) {
-        User user = userRepository.findByUserId(userId);
-        if(user.getIsDeleted()) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+        User user = userRepository.findByUserIdAndIsDeleted(userId, false);
+        if(user == null) {
+            //탈퇴한 적 있는 회원
+            if(userRepository.countByUserIdAndIsDeleted(userId, true) > 0) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+            else throw new GeneralException(Code.USER_NOT_FOUND);
+        }
         return user;
     }
 

src/main/java/com/boggle_boggle/bbegok/service/SearchLogService.java

@@ -19,8 +19,12 @@ public class SearchLogService {
     private final UserRepository userRepository;
 
     public User getUser(String userId) {
-        User user = userRepository.findByUserId(userId);
-        if(user.getIsDeleted()) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+        User user = userRepository.findByUserIdAndIsDeleted(userId, false);
+        if(user == null) {
+            //탈퇴한 적 있는 회원
+            if(userRepository.countByUserIdAndIsDeleted(userId, true) > 0) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+            else throw new GeneralException(Code.USER_NOT_FOUND);
+        }
         return user;
     }
 

src/main/java/com/boggle_boggle/bbegok/service/UserService.java

@@ -31,8 +31,12 @@ public class UserService {
     private final UserRefreshTokenRepository userRefreshTokenRepository;
 
     public User getUser(String userId) {
-        User user = userRepository.findByUserId(userId);
-        if(user.getIsDeleted()) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+        User user = userRepository.findByUserIdAndIsDeleted(userId, false);
+        if(user == null) {
+            //탈퇴한 적 있는 회원
+            if(userRepository.countByUserIdAndIsDeleted(userId, true) > 0) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+            else throw new GeneralException(Code.USER_NOT_FOUND);
+        }
         return user;
     }
 

src/main/java/com/boggle_boggle/bbegok/service/UserSettingsService.java

@@ -19,8 +19,12 @@ public class UserSettingsService {
     private final UserRepository userRepository;
 
     public User getUser(String userId) {
-        User user = userRepository.findByUserId(userId);
-        if(user.getIsDeleted()) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+        User user = userRepository.findByUserIdAndIsDeleted(userId, false);
+        if(user == null) {
+            //탈퇴한 적 있는 회원
+            if(userRepository.countByUserIdAndIsDeleted(userId, true) > 0) throw new GeneralException(Code.USER_ALREADY_WITHDRAWN);
+            else throw new GeneralException(Code.USER_NOT_FOUND);
+        }
         return user;
     }