feat: 스케줄러 도입 (#288)

* feat: 엔티티 세팅

* feat: 엔티티 인덱스 추가

* feat: 엔티티 만료 시간 추가 관련 메서드 수정

* feat: 메서드 일부 수정

* feat: 레포지토리에 변경 로직 추기

* feat: 스케줄러, 서비스 추가

* feat: 테스트 컨트롤러 추가

* feat: 테스트 코드 수정

* feat: 메서드로 코드 수정

* feat: 검증 코드 추가

* feat: 테스트 코드 추가

* feat: 동시성 테스트 추가

* feat: 동시성 테스트 수정

Author: whyin

src/main/java/com/back/b2st/domain/reservation/service/ReservationService.java

@@ -13,7 +13,6 @@
 import com.back.b2st.domain.reservation.entity.ReservationStatus;
 import com.back.b2st.domain.reservation.error.ReservationErrorCode;
 import com.back.b2st.domain.reservation.repository.ReservationRepository;
-import com.back.b2st.domain.scheduleseat.entity.ScheduleSeat;
 import com.back.b2st.domain.scheduleseat.repository.ScheduleSeatRepository;
 import com.back.b2st.domain.scheduleseat.service.ScheduleSeatStateService;
 import com.back.b2st.domain.scheduleseat.service.SeatHoldTokenService;
@@ -68,6 +67,8 @@ public void cancelReservation(Long reservationId, Long memberId) {
 			reservation.getScheduleId(),
 			reservation.getSeatId()
 		);
+
+		seatHoldTokenService.remove(reservation.getScheduleId(), reservation.getSeatId());
 	}
 
 	/** === 예매 확정 === */
@@ -91,6 +92,8 @@ public void completeReservation(Long reservationId) {
 			reservation.getScheduleId(),
 			reservation.getSeatId()
 		);
+
+		seatHoldTokenService.remove(reservation.getScheduleId(), reservation.getSeatId());
 	}
 
 	/** === 예매 만료 === */
@@ -105,9 +108,13 @@ public void expireReservation(Long reservationId) {
 
 		reservation.expire();
 
-		scheduleSeatRepository
-			.findByScheduleIdAndSeatId(reservation.getScheduleId(), reservation.getSeatId())
-			.ifPresent(ScheduleSeat::release);
+		// 좌석 상태 복구 (HOLD → AVAILABLE)
+		scheduleSeatStateService.changeToAvailable(
+			reservation.getScheduleId(),
+			reservation.getSeatId()
+		);
+
+		seatHoldTokenService.remove(reservation.getScheduleId(), reservation.getSeatId());
 	}
 
 	/** === 예매 단건 조회 === */

src/main/java/com/back/b2st/domain/scheduleseat/controller/ScheduleSeatTestController.java

@@ -0,0 +1,37 @@
+package com.back.b2st.domain.scheduleseat.controller;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.back.b2st.domain.scheduleseat.service.ScheduleSeatStateService;
+import com.back.b2st.global.common.BaseResponse;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/test/schedules")
+public class ScheduleSeatTestController {
+
+	private final ScheduleSeatStateService scheduleSeatStateService;
+
+	/** === 만료된 HOLD 좌석 일괄 해제 (수동) === */
+	@PostMapping("/expired/release")
+	public BaseResponse<Integer> releaseExpiredHolds() {
+		int updated = scheduleSeatStateService.releaseExpiredHolds();
+		return BaseResponse.success(updated);
+	}
+
+	/** === 특정 좌석을 강제로 AVAILABLE로 복구 === */
+	@PostMapping("/{scheduleId}/seats/{seatId}/release")
+	public BaseResponse<Void> forceReleaseSeat(
+		@PathVariable Long scheduleId,
+		@PathVariable Long seatId
+	) {
+		scheduleSeatStateService.changeToAvailable(scheduleId, seatId);
+		return BaseResponse.success();
+	}
+
+}

src/main/java/com/back/b2st/domain/scheduleseat/entity/ScheduleSeat.java

@@ -1,5 +1,7 @@
 package com.back.b2st.domain.scheduleseat.entity;
 
+import java.time.LocalDateTime;
+
 import com.back.b2st.global.jpa.entity.BaseEntity;
 
 import jakarta.persistence.Column;
