Feature/seat reservation and query test + 예약 결제 구현

.gitignore

@@ -47,12 +47,15 @@ CLAUDE.md
 .mcp.json
 AGENTS.md
 .codex
+GEMINI.md
+.gemini
 
 ### Temp Files ###
 cookies.txt
 
 ### Environment Variables ###
 .env
+gradle.properties
 
 ### Docker Compose Override ###
 docker-compose.override.yml

ToDoAfterCheckout.md

@@ -0,0 +1,7 @@
+[IntelliJ Setting]
+
+- File encoding
+- Settings > Editor -> code style -> naver-coding-convention
+- Settings > Tools > Actions on Save > Optimize imports, Reformat code 켜기
+- 설정 파일 옮기기 (.env 등)
+- Test 용 run configuration 설정하기 

build.gradle.kts

@@ -7,6 +7,8 @@ plugins {
 group = "personnel.jupitorSendsme"
 version = "0.0.1-SNAPSHOT"
 description = "PulseTicket"
+// Mockito agent 정적 로딩을 위한 변수
+val mockitoAgent = configurations.create("mockitoAgent")
 
 java {
     toolchain {
@@ -28,15 +30,27 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
     implementation("org.springframework.boot:spring-boot-starter-web")
-    // Spring Session Redis 의존성 추가
-    // Redis를 세션 저장소로 사용하기 위한 의존성
     implementation("org.springframework.session:spring-session-data-redis")
+
+    // lombok
     compileOnly("org.projectlombok:lombok")
-    developmentOnly("org.springframework.boot:spring-boot-devtools")
-    runtimeOnly("org.postgresql:postgresql")
     annotationProcessor("org.projectlombok:lombok")
+    runtimeOnly("org.postgresql:postgresql")
+
+    // dev
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
+
+    // test
     testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.assertj:assertj-core")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testCompileOnly("org.projectlombok:lombok")
+    testAnnotationProcessor("org.projectlombok:lombok")
+    testRuntimeOnly("com.h2database:h2")
+    testImplementation("com.github.codemonstur:embedded-redis:1.4.3")
+
+    // Mockito agent (Java 21+ 지원)
+    mockitoAgent("org.mockito:mockito-core") { isTransitive = false }
 
     // Argon2id 비밀번호 해싱
     implementation("org.springframework.security:spring-security-crypto")
@@ -54,6 +68,20 @@ tasks.withType<JavaCompile> {
 tasks.withType<Test> {
     systemProperty("file.encoding", "UTF-8")
     useJUnitPlatform()
+
+    // gradle.properties 값을 시스템 프로퍼티로 전달
+    systemProperty("TEST_POSTGRES_PORT", findProperty("TEST_POSTGRES_PORT") ?: "")
+    systemProperty("TEST_POSTGRES_DB", findProperty("TEST_POSTGRES_DB") ?: "")
+    systemProperty("TEST_POSTGRES_USER", findProperty("TEST_POSTGRES_USER") ?: "")
+    systemProperty("TEST_POSTGRES_PASSWORD", findProperty("TEST_POSTGRES_PASSWORD") ?: "")
+    systemProperty("TEST_REDIS_PORT", findProperty("TEST_REDIS_PORT") ?: "")
+    systemProperty("TEST_REDIS_PASSWORD", findProperty("TEST_REDIS_PASSWORD") ?: "")
+
+    // 클래스 데이터 공유 관련 경고 방지
+    jvmArgs("-Xshare:off")
+
+    // Mockito agent 정적 로딩 (Java 21+ 동적 agent 로딩 경고 방지)
+    jvmArgs("-javaagent:${mockitoAgent.asPath}")
 }
 
 // ============================================================================

db_creation_query.sql

@@ -5,20 +5,21 @@
 CREATE TABLE users
 (
     id            BIGSERIAL PRIMARY KEY,
-    login_id      VARCHAR(50) UNIQUE NOT NULL,
-    password_hash VARCHAR(255)       NOT NULL,
-    created_at    TIMESTAMP          NOT NULL,
-    updated_at    TIMESTAMP          NOT NULL
+    login_id      VARCHAR(100) UNIQUE NOT NULL,
+    password_hash VARCHAR(255)        NOT NULL,
+    created_at    TIMESTAMP           NOT NULL,
+    updated_at    TIMESTAMP           NOT NULL
 );
 
 -- EVENTS 테이블
 CREATE TABLE events
 (
-    id          BIGSERIAL PRIMARY KEY,
-    name        VARCHAR(255) NOT NULL,
-    total_seats INT          NOT NULL,
-    created_at  TIMESTAMP    NOT NULL,
-    updated_at  TIMESTAMP    NOT NULL
+    id           BIGSERIAL PRIMARY KEY,
+    name         VARCHAR(255)   NOT NULL,
+    total_seats  INT            NOT NULL,
+    ticket_price Numeric(10, 2) NOT NULL,
+    created_at   TIMESTAMP      NOT NULL,
+    updated_at   TIMESTAMP      NOT NULL
 );
 
 -- SEATS 테이블
@@ -27,7 +28,7 @@ CREATE TABLE seats
     id             BIGSERIAL PRIMARY KEY,
     event_id       BIGINT      NOT NULL, -- FK -> events.id
     seat_number    INT         NOT NULL,
-    status         VARCHAR(20) NOT NULL,
+    status         VARCHAR(20) NOT NULL, -- AVAILABLE, RESERVED, SOLD
     reserved_until TIMESTAMP   NULL,
     created_at     TIMESTAMP   NOT NULL,
     updated_at     TIMESTAMP   NOT NULL,
@@ -41,7 +42,7 @@ CREATE TABLE reservations
     user_id      BIGINT      NOT NULL, -- FK -> users.id
     seat_id      BIGINT      NOT NULL, -- FK -> seats.id
     event_id     BIGINT      NOT NULL, -- FK -> events.id
-    status       VARCHAR(20) NOT NULL,
+    status       VARCHAR(20) NOT NULL, -- PENDING, CONFIRMED, CANCELLED, EXPIRED
     expires_at   TIMESTAMP   NOT NULL,
     confirmed_at TIMESTAMP   NULL,
     cancelled_at TIMESTAMP   NULL,

docker-compose.yml

@@ -17,26 +17,20 @@ services:
     env_file:
       - .env
     environment:
-      # 로케일 설정
       PGDATA: /var/lib/postgresql/data/pgdata
     ports:
       # 호스트 포트:컨테이너 포트 (docker-compose.override.yml에서 설정)
       - "${POSTGRES_HOST_PORT:-5432}:${POSTGRES_PORT:-5432}"
     volumes:
-      # 데이터 영속성을 위한 볼륨 마운트
       - postgres_data:/var/lib/postgresql/data
-      # 초기화 스크립트 마운트
-      - ./docker/postgres/init:/docker-entrypoint-initdb.d
     networks:
       - pulseticket-network
     healthcheck:
-      # 데이터베이스 준비 상태 확인
       test: [ "CMD-SHELL", "pg_isready -h localhost -p ${POSTGRES_PORT:-5432} -U ${POSTGRES_USER} -d ${POSTGRES_DB}" ]
       interval: 10s
       timeout: 5s
       retries: 5
     labels:
-      # Promtail이 이 컨테이너의 로그를 수집하도록 설정
       logging: "promtail"
       logging_jobname: "pulseticket-postgres"
     restart: unless-stopped
@@ -56,7 +50,6 @@ services:
       # 호스트 포트:컨테이너 포트 (docker-compose.override.yml에서 설정)
       - "${REDIS_HOST_PORT:-6379}:${REDIS_PORT:-6379}"
     volumes:
-      # 데이터 영속성을 위한 볼륨 마운트
       - redis_data:/data
     networks:
       - pulseticket-network
@@ -191,15 +184,13 @@ services:
 
 # ============================================================================
 # 네트워크 설정
-# 서비스 간 통신을 위한 내부 네트워크 생성
 # ============================================================================
 networks:
   pulseticket-network:
     driver: bridge
 
 # ============================================================================
 # 볼륨 설정
-# 데이터 영속성을 위한 볼륨 정의
 # ============================================================================
 volumes:
   postgres_data:

src/main/java/personnel/jupitorsendsme/pulseticket/controller/ReservationBookingController.java

@@ -6,8 +6,8 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import lombok.RequiredArgsConstructor;
-import personnel.jupitorsendsme.pulseticket.dto.ReservationBookingRequest;
 import personnel.jupitorsendsme.pulseticket.dto.ReservationBookingResponse;
+import personnel.jupitorsendsme.pulseticket.dto.ReservationRequest;
 import personnel.jupitorsendsme.pulseticket.service.ReservationBookingService;
 
 /**
@@ -30,7 +30,7 @@ public class ReservationBookingController {
 	 * @return 예약 성공 여부를 포함한 예약 관련 정보
 	 */
 	@PostMapping
-	ReservationBookingResponse booking(@RequestBody ReservationBookingRequest request) {
+	ReservationBookingResponse booking(@RequestBody ReservationRequest request) {
 		return reservationBookingService.book(request);
 	}
 }

src/main/java/personnel/jupitorsendsme/pulseticket/controller/ReservationQueryController.java

@@ -8,10 +8,11 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import lombok.RequiredArgsConstructor;
-import personnel.jupitorsendsme.pulseticket.dto.ReservationBookingRequest;
 import personnel.jupitorsendsme.pulseticket.dto.ReservationQueryResponse;
+import personnel.jupitorsendsme.pulseticket.dto.ReservationRequest;
 import personnel.jupitorsendsme.pulseticket.entity.SeatStatusResponse;
 import personnel.jupitorsendsme.pulseticket.service.ReservationQueryService;
+import personnel.jupitorsendsme.pulseticket.service.SeatManagementService;
 
 /**
  * 좌석 조회 컨트롤러
@@ -24,6 +25,7 @@
 public class ReservationQueryController {
 
 	private final ReservationQueryService reservationQueryService;
+	private final SeatManagementService seatManagementService;
 
 	/**
 	 * 특정 이벤트에 대한 예약 가능 여부. <br>
@@ -32,7 +34,7 @@ public class ReservationQueryController {
 	 * @return 예약 가능 여부
 	 */
 	@GetMapping("isBookingEventAvailable")
-	public Boolean isBookingEventAvailable(@ModelAttribute ReservationBookingRequest request) {
+	public Boolean isBookingEventAvailable(@ModelAttribute ReservationRequest request) {
 		return reservationQueryService.isBookingEventAvailable(request);
 	}
 
@@ -42,8 +44,8 @@ public Boolean isBookingEventAvailable(@ModelAttribute ReservationBookingRequest
 	 * @return 특정 이벤트의 좌석 정보 리스트
 	 */
 	@GetMapping("statusOfSeatsOfTheEvent")
-	public List<SeatStatusResponse> statusOfSeatsOfTheEvent(@ModelAttribute ReservationBookingRequest request) {
-		return reservationQueryService.statusOfSeatsOfTheEvent(request);
+	public List<SeatStatusResponse> statusOfSeatsOfTheEvent(@ModelAttribute ReservationRequest request) {
+		return seatManagementService.statusOfSeatsOfTheEvent(request);
 	}
 
 	/**
@@ -53,8 +55,8 @@ public List<SeatStatusResponse> statusOfSeatsOfTheEvent(@ModelAttribute Reservat
 	 */
 
 	@GetMapping("isSpecificSeatAvailable")
-	public Boolean isSpecificSeatAvailable(@ModelAttribute ReservationBookingRequest request) {
-		return reservationQueryService.isSpecificSeatAvailable(request);
+	public Boolean isSpecificSeatAvailable(@ModelAttribute ReservationRequest request) {
+		return seatManagementService.isSpecificSeatAvailable(request);
 	}
 
 	/**
@@ -63,7 +65,7 @@ public Boolean isSpecificSeatAvailable(@ModelAttribute ReservationBookingRequest
 	 * @return 예약 목록이 담긴 DTO
 	 */
 	@GetMapping("inquiryUserReservations")
-	public List<ReservationQueryResponse> inquiryUserReservations(@ModelAttribute ReservationBookingRequest request) {
+	public List<ReservationQueryResponse> inquiryUserReservations(@ModelAttribute ReservationRequest request) {
 		return reservationQueryService.inquiryUserReservations(request);
 	}
 }

src/main/java/personnel/jupitorsendsme/pulseticket/controller/UserManagementController.java

@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import lombok.RequiredArgsConstructor;
-import personnel.jupitorsendsme.pulseticket.dto.ReservationBookingRequest;
+import personnel.jupitorsendsme.pulseticket.dto.ReservationRequest;
 import personnel.jupitorsendsme.pulseticket.service.UserManagementService;
 
 /**
@@ -22,17 +22,17 @@ public class UserManagementController {
 	private final UserManagementService userManagementService;
 
 	@GetMapping("isUserPresent")
-	Boolean isUserPresent(@ModelAttribute ReservationBookingRequest request) {
+	Boolean isUserPresent(@ModelAttribute ReservationRequest request) {
 		return userManagementService.isUserPresent(request);
 	}
 
 	@PostMapping("registerUser")
-	Boolean registerUser(@RequestBody ReservationBookingRequest request) {
+	Boolean registerUser(@RequestBody ReservationRequest request) {
 		return userManagementService.registerUser(request);
 	}
 
 	@PostMapping("isUserValid")
-	Boolean isUserValid(@RequestBody ReservationBookingRequest request) {
+	Boolean isUserValid(@RequestBody ReservationRequest request) {
 		return userManagementService.isUserValid(request);
 	}
 }

src/main/java/personnel/jupitorsendsme/pulseticket/dto/ReservationBookingRequest.java → src/main/java/personnel/jupitorsendsme/pulseticket/dto/ReservationRequest.java

@@ -1,5 +1,9 @@
 package personnel.jupitorsendsme.pulseticket.dto;
 
+import java.math.BigDecimal;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -9,8 +13,10 @@
  */
 @Getter
 @Setter
+@Builder
 @NoArgsConstructor
-public class ReservationBookingRequest {
+@AllArgsConstructor
+public class ReservationRequest {
 	/**
 	 * 예약신청자 로그인 ID
 	 */
@@ -30,4 +36,14 @@ public class ReservationBookingRequest {
 	 * 예약하고자 하는 시트 번호
 	 */
 	private Integer seatNumber;
+
+	/**
+	 * 예약 고유 번호
+	 */
+	private Long reservationId;
+
+	/**
+	 * 결제 금액
+	 */
+	private BigDecimal paymentAmount;
 }

src/main/java/personnel/jupitorsendsme/pulseticket/entity/Event.java

@@ -1,5 +1,6 @@
 package personnel.jupitorsendsme.pulseticket.entity;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import jakarta.persistence.Column;
@@ -48,4 +49,10 @@ public class Event extends BaseEntity {
 	 */
 	@OneToMany(mappedBy = "event")
 	private List<Seat> seats;
+
+	/**
+	 * 티켓 가격
+	 */
+	@Column(name = "ticket_price", nullable = false)
+	private BigDecimal ticketPrice;
 }