diff --git a/src/main/java/org/example/siljeun/domain/reservation/controller/WaitingQueueController.java b/src/main/java/org/example/siljeun/domain/reservation/controller/WaitingQueueController.java index 03e4061..5803700 100644 --- a/src/main/java/org/example/siljeun/domain/reservation/controller/WaitingQueueController.java +++ b/src/main/java/org/example/siljeun/domain/reservation/controller/WaitingQueueController.java @@ -1,10 +1,10 @@ package org.example.siljeun.domain.reservation.controller; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.example.siljeun.domain.reservation.dto.request.AddQueueRequest; import org.example.siljeun.domain.reservation.service.WaitingQueueService; +import org.springframework.messaging.Message; import org.springframework.messaging.handler.annotation.MessageMapping; +import org.springframework.messaging.simp.SimpMessageHeaderAccessor; import org.springframework.web.bind.annotation.RestController; @RestController @@ -14,9 +14,14 @@ public class WaitingQueueController { private final WaitingQueueService waitingQueueService; @MessageMapping("/addQueue") - public void addQueue(@Valid AddQueueRequest request) { - Long scheduleId = request.scheduleId(); - String username = request.username(); + public void addQueue(Message message) { + SimpMessageHeaderAccessor accessor = SimpMessageHeaderAccessor.wrap(message); + + String username = (String) accessor.getSessionAttributes().get("username"); + Long scheduleId = Long.valueOf((String) accessor.getSessionAttributes().get("scheduleId")); + + //Long scheduleId = request.scheduleId(); + //String username = request.username(); waitingQueueService.addWaitingQueue(scheduleId, username); System.out.println("연결 성공"); } diff --git a/src/main/java/org/example/siljeun/domain/reservation/entity/Reservation.java b/src/main/java/org/example/siljeun/domain/reservation/entity/Reservation.java index b1ed8b5..f2032a2 100644 --- a/src/main/java/org/example/siljeun/domain/reservation/entity/Reservation.java +++ b/src/main/java/org/example/siljeun/domain/reservation/entity/Reservation.java @@ -70,7 +70,7 @@ public Reservation(User user, SeatScheduleInfo seatScheduleInfo) { public void updateTicketPrice(UpdatePriceRequest dto) { if (!StringUtils.isBlank(dto.ticketReceipt())) { - this.ticketReceipt = TicketReceipt.valueOf(dto.ticketReceipt()); + this.ticketReceipt = TicketReceipt.valueOf(dto.ticketReceipt().toUpperCase()); } if (!StringUtils.isBlank(dto.discount())) { this.discount = Discount.valueOf(dto.discount()); diff --git a/src/main/java/org/example/siljeun/domain/schedule/controller/SeatScheduleInfoController.java b/src/main/java/org/example/siljeun/domain/schedule/controller/SeatScheduleInfoController.java index c862976..71b1296 100644 --- a/src/main/java/org/example/siljeun/domain/schedule/controller/SeatScheduleInfoController.java +++ b/src/main/java/org/example/siljeun/domain/schedule/controller/SeatScheduleInfoController.java @@ -18,7 +18,7 @@ public class SeatScheduleInfoController { private final SeatScheduleInfoService seatScheduleInfoService; - @PostMapping("/seat-schedule-info/{seatScheduleInfoId}") + @PostMapping("/seat-schedule-infos/{seatScheduleInfoId}") public ResponseEntity selectSeat( @PathVariable Long seatScheduleInfoId, @AuthenticationPrincipal PrincipalDetails userDetails @@ -28,7 +28,7 @@ public ResponseEntity selectSeat( return ResponseEntity.ok("좌석이 선택되었습니다."); } - @GetMapping("/schedule/{scheduleId}/seat-schedule-info") + @GetMapping("/schedules/{scheduleId}/seat-schedule-infos") public ResponseEntity> getSeatScheduleInfos( @PathVariable Long scheduleId ) { diff --git a/src/main/resources/stomp_send_frame_with_null_octet.bin b/src/main/resources/stomp_send_frame_with_null_octet.bin new file mode 100644 index 0000000..585014f Binary files /dev/null and b/src/main/resources/stomp_send_frame_with_null_octet.bin differ