@@ -25,7 +27,8 @@
 	name = "schedule_seat",
 	indexes = {
 		@Index(name = "idx_schedule_seat_schedule_seat", columnList = "schedule_id, seat_id"),
-		@Index(name = "idx_schedule_seat_schedule_status", columnList = "schedule_id, status")
+		@Index(name = "idx_schedule_seat_schedule_status", columnList = "schedule_id, status"),
+		@Index(name = "idx_schedule_seat_status_expired", columnList = "status, hold_expired_at")
 	},
 	uniqueConstraints = {
 		@UniqueConstraint(name = "uk_schedule_seat_schedule_seat", columnNames = {"schedule_id", "seat_id"})
@@ -53,31 +56,38 @@ public class ScheduleSeat extends BaseEntity {
 	@Column(name = "status", nullable = false, length = 20)
 	private SeatStatus status;
 
+	@Column(name = "hold_expired_at")
+	private LocalDateTime holdExpiredAt; // HOLD 만료 시각
+
 	@Builder
 	public ScheduleSeat(Long scheduleId, Long seatId) {
 		this.scheduleId = scheduleId;
 		this.seatId = seatId;
 		this.status = SeatStatus.AVAILABLE;
+		this.holdExpiredAt = null;
 	}
 
-	/* === 상태 전환 메서드 === */
+	/** === 상태 전환 메서드 === */
 
-	/** HOLD 상태로 변경 */
-	public void hold() {
+	/* HOLD 상태로 변경 */
+	public void hold(LocalDateTime expiredAt) {
 		this.status = SeatStatus.HOLD;
+		this.holdExpiredAt = expiredAt;
 	}
 
-	/** SOLD(예매 확정) 상태로 변경 */
+	/* SOLD(예매 확정) 상태로 변경 */
 	public void sold() {
 		this.status = SeatStatus.SOLD;
+		this.holdExpiredAt = null;
 	}
 
-	/** AVAILABLE 상태로 복구 (취소) */
+	/* AVAILABLE 상태로 복구 (취소) */
 	public void release() {
 		this.status = SeatStatus.AVAILABLE;
+		this.holdExpiredAt = null;
 	}
 
-	/** HOLD 상태인지 확인 */
+	/* HOLD 상태인지 확인 */
 	public boolean isHold() {
 		return this.status == SeatStatus.HOLD;
 	}

src/main/java/com/back/b2st/domain/scheduleseat/repository/ScheduleSeatRepository.java

@@ -1,9 +1,13 @@
 package com.back.b2st.domain.scheduleseat.repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import com.back.b2st.domain.scheduleseat.entity.ScheduleSeat;
 import com.back.b2st.domain.scheduleseat.entity.SeatStatus;
@@ -18,4 +22,19 @@ public interface ScheduleSeatRepository extends JpaRepository<ScheduleSeat, Long
 
 	/* 특정 회차에서 특정 상태의 좌석 조회 (예: AVAILABLE 좌석만) */
 	List<ScheduleSeat> findByScheduleIdAndStatus(Long scheduleId, SeatStatus status);
+
+	/* HOLD 만료 좌석을 AVAILABLE로 일괄 복구 */
+	@Modifying(clearAutomatically = true, flushAutomatically = true)
+	@Query("""
+		update ScheduleSeat s
+		   set s.status = :available,
+		       s.holdExpiredAt = null
+		 where s.status = :hold
+		   and s.holdExpiredAt is not null
+		   and s.holdExpiredAt <= :now
+		""")
+	int releaseExpiredHolds(
+		@Param("hold") SeatStatus hold,
+		@Param("available") SeatStatus available,
+		@Param("now") LocalDateTime now);
 }

src/main/java/com/back/b2st/domain/scheduleseat/scheduler/ScheduleSeatScheduler.java

@@ -0,0 +1,26 @@
+package com.back.b2st.domain.scheduleseat.scheduler;
+
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import com.back.b2st.domain.scheduleseat.service.ScheduleSeatStateService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ScheduleSeatScheduler {
+
+	private final ScheduleSeatStateService scheduleSeatStateService;
+
+	/** === HOLD 만료 좌석 자동 복구 스케줄러 === */
+	@Scheduled(fixedDelayString = "${seat.hold.expire-release-interval-ms:5000}")
+	public void releaseExpiredHolds() {
+		int updated = scheduleSeatStateService.releaseExpiredHolds();
+		if (updated > 0) {
+			log.info("[HOLD 만료 복구] 복구된 좌석 수={}", updated);
+		}
+	}
+}

src/main/java/com/back/b2st/domain/scheduleseat/service/ScheduleSeatStateService.java

@@ -1,5 +1,7 @@
 package com.back.b2st.domain.scheduleseat.service;
 
+import java.time.LocalDateTime;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,43 +45,66 @@ public void holdSeat(Long memberId, Long scheduleId, Long seatId) {
 		}
 	}
 
+	/** === 만료된 HOLD 좌석을 AVAILABLE로 일괄 복구 === */
+	@Transactional
+	public int releaseExpiredHolds() {
+		LocalDateTime now = LocalDateTime.now();
+		return scheduleSeatRepository.releaseExpiredHolds(SeatStatus.HOLD, SeatStatus.AVAILABLE, now);
+	}
+
 	// === 상태 변경 AVAILABLE → HOLD === //
+	@Transactional
 	public void changeToHold(Long scheduleId, Long seatId) {
 		ScheduleSeat seat = getScheduleSeat(scheduleId, seatId);
+
 		if (seat.getStatus() == SeatStatus.SOLD) {
 			throw new BusinessException(ScheduleSeatErrorCode.SEAT_ALREADY_SOLD);
 		}
 		if (seat.getStatus() == SeatStatus.HOLD) {
 			throw new BusinessException(ScheduleSeatErrorCode.SEAT_ALREADY_HOLD);
 		}
-		seat.hold();
+
+		LocalDateTime expiredAt = LocalDateTime.now().plus(SeatHoldTokenService.HOLD_TTL);
+
+		seat.hold(expiredAt);
 	}
 
 	// === 상태 변경 HOLD → AVAILABLE === //
 	@Transactional
 	public void changeToAvailable(Long scheduleId, Long seatId) {
 		ScheduleSeat seat = getScheduleSeat(scheduleId, seatId);
+
+		if (seat.getStatus() == SeatStatus.AVAILABLE) {
+			return;
+		}
+
 		if (seat.getStatus() != SeatStatus.HOLD) {
 			return;
 		}
+
 		seat.release();
 	}
 
 	// === 상태 변경 HOLD → SOLD === //
 	@Transactional
 	public void changeToSold(Long scheduleId, Long seatId) {
 		ScheduleSeat seat = getScheduleSeat(scheduleId, seatId);
+
+		if (seat.getStatus() == SeatStatus.SOLD) {
+			return;
+		}
+
 		if (seat.getStatus() != SeatStatus.HOLD) {
 			throw new BusinessException(ScheduleSeatErrorCode.SEAT_NOT_HOLD);
 		}
+
 		seat.sold();
 	}
 
 	// === 좌석 조회 공통 로직 === //
 	private ScheduleSeat getScheduleSeat(Long scheduleId, Long seatId) {
-		ScheduleSeat seat = scheduleSeatRepository
+		return scheduleSeatRepository
 			.findByScheduleIdAndSeatId(scheduleId, seatId)
 			.orElseThrow(() -> new BusinessException(ScheduleSeatErrorCode.SEAT_NOT_FOUND));
-		return seat;
 	}
 }

