Merge pull request #139 from Team-Shaka/fix/138

🐛 Fix: 회원 가입은 했으나 소속 트리하우스가 없는 경우에 대한 처리

Author: koojun99

src/main/java/treehouse/server/api/user/business/UserService.java

@@ -99,6 +99,24 @@ public UserResponseDTO.checkUserStatus checkUserStatus(UserRequestDTO.checkUserS
         Boolean isNewUser = !userQueryAdapter.existByPhoneNumber(request.getPhoneNumber());
         Boolean isInvited = invitationQueryAdapter.existByPhoneNumber(request.getPhoneNumber());
 
+        // User가 존재하지만, 해당 User와 연결된 Member가 하나도 없는 경우
+        if (!isNewUser) {
+            User user = userQueryAdapter.findByPhoneNumber(request.getPhoneNumber());
+            // 해당 User와 연관된 Member가 없는지 확인
+            if (user.getMemberList().isEmpty()) {
+                List<Invitation> receivedInvitations = invitationQueryAdapter.findAllByPhone(request.getPhoneNumber());
+                receivedInvitations.forEach(invitation -> {
+                    invitation.setReceiver(null);
+                    invitationCommandAdapter.saveInvitation(invitation);
+                });
+                fcmService.deleteAllFcmToken(user);
+                userCommandAdapter.delete(user); // User 삭제
+
+                isNewUser = true; // 삭제했으므로 isNewUser를 true로 변경
+            }
+        }
+
+
         return UserMapper.toCheckUserStatus(isNewUser, isInvited);
     }
 

src/main/java/treehouse/server/api/user/implement/UserCommandAdapter.java

@@ -49,6 +49,10 @@ public TokenDTO reissueToken(User user, RefreshToken refreshToken){
     }
 
     public void withdraw(User user) {
+        user.withdraw();
+    }
+
+    public void delete(User user) {
         userRepository.delete(user);
     }
 }

src/main/java/treehouse/server/global/entity/User/User.java

@@ -21,7 +21,6 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Table(name = "user")
-@SQLDelete(sql = "UPDATE user SET inactivated_at = NOW(), status = 'WITHDRAWAL' WHERE id = ?")
 public class User extends BaseDateTimeEntity {
 
     @Id
@@ -67,6 +66,11 @@ public class User extends BaseDateTimeEntity {
     @OneToMany(mappedBy = "receiver")
     List<Notification> notificationList;
 
+    public void withdraw() {
+        this.status = UserStatus.WITHDRAWAL;
+        this.inactivatedAt = LocalDateTime.now();
+    }
+
     public void addMember(Member member) {
         memberList.add(member);
     }