[FIX] 행사 종료 시, 출석 체크가 자동으로 종료되지 않는 오류를 수정합니다.

eeos/src/main/java/com/blackcompany/eeos/program/application/model/ProgramModel.java

@@ -40,7 +40,7 @@ public class ProgramModel implements AbstractModel {
 	private Long id;
 	private String title;
 	private String content;
-	private Timestamp programDate;
+	private Timestamp programDate; // programDate 는 행사 종료 시간
 	private String eventStatus;
 	private ProgramCategory programCategory;
 	private String githubUrl;

eeos/src/main/java/com/blackcompany/eeos/program/application/service/ProgramQuitService.java

@@ -1,23 +1,90 @@
 package com.blackcompany.eeos.program.application.service;
 
+import com.blackcompany.eeos.common.utils.DateConverter;
+import com.blackcompany.eeos.program.application.model.ProgramAttendMode;
 import com.blackcompany.eeos.program.application.model.ProgramModel;
+import com.blackcompany.eeos.program.application.support.DelayedQueue;
 import com.blackcompany.eeos.program.application.usecase.ProgramQuitUsecase;
 import com.blackcompany.eeos.program.persistence.ProgramRepository;
-import com.blackcompany.eeos.program.persistence.RedisDelayedQueue;
-import java.time.Instant;
+import com.blackcompany.eeos.target.application.model.AttendStatus;
+import com.blackcompany.eeos.target.persistence.AttendRepository;
+import java.time.LocalDate;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class ProgramQuitService implements ProgramQuitUsecase {
 
-	private final RedisDelayedQueue redisDelayedQueue;
+	private final DelayedQueue delayedQueue;
+	private final AttendRepository attendRepository;
 	private final ProgramRepository programRepository;
+	private final String KEY = "quit_program_reservation";
 
 	@Override
-	public void pushQuitAttendJob(ProgramModel model) {
-		long delayedTime = model.getProgramDate().getTime() - Instant.now().toEpochMilli();
-		redisDelayedQueue.addTask(model.getId(), delayedTime);
+	public void reserveQuitProgram(ProgramModel model) {
+		// programDate 를 score 로 사용
+		long programDate = model.getProgramDate().getTime() / 1000;
+
+		delayedQueue.addTask(KEY, model.getId(), programDate);
+	}
+
+	@Transactional
+	@Scheduled(cron = "0 0 0 * * *")
+	public void quitAttend() {
+		log.info("출석 체크 자동 종료 시작");
+		try {
+			long programDate = DateConverter.toEpochSecond(LocalDate.now()).getTime();
+
+			Set<Long> jobs = getReadyTasks(programDate);
+
+			Set<Long> completedIds = doQuit(jobs);
+
+			removeCompleteTask(completedIds);
+
+		} catch (Exception e) {
+			log.error("행사 자동 종료 중 에러가 발생하였습니다. {}", e.getMessage());
+			throw e;
+		}
+	}
+
+	private Set<Long> doQuit(Set<Long> programIds) {
+		if (!programIds.isEmpty()) {
+			Set<Long> completedIds = new HashSet<>();
+
+			for (Long id : programIds) {
+				log.info("출석 체크 자동 종료 (programId : {})", id);
+
+				programRepository.changeAttendMode(id, ProgramAttendMode.END);
+				attendRepository.updateAttendStatusByProgramId(
+						id, AttendStatus.NONRESPONSE, AttendStatus.ABSENT);
+
+				completedIds.add(id);
+			}
+
+			return completedIds;
+		}
+
+		log.info("종료할 행사가 존재하지 않습니다.");
+		return new HashSet<>();
+	}
+
+	private Set<Long> getReadyTasks(long programDate) {
+		Set<Long> jobs =
+				delayedQueue.getReadyTasks(KEY, (double) programDate).stream()
+						.map(id -> Long.parseLong(id.toString()))
+						.collect(Collectors.toSet());
+		return jobs;
+	}
+
+	private void removeCompleteTask(Set<Long> programIds) {
+		delayedQueue.removeByValue(KEY, programIds);
 	}
 }

eeos/src/main/java/com/blackcompany/eeos/program/application/service/ProgramService.java

@@ -90,7 +90,7 @@ public CommandProgramResponse create(final Long memberId, final CreateProgramReq
 
 		attendTargetService.save(saveId, request.getMembers());
 		presentTeamUsecase.save(saveId, request.getTeamIds());
-		quitUsecase.pushQuitAttendJob(model.toBuilder().id(saveId).build());
+		quitUsecase.reserveQuitProgram(model.toBuilder().id(saveId).build());
 
 		return responseConverter.from(saveId);
 	}

eeos/src/main/java/com/blackcompany/eeos/program/application/support/DelayedQueue.java

@@ -0,0 +1,31 @@
+package com.blackcompany.eeos.program.application.support;
+
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class DelayedQueue {
+
+	private final RedisTemplate<String, Object> redisTemplate;
+
+	public void addTask(String key, Object value, double score) {
+		redisTemplate.opsForZSet().add(key, value, score);
+	}
+
+	public Set<Object> getReadyTasks(String key, double score) {
+		Set<Object> tasks = redisTemplate.opsForZSet().rangeByScore(key, 0, score);
+
+		return tasks;
+	}
+
+	public void removeByScore(String key, double score) {
+		redisTemplate.opsForZSet().removeRangeByScore(key, 0, score);
+	}
+
+	public void removeByValue(String key, Object... value) {
+		redisTemplate.opsForZSet().remove(key, value);
+	}
+}

eeos/src/main/java/com/blackcompany/eeos/program/application/usecase/ProgramQuitUsecase.java

@@ -4,5 +4,5 @@
 
 public interface ProgramQuitUsecase {
 
-	void pushQuitAttendJob(ProgramModel model);
+	void reserveQuitProgram(ProgramModel model);
 }

eeos/src/main/java/com/blackcompany/eeos/target/application/event/EndAttendModeEventListener.java

@@ -6,13 +6,11 @@
 import com.blackcompany.eeos.target.persistence.AttendRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.event.TransactionPhase;
-import org.springframework.transaction.event.TransactionalEventListener;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 @Component
 @RequiredArgsConstructor
@@ -23,21 +21,21 @@ public class EndAttendModeEventListener {
 	private final ProgramRepository programRepository;
 
 	@Async
-	@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
 	@Transactional(propagation = Propagation.REQUIRES_NEW)
-	public void handleDeletedProgram(EndAttendModeEvent event) {
-		log.info(
-				"출석 체크 종료 Transaction committed: {}",
-				TransactionSynchronizationManager.isActualTransactionActive());
+	@EventListener(EndAttendModeEvent.class)
+	public void handle(EndAttendModeEvent event) {
+		log.info("출석 체크 자동 종료 시작");
 
-		for (Long id : event.getProgramIds()) {
-			programRepository.changeAttendMode(id, ProgramAttendMode.END);
-			attendRepository.updateAttendStatusByProgramId(
-					id, AttendStatus.NONRESPONSE, AttendStatus.ABSENT);
+		if (!event.getProgramIds().isEmpty()) {
+			for (Long id : event.getProgramIds()) {
+				log.info("출석 체크 자동 종료 (programId : {})", id);
+				programRepository.changeAttendMode(id, ProgramAttendMode.END);
+				attendRepository.updateAttendStatusByProgramId(
+						id, AttendStatus.NONRESPONSE, AttendStatus.ABSENT);
+			}
+			return;
 		}
 
-		if (event.getProgramIds().isEmpty()) {
-			log.info("종료할 프로그램이 없습니다.");
-		}
+		log.info("종료할 프로그램이 없습니다.");
 	}
 }