refactor: 대기열 이탈 시 즉시 좌석 AVAILABLE

Author: gksdud1109

backend/src/main/java/com/back/api/queue/service/QueueEntryProcessService.java

@@ -17,6 +17,7 @@
 import com.back.api.queue.dto.response.ProcessEntriesResponse;
 import com.back.api.queue.dto.response.WaitingQueueBatchEventResponse;
 import com.back.api.queue.dto.response.WaitingQueueResponse;
+import com.back.api.ticket.service.TicketService;
 import com.back.domain.event.entity.Event;
 import com.back.domain.event.repository.EventRepository;
 import com.back.domain.notification.systemMessage.QueueEntriesMessage;
@@ -51,6 +52,7 @@ public class QueueEntryProcessService {
 	private final QueueSchedulerProperties properties;
 	private final QueueEntryReadService queueEntryReadService;
 	private final EventRepository eventRepository;
+	private final TicketService ticketService;
 
 
 	/* ==================== 입장 처리 ==================== */
@@ -102,9 +104,9 @@ public void processEventQueueEntries(Event event) {
 		Long totalWaitingCount;
 
 		try {
-			totalWaitingCount =  queueEntryRedisRepository.getTotalWaitingCount(eventId);
+			totalWaitingCount = queueEntryRedisRepository.getTotalWaitingCount(eventId);
 		} catch (Exception e) {
-			log.warn("Redis 조회 실패, DB로부터 대기 중 인원 수 조회 시도 - eventId: {}", eventId,  e);
+			log.warn("Redis 조회 실패, DB로부터 대기 중 인원 수 조회 시도 - eventId: {}", eventId, e);
 			totalWaitingCount = queueEntryRepository.countByEvent_IdAndQueueEntryStatus(
 				eventId,
 				QueueEntryStatus.WAITING
@@ -121,14 +123,13 @@ public void processEventQueueEntries(Event event) {
 		try {
 			currentEnteredCount = queueEntryRedisRepository.getTotalEnteredCount(eventId);
 		} catch (Exception e) {
-			log.warn("Redis 조회 실패, DB로부터 입장 완료된 인원 수 조회 시도 - eventId: {}", eventId,  e);
+			log.warn("Redis 조회 실패, DB로부터 입장 완료된 인원 수 조회 시도 - eventId: {}", eventId, e);
 			currentEnteredCount = queueEntryRepository.countByEvent_IdAndQueueEntryStatus(
 				eventId,
 				QueueEntryStatus.ENTERED
 			);
 		}
 
-
 		int maxEnteredLimit = properties.getEntry().getMaxEnteredLimit();
 
 		//입장 가능한 인원 확인
@@ -153,16 +154,14 @@ public void processEventQueueEntries(Event event) {
 		log.info("입장 처리 - eventId: {}, 대기: {}명, 입장완료: {}명, 빈자리: {}명, 배치사이즈: {}명, 입장시킬인원: {}명",
 			eventId, totalWaitingCount, currentEnteredCount, availableEnteredCount, batchSize, entryCount);
 
-
-
 		List<Long> userIds;
 		try {
 			Set<Object> topWaitingUsers = queueEntryRedisRepository.getTopWaitingUsers(eventId, entryCount);
 			userIds = topWaitingUsers.stream()
 				.map(obj -> Long.parseLong(obj.toString()))
 				.toList();
 		} catch (Exception e) {
-			log.warn("Redis 조회 실패, DB로부터 상위 대기 인원 조회 시도 - eventId: {}", eventId,  e);
+			log.warn("Redis 조회 실패, DB로부터 상위 대기 인원 조회 시도 - eventId: {}", eventId, e);
 			userIds = queueEntryRepository.findTopNWaitingUsers(eventId, entryCount);
 		}
 
@@ -358,7 +357,6 @@ public void expireBatchEntries(List<QueueEntry> entries) {
 
 	/* ==================== 결제 완료 처리 ==================== */
 
-
 	@Transactional
 	public void completePayment(Long eventId, Long userId) {
 
@@ -443,6 +441,8 @@ public MoveToBackResponse moveToBackQueue(Long eventId, Long userId) {
 
 		int previousRank = queueEntry.getQueueRank();
 
+		ticketService.releaseDraftTicketAndSeat(eventId, userId);
+
 		Long maxRank = queueEntryRepository.findMaxRankInQueue(eventId)
 			.orElse(0L);
 
@@ -470,7 +470,6 @@ public MoveToBackResponse moveToBackQueue(Long eventId, Long userId) {
 
 	}
 
-
 	private void validateEntry(QueueEntry queueEntry) {
 		QueueEntryStatus status = queueEntry.getQueueEntryStatus();
 
@@ -519,7 +518,6 @@ private void validatePaymentCompletion(QueueEntry queueEntry) {
 		}
 	}
 
-
 	private void updateRedis(Long eventId, Long userId) {
 		try {
 			queueEntryRedisRepository.moveToEnteredQueue(eventId, userId);
@@ -531,7 +529,6 @@ private void updateRedis(Long eventId, Long userId) {
 		}
 	}
 
-
 	private void publishEnteredEvent(QueueEntry queueEntry) {
 		EnteredQueueResponse response = EnteredQueueResponse.from(
 			queueEntry.getUserId(),

backend/src/main/java/com/back/api/ticket/service/TicketService.java

@@ -1,6 +1,7 @@
 package com.back.api.ticket.service;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,12 +24,14 @@
 import com.back.global.error.exception.ErrorException;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 티켓 상태 변경 담당 서비스
  */
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class TicketService {
 
 	private final TicketRepository ticketRepository;
@@ -202,4 +205,31 @@ public void expireDraftTicket(Long ticketId) {
 			seatService.markSeatAsAvailable(ticket.getSeat());
 		}
 	}
+
+	public void releaseDraftTicketAndSeat(Long eventId, Long userId) {
+		try {
+			Optional<Ticket> draftTicketOpt =
+				ticketRepository.findByEventIdAndOwnerIdAndTicketStatus(
+					eventId, userId, TicketStatus.DRAFT
+				);
+
+			if (draftTicketOpt.isEmpty()) {
+				return;
+			}
+
+			Ticket draftTicket = draftTicketOpt.get();
+			draftTicket.cancel();
+
+			if (draftTicket.getSeat() != null) {
+				seatService.markSeatAsAvailable(draftTicket.getSeat());
+			}
+
+		} catch (Exception e) {
+			log.warn(
+				"Draft ticket release failed on queue demotion (scheduler will handle) " +
+					"- eventId={}, userId={}",
+				eventId, userId, e
+			);
+		}
+	}
 }

backend/src/test/java/com/back/api/queue/service/QueueEntryProcessServiceTest.java

@@ -24,6 +24,7 @@
 import com.back.api.queue.dto.response.EnteredQueueResponse;
 import com.back.api.queue.dto.response.ExpiredQueueResponse;
 import com.back.api.queue.dto.response.MoveToBackResponse;
+import com.back.api.ticket.service.TicketService;
 import com.back.config.TestRedisConfig;
 import com.back.domain.event.entity.Event;
 import com.back.domain.event.repository.EventRepository;
@@ -62,6 +63,9 @@ class QueueEntryProcessServiceTest {
 	@Mock
 	private EventRepository eventRepository;
 
+	@Mock
+	private TicketService ticketService;
+
 	private QueueSchedulerProperties queueSchedulerProperties;
 
 	private Event testEvent;
@@ -89,7 +93,8 @@ void setUp() {
 			eventPublisher,
 			queueSchedulerProperties,
 			queueEntryReadService,
-			eventRepository
+			eventRepository,
+			ticketService
 		);
 
 		testEvent = EventFactory.fakeEvent("TestEvent");
@@ -907,7 +912,6 @@ void moveToBackQueue_NotEnteredStatus_Completed() {
 			then(queueEntryRepository).should(never()).save(any());
 		}
 
-
 	}
 
 }