Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
5e22823
docs : PR Template 작성
pokerbearkr May 16, 2025
eba9b06
docs : readmd.md 변경
pokerbearkr May 16, 2025
b92dabd
Merge branch 'dev' of https://github.com/pokerbearkr/nullnullTicket
kmchaejin May 16, 2025
4e3b58e
feat : entity 수정
kmchaejin May 16, 2025
f8583b0
refactor : enum 클래스 분리 및 repo에 JPA 상속
kmchaejin May 18, 2025
d4d168e
feat : create(), saveSeatInfo() 기본 틀 구현
kmchaejin May 18, 2025
fe596bb
Merge branch 'dev'
kmchaejin May 18, 2025
8a39d8a
feat : 예매상태 변경하는 메서드 구현 및 생성자 수정
kmchaejin May 18, 2025
6fa4c41
Merge branch 'dev' of https://github.com/pokerbearkr/nullnullTicket i…
kmchaejin May 18, 2025
313afde
feat : updatePrice() 메서드 구현
kmchaejin May 19, 2025
35df0c4
feat : 일정시간 후 좌석반환, 공통응답 구현
kmchaejin May 19, 2025
8a92d52
feat : reservation 도메인 예외처리
kmchaejin May 19, 2025
cd648b6
refactor : 다른 api와 중복되는 api 삭제
kmchaejin May 19, 2025
f6d925a
feat : redis 연결설정 및 예매 대기 기능 구현
kmchaejin May 20, 2025
b907826
Merge branch 'dev'
kmchaejin May 20, 2025
279b555
feat : 소켓 연결 끊겼을 때 sorted set에서 데이터 삭제하는 로직 구현
kmchaejin May 20, 2025
bbf9103
refactor : 전체 코드 리팩토링
kmchaejin May 20, 2025
c5d8529
feat : 예매취소, 예매조회 api 및 유효성 검증 구현
kmchaejin May 21, 2025
d508180
refactor : 인터셉터에서 데이터 추출 방식 변경 및 주석 제거
kmchaejin May 21, 2025
ccc5362
chore : .gitignore update
kmchaejin May 21, 2025
4dd97ca
feat : 소켓 연결 테스트코드 작성
kmchaejin May 21, 2025
ebf38d2
Merge branch 'dev'
kmchaejin May 21, 2025
d302215
chore : 테스트코드 수정
kmchaejin May 21, 2025
390cc9b
fix : 테스트코드 오류 수정, SecurityConfig oauth 설정 주석 처리
kmchaejin May 21, 2025
615ef29
Merge branch 'dev'
kmchaejin May 21, 2025
3454fba
chore : 주석 해제
kmchaejin May 21, 2025
e28ede0
chore : dev-ci.yml에 redis 설정 추가
kmchaejin May 22, 2025
a45935b
chore : redis 버전 변경, 호스트명 변경
kmchaejin May 22, 2025
0e6dc93
feat : 티켓팅 가능 시간 체크하는 로직 추가
kmchaejin May 22, 2025
1292365
Merge branch 'dev'
kmchaejin May 22, 2025
087f585
fix : seat 테이블 컬럼 수정 반영
kmchaejin May 22, 2025
68e8de8
refactor : 결제 도메인이랑 로직 연결
kmchaejin May 22, 2025
3b2a11f
Merge branch 'dev'
kmchaejin May 22, 2025
a9e8846
chore : 사용안하는 클래스 삭제
kmchaejin May 22, 2025
d56f615
refactor : 소켓 연결시 헤더에서 token 추출
kmchaejin May 22, 2025
d3bf2c3
Merge branch 'dev' of https://github.com/pokerbearkr/nullnullTicket i…
kmchaejin May 22, 2025
8196b4b
Merge branch 'dev' of https://github.com/pokerbearkr/nullnullTicket i…
kmchaejin May 22, 2025
0bb6fda
feat : 대기열 TTL을 좌석 선택 화면 접근 후부터 적용하도록 수정
kmchaejin May 22, 2025
07c3a31
feat : 예매취소시 좌석 반환
kmchaejin May 22, 2025
45ace48
feat : SeatScheduleInfo Service에 대기열 passed 여부 확인 및 좌석 선택 완료 후 queue에…
kmchaejin May 23, 2025
3466e97
Merge branch 'dev'
kmchaejin May 23, 2025
a27adfc
Merge branch 'dev' of https://github.com/pokerbearkr/nullnullTicket i…
kmchaejin May 23, 2025
043cfe9
Merge branch 'dev' of https://github.com/pokerbearkr/nullnullTicket i…
kmchaejin May 23, 2025
075c532
refactor : 소켓메세지 전송할 때 body 안넣어도 되도록 수정 및 오류 해결
kmchaejin May 23, 2025
707726e
chore : 웹소켓 테스트용 text 파일 추가
kmchaejin May 23, 2025
3ac74b1
Merge branch 'dev' of https://github.com/pokerbearkr/nullnullTicket i…
kmchaejin May 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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("연결 성공");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class SeatScheduleInfoController {

private final SeatScheduleInfoService seatScheduleInfoService;

@PostMapping("/seat-schedule-info/{seatScheduleInfoId}")
@PostMapping("/seat-schedule-infos/{seatScheduleInfoId}")
public ResponseEntity<String> selectSeat(
@PathVariable Long seatScheduleInfoId,
@AuthenticationPrincipal PrincipalDetails userDetails
Expand All @@ -28,7 +28,7 @@ public ResponseEntity<String> selectSeat(
return ResponseEntity.ok("좌석이 선택되었습니다.");
}

@GetMapping("/schedule/{scheduleId}/seat-schedule-info")
@GetMapping("/schedules/{scheduleId}/seat-schedule-infos")
public ResponseEntity<Map<String, String>> getSeatScheduleInfos(
@PathVariable Long scheduleId
) {
Expand Down
Binary file not shown.