src/main/java/com/back/b2st/domain/scheduleseat/service/SeatHoldTokenService.java

@@ -16,7 +16,7 @@ public class SeatHoldTokenService {
 
 	private final StringRedisTemplate redisTemplate;
 
-	private static final Duration HOLD_TTL = Duration.ofMinutes(5);
+	public static final Duration HOLD_TTL = Duration.ofMinutes(5);
 
 	/** === HOLD 소유권 저장 === */
 	public void save(Long scheduleId, Long seatId, Long memberId) {

src/main/java/com/back/b2st/global/init/DataInitializer.java

@@ -346,7 +346,7 @@ record SectionConfig(Section section) {
 			.orElseThrow(() -> new IllegalStateException("ScheduleSeat not found"));
 
 		// 좌석 상태 HOLD 처리 (결제 완료했지만 확정 전)
-		paidScheduleSeat.hold();
+		paidScheduleSeat.hold(LocalDateTime.now().plusMinutes(5));
 
 		// 예매 생성
 		Reservation paidReservation = Reservation.builder()

src/test/java/com/back/b2st/domain/payment/controller/PaymentConfirmControllerTest.java

@@ -84,7 +84,7 @@ void confirm_success() throws Exception {
 			.scheduleId(scheduleId)
 			.seatId(seatId)
 			.build();
-		scheduleSeat.hold();
+		scheduleSeat.hold(LocalDateTime.now().plusMinutes(5));
 		scheduleSeatRepository.save(scheduleSeat);
 
 		Payment payment = Payment.builder()

src/test/java/com/back/b2st/domain/payment/service/PaymentConfirmServiceConcurrencyTest.java

@@ -1,5 +1,8 @@
 package com.back.b2st.domain.payment.service;
 
+import static org.assertj.core.api.Assertions.*;
+
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -27,8 +30,6 @@
 import com.back.b2st.domain.scheduleseat.repository.ScheduleSeatRepository;
 import com.back.b2st.domain.ticket.repository.TicketRepository;
 
-import static org.assertj.core.api.Assertions.*;
-
 @SpringBootTest
 @ActiveProfiles("test")
 class PaymentConfirmServiceConcurrencyTest {
@@ -72,7 +73,7 @@ void confirm_concurrent_onlyOneApplied() throws Exception {
 			.scheduleId(scheduleId)
 			.seatId(seatId)
 			.build();
-		scheduleSeat.hold();
+		scheduleSeat.hold(LocalDateTime.now().plusMinutes(5));
 		scheduleSeatRepository.save(scheduleSeat);
 
 		Reservation reservation = Reservation.builder()