feat : Queue 관련 로직 수정, 좌석 선택 시 hasPassed 여부 검증

src/main/java/org/example/siljeun/domain/reservation/controller/WaitingQueueController.java

@@ -17,7 +17,7 @@ public class WaitingQueueController {
   public void addQueue(@Valid AddQueueRequest request) {
     Long scheduleId = request.scheduleId();
     String username = request.username();
-    waitingQueueService.addQueue(scheduleId, username);
+    waitingQueueService.addWaitingQueue(scheduleId, username);
     System.out.println("연결 성공");
   }
 }

src/main/java/org/example/siljeun/domain/reservation/dto/request/AddQueueRequest.java

@@ -1,9 +1,10 @@
 package org.example.siljeun.domain.reservation.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 public record AddQueueRequest(
-    @NotBlank
+    @NotNull
     Long scheduleId,
     @NotBlank
     String username

src/main/java/org/example/siljeun/domain/reservation/dto/response/MyQueueInfoResponse.java

@@ -4,7 +4,7 @@ public record MyQueueInfoResponse(
     Long scheduleId,
     String username,
     Long rank,
-    Long acceptedRank
+    boolean isPassable
 ) {
 
 }

src/main/java/org/example/siljeun/domain/reservation/exception/CustomException.java

@@ -1,15 +1,14 @@
 package org.example.siljeun.domain.reservation.exception;
 
 import lombok.Getter;
-import org.springframework.http.HttpStatus;
 
 public class CustomException extends RuntimeException {
 
   @Getter
-  private HttpStatus errorCode;
+  private ErrorCode errorCode;
 
   public CustomException(ErrorCode errorCode) {
     super(errorCode.getMessage());
-    this.errorCode = errorCode.getCode();
+    this.errorCode = errorCode;
   }
 }

src/main/java/org/example/siljeun/domain/reservation/exception/ReservationExceptionHandler.java

@@ -15,7 +15,7 @@ public class ReservationExceptionHandler {
   @ExceptionHandler(CustomException.class)
   public ResponseEntity<ResponseDto<Void>> reservationExceptionHandler(
       CustomException e) {
-    return ResponseEntity.status(e.getErrorCode())
+    return ResponseEntity.status(e.getErrorCode().getCode())
         .body(ResponseDto.fail(e.getMessage()));
   }
 

src/main/java/org/example/siljeun/domain/reservation/scheduler/CheckExpiredScheduler.java

@@ -0,0 +1,99 @@
+package org.example.siljeun.domain.reservation.scheduler;
+
+import static org.example.siljeun.domain.reservation.service.WaitingQueueService.prefixKeyForSelecingQueue;
+import static org.example.siljeun.domain.reservation.service.WaitingQueueService.prefixKeyForWaitingQueue;
+
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+import org.example.siljeun.domain.schedule.entity.Schedule;
+import org.example.siljeun.domain.schedule.repository.ScheduleRepository;
+import org.springframework.data.redis.core.Cursor;
+import org.springframework.data.redis.core.ScanOptions;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class CheckExpiredScheduler {
+
+  private final StringRedisTemplate redisTemplate;
+  private final ScheduleRepository scheduleRepository;
+
+  private final Set<String> keys = new HashSet<>();
+
+  // 1시간마다 티켓팅 기간인 schedule을 keys에 저장
+  @Scheduled(cron = "0 0 * * * *")
+  public void checkOpenedSchedule() {
+
+    keys.clear();
+
+    List<Long> openedSchedules = scheduleRepository.findAllByStartTimeAfterAndTicketingStartTimeBefore(
+            LocalDateTime.now(),
+            LocalDateTime.now()).stream()
+        .map(Schedule::getId)
+        .toList();
+
+    try (Cursor<byte[]> cursor = redisTemplate.getConnectionFactory().getConnection()
+        .scan(ScanOptions.scanOptions().match(prefixKeyForSelecingQueue + "*")
+            .build())) {
+      while (cursor.hasNext()) {
+        String key = new String(cursor.next(), StandardCharsets.UTF_8);
+        String[] parts = key.split(":");
+        Long scheduleId = Long.valueOf(parts[2]);
+
+        if (openedSchedules.contains(scheduleId)) {
+          keys.add(key);
+        }
+      }
+    }
+  }
+
+  // 1분마다 keys에 저장된 각 schedule의 대기열에서 TTL 만료인 유저 삭제
+  @Scheduled(cron = "0 * * * * *")
+  public void checkExpiredUser() {
+
+    for (String key : keys) {
+      redisTemplate.opsForZSet()
+          .removeRangeByScore(key, 0, System.currentTimeMillis());
+    }
+  }
+
+  // 1일마다 예매 종료된 공연은 sorted set에서 삭제
+  @Scheduled(cron = "0 0 0 * * *")
+  public void deleteExpiredKey() {
+
+    Set<Long> scheduleIdForDelete = new HashSet<>();
+
+    // sorted set에 저장된 scheduleId 추출
+    try (Cursor<byte[]> cursor = redisTemplate.getConnectionFactory().getConnection()
+        .scan(ScanOptions.scanOptions().match(prefixKeyForSelecingQueue + "*")
+            .build())) {
+      while (cursor.hasNext()) {
+        String key = new String(cursor.next(), StandardCharsets.UTF_8);
+        String[] parts = key.split(":");
+        Long scheduleId = Long.valueOf(parts[2]);
+        scheduleIdForDelete.add(scheduleId);
+      }
+    }
+
+    // schedule.startTime < 현재 시각인 schedule 추출
+    List<Schedule> schedules = scheduleRepository.findByIdInAndStartTimeBefore(
+        new ArrayList<>(scheduleIdForDelete),
+        LocalDateTime.now()
+    );
+
+    // sorted set 에서 제거
+    schedules.stream()
+        .map(schedule -> prefixKeyForWaitingQueue + schedule.getId())
+        .forEach(redisTemplate::delete);
+    schedules.stream()
+        .map(schedule -> prefixKeyForSelecingQueue + schedule.getId())
+        .forEach(redisTemplate::delete);
+  }
+}

src/main/java/org/example/siljeun/domain/reservation/service/ReservationService.java

@@ -9,6 +9,7 @@
 import org.example.siljeun.domain.reservation.repository.ReservationRepository;
 import org.example.siljeun.domain.schedule.repository.SeatScheduleInfoRepository;
 import org.example.siljeun.domain.seat.entity.SeatScheduleInfo;
+import org.example.siljeun.domain.seat.enums.SeatStatus;
 import org.example.siljeun.domain.user.entity.User;
 import org.example.siljeun.domain.user.repository.UserRepository;
 import org.springframework.stereotype.Service;
@@ -32,7 +33,8 @@ public void save(Long userId, Long seatScheduleInfoId) {
 
     Reservation reservation = new Reservation(user, seatScheduleInfo);
     reservationRepository.save(reservation);
-    waitingQueueService.deleteAtQueue(seatScheduleInfo.getSchedule().getId(), user.getUsername());
+    waitingQueueService.deleteSelectingUser(seatScheduleInfo.getSchedule().getId(),
+        user.getUsername());
   }
 
   @Transactional
@@ -61,7 +63,7 @@ public void delete(String username, Long reservationId) {
     }
 
     reservationRepository.delete(reservation);
-    // Todo : 좌석 상태 변경
+    reservation.getSeatScheduleInfo().updateSeatScheduleInfoStatus(SeatStatus.AVAILABLE);
   }
 
   public ReservationInfoResponse findById(String username, Long reservationId) {

src/main/java/org/example/siljeun/domain/reservation/service/WaitingQueueService.java

@@ -2,6 +2,7 @@
 
 import jakarta.annotation.PostConstruct;
 import java.time.LocalDateTime;
+import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.example.siljeun.domain.reservation.dto.response.MyQueueInfoResponse;
@@ -13,19 +14,22 @@
 import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
+@Transactional
 public class WaitingQueueService {
 
   private final StringRedisTemplate redisTemplate;
   private final SimpMessagingTemplate messagingTemplate;
+  private final ScheduleRepository scheduleRepository;
 
   private static final long ttlMillis = 900000L; // ttl 15분
   private static final long acceptedRank = 1000L; // 좌석 선택 최대 수용 인원 1000명
-  private static final String prefixKey = "queue:schedule:";
-  private final ScheduleRepository scheduleRepository;
+  public static final String prefixKeyForWaitingQueue = "waiting:schedule:";
+  public static final String prefixKeyForSelecingQueue = "selecting:schedule:";
 
   // redis 연결 확인
   @PostConstruct
@@ -35,7 +39,8 @@ public void testRedisConnection() {
   }
 
   // 예매 대기 시작
-  public void addQueue(Long scheduleId, String username) {
+  public void addWaitingQueue(Long scheduleId, String username) {
+    ZSetOperations<String, String> zSet = redisTemplate.opsForZSet();
 
     Schedule schedule = scheduleRepository.findById(scheduleId)
         .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_SCHEDULE));
@@ -44,49 +49,95 @@ public void addQueue(Long scheduleId, String username) {
       throw new CustomException(ErrorCode.NOT_TICKETING_TIME);
     }
 
-    String key = prefixKey + scheduleId;
-    long expiredAt = System.currentTimeMillis() + ttlMillis;
-    ZSetOperations<String, String> zSet = redisTemplate.opsForZSet();
+    String key = prefixKeyForWaitingQueue + scheduleId;
+    long createdAt = System.currentTimeMillis();
 
     if (zSet.score(key, username) == null) {
+      zSet.add(key, username, createdAt);
+    }
+
+    sendWaitingNumber(key, username, scheduleId);
+  }
+
+  // 좌석 선택 중인 유저 큐에 insert (TTL 관리용 큐)
+  public void addSelectingQueue(Long scheduleId, String username) {
+    ZSetOperations<String, String> zSet = redisTemplate.opsForZSet();
+
+    String key = prefixKeyForSelecingQueue + scheduleId;
+    Long expiredAt = System.currentTimeMillis() + ttlMillis;
+
+    if (zSet.score(prefixKeyForSelecingQueue + scheduleId, username) == null) {
       zSet.add(key, username, expiredAt);
     }
+  }
+
+  // 대기 끝 or 소켓 연결 해제되면 대기열에서 삭제
+  public void deleteWaitingUser(Long scheduleId, String username) {
+    String key = prefixKeyForWaitingQueue + scheduleId;
+    redisTemplate.opsForZSet().remove(key, username);
+  }
+
+  // 좌석 선택 완료 or 소켓 연결 해제 or TTL 만료되면 큐에서 삭제
+  public void deleteSelectingUser(Long scheduleId, String username) {
+    String key = prefixKeyForSelecingQueue + scheduleId;
+    redisTemplate.opsForZSet().remove(key, username);
+    sendAllWaitingNumber(scheduleId);
+  }
+
+  // 정상적인 경로로 좌석 선택 api 호출했는지 검증
+  public boolean hasPassedWaitingQueue(Long scheduleId, String username) {
+    return
+        redisTemplate.opsForZSet().score(prefixKeyForSelecingQueue + scheduleId, username) != null;
+  }
+
+  // 대기중인 특정 사용자에게 랭킹 및 대기번호 전송
+  public void sendWaitingNumber(String key, String username, Long scheduleId) {
+    ZSetOperations<String, String> zSet = redisTemplate.opsForZSet();
 
     Long rank = zSet.rank(key, username);
+
     if (rank == null) {
       throw new CustomException(ErrorCode.QUEUE_INSERT_FAIL);
     }
+
     rank = rank + 1;
 
-    String destination = "/topic/queue/" + scheduleId + "/" + username;
-    MyQueueInfoResponse response = new MyQueueInfoResponse(scheduleId, username, rank,
-        acceptedRank);
-    messagingTemplate.convertAndSend(destination, response);
-  }
+    // 내 순위와 현재 좌석 선택 중인 사용자 수의 합이 수용 인원보다 적으면 대기 X
+    Long selectingQueueSize = zSet.size(prefixKeyForSelecingQueue + scheduleId);
+    selectingQueueSize = (selectingQueueSize == null) ? 0 : selectingQueueSize;
 
-  // 기존 유저가 좌석 선택 완료 or 소켓 연결 종료하면 대기열에서 삭제
-  public void deleteAtQueue(Long scheduleId, String username) {
-    redisTemplate.opsForZSet().remove(prefixKey + scheduleId, username);
-    log.info("Disconnected and removed Schedule: {}, User: {}", scheduleId, username);
+    if (rank + selectingQueueSize <= acceptedRank) {
+      String destination = "/topic/queue/" + scheduleId + "/" + username;
+      MyQueueInfoResponse response = new MyQueueInfoResponse(scheduleId, username, rank,
+          true);
+      messagingTemplate.convertAndSend(destination, response);
 
-    // TTL 만료된 데이터 삭제
-    redisTemplate.opsForZSet()
-        .removeRangeByScore(prefixKey + scheduleId, 0, System.currentTimeMillis());
+      addSelectingQueue(scheduleId, username);
+      deleteWaitingUser(scheduleId, username);
 
-    // rank() 재실행해서 변경된 대기번호 클라이언트에 전송
-    Long rank = redisTemplate.opsForZSet().rank(prefixKey + scheduleId, username);
-    rank = (rank != null) ? rank + 1 : -1;
+      return;
+    }
 
     String destination = "/topic/queue/" + scheduleId + "/" + username;
     MyQueueInfoResponse response = new MyQueueInfoResponse(scheduleId, username, rank,
-        acceptedRank);
+        false);
     messagingTemplate.convertAndSend(destination, response);
   }
 
-  // sorted set에 해당 scheduleId, userId를 가지는 데이터가 존재하는지 확인
-  // Todo : 좌석 선택 메서드 안에서 호출(정상 경로로 접근했는지 검증 필요)
-  public boolean checkQueue(Long scheduleId, String username) {
-    boolean exists = redisTemplate.opsForZSet().score(prefixKey + scheduleId, username) != null;
-    return exists;
+  // 대기중인 모든 사용자에게 랭킹 및 대기번호 전송
+  public void sendAllWaitingNumber(Long scheduleId) {
+    String key = prefixKeyForWaitingQueue + scheduleId;
+
+    // for문이나 stream으로 scheduleId에 해당하는 value값 리스트 추출
+    Set<String> usernames = redisTemplate.opsForZSet().range(key, 0, -1);
+
+    if (usernames == null || usernames.isEmpty()) {
+      return;
+    }
+
+    // 해당 유저들한테 메세지 전송
+    for (String username : usernames) {
+      sendWaitingNumber(key, username, scheduleId);
+    }
   }
 }

src/main/java/org/example/siljeun/domain/schedule/controller/SeatScheduleInfoController.java

@@ -10,28 +10,28 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
-import java.util.List;
 import java.util.Map;
 
 @Controller
 @RequiredArgsConstructor
 public class SeatScheduleInfoController {
 
-    private final SeatScheduleInfoService seatScheduleInfoService;
+  private final SeatScheduleInfoService seatScheduleInfoService;
 
-    @PostMapping("/seat-schedule-info/{seatScheduleInfoId}")
-    public ResponseEntity<String> selectSeat(
-        @PathVariable Long seatScheduleInfoId,
-        @AuthenticationPrincipal PrincipalDetails userDetails
-    ){
-        seatScheduleInfoService.selectSeat(userDetails.getUserId(), seatScheduleInfoId);
-        return ResponseEntity.ok("좌석이 선택되었습니다.");
-    }
+  @PostMapping("/seat-schedule-info/{seatScheduleInfoId}")
+  public ResponseEntity<String> selectSeat(
+      @PathVariable Long seatScheduleInfoId,
+      @AuthenticationPrincipal PrincipalDetails userDetails
+  ) {
+    seatScheduleInfoService.selectSeat(userDetails.getUserId(), userDetails.getUsername(),
+        seatScheduleInfoId);
+    return ResponseEntity.ok("좌석이 선택되었습니다.");
+  }
 
-    @GetMapping("/schedule/{scheduleId}/seat-schedule-info")
-    public ResponseEntity<Map<String, String>> getSeatScheduleInfos(
-            @PathVariable Long scheduleId
-    ){
-        return ResponseEntity.ok(seatScheduleInfoService.getSeatStatusMap(scheduleId));
-    }
+  @GetMapping("/schedule/{scheduleId}/seat-schedule-info")
+  public ResponseEntity<Map<String, String>> getSeatScheduleInfos(
+      @PathVariable Long scheduleId
+  ) {
+    return ResponseEntity.ok(seatScheduleInfoService.getSeatStatusMap(scheduleId));
+  }
 }