Skip to content

[FIX]: 게스트 정리 스케줄러 로직 수정 #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2025
Merged

[FIX]: 게스트 정리 스케줄러 로직 수정 #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 40 additions & 11 deletions back/src/main/java/com/back/global/scheduler/GuestCleanupScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.back.global.scheduler;

import com.back.domain.node.entity.BaseLine;
import com.back.domain.node.repository.BaseLineRepository;
import com.back.domain.node.service.BaseLineService;
import com.back.domain.user.entity.Role;
import com.back.domain.user.entity.User;
import com.back.domain.user.repository.UserRepository;
Expand All @@ -11,34 +14,35 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
* 게스트 유저 정리 보조 scheduler
* - 세션 리스너에서 처리하지 못하고 남은 게스트가 있다면 삭제
* 게스트 유저 정리 보조 Scheduler
* - 세션 리스너에서 처리하지 못하고 남은 게스트가 있다면 정리
*/
@Slf4j
@Component
@RequiredArgsConstructor
public class GuestCleanupScheduler {

private final UserRepository userRepository;
private final BaseLineRepository baseLineRepository;
private final BaseLineService baseLineService;
private final FindByIndexNameSessionRepository<? extends Session> sessionIndexRepo;

@Scheduled(cron = "0 0 17 * * ?") // 매일 오후 5시
@Transactional
public void cleanupExpiredGuests() {
log.info("=== 게스트 정리 작업 시작 (index 기반) ===");
log.info("=== 게스트 정리 작업 시작 ===");

List<User> allGuests = userRepository.findByRole(Role.GUEST);
if (allGuests.isEmpty()) {
log.info("게스트 유저가 없습니다.");
return;
}

List<User> expiredGuests = new ArrayList<>();
int deletedUsers = 0;

for (User guest : allGuests) {
String principal = guest.getEmail();
Expand All @@ -50,14 +54,39 @@ public void cleanupExpiredGuests() {
);

boolean hasActive = sessions != null && !sessions.isEmpty();
if (!hasActive) expiredGuests.add(guest);
if (hasActive) { continue; }

Long userId = guest.getId();

try {
List<Long> baseLineIds = baseLineRepository
.findByUser_IdOrderByIdDesc(userId)
.stream()
.map(BaseLine::getId)
.toList();

for (Long baseLineId : baseLineIds) {
try {
baseLineService.deleteBaseLineDeep(userId, baseLineId);
} catch (Exception ex) {
log.error("[GuestCleanupScheduler] baseline({}) deep 삭제 실패 - 계속 진행", baseLineId, ex);
}
}

userRepository.delete(guest);
deletedUsers++;

log.info("[GuestCleanupScheduler] 게스트 및 소유 리소스 삭제 완료: email={}, userId={}",
principal, userId);

} catch (Exception e) {
log.error("[GuestCleanupScheduler] 게스트(userId={}, email={}) 삭제 처리 중 오류 - 다음 유저로 계속",
userId, principal, e);
}
}

if (!expiredGuests.isEmpty()) {
userRepository.deleteAllInBatch(expiredGuests);
log.info("만료 게스트 {}명 삭제 완료 - IDs={}",
expiredGuests.size(),
expiredGuests.stream().map(User::getId).toList());
if (deletedUsers > 0) {
log.info("만료 게스트 {}명 삭제 완료", deletedUsers);
} else {
log.info("삭제할 만료 게스트가 없습니다.");
}
Expand Down