활성화된 멤버가 없는 그룹 정리 로직 구현

Author: son0307

src/main/java/com/sonkim/bookmarking/common/scheduler/TeamCleanupScheduler.java

@@ -2,16 +2,27 @@
 
 import com.sonkim.bookmarking.domain.team.service.TeamService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class TeamCleanupScheduler {
     private final TeamService teamService;
 
     @Scheduled(cron = "0 0 4 * * *")
     public void deleteScheduledTeams() {
+        log.info("삭제가 예정된 그룹 정리 작업 시작...");
         teamService.deletePendingTeams();
+        log.info("삭제가 예정된 그룹 저일 작업 완료.");
+    }
+
+    @Scheduled(cron = "0 0 5 * * *")
+    public void cleanupOrphanedTeams() {
+        log.info("주인 없는 그룹 정리 작업 시작...");
+        teamService.deleteOrphanedTeams();
+        log.info("주인 없는 그룹 정리 작업 완료.");
     }
 }

src/main/java/com/sonkim/bookmarking/domain/mypage/service/MyPageService.java

@@ -133,7 +133,5 @@ public void deleteAccount(Long userId) {
 
         // RefreshToken 삭제하여 세션 무효화
         tokenService.deleteRefreshToken(userId);
-
-        // 마지막 관리자인 그룹이 있는 경우 탈퇴가 불가능하도록 로직 추가 필요
     }
 }

src/main/java/com/sonkim/bookmarking/domain/team/repository/TeamRepository.java

@@ -3,6 +3,7 @@
 import com.sonkim.bookmarking.domain.team.entity.Team;
 import com.sonkim.bookmarking.domain.team.enums.TeamStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
@@ -14,4 +15,9 @@ public interface TeamRepository extends JpaRepository<Team, Long> {
     Optional<Team> findByInviteCode(String inviteCode);
 
     List<Team> findAllByStatusAndDeletionScheduledAtBefore(TeamStatus status, LocalDateTime deletionScheduledAtBefore);
+
+    @Query("SELECT t FROM Team t WHERE NOT EXISTS " +
+            "(SELECT 1 FROM TeamMember tm JOIN tm.user u " +
+            "WHERE tm.team = t AND u.userStatus = 'ACTIVE')")
+    List<Team> findOrphanedTeams();
 }

src/main/java/com/sonkim/bookmarking/domain/team/service/TeamService.java

@@ -238,4 +238,15 @@ public void validateGroupIsActive(Long teamId) {
         if (team.getStatus() == TeamStatus.PENDING_DELETION)
             throw new IllegalStateException("삭제가 예정된 그룹에서는 이 작업을 수행할 수 없습니다.");
     }
+
+    @Transactional
+    public void deleteOrphanedTeams() {
+        // 활성 멤버가 없는 그룹 조회
+        List<Team> orphanedTeams = teamRepository.findOrphanedTeams();
+
+        if (!orphanedTeams.isEmpty()) {
+            log.info("{}개의 주인 없는 그룹을 삭제합니다.", orphanedTeams.size());
+            teamRepository.deleteAll(orphanedTeams);
+        }
+    }
 }

src/main/java/com/sonkim/bookmarking/domain/user/entity/User.java

@@ -51,6 +51,10 @@ public void updatePassword(String newPassword) {
     public void withdraw() {
         this.userStatus = UserStatus.DELETED;
         this.deletedAt = LocalDateTime.now();
+
+        String uniqueSuffix = "_" + this.id + "_" + System.currentTimeMillis();
+        this.username = "deleted" + uniqueSuffix + "@deleted.com";
+
         this.password = null;
         profile.anonymize();
     }