From 6b5f1a1b003591cd22f483d3fdcef217264c66fa Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Sat, 25 Apr 2026 23:00:10 +0900
Subject: [PATCH 001/142] =?UTF-8?q?feat=20:=20reservation=20=EC=97=94?=
 =?UTF-8?q?=ED=8B=B0=ED=8B=B0=20=EB=B0=8F=20vo=20=EC=84=A4=EC=A0=95=20(#2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat : reservation 엔티티 및 vo 설정
- ReservationCandidate과 Reservation의 엔티티 설정 및 관련 vo 작성
- 관련 에러 코드 ReservationErrorCode에 작성 완료

* fix : reservation,ReservationCandidate 엔티티 변경
- PENDING가 아니라면 어떠한 상태 변경도 금지
- 낙관적 락을 위한 버전 추가(추후 분산 락으로 수정 할 필요 있는지 고민 필요)
- ReservationCandidate에 생성,선정,취소시 검증 로직 추가

* fix : reservation 엔티티 변경
- cancelInfo필드 삭제(추후 reservation_history 부분 추가시 해당 테이블에 작성 예정

* fix : reservation,reservationCandidate 검증 로직 변경
- reservationCandidate에서 후보자 선정시 검증 로직 추가
- reservation에서 예약 생성시 검증 로직 추가
- reservation에서 순번 구매자 교체시 검증 로직 추가

* fix : reservation 검증 로직 변경
- 예약 후보자에 get,add,remove부분 추가하여 양뱡향 동기화 작업 설정
- 다음 순번자 교체시 검사 로직 부분 추가

* fix : reservation 누락 부분 추가
---
 .gradle/9.0.0/fileHashes/fileHashes.lock      | Bin 17 -> 17 bytes
 .idea/compiler.xml                            |   7 --
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |   3 +
 .idea/modules.xml                             |   9 ++
 .idea/modules/reservation-service.main.iml    |   9 ++
 .idea/modules/reservation-service.test.iml    |   8 ++
 .idea/vcs.xml                                 |   1 +
 build.gradle                                  |  24 ++++
 .../exception/ReservationErrorCode.java       |  23 ++++
 .../exception/ReservationException.java       |  14 +++
 .../domain/model/reservation/BuyerInfo.java   |  14 +++
 .../domain/model/reservation/ProductInfo.java |  15 +++
 .../domain/model/reservation/Reservation.java | 118 ++++++++++++++++++
 .../model/reservation/SelectStatus.java       |  24 ++++
 .../domain/model/reservation/SellerInfo.java  |  14 +++
 .../ReservationCandidate.java                 |  81 ++++++++++++
 .../ReservationStatus.java                    |  27 ++++
 18 files changed, 385 insertions(+), 7 deletions(-)
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/modules/reservation-service.main.iml
 create mode 100644 .idea/modules/reservation-service.test.iml
 create mode 100644 src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/exception/ReservationException.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/model/reservation/BuyerInfo.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/model/reservation/ProductInfo.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/model/reservation/SelectStatus.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/model/reservation/SellerInfo.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationStatus.java

diff --git a/.gradle/9.0.0/fileHashes/fileHashes.lock b/.gradle/9.0.0/fileHashes/fileHashes.lock
index 2af0afda1be442436ac10dd930ac4ffdff9cc1b0..9adee877962f00dcc3f565df8322845daf2387d0 100644
GIT binary patch
literal 17
UcmZSfeLRPC!kJE11_<B-05C%X%>V!Z

literal 17
UcmZSfeLRPC!kJE11_<B*05CxV%K!iX

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b64384e..5506860 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,13 +2,6 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
-      <profile name="Gradle Imported" enabled="true">
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="false">
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.44/503fd0b002dbb237fa4656cf4b8021666a8aebac/lombok-1.18.44.jar" />
-        </processorPath>
-        <module name="reservation-service.main" />
-      </profile>
       <profile name="Gradle Imported" enabled="true">
         <outputRelativeToContentRoot value="true" />
         <processorPath useClasspath="false">
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ba50364..bcddc3f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bad0966..8269728 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..37eb0da
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/reservation-service.main.iml" filepath="$PROJECT_DIR$/.idea/modules/reservation-service.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/reservation-service.test.iml" filepath="$PROJECT_DIR$/.idea/modules/reservation-service.test.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules/reservation-service.main.iml b/.idea/modules/reservation-service.main.iml
new file mode 100644
index 0000000..4f0b678
--- /dev/null
+++ b/.idea/modules/reservation-service.main.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/../../src/main" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+    </content>
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/reservation-service.test.iml b/.idea/modules/reservation-service.test.iml
new file mode 100644
index 0000000..8210e2d
--- /dev/null
+++ b/.idea/modules/reservation-service.test.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/../../src/test" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
+    </content>
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..88cbea5 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/libs/common" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6c1daa1..8e875dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.springframework.boot' version '3.5.13'
     id 'io.spring.dependency-management' version '1.1.7'
 }
+
 group = 'org.pgsg'
 version = '0.0.1-SNAPSHOT'
 
@@ -10,6 +11,12 @@ java {
     sourceCompatibility = '17'
 }
 
+configurations {
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
+}
+
 repositories {
     mavenCentral()
 }
@@ -20,8 +27,25 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+
+    implementation 'io.github.querydsl:querydsl-jpa:5.1.0:jakarta'
+    annotationProcessor "io.github.querydsl:querydsl-apt:5.1.0:jakarta"
+
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
+}
+
+def querydslSrcDir = 'src/main/generated'
+
+clean {
+    delete file(querydslSrcDir)
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.generatedSourceOutputDirectory = file(querydslSrcDir)
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
new file mode 100644
index 0000000..7164eb8
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
@@ -0,0 +1,23 @@
+package org.pgsg.reservation.domain.exception;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ReservationErrorCode {
+
+    // 400 Bad Request
+    INVALID_STATUS(400, "잘못된 예약 상태입니다."),
+    INVALID_SELECT_STATUS(400, "잘못된 선정 상태입니다."),
+    CANNOT_CHANGE_STATUS(400, "현재 상태에서는 변경할 수 없는 요청입니다."),
+
+    // 404 Not Found
+    RESERVATION_NOT_FOUND(404, "해당 예약을 찾을 수 없습니다."),
+
+    // 409 Conflict (중복 등 비즈니스 규칙 위반)
+    DUPLICATE_RESERVATION(409, "이미 해당 상품에 대한 예약 진행 내역이 존재합니다.");
+
+    private final int status;
+    private final String message;
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/exception/ReservationException.java b/src/main/java/org/pgsg/reservation/domain/exception/ReservationException.java
new file mode 100644
index 0000000..902cbee
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/exception/ReservationException.java
@@ -0,0 +1,14 @@
+package org.pgsg.reservation.domain.exception;
+
+import lombok.Getter;
+
+@Getter
+public class ReservationException extends RuntimeException {
+
+    private final ReservationErrorCode errorCode;
+
+    public ReservationException(ReservationErrorCode errorCode) {
+        super(errorCode.getMessage());
+        this.errorCode = errorCode;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/BuyerInfo.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/BuyerInfo.java
new file mode 100644
index 0000000..617e358
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/BuyerInfo.java
@@ -0,0 +1,14 @@
+package org.pgsg.reservation.domain.model.reservation;
+
+import jakarta.persistence.Embeddable;
+import lombok.*;
+import java.util.UUID;
+
+@Embeddable
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(staticName = "of")
+public class BuyerInfo {
+    private UUID buyerId;
+    private String buyerName;
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/ProductInfo.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/ProductInfo.java
new file mode 100644
index 0000000..3cd41a9
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/ProductInfo.java
@@ -0,0 +1,15 @@
+package org.pgsg.reservation.domain.model.reservation;
+
+import jakarta.persistence.Embeddable;
+import lombok.*;
+import java.util.UUID;
+
+@Embeddable
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(staticName = "of")
+public class ProductInfo {
+    private UUID productId;
+    private Integer productPrice;
+    private String productName;
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
new file mode 100644
index 0000000..960ac22
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -0,0 +1,118 @@
+package org.pgsg.reservation.domain.model.reservation;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.pgsg.common.domain.BaseEntity;
+import org.pgsg.reservation.domain.exception.ReservationException;
+import org.pgsg.reservation.domain.exception.ReservationErrorCode;
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationStatus;
+import java.util.Objects;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+@Entity
+@Getter
+@Table(name = "p_reservations")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Reservation extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    private UUID id;
+
+    //낙관적 락을 위한 버전 추가(추후 분산 락으로 수정예정)
+    @Version
+    private Long version;
+
+    @Enumerated(EnumType.STRING)
+    private ReservationStatus status;
+
+    @Embedded
+    private BuyerInfo buyerInfo;
+
+    @Embedded
+    private SellerInfo sellerInfo;
+
+    @Embedded
+    private ProductInfo productInfo;
+
+    // 예약 후보자들
+    @OneToMany(mappedBy = "reservation", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<ReservationCandidate> candidates = new ArrayList<>();
+
+    public List<ReservationCandidate> getCandidates() {
+        return Collections.unmodifiableList(candidates);
+    }
+
+    public void addCandidate(ReservationCandidate candidate) {
+        validatePendingStatus();
+        this.candidates.add(candidate);
+    }
+
+    public void removeCandidate(ReservationCandidate candidate) {
+        validatePendingStatus();
+        this.candidates.remove(candidate);
+    }
+
+    // 예약 생성
+    public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
+        Objects.requireNonNull(buyer, "buyer must not be null");
+        Objects.requireNonNull(seller, "seller must not be null");
+        Objects.requireNonNull(product, "product must not be null");
+        Reservation reservation = new Reservation();
+        reservation.buyerInfo = buyer;
+        reservation.sellerInfo = seller;
+        reservation.productInfo = product;
+        reservation.status = ReservationStatus.PENDING;
+        return reservation;
+    }
+
+    // 예약 완료: PENDING 상태일 때만 가능
+    public void complete() {
+        validatePendingStatus();
+        this.status = ReservationStatus.COMPLETED;
+    }
+
+    // 예약 만료: PENDING 상태일 때만 가능
+    public void expire() {
+        validatePendingStatus();
+        this.status = ReservationStatus.EXPIRED;
+    }
+
+    // 예약 취소: 취소 사유 업데이트 포함
+    public void cancel() {
+        validatePendingStatus();
+        this.status = ReservationStatus.CANCELLED;
+    }
+
+    // 다음 순번 구매자로 교체
+    public void changeToNextBuyer(ReservationCandidate nextCandidate) {
+        // 예약 자체가 변경 가능한 상태인지 확인
+        validatePendingStatus();
+        // 인자 유효성 검사
+        if (nextCandidate == null) {
+            throw new IllegalArgumentException("nextBuyer must not be null");
+        }
+        // 해당 후보자가 실제 이 예약의 후보 명단에 포함되어 있는지 검증
+        if (!this.candidates.contains(nextCandidate)) {
+            throw new ReservationException(ReservationErrorCode.INVALID_STATUS); // 혹은 "후보자가 아닙니다" 에러
+        }
+        // 후보자의 상태가 '대기' 중인지 확인
+        if (nextCandidate.getStatus() != SelectStatus.WAITING) {
+            throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
+        }
+        nextCandidate.selected();
+        // 검증 완료 후 구매자 정보 교체
+        this.buyerInfo = BuyerInfo.of(nextCandidate.getCandidateId(), nextCandidate.getCandidateNickname());
+    }
+
+    private void validatePendingStatus() {
+        if (this.status != ReservationStatus.PENDING) {
+            throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/SelectStatus.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/SelectStatus.java
new file mode 100644
index 0000000..9224b53
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/SelectStatus.java
@@ -0,0 +1,24 @@
+package org.pgsg.reservation.domain.model.reservation;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.pgsg.reservation.domain.exception.ReservationException;
+import org.pgsg.reservation.domain.exception.ReservationErrorCode;
+import java.util.Arrays;
+
+@Getter
+@AllArgsConstructor
+public enum SelectStatus {
+    WAITING("예약후보 선정 대기 중"),
+    SELECTED("예약후보로 선정 완료됨"),
+    CANCELLED("예약후보로 선정되었다가 취소");
+
+    private final String description;
+
+    public static SelectStatus find(String statusName) {
+        return Arrays.stream(values())
+                .filter(s -> s.name().equalsIgnoreCase(statusName))
+                .findFirst()
+                .orElseThrow(() -> new ReservationException(ReservationErrorCode.INVALID_SELECT_STATUS));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/SellerInfo.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/SellerInfo.java
new file mode 100644
index 0000000..0eb6d04
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/SellerInfo.java
@@ -0,0 +1,14 @@
+package org.pgsg.reservation.domain.model.reservation;
+
+import jakarta.persistence.Embeddable;
+import lombok.*;
+import java.util.UUID;
+
+@Embeddable
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(staticName = "of")
+public class SellerInfo {
+    private UUID sellerId;
+    private String sellerName;
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
new file mode 100644
index 0000000..f506cd1
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
@@ -0,0 +1,81 @@
+package org.pgsg.reservation.domain.model.reservationcandidate;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.pgsg.common.domain.BaseEntity;
+import org.pgsg.reservation.domain.exception.ReservationErrorCode;
+import org.pgsg.reservation.domain.exception.ReservationException;
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.domain.model.reservation.SelectStatus;
+import java.util.Objects;
+
+import java.util.UUID;
+
+@Entity
+@Getter
+@Table(name = "p_reservation_candidates", uniqueConstraints = {
+        @UniqueConstraint(
+                name = "uk_reservation_candidate_nickname",
+                columnNames = {"reservation_id", "candidateNickname"}
+        )
+})
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class ReservationCandidate extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "reservation_id")
+    private Reservation reservation;
+
+    private UUID candidateId;      // 후보자 식별자
+    private String candidateNickname; // 후보자 닉네임
+
+    @Enumerated(EnumType.STRING)
+    private SelectStatus status = SelectStatus.WAITING;
+
+    // 예약 후보 생성
+    public static ReservationCandidate of(Reservation reservation, UUID candidateId, String candidateNickname) {
+        verify(reservation, candidateId, candidateNickname);
+        ReservationCandidate candidate = new ReservationCandidate();
+        candidate.reservation = reservation;
+        candidate.candidateId = candidateId;
+        candidate.candidateNickname = candidateNickname;
+        return candidate;
+    }
+
+    // 유효성 검사
+    private static void verify(Reservation reservation, UUID candidateId, String candidateNickname) {
+        Objects.requireNonNull(reservation, "reservation must not be null");
+        Objects.requireNonNull(candidateId, "candidateId must not be null");
+        if (candidateNickname == null || candidateNickname.isBlank()) {
+            throw new IllegalArgumentException("candidateNickname must not be blank");
+        }
+    }
+
+    // 후보 선정: 판매자가 후보를 구매자로 최종 선택했을 때 사용
+    public void selected() {
+        validateReservationPendingStatus();
+        if (this.status != SelectStatus.WAITING) {
+            throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
+        }
+        this.status = SelectStatus.SELECTED;
+    }
+
+    // 후보 취소: 후보자가 대기를 철회하거나 선정에서 제외될 때 사용
+    public void cancel() {
+        if (this.status == SelectStatus.CANCELLED) {
+            throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
+        }
+        this.status = SelectStatus.CANCELLED;
+    }
+
+    // Reservation에서 예약 상태(PENDING)이어야 후보자 선정 가능
+    private void validateReservationPendingStatus() {
+        if (this.reservation == null || this.reservation.getStatus() != ReservationStatus.PENDING) {
+            throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationStatus.java b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationStatus.java
new file mode 100644
index 0000000..cc9cdfd
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationStatus.java
@@ -0,0 +1,27 @@
+package org.pgsg.reservation.domain.model.reservationcandidate;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.pgsg.reservation.domain.exception.ReservationException;
+import org.pgsg.reservation.domain.exception.ReservationErrorCode;
+
+import java.util.Arrays;
+
+@Getter
+@AllArgsConstructor
+public enum ReservationStatus {
+    PENDING("임시 예약"),
+    EXPIRED("예약 만료"),
+    CANCELLED("예약 취소"),
+    COMPLETED("예약 완료");
+
+    private final String description;
+
+    // 설계서의 "행위" 부분 구현: 문자열로 enum을 찾는 기능
+    public static ReservationStatus find(String statusName) {
+        return Arrays.stream(values())
+                .filter(s -> s.name().equalsIgnoreCase(statusName))
+                .findFirst()
+                .orElseThrow(() -> new ReservationException(ReservationErrorCode.INVALID_STATUS));
+    }
+}
\ No newline at end of file

From 69ec7274111576b99524480346230903a07f7e29 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Sun, 26 Apr 2026 08:18:01 +0900
Subject: [PATCH 002/142] =?UTF-8?q?feat:=20=EC=98=88=EC=95=BD=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=20=EA=B8=B0=EB=8A=A5=20=EC=83=9D=EC=84=B1=20(#4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 예약 생성 기능 생성

* fix : coderabbitai 코멘트 보안
- ReservationRepositoryImpl 부분 추가
- userId 부분 string -> uuid로 수정
- ReservationResponse에서 ReservationCreateResult를 받아오도록 수정
- ReservationDomainService에서 검증 로직은 분리

* fix : coderabbitai 코멘트 보안
- ReservationValidator에서 id값이 null이 아닌지 체크하도록 수정
---
 .../dto/command/ReservationCreateCommand.java | 13 +++++
 .../dto/result/ReservationCreateResult.java   | 12 ++++
 .../service/ReservationService.java           | 57 +++++++++++++++++++
 .../exception/ReservationErrorCode.java       |  1 +
 .../repository/ReservationRepository.java     |  9 +++
 .../service/ReservationDomainService.java     | 27 +++++++++
 .../domain/service/ReservationValidator.java  | 33 +++++++++++
 .../repository/ReservationJpaRepository.java  |  8 +++
 .../repository/ReservationRepositoryImpl.java | 18 ++++++
 .../controller/ReservationController.java     | 42 ++++++++++++++
 .../dto/request/ReservationCreateRequest.java | 15 +++++
 .../dto/response/ReservationResponse.java     | 25 ++++++++
 12 files changed, 260 insertions(+)
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java
 create mode 100644 src/main/java/org/pgsg/reservation/application/service/ReservationService.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationJpaRepository.java
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java

diff --git a/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java
new file mode 100644
index 0000000..7bed285
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java
@@ -0,0 +1,13 @@
+package org.pgsg.reservation.application.dto.command;
+
+import lombok.Builder;
+import lombok.Getter;
+import java.util.UUID;
+
+@Getter
+@Builder
+public class ReservationCreateCommand {
+    private UUID productId;
+    private UUID buyerId;
+    private String buyerNickname;
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java
new file mode 100644
index 0000000..55e03f3
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java
@@ -0,0 +1,12 @@
+package org.pgsg.reservation.application.dto.result;
+
+import lombok.Builder;
+import lombok.Getter;
+import java.util.UUID;
+
+@Getter
+@Builder
+public class ReservationCreateResult {
+    private UUID reservationId;
+    private String status;
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
new file mode 100644
index 0000000..271f93e
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -0,0 +1,57 @@
+package org.pgsg.reservation.application.service;
+
+import lombok.RequiredArgsConstructor;
+import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
+import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
+import org.pgsg.reservation.domain.model.reservation.*;
+import org.pgsg.reservation.domain.service.ReservationDomainService;
+import org.pgsg.reservation.domain.repository.ReservationRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.UUID;
+
+@Service
+@RequiredArgsConstructor
+public class ReservationService {
+
+    private final ReservationRepository reservationRepository;
+    private final ReservationDomainService reservationDomainService;
+    // private final ProductClient productClient; // 추후 구현 예정
+
+    // 도메인 서비스 호출 전까지의 작업은 트랜잭션 밖으로 분리(추후 고도화 작업시)
+    @Transactional
+    public ReservationCreateResult createReservation(ReservationCreateCommand command) {
+
+        // 구매자 정보(VO) 생성
+        BuyerInfo buyer = BuyerInfo.of(command.getBuyerId(), command.getBuyerNickname());
+
+        // 상품 및 판매자 정보 조회(추후 구현 예정)
+        // ProductResponse productResponse = productClient.getProductDetails(command.getProductId());
+
+        // 임시로 생성(추후 상품 판매 정보 조회시 수정 필요)
+        SellerInfo seller = SellerInfo.of(
+                UUID.randomUUID(), // productResponse.getSellerId()
+                "임시 판매자" // productResponse.getSellerName()
+        );
+        ProductInfo product = ProductInfo.of(
+                command.getProductId(),
+                50000,             // productResponse.getPrice()
+                "타임딜 특가 상품"    // productResponse.getName()
+        );
+
+        // 도메인 서비스 호출
+        Reservation reservation = reservationDomainService.createReservation(buyer, seller, product);
+
+        // ransaction outbox 패턴에 기반한 이벤트 발송 로직 추가 예정
+
+        // DB 저장
+        Reservation savedReservation = reservationRepository.save(reservation);
+
+        // 5. [결과 반환] Result DTO로 변환하여 Controller로 전달
+        return ReservationCreateResult.builder()
+                .reservationId(savedReservation.getId())
+                .status(savedReservation.getStatus().name())
+                .build();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
index 7164eb8..b040d74 100644
--- a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
+++ b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
@@ -8,6 +8,7 @@
 public enum ReservationErrorCode {
 
     // 400 Bad Request
+    INVALID_INPUT(400, "입력값이 누락되었습니다."),
     INVALID_STATUS(400, "잘못된 예약 상태입니다."),
     INVALID_SELECT_STATUS(400, "잘못된 선정 상태입니다."),
     CANNOT_CHANGE_STATUS(400, "현재 상태에서는 변경할 수 없는 요청입니다."),
diff --git a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
new file mode 100644
index 0000000..f97def8
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
@@ -0,0 +1,9 @@
+package org.pgsg.reservation.domain.repository;
+
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+import java.util.Optional;
+import java.util.UUID;
+
+public interface ReservationRepository {
+    Reservation save(Reservation reservation);
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
new file mode 100644
index 0000000..16087e1
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -0,0 +1,27 @@
+package org.pgsg.reservation.domain.service;
+
+import lombok.RequiredArgsConstructor;
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.domain.model.reservation.BuyerInfo;
+import org.pgsg.reservation.domain.model.reservation.SellerInfo;
+import org.pgsg.reservation.domain.model.reservation.ProductInfo;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@RequiredArgsConstructor
+public class ReservationDomainService {
+
+    private final ReservationValidator reservationValidator;
+
+    /**
+     * 예약 생성 로직
+     * 각 VO들을 조합하여 예약 엔티티를 생성하고, 도메인 규칙을 검증
+     */
+    public Reservation createReservation(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
+
+        reservationValidator.validate(buyer, seller, product);
+
+        return Reservation.create(buyer, seller, product);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
new file mode 100644
index 0000000..a8580ee
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
@@ -0,0 +1,33 @@
+package org.pgsg.reservation.domain.service;
+
+import org.pgsg.reservation.domain.model.reservation.*;
+import org.pgsg.reservation.domain.exception.*;
+import org.springframework.stereotype.Component;
+
+@Component
+
+public class ReservationValidator {
+
+    public void validate(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
+
+        if (buyer == null || seller == null || product == null) {
+            throw new ReservationException(ReservationErrorCode.INVALID_INPUT);
+        }
+
+        if (buyer.getBuyerId() == null || seller.getSellerId() == null) {
+            throw new ReservationException(ReservationErrorCode.INVALID_INPUT);
+        }
+
+        // 본인 상품 예약 금지 규칙
+        if (isSamePerson(buyer, seller)) {
+            throw new ReservationException(ReservationErrorCode.INVALID_STATUS);
+        }
+
+        // 검증 규칙 추가 예정
+    }
+
+    // 본인 상품 예약 금지 규칙
+    private boolean isSamePerson(BuyerInfo buyer, SellerInfo seller) {
+        return buyer.getBuyerId().equals(seller.getSellerId());
+    }
+}
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationJpaRepository.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationJpaRepository.java
new file mode 100644
index 0000000..797a746
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationJpaRepository.java
@@ -0,0 +1,8 @@
+package org.pgsg.reservation.infrastructure.repository;
+
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.UUID;
+
+public interface ReservationJpaRepository extends JpaRepository<Reservation, UUID> {
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
new file mode 100644
index 0000000..e739a30
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
@@ -0,0 +1,18 @@
+package org.pgsg.reservation.infrastructure.repository;
+
+import lombok.RequiredArgsConstructor;
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.domain.repository.ReservationRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class ReservationRepositoryImpl implements ReservationRepository {
+
+    private final ReservationJpaRepository reservationJpaRepository;
+
+    @Override
+    public Reservation save(Reservation reservation) {
+        return reservationJpaRepository.save(reservation);
+    }
+}
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
new file mode 100644
index 0000000..b737222
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -0,0 +1,42 @@
+package org.pgsg.reservation.presentation.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
+import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
+import org.pgsg.reservation.application.service.ReservationService;
+import org.pgsg.reservation.presentation.dto.request.ReservationCreateRequest;
+import org.pgsg.reservation.presentation.dto.response.ReservationResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.UUID;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/reservations")
+public class ReservationController {
+
+    private final ReservationService reservationService;
+
+    @PostMapping
+    public ResponseEntity<ReservationResponse> createReservation(
+            @Valid @RequestBody ReservationCreateRequest request,
+            @RequestHeader(value = "X-User-Id") UUID userId,
+            @RequestHeader(value = "X-User-Nickname") String nickname
+    ) {
+
+        ReservationCreateCommand command = ReservationCreateCommand.builder()
+                .productId(request.getProductId())
+                .buyerId(userId)
+                .buyerNickname(nickname)
+                .build();
+
+        ReservationCreateResult result = reservationService.createReservation(command);
+
+        return ResponseEntity
+                .status(HttpStatus.CREATED)
+                .body(ReservationResponse.from(result));
+    }
+}
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java
new file mode 100644
index 0000000..650f5f4
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java
@@ -0,0 +1,15 @@
+package org.pgsg.reservation.presentation.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+@Getter
+@NoArgsConstructor
+public class ReservationCreateRequest {
+
+    @NotNull(message = "상품 ID는 필수입니다.")
+    private UUID productId;
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
new file mode 100644
index 0000000..29b1f60
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
@@ -0,0 +1,25 @@
+package org.pgsg.reservation.presentation.dto.response;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
+
+import java.util.UUID;
+
+@Getter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class ReservationResponse {
+
+    private UUID reservationId;
+    private String status;
+
+    public static ReservationResponse from(ReservationCreateResult result) {
+        return ReservationResponse.builder()
+                .reservationId(result.getReservationId())
+                .status(result.getStatus())
+                .build();
+    }
+}

From c82fac62c2a49b7452a7c6ceda37bf3a21c9906a Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Sun, 26 Apr 2026 12:52:31 +0900
Subject: [PATCH 003/142] =?UTF-8?q?feat=20:=20=EC=98=88=EC=95=BD=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?(#6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix : 예약 검색 기능 추가 및 빌드 파일 제거

* Update src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Refactor product, seller, and buyer name retrieval

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .gitignore                                    |  48 ++
 .gradle/9.0.0/checksums/checksums.lock        | Bin 17 -> 0 bytes
 .gradle/9.0.0/checksums/md5-checksums.bin     | Bin 22247 -> 0 bytes
 .gradle/9.0.0/checksums/sha1-checksums.bin    | Bin 31673 -> 0 bytes
 .../executionHistory/executionHistory.bin     | Bin 19719 -> 0 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 0 bytes
 .gradle/9.0.0/fileChanges/last-build.bin      | Bin 1 -> 0 bytes
 .gradle/9.0.0/fileHashes/fileHashes.bin       | Bin 18897 -> 0 bytes
 .gradle/9.0.0/fileHashes/fileHashes.lock      | Bin 17 -> 0 bytes
 .gradle/9.0.0/gc.properties                   |   0
 .../buildOutputCleanup.lock                   | Bin 17 -> 0 bytes
 .gradle/buildOutputCleanup/cache.properties   |   2 -
 .gradle/buildOutputCleanup/outputFiles.bin    | Bin 18695 -> 0 bytes
 .gradle/file-system.probe                     | Bin 8 -> 0 bytes
 .gradle/vcs-1/gc.properties                   |   0
 .idea/.gitignore                              |  10 -
 .idea/compiler.xml                            |  30 -
 .idea/gradle.xml                              |  17 -
 .idea/misc.xml                                |  10 -
 .idea/modules.xml                             |   9 -
 .idea/modules/reservation-service.main.iml    |   9 -
 .idea/modules/reservation-service.test.iml    |   8 -
 .idea/reservation-service.iml                 |   9 -
 .idea/vcs.xml                                 |   7 -
 build.gradle                                  |  48 +-
 build/reports/problems/problems-report.html   | 663 ------------------
 gradle/wrapper/gradle-wrapper.jar             | Bin 45457 -> 0 bytes
 libs/common                                   |   2 +-
 .../ReservationServiceApplication.java        |  11 +
 .../dto/query/ReservationSearchQuery.java     |  14 +
 .../dto/result/ReservationSearchResult.java   |  16 +
 .../service/ReservationService.java           |  19 +
 .../exception/ReservationErrorCode.java       |   3 +
 .../model/reservation/SearchPolicy.java       |   9 +
 .../repository/ReservationRepository.java     |  14 +-
 .../service/ReservationDomainService.java     |  32 +-
 .../domain/service/ReservationValidator.java  |  10 +
 .../infrastructure/config/QuerydslConfig.java |  19 +
 .../repository/ReservationRepositoryImpl.java | 107 ++-
 .../controller/ReservationController.java     |  32 +
 .../dto/request/ReservationSearchRequest.java |  18 +
 .../dto/response/ReservationResponse.java     |  27 +-
 42 files changed, 406 insertions(+), 797 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .gradle/9.0.0/checksums/checksums.lock
 delete mode 100644 .gradle/9.0.0/checksums/md5-checksums.bin
 delete mode 100644 .gradle/9.0.0/checksums/sha1-checksums.bin
 delete mode 100644 .gradle/9.0.0/executionHistory/executionHistory.bin
 delete mode 100644 .gradle/9.0.0/executionHistory/executionHistory.lock
 delete mode 100644 .gradle/9.0.0/fileChanges/last-build.bin
 delete mode 100644 .gradle/9.0.0/fileHashes/fileHashes.bin
 delete mode 100644 .gradle/9.0.0/fileHashes/fileHashes.lock
 delete mode 100644 .gradle/9.0.0/gc.properties
 delete mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock
 delete mode 100644 .gradle/buildOutputCleanup/cache.properties
 delete mode 100644 .gradle/buildOutputCleanup/outputFiles.bin
 delete mode 100644 .gradle/file-system.probe
 delete mode 100644 .gradle/vcs-1/gc.properties
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/gradle.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/modules/reservation-service.main.iml
 delete mode 100644 .idea/modules/reservation-service.test.iml
 delete mode 100644 .idea/reservation-service.iml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 build/reports/problems/problems-report.html
 delete mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/query/ReservationSearchQuery.java
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/config/QuerydslConfig.java
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationSearchRequest.java

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..588af4e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,48 @@
+HELP.md
+.gradle
+**/build/
+**/out/
+**/bin/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+.env
+
+# QueryDSL
+src/main/generated/
+**/generated/
+
+# Artifacts
+*.jar
+*.war
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
\ No newline at end of file
diff --git a/.gradle/9.0.0/checksums/checksums.lock b/.gradle/9.0.0/checksums/checksums.lock
deleted file mode 100644
index fccd03d96708823306f981d72f967de51f576e7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
UcmZS1O7X4U|4luD0Sp*(0WZh|JOBUy

diff --git a/.gradle/9.0.0/checksums/md5-checksums.bin b/.gradle/9.0.0/checksums/md5-checksums.bin
deleted file mode 100644
index 3ec758ea57e524c664fd4e29c624a0e62feb8d0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22247
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
W%aRR7&ZtTWz^jBE0}Nhe()cI$?{uF4

diff --git a/.gradle/9.0.0/checksums/sha1-checksums.bin b/.gradle/9.0.0/checksums/sha1-checksums.bin
deleted file mode 100644
index c879418220a3861e2aa03f462319c6b3edf18d16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31673
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

diff --git a/.gradle/9.0.0/executionHistory/executionHistory.bin b/.gradle/9.0.0/executionHistory/executionHistory.bin
deleted file mode 100644
index 1396b9bb7bad7a47d0766a4ed427cbec830b507f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19719
zcmeI%Pe>F|90%|>x`9a195RB0AU66#j_$0wSto6`H2Ozoe;2m5Gf#Kgb$5DicGv7s
z2dOZzyhIS%q4HKyVNj4!6dnxHj0mJ6tV91U6-5x#%>F^64pAK<z5_G!cyH$Ye($rt
zH<$GjGDrTJJILfwGTB560uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_0D=ESpvhiH
zadt6tmKHdTnQ1~QrrQmvLYup-U`BsmcDTMa|NlY$Zuc+Fj^PRc2tWV=5P$##AOHaf
zKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fWW^X
z;3dR$-987L^Q0Q)dMdg{XsPCKTR7To?p3RzRX$%lDWASPboHY9_QRqbee}|&&fX)^
z4_)L!g10Cwoa!;AP}5K>DxyM3b84E5D_gVoke_J@PA#U(YtGzD)%Esu-U%#OF{|Wt
zTfraCK!&7HUDAl@jT$#hE94IGWIUwB5+cc&$DMDfA&*MKn%7(Hp}uO(t1`V(RaM_I
zk8fGCPpk2GWp_vC<AEjm$9-dOM_wAU4;6P&u0@O#tD}Myo&S}Ux;IiQ;ym87dQ+``
zZ6MUt7}yl5->@!_pUZimusa7-t{cJ<J<gRI;iP3G;(sI7cN6|3;PI&e8zWS$s%}iS
zlJ8#Iyw_w!SAJ>D{we7@uXWTltUoq2L=%q{-iTP1DVCR)3&vB1#zekq><}4-Jb)<A
zmQz`cQlV6og^jq<ZkXNK&Mk}!8>#SMX7Fg7S?L6iZZ=w3B5An@Sty@K(U_szwKg>?
zI{}Hfy28}bBH1#L23IZ*Hrcs|V7qAZcx!yY2A$E3Jh7W;mI!j@<Vl@hq%4<lFq=YJ
zv8N$&d*O@HQt9TYd8x|Eb2VbYlhH@-#=W0syAJQBe3cPn(gW#tLj-f>k&9TC-%j?-
zMBYDq_QU<*Q>_=qdk3#ic&5D=aRT>D6u6F>JYnxT%U~jt!1!NJU@`!a>-|gLkL(<|
zJHxdo{p#uZ(dU^wzDTYkBC`=QDO~$qf;5pY4?a7vsQ8T;*gn6ua%|T?e@6I(-zC`}
Hu3O&#Eg=7(

diff --git a/.gradle/9.0.0/executionHistory/executionHistory.lock b/.gradle/9.0.0/executionHistory/executionHistory.lock
deleted file mode 100644
index c43cd63f17c9318290f2410168c0e74ca88a00e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
UcmZQp4Zb#GlgK#<1_)pV04(?enE(I)

diff --git a/.gradle/9.0.0/fileChanges/last-build.bin b/.gradle/9.0.0/fileChanges/last-build.bin
deleted file mode 100644
index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1
IcmZPo000310RR91

diff --git a/.gradle/9.0.0/fileHashes/fileHashes.bin b/.gradle/9.0.0/fileHashes/fileHashes.bin
deleted file mode 100644
index 1404cd73f038d288b9f85f31c69d05c12f887002..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18897
zcmeI&;Y$-?0LSrLo8VSMQLGh0HON+&B+eH$Uu>{oO8P=*mHDF5=!F`tk!BbgVlRAE
z2qVyWK^VwTkw_A9uvfiMYU+z#1jbldnC~nkFy_sB9%S5qAm4+#=iztvySwM}_Rg;;
zj>3%Cl>Mz_f65F21Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#?;z*TJ_HhnRU@<Z84
zL64$bJfcnV=ZF3;IFCk7=%)id`Tby{_ReI}pgAJ)u*^4~_MWOseV7#agv>L|?=L(k
zx_wU1>r|QhLic{1Evs%2d8f>Sv7)NPrTG?-TV>vC9jhOHogWtW|044a&$zlB`WF?~
zdt@$0Enn8paYO(C1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILK;U2tRB6l0{=k1ayB9t-|0pdrCDfDMZueA8_>7{MqVb?>O*c5)
ztBn=8jsC@nKP!uB=gik=d?8(#CmMJ4#_S7YBj7LJO5RK^*)6V~jc<+GAN+gIXww_Y
zj<NAJo*Ho3HoGq0aQfV<x88}y8@=Il7#n4-q<#I>u`7{}fhU=!IqfY>qu+~Xy7n5@
zmY}gQlJdr5=})#czjvs+WanB=<Gy;`*r-oFnoG2{&)WY^KYZEu+?&%l9z1Vsq%EI^
Xt38&ViP-O@n(=29ISun#DBIWtk@469

diff --git a/.gradle/9.0.0/fileHashes/fileHashes.lock b/.gradle/9.0.0/fileHashes/fileHashes.lock
deleted file mode 100644
index 9adee877962f00dcc3f565df8322845daf2387d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
UcmZSfeLRPC!kJE11_<B-05C%X%>V!Z

diff --git a/.gradle/9.0.0/gc.properties b/.gradle/9.0.0/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index 24074fcf7406430773ceca343549cac634f88fc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
UcmZR6>Hb&p?tS@f3=qHv06nt==>Px#

diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
deleted file mode 100644
index 23847c6..0000000
--- a/.gradle/buildOutputCleanup/cache.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Fri Apr 24 16:13:26 KST 2026
-gradle.version=9.0.0
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
deleted file mode 100644
index 8f2b07b526d72b9b9110d27ae00700cb4aa5513f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18695
zcmeI%PbdUo7=ZD2?7^<plCte?iR88txw<HdRT8;4uG}Q;q)oX<3P*>%teevuHfQC}
ziHlOo)nV67TS}xz%$oOYlbce~Gxg1UJu~z5&F?xRB8k>_J*0lL*Qd-7KmY**5I_I{
z1Q0*~0R#|0009ILKmY**5J2F+2+aB)(iD75qPL+oX~~Q9H~W+5;pW?Mcf61aZjTMy
z|AV`stT(+8DrhfRudc6ljhBx+?YGt+%DLFu<?gcf1?!D&^<``7I;lNxJ({YtmAu6j
z?c3ISZqCvJY4=t8mGud6Dp`pyX+O0-dEOTq?YN)UK4X0@vX|M}54+l*tmiJm2Pcou
zo!X1m?JDBvUV|q%BY*$`2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
uAb<b@2q1s}0tg_000Iag@Ye(e{S8I@;pmXqmr~2WQ~ZU0u=4k}KFbG)2%k>?

diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
deleted file mode 100644
index c6b7878aae7702e8d557c42346a0e9d3d2ed8367..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8
PcmZQzV4S-zOyea02vP#X

diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 9879198..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# 디폴트 무시된 파일
-/shelf/
-/workspace.xml
-# 쿼리 파일을 포함한 무시된 디폴트 폴더
-/queries/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# 에디터 기반 HTTP 클라이언트 요청
-/httpRequests/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 5506860..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Gradle Imported" enabled="true">
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="false">
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.github.openfeign.querydsl/querydsl-apt/6.8/3d84d97ecc166b9c85aaa5a89e69bd4d7cc7825d/querydsl-apt-6.8.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.github.openfeign.querydsl/querydsl-codegen/6.8/9a748742bc55d680cfefb9ed96acf7a02435c446/querydsl-codegen-6.8.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/jakarta.annotation/jakarta.annotation-api/2.1.1/48b9bda22b091b1f48b13af03fe36db3be6e1ae3/jakarta.annotation-api-2.1.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/jakarta.persistence/jakarta.persistence-api/3.1.0/66901fa1c373c6aff65c13791cc11da72060a8d6/jakarta.persistence-api-3.1.0.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.44/503fd0b002dbb237fa4656cf4b8021666a8aebac/lombok-1.18.44.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.github.openfeign.querydsl/querydsl-core/6.8/fdf80634d176a583824d5923c187f00ef55ba601/querydsl-core-6.8.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.github.openfeign.querydsl/querydsl-codegen-utils/6.8/f046b3c073b57b21ca693144ae2fb6e5be2ed83/querydsl-codegen-utils-6.8.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/jakarta.inject/jakarta.inject-api/2.0.1/4c28afe1991a941d7702fe1362c365f0a8641d1e/jakarta.inject-api-2.0.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.github.classgraph/classgraph/4.8.175/dc8db5eac2cd176344e5a492568b2acf32b8ac/classgraph-4.8.175.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.mysema.commons/mysema-commons-lang/0.2.4/d09c8489d54251a6c22fbce804bdd4a070557317/mysema-commons-lang-0.2.4.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.projectreactor/reactor-core/3.7.17/d0fdb9ac0e6766e72a98513ce0a6f87499deb967/reactor-core-3.7.17.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jdt/ecj/3.33.0/4041d27ffea3c9351e3121f9bfe94dea4723d583/ecj-3.33.0.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.4/3864a1320d97d7b045f729a326e1e077661f31b7/reactive-streams-1.0.4.jar" />
-        </processorPath>
-        <module name="reservation-service.common.main" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel target="17" />
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_STRING" value="-parameters" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index bcddc3f..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/libs/common" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 8269728..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 37eb0da..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/reservation-service.main.iml" filepath="$PROJECT_DIR$/.idea/modules/reservation-service.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/reservation-service.test.iml" filepath="$PROJECT_DIR$/.idea/modules/reservation-service.test.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules/reservation-service.main.iml b/.idea/modules/reservation-service.main.iml
deleted file mode 100644
index 4f0b678..0000000
--- a/.idea/modules/reservation-service.main.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../../src/main" dumb="true">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
-    </content>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/reservation-service.test.iml b/.idea/modules/reservation-service.test.iml
deleted file mode 100644
index 8210e2d..0000000
--- a/.idea/modules/reservation-service.test.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../../src/test" dumb="true">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-    </content>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/reservation-service.iml b/.idea/reservation-service.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/.idea/reservation-service.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 88cbea5..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/libs/common" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8e875dc..4a35933 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,9 @@ group = 'org.pgsg'
 version = '0.0.1-SNAPSHOT'
 
 java {
-    sourceCompatibility = '17'
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 }
 
 configurations {
@@ -19,9 +21,29 @@ configurations {
 
 repositories {
     mavenCentral()
+    maven { url 'https://repo.spring.io/milestone' }
+}
+
+ext {
+    set('springCloudVersion', "2025.0.1")
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
 }
 
 dependencies {
+    compileOnly 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+
+    implementation 'io.github.openfeign.querydsl:querydsl-core:6.10.1'
+    implementation 'io.github.openfeign.querydsl:querydsl-jpa:6.10.1'
+    annotationProcessor 'io.github.openfeign.querydsl:querydsl-apt:6.10.1:jpa'
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
     implementation project(':common')
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
@@ -29,23 +51,23 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
-    implementation 'io.github.querydsl:querydsl-jpa:5.1.0:jakarta'
-    annotationProcessor "io.github.querydsl:querydsl-apt:5.1.0:jakarta"
-
-    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
-    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
-
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
 }
 
-def querydslSrcDir = 'src/main/generated'
+def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
 
-clean {
-    delete file(querydslSrcDir)
+sourceSets {
+    main.java.srcDirs += [ querydslDir ]
 }
 
 tasks.withType(JavaCompile).configureEach {
-    options.generatedSourceOutputDirectory = file(querydslSrcDir)
+    options.getGeneratedSourceOutputDirectory().set(querydslDir)
+}
+
+jar {
+    enabled = false
+}
+
+clean {
+    delete querydslDir
 }
\ No newline at end of file
diff --git a/build/reports/problems/problems-report.html b/build/reports/problems/problems-report.html
deleted file mode 100644
index ba0c211..0000000
--- a/build/reports/problems/problems-report.html
+++ /dev/null
@@ -1,663 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-                    <style type="text/css">
-                /*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
-html {
-    line-height: 1.15;
-    -ms-text-size-adjust: 100%;
-    -webkit-text-size-adjust: 100%
-}
-
-body {
-    margin: 0
-}
-
-article, aside, footer, header, nav, section {
-    display: block
-}
-
-h1 {
-    font-size: 2em;
-    margin: .67em 0
-}
-
-figcaption, figure, main {
-    display: block
-}
-
-figure {
-    margin: 1em 40px
-}
-
-hr {
-    box-sizing: content-box;
-    height: 0;
-    overflow: visible
-}
-
-pre {
-    font-family: monospace, monospace;
-    font-size: 1em
-}
-
-a {
-    background-color: transparent;
-    -webkit-text-decoration-skip: objects
-}
-
-abbr[title] {
-    border-bottom: none;
-    text-decoration: underline;
-    text-decoration: underline dotted
-}
-
-b, strong {
-    font-weight: inherit
-}
-
-b, strong {
-    font-weight: bolder
-}
-
-code, kbd, samp {
-    font-family: monospace, monospace;
-    font-size: 1em
-}
-
-dfn {
-    font-style: italic
-}
-
-mark {
-    background-color: #ff0;
-    color: #000
-}
-
-small {
-    font-size: 80%
-}
-
-sub, sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline
-}
-
-sub {
-    bottom: -.25em
-}
-
-sup {
-    top: -.5em
-}
-
-audio, video {
-    display: inline-block
-}
-
-audio:not([controls]) {
-    display: none;
-    height: 0
-}
-
-img {
-    border-style: none
-}
-
-svg:not(:root) {
-    overflow: hidden
-}
-
-button, input, optgroup, select, textarea {
-    font-family: sans-serif;
-    font-size: 100%;
-    line-height: 1.15;
-    margin: 0
-}
-
-button, input {
-    overflow: visible
-}
-
-button, select {
-    text-transform: none
-}
-
-[type=reset], [type=submit], button, html [type=button] {
-    -webkit-appearance: button
-}
-
-[type=button]::-moz-focus-inner, [type=reset]::-moz-focus-inner, [type=submit]::-moz-focus-inner, button::-moz-focus-inner {
-    border-style: none;
-    padding: 0
-}
-
-[type=button]:-moz-focusring, [type=reset]:-moz-focusring, [type=submit]:-moz-focusring, button:-moz-focusring {
-    outline: 1px dotted ButtonText
-}
-
-fieldset {
-    padding: .35em .75em .625em
-}
-
-legend {
-    box-sizing: border-box;
-    color: inherit;
-    display: table;
-    max-width: 100%;
-    padding: 0;
-    white-space: normal
-}
-
-progress {
-    display: inline-block;
-    vertical-align: baseline
-}
-
-textarea {
-    overflow: auto
-}
-
-[type=checkbox], [type=radio] {
-    box-sizing: border-box;
-    padding: 0
-}
-
-[type=number]::-webkit-inner-spin-button, [type=number]::-webkit-outer-spin-button {
-    height: auto
-}
-
-[type=search] {
-    -webkit-appearance: textfield;
-    outline-offset: -2px
-}
-
-[type=search]::-webkit-search-cancel-button, [type=search]::-webkit-search-decoration {
-    -webkit-appearance: none
-}
-
-::-webkit-file-upload-button {
-    -webkit-appearance: button;
-    font: inherit
-}
-
-details, menu {
-    display: block
-}
-
-summary {
-    display: list-item
-}
-
-canvas {
-    display: inline-block
-}
-
-template {
-    display: none
-}
-
-[hidden] {
-    display: none
-}
-
-/* configuration cache styles */
-
-.report-wrapper {
-    margin: 0;
-    padding: 0 24px;
-}
-
-.gradle-logo {
-    width: 32px;
-    height: 24px;
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAYCAYAAACbU/80AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAGAAAAAA915G0AAAD5klEQVRIDbVWC0xTZxT+emmhVUEeA1/ROh/tFAFFGK7oJisIKsNVoOwBbJPowEWHzikRxeiMRpwwjDWRBHQLIzOmiRhe22BT40TitiyaMBQFfMEeLMIEaSmk+/+rvd7be4no6Elu7n++c/5zzv845/wyOyG4iGyDgzCdNOPLM9W41n4bnmNUiHo5DNsz0hGsmcV6lbkyAOOWXJjrz4qWp1C4o3z/LqzWL4VcJB1FIHmZHn/f78a6pDcxbeIEfNvQiPwTZbDZBpC24zOEaGfDpTsgtZby6u+QlrubFWUY3nh6AH39/ahr/Bn1jZfxW3ML2js60dtvgbtcQVblj8CZM7A0PBSrol6Ft+c4KZ8iTB1nwN0//8IEP9/hA2i924Gir0/iq8oa/NvbJzLiDKiUSqTE6pGVbEBY4BxnsYAPSnwXTa3tLCZ5BF3dPdAkGNHzoFcwcaRMnC4CeZkZiAgKFE252nITC1Pew9Dj5GNEGgS4Rbb5eZ1Te7UXG6FLX4cV6zeh5kIDaDpSunL9Boyf5nLOpwT4Sx+BxWrFK8QAnTAapPRQwofcj86uLoG59cbVEOzA0NAQNh38Atn5RSjY8rFAmc/I3dyQvOx1PsSNVy7Roa3ajHDePbBYLSLn1MaGd5KFAXy07xAOl59C6elK+I73hIHcbGd6wXs8qkyH8FZcjLOI5X/9/TrOnLsAldJDUu4As1NToFFPe3IEpm/M2HigwCFnU6t4Zw6Ck1JhGRhgcXq5juXloKyqFnlHirmz5CaNcEAv59kSE9wVikcB3O78A/MSU0Fznk/H9+yAetJEnPr+B8RFLsLcGS8ia28+qQuX+WrPNNZOV+Nc6VH4+3iz89g0pEaLzRUiQ3LGDWsM8Qidq2WL0PGKKlgf74ZIeQTAfFJ6a44WIsDXh9OW/dPdY58aawC9KK6kpOgolO7JxViVSuBGXnvxksudZ5F0O5yzGYxMJnBOGaau4fnPU2RNAtCFBKFoa7akczaAptY2iWmjB33+yQa4kZwfjpi2ex3Dyf43vuAljWQ/4Btmei1WPj+q45hF4U+1J4fEizCEvNf0EWHoIW244sfzoN1RipaT2kDfdjfv3MNpojdISjmfIheE8Fnp8WR9vJ2Zr+O+bYUmO+kJ9KnIUtf9bnvY2x9wcqrrvnCJvfL8Tw4V9v9LU7PdKzJaoNdy645AR4ph1JMncZHRKrVvYyYY5kmP8iO1v2T3dk6HDtYmrgJtOnwKnaPFrg8z+BBX7QSgEyOPJfX9Qd9DFs40GgTOHbrBs2ch4bXFuEG2mmFkeD9hpUMk+NMXEe0TNtsg/Ly94DVurEAuxfwHC1WiVbe0U7MAAAAASUVORK5CYII=");
-    background-size: contain;
-}
-
-.header {
-    display: flex;
-    flex-wrap: wrap;
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    padding: 24px 24px 0 24px;
-    background-color: white;
-    z-index: 1;
-}
-
-.learn-more {
-    margin-left: auto;
-    align-self: center;
-    font-size: 0.875rem;
-    font-weight: normal;
-}
-
-.title {
-    display: flex;
-    align-items: center;
-    padding: 18px 0 24px 0;
-    flex: 1 0 100%;
-}
-
-.content {
-    font-size: 0.875rem;
-    padding: 240px 0 48px;
-    overflow-x: auto;
-    white-space: nowrap;
-}
-
-.content ol:first-of-type {
-    margin: 0;
-}
-
-.tree-btn {
-    cursor: pointer;
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-size: contain;
-    background-repeat: no-repeat;
-    vertical-align: middle;
-    margin-top: -0.2em;
-}
-
-.tree-btn.collapsed {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192 512"><path d="M166.9 264.5l-117.8 116c-4.7 4.7-12.3 4.7-17 0l-7.1-7.1c-4.7-4.7-4.7-12.3 0-17L127.3 256 25.1 155.6c-4.7-4.7-4.7-12.3 0-17l7.1-7.1c4.7-4.7 12.3-4.7 17 0l117.8 116c4.6 4.7 4.6 12.3-.1 17z" fill="%23999999" stroke="%23999999"/></svg>');
-}
-
-.tree-btn.expanded {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512"><path d="M119.5 326.9L3.5 209.1c-4.7-4.7-4.7-12.3 0-17l7.1-7.1c4.7-4.7 12.3-4.7 17 0L128 287.3l100.4-102.2c4.7-4.7 12.3-4.7 17 0l7.1 7.1c4.7 4.7 4.7 12.3 0 17L136.5 327c-4.7 4.6-12.3 4.6-17-.1z" fill="%23999999" stroke="%23999999"/></svg>');
-}
-
-ul .tree-btn {
-    margin-right: 3px;
-}
-
-.leaf-icon {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512"><path d="M32 256 H224" stroke="%23999999" stroke-width="48" stroke-linecap="round"/></svg>');
-    background-size: contain;
-    background-repeat: no-repeat;
-    vertical-align: middle;
-    margin-top: -0.2em;
-}
-
-.invisible-text {
-    user-select: all; /* Allow the text to be selectable */
-    color: transparent; /* Hide the text */
-    text-indent: -9999px; /* Move the text out of view */
-    position: relative;
-    white-space: pre; /* Preserve meaningful whitespace in the invisible text for copying */
-}
-
-.text-for-copy {
-    display: inline-block;
-}
-
-.enum-icon {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><circle cx="512" cy="512" r="200" /></svg>');
-    background-size: contain;
-    background-repeat: no-repeat;
-    vertical-align: middle;
-    margin-inline-start: 0.5ex;
-    margin-inline-end: 0.5ex;
-    margin-top: -0.2em;
-}
-
-.error-icon {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path d="M193.94 256L296.5 153.44l21.15-21.15c3.12-3.12 3.12-8.19 0-11.31l-22.63-22.63c-3.12-3.12-8.19-3.12-11.31 0L160 222.06 36.29 98.34c-3.12-3.12-8.19-3.12-11.31 0L2.34 120.97c-3.12 3.12-3.12 8.19 0 11.31L126.06 256 2.34 379.71c-3.12 3.12-3.12 8.19 0 11.31l22.63 22.63c3.12 3.12 8.19 3.12 11.31 0L160 289.94 262.56 392.5l21.15 21.15c3.12 3.12 8.19 3.12 11.31 0l22.63-22.63c3.12-3.12 3.12-8.19 0-11.31L193.94 256z" fill="%23FC461E" stroke="%23FC461E"/></svg>');
-    background-size: contain;
-    background-repeat: no-repeat;
-    vertical-align: middle;
-    margin-inline-start: 0.5ex;
-    margin-inline-end: 0.5ex;
-    margin-top: -0.2em;
-}
-
-.advice-icon {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-image: url('data:image/svg+xml;utf8,<svg width="800px" height="800px" viewBox="-4.93 0 122.88 122.88" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  style="enable-background:new 0 0 113.01 122.88" xml:space="preserve"><g><path d="M44.13,102.06c-1.14,0.03-2.14-0.81-2.3-1.96c-0.17-1.2,0.64-2.31,1.82-2.54c-1.3-7.37-4.85-11.43-8.6-15.72 c-2.92-3.34-5.95-6.81-8.34-11.92c-2.35-5.03-3.64-10.23-3.6-15.63c0.05-5.4,1.42-10.96,4.4-16.71c0.02-0.04,0.04-0.07,0.06-0.11 l0,0c3.91-6.62,9.38-11.04,15.47-13.52c5.11-2.09,10.66-2.8,16.1-2.3c5.42,0.5,10.73,2.2,15.37,4.94 c5.9,3.49,10.75,8.67,13.42,15.21c1.44,3.54,2.42,7.49,2.54,11.82c0.12,4.31-0.62,8.96-2.61,13.88 c-2.66,6.59-6.18,10.68-9.47,14.51c-3.03,3.53-5.85,6.81-7.42,11.84c0.89,0.21,1.59,0.94,1.73,1.9c0.17,1.24-0.7,2.39-1.94,2.56 l-0.77,0.11c-0.14,1.09-0.23,2.26-0.27,3.51l0.25-0.04c1.24-0.17,2.39,0.7,2.56,1.94c0.17,1.24-0.7,2.39-1.94,2.56l-0.78,0.11 c0.01,0.15,0.02,0.3,0.03,0.45l0,0c0.07,0.88,0.08,1.73,0.03,2.54l0.13-0.02c1.25-0.15,2.38,0.74,2.54,1.98 c0.15,1.25-0.74,2.38-1.98,2.54l-1.68,0.21c-1.2,3.11-3.34,5.48-5.87,6.94c-1.74,1.01-3.67,1.59-5.61,1.71 c-1.97,0.12-3.96-0.25-5.78-1.13c-2.08-1.02-3.94-2.71-5.29-5.14c-0.65-0.33-1.13-0.97-1.23-1.75c-0.04-0.31-0.01-0.61,0.07-0.89 c-0.39-1.16-0.68-2.43-0.87-3.83l-0.07,0.01c-1.24,0.17-2.39-0.7-2.56-1.94c-0.17-1.24,0.7-2.39,1.94-2.56l0.54-0.08 C44.19,104.32,44.18,103.16,44.13,102.06L44.13,102.06z M2.18,58.86C1.01,58.89,0.04,57.98,0,56.81c-0.04-1.17,0.88-2.14,2.05-2.18 l8.7-0.3c1.17-0.04,2.14,0.88,2.18,2.05c0.04,1.17-0.88,2.14-2.05,2.18L2.18,58.86L2.18,58.86z M110.68,50.25 c1.16-0.12,2.2,0.73,2.32,1.89c0.12,1.16-0.73,2.2-1.89,2.32l-8.66,0.91c-1.16,0.12-2.2-0.73-2.32-1.89 c-0.12-1.16,0.73-2.2,1.89-2.32L110.68,50.25L110.68,50.25z M94.91,14.78c0.65-0.97,1.96-1.23,2.93-0.58 c0.97,0.65,1.23,1.96,0.58,2.93l-4.84,7.24c-0.65,0.97-1.96,1.23-2.93,0.58c-0.97-0.65-1.23-1.96-0.58-2.93L94.91,14.78 L94.91,14.78z M57.63,2.06c0.03-1.17,1-2.09,2.16-2.06c1.17,0.03,2.09,1,2.06,2.16l-0.22,8.7c-0.03,1.17-1,2.09-2.16,2.06 c-1.17-0.03-2.09-1-2.06-2.16L57.63,2.06L57.63,2.06z M13.88,15.53c-0.86-0.8-0.9-2.14-0.11-2.99c0.8-0.86,2.14-0.9,2.99-0.11 l6.37,5.94c0.86,0.8,0.9,2.14,0.11,2.99c-0.8,0.86-2.14,0.9-2.99,0.11L13.88,15.53L13.88,15.53z M47.88,96.95l18.49-2.63 c1.59-6.7,5.05-10.73,8.8-15.08c3.08-3.58,6.36-7.4,8.76-13.34c1.76-4.35,2.41-8.43,2.31-12.19c-0.1-3.75-0.96-7.21-2.24-10.34 c-2.3-5.63-6.51-10.11-11.65-13.15c-4.11-2.43-8.8-3.94-13.59-4.37c-4.77-0.44-9.64,0.19-14.13,2.02 c-5.26,2.15-9.99,5.97-13.39,11.72c-2.64,5.12-3.86,10.02-3.9,14.73c-0.04,4.74,1.11,9.33,3.2,13.8c2.13,4.56,4.97,7.8,7.69,10.92 C42.47,83.9,46.48,88.49,47.88,96.95L47.88,96.95z M65.62,99.02l-17.27,2.45c0.05,1.1,0.07,2.25,0.05,3.47l17.05-2.42 C65.47,101.29,65.52,100.12,65.62,99.02L65.62,99.02z M48.49,109.52c0.12,0.92,0.3,1.76,0.53,2.54l16.55-2.04 c0.11-0.86,0.13-1.77,0.05-2.74l0,0l0-0.02l-0.01-0.17L48.49,109.52L48.49,109.52z M51.37,116.36c0.64,0.67,1.35,1.19,2.1,1.55 c1.15,0.56,2.42,0.79,3.67,0.72c1.29-0.08,2.57-0.47,3.74-1.15c1.1-0.64,2.09-1.53,2.88-2.65L51.37,116.36L51.37,116.36z"/></g></svg>');
-    background-size: contain;
-    background-repeat: no-repeat;
-    vertical-align: middle;
-    margin-inline-start: 0.5ex;
-    margin-inline-end: 0.5ex;
-    margin-top: -0.2em;
-}
-
-.warning-icon {
-    display: inline-block;
-    width: 13px;
-    height: 13px;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M270.2 160h35.5c3.4 0 6.1 2.8 6 6.2l-7.5 196c-.1 3.2-2.8 5.8-6 5.8h-20.5c-3.2 0-5.9-2.5-6-5.8l-7.5-196c-.1-3.4 2.6-6.2 6-6.2zM288 388c-15.5 0-28 12.5-28 28s12.5 28 28 28 28-12.5 28-28-12.5-28-28-28zm281.5 52L329.6 24c-18.4-32-64.7-32-83.2 0L6.5 440c-18.4 31.9 4.6 72 41.6 72H528c36.8 0 60-40 41.5-72zM528 480H48c-12.3 0-20-13.3-13.9-24l240-416c6.1-10.6 21.6-10.7 27.7 0l240 416c6.2 10.6-1.5 24-13.8 24z" fill="%23DEAD22" stroke="%23DEAD22"/></svg>');
-    background-size: contain;
-    background-repeat: no-repeat;
-    vertical-align: middle;
-    margin-inline-start: 0.3ex;
-    margin-inline-end: 1.1ex;
-    margin-top: -0.1em;
-}
-
-.documentation-button {
-    cursor: pointer;
-    display: inline-block;
-    width: 13px;
-    height: 13px;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256 340c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm7.67-24h-16c-6.627 0-12-5.373-12-12v-.381c0-70.343 77.44-63.619 77.44-107.408 0-20.016-17.761-40.211-57.44-40.211-29.144 0-44.265 9.649-59.211 28.692-3.908 4.98-11.054 5.995-16.248 2.376l-13.134-9.15c-5.625-3.919-6.86-11.771-2.645-17.177C185.658 133.514 210.842 116 255.67 116c52.32 0 97.44 29.751 97.44 80.211 0 67.414-77.44 63.849-77.44 107.408V304c0 6.627-5.373 12-12 12zM256 40c118.621 0 216 96.075 216 216 0 119.291-96.61 216-216 216-119.244 0-216-96.562-216-216 0-119.203 96.602-216 216-216m0-32C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8z" fill="%23999999" stroke="%23999999"/></svg>');
-    background-size: contain;
-    background-repeat: no-repeat;
-    vertical-align: middle;
-    margin-inline-start: 0.5ex;
-    margin-inline-end: 0.5ex;
-    margin-top: -0.2em;
-}
-
-.documentation-button::selection {
-    color: transparent;
-}
-
-.documentation-button:hover {
-    color: transparent;
-}
-
-.copy-button {
-    cursor: pointer;
-    display: inline-block;
-    width: 12px;
-    height: 12px;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M433.941 193.941l-51.882-51.882A48 48 0 0 0 348.118 128H320V80c0-26.51-21.49-48-48-48h-66.752C198.643 13.377 180.858 0 160 0s-38.643 13.377-45.248 32H48C21.49 32 0 53.49 0 80v288c0 26.51 21.49 48 48 48h80v48c0 26.51 21.49 48 48 48h224c26.51 0 48-21.49 48-48V227.882a48 48 0 0 0-14.059-33.941zm-22.627 22.627a15.888 15.888 0 0 1 4.195 7.432H352v-63.509a15.88 15.88 0 0 1 7.431 4.195l51.883 51.882zM160 30c9.941 0 18 8.059 18 18s-8.059 18-18 18-18-8.059-18-18 8.059-18 18-18zM48 384c-8.822 0-16-7.178-16-16V80c0-8.822 7.178-16 16-16h66.752c6.605 18.623 24.389 32 45.248 32s38.643-13.377 45.248-32H272c8.822 0 16 7.178 16 16v48H176c-26.51 0-48 21.49-48 48v208H48zm352 96H176c-8.822 0-16-7.178-16-16V176c0-8.822 7.178-16 16-16h144v72c0 13.2 10.8 24 24 24h72v208c0 8.822-7.178 16-16 16z" fill="%23999999" stroke="%23999999"/></svg>');
-    background-size: contain;
-    background-repeat: no-repeat;
-    vertical-align: middle;
-    margin-inline-start: 0.5ex;
-    margin-top: -0.2em;
-}
-
-.groups{
-    display: flex;
-    border-bottom: 1px solid #EDEEEF;
-    flex: 1 0 100%;
-}
-
-.uncategorized {
-    display: flex;
-    border-top: 4px solid #EDEEEF;
-    flex: 1 0 100%;
-}
-
-.group-selector {
-    padding: 0 52px 24px 0;
-    font-size: 0.9rem;
-    font-weight: bold;
-    color: #999999;
-    cursor: pointer;
-}
-
-.group-selector__count {
-    margin: 0 8px;
-    border-radius: 8px;
-    background-color: #999;
-    color: #fff;
-    padding: 1px 8px 2px;
-    font-size: 0.75rem;
-}
-
-.group-selector--active {
-    color: #02303A;
-    cursor: auto;
-}
-
-.group-selector--active .group-selector__count {
-    background-color: #686868;
-}
-
-.group-selector--disabled {
-    cursor: not-allowed;
-}
-
-.accordion-header {
-    cursor: pointer;
-}
-
-.container {
-    padding-left: 0.5em;
-    padding-right: 0.5em;
-}
-
-.stacktrace {
-    border-radius: 4px;
-    overflow-x: auto;
-    padding: 0.5rem;
-    margin-bottom: 0;
-    min-width: 1000px;
-}
-
-/* Lato (bold, regular) */
-@font-face {
-    font-display: swap;
-    font-family: Lato;
-    font-weight: 500;
-    font-style: normal;
-    src: url("https://assets.gradle.com/lato/fonts/lato-semibold/lato-semibold.woff2") format("woff2"),
-    url("https://assets.gradle.com/lato/fonts/lato-semibold/lato-semibold.woff") format("woff");
-}
-
-@font-face {
-    font-display: swap;
-    font-family: Lato;
-    font-weight: bold;
-    font-style: normal;
-    src: url("https://assets.gradle.com/lato/fonts/lato-bold/lato-bold.woff2") format("woff2"),
-    url("https://assets.gradle.com/lato/fonts/lato-bold/lato-bold.woff") format("woff");
-}
-
-* {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-}
-
-html,
-body {
-    margin: 0;
-    padding: 0;
-}
-
-html {
-    font-family: "Lato", "Helvetica Neue", Arial, sans-serif;
-    font-size: 16px;
-    font-weight: 400;
-    line-height: 1.5;
-}
-
-body {
-    color: #02303A;
-    background-color: #ffffff;
-    -webkit-text-size-adjust: 100%;
-    -ms-text-size-adjust: 100%;
-    -webkit-font-smoothing: antialiased;
-}
-
-
-/* typography */
-h1, h2, h3, h4, h5, h6 {
-    color: #02303A;
-    text-rendering: optimizeLegibility;
-    margin: 0;
-}
-
-h1 {
-    font-size: 1rem;
-}
-
-h2 {
-    font-size: 0.9rem;
-}
-
-h3 {
-    font-size: 1.125rem;
-}
-
-h4, h5, h6 {
-    font-size: 0.875rem;
-}
-
-h1 code {
-    font-weight: bold;
-}
-
-ul, ol, dl {
-    list-style-position: outside;
-    line-height: 1.6;
-    padding: 0;
-    margin: 0 0 0 20px;
-    list-style-type: none;
-}
-
-li {
-    line-height: 2;
-}
-
-a {
-    color: #1DA2BD;
-    text-decoration: none;
-    transition: all 0.3s ease, visibility 0s;
-}
-
-a:hover {
-    color: #35c1e4;
-}
-
-/* code */
-code, pre {
-    font-family: Inconsolata, Monaco, "Courier New", monospace;
-    font-style: normal;
-    font-variant-ligatures: normal;
-    font-variant-caps: normal;
-    font-variant-numeric: normal;
-    font-variant-east-asian: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    color: #686868;
-}
-
-*:not(pre) > code {
-    letter-spacing: 0;
-    padding: 0.1em 0.5ex;
-    text-rendering: optimizeSpeed;
-    word-spacing: -0.15em;
-    word-wrap: break-word;
-}
-
-pre {
-    font-size: 0.75rem;
-    line-height: 1.8;
-    margin-top: 0;
-    margin-bottom: 1.5em;
-    padding: 1rem;
-}
-
-pre code {
-    background-color: transparent;
-    color: inherit;
-    line-height: 1.8;
-    font-size: 100%;
-    padding: 0;
-}
-
-a code {
-    color: #1BA8CB;
-}
-
-pre.code, pre.programlisting, pre.screen, pre.tt {
-    background-color: #f7f7f8;
-    border-radius: 4px;
-    font-size: 1em;
-    line-height: 1.45;
-    margin-bottom: 1.25em;
-    overflow-x: auto;
-    padding: 1rem;
-}
-
-li em, p em {
-    padding: 0 1px;
-}
-
-code em, tt em {
-    text-decoration: none;
-}
-
-code + .copy-button {
-    margin-inline-start: 0.2ex;
-}
-
-.java-exception {
-    font-size: 0.75rem;
-    padding-left: 24px;
-}
-
-.java-exception ul {
-    margin: 0;
-    line-height: inherit;
-}
-
-.java-exception code {
-    white-space: pre;
-}
-
-.java-exception-part-toggle {
-    user-select: none;
-    cursor: pointer;
-    border-radius: 2px;
-    padding: 0.1em 0.2em;
-    background: azure;
-    color: #686868;
-}
-
-                </style>
-    <!-- Inconsolata is used as a default monospace font in the report. -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Inconsolata:400,700" />
-
-    <title>Gradle Configuration Cache</title>
-</head>
-<body>
-
-<div id="playground"></div>
-
-<div class="report" id="report">
-    Loading...
-</div>
-
-<script type="text/javascript">
-function configurationCacheProblems() { return (
-// begin-report-data
-{"diagnostics":[{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]}],"problemsReport":{"totalProblemCount":1,"buildName":"reservation-service","requestedTasks":"","documentationLink":"https://docs.gradle.org/9.0.0/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
-// end-report-data
-);}
-</script>
-                <script type="text/javascript">
-                !function(n,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["configuration-cache-report"]=t():n["configuration-cache-report"]=t()}(this,(()=>(({70:function(){void 0===ArrayBuffer.isView&&(ArrayBuffer.isView=function(n){return null!=n&&null!=n.__proto__&&n.__proto__.__proto__===Int8Array.prototype.__proto__}),void 0===Math.imul&&(Math.imul=function(n,t){return(4294901760&n)*(65535&t)+(65535&n)*(0|t)|0}),this["configuration-cache-report"]=function(n){"use strict";var t,r,i,e,u,o,f,s,c,a,h,l,_,v,d,g,w,b,p,m,k,q,y,B,C,x,j,P,I,S,z,T,E,L,N,A,M,F,D,O,R,H,$,G,U,V,Q,Z,Y,W,K,X,J,nn,tn,rn,en,un,on,fn,sn,cn,an,hn,ln,_n,vn,dn,gn,wn,bn,pn,mn,kn,qn,yn,Bn,Cn,xn,jn,Pn,In,Sn,zn,Tn,En,Ln,Nn,An,Mn=Math.imul,Fn=ArrayBuffer.isView;function Dn(n,t){if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));if(0===t)return Ct();if(t>=n.length)return function(n){switch(n.length){case 0:return Ct();case 1:return qr(n[0]);default:return function(n){return Hr(function(n){return new It(n,!1)}(n))}(n)}}(n);if(1===t)return qr(n[0]);var r=0,i=Rr(),e=0,u=n.length;n:for(;e<u;){var o=n[e];if(e=e+1|0,i.d(o),(r=r+1|0)===t)break n}return i}(n,rt(n.length-t|0,0))}function On(n,t,r,i,e,u,o){return t=t===A?", ":t,r=r===A?"":r,i=i===A?"":i,e=e===A?-1:e,u=u===A?"...":u,o=o===A?null:o,function(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=0,a=n.length;n:for(;c<a;){var h=n[c];if(c=c+1|0,(s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Jt(t,h,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}(n,Bi(),t,r,i,e,u,o).toString()}function Rn(n){return n.length-1|0}function Hn(n,t){if(null==t){var r=0,i=n.length-1|0;if(r<=i)do{var e=r;if(r=r+1|0,null==n[e])return e}while(r<=i)}else{var u=0,o=n.length-1|0;if(u<=o)do{var f=u;if(u=u+1|0,le(t,n[f]))return f}while(u<=o)}return-1}function $n(n,t,r,i,e,u,o){return t=t===A?", ":t,r=r===A?"":r,i=i===A?"":i,e=e===A?-1:e,u=u===A?"...":u,o=o===A?null:o,Gn(n,Bi(),t,r,i,e,u,o).toString()}function Gn(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=n.f();n:for(;c.g();){var a=c.h();if((s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Jt(t,a,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}function Un(n){if(n.i())throw xu("List is empty.");return n.j(0)}function Vn(n){return new tt(n)}function Qn(n){if(Ke(n,Di)){var t;switch(n.k()){case 0:t=Ct();break;case 1:t=qr(Ke(n,Fi)?n.j(0):n.f().h());break;default:t=Zn(n)}return t}return xt(Xn(n))}function Zn(n){return Hr(n)}function Yn(n){if(Ke(n,Di)&&n.k()<=1)return Qn(n);var t=Xn(n);return function(n){var t=(n.k()/2|0)-1|0;if(t<0)return br();var r=jt(n),i=0;if(i<=t)do{var e=i;i=i+1|0;var u=n.j(e);n.f4(e,n.j(r)),n.f4(r,u),r=r-1|0}while(e!==t)}(t),t}function Wn(n,t){if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));if(0===t)return Ct();if(Ke(n,Di)){if(t>=n.k())return Qn(n);if(1===t)return qr(function(n){if(Ke(n,Fi))return Un(n);var t=n.f();if(!t.g())throw xu("Collection is empty.");return t.h()}(n))}var r=0,i=Rr(),e=n.f();n:for(;e.g();){var u=e.h();if(i.d(u),(r=r+1|0)===t)break n}return xt(i)}(n,rt(n.k()-t|0,0))}function Kn(n,t){if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));if(0===t)return Ct();var r=n.k();if(t>=r)return Qn(n);if(1===t)return qr(Jn(n));var i=Rr();if(Ke(n,bi)){var e=r-t|0;if(e<r)do{var u=e;e=e+1|0,i.d(n.j(u))}while(e<r)}else for(var o=n.l(r-t|0);o.g();){var f=o.h();i.d(f)}return i}function Xn(n){return Ke(n,Di)?Zn(n):nt(n,Or())}function Jn(n){if(n.i())throw xu("List is empty.");return n.j(jt(n))}function nt(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}function tt(n){this.n_1=n}function rt(n,t){return n<t?t:n}function it(n,t){return n>t?t:n}function et(n,t){return Kt().q(n,t,-1)}function ut(n,t){return new Ft(n,t)}function ot(n){var t=n.f();if(!t.g())return Ct();var r=t.h();if(!t.g())return qr(r);var i=Or();for(i.d(r);t.g();)i.d(t.h());return i}function ft(n){this.r_1=n}function st(n,t){this.s_1=n,this.t_1=t}function ct(){}function at(n){this.x_1=n,this.w_1=0}function ht(n,t){this.a1_1=n,at.call(this,n),_t().b1(t,this.a1_1.k()),this.w_1=t}function lt(){t=this}function _t(){return null==t&&new lt,t}function vt(){_t(),ct.call(this)}function dt(n){this.h1_1=n}function gt(n,t){return t===n?"(this Map)":Vi(t)}function wt(n,t){var r;n:{for(var i=n.o().f();i.g();){var e=i.h();if(le(e.j1(),t)){r=e;break n}}r=null}return r}function bt(){r=this}function pt(){return null==r&&new bt,r}function mt(n){this.q1_1=n,ct.call(this)}function kt(){pt(),this.n1_1=null,this.o1_1=null}function qt(){i=this}function yt(){return null==i&&new qt,i}function Bt(n){return n.length>0?ou(n):Ct()}function Ct(){return null==e&&new Pt,e}function xt(n){switch(n.k()){case 0:return Ct();case 1:return qr(n.j(0));default:return n}}function jt(n){return n.k()-1|0}function Pt(){e=this,this.z1_1=new ke(-1478467534,-1720727600)}function It(n,t){this.b2_1=n,this.c2_1=t}function St(){u=this}function zt(){return null==u&&new St,u}function Tt(n,t){return Ke(n,Di)?n.k():t}function Et(n,t){if(Ke(t,Di))return n.m(t);for(var r=!1,i=t.f();i.g();){var e=i.h();n.d(e)&&(r=!0)}return r}function Lt(){}function Nt(n,t){this.h2_1=n,this.g2_1=n.i2_1.l(function(n,t){if(!(0<=t&&t<=n.k()))throw du("Position index "+t+" must be in range ["+Ve(0,n.k())+"].");return n.k()-t|0}(n,t))}function At(n){vt.call(this),this.i2_1=n}function Mt(n){this.k2_1=n,this.j2_1=n.l2_1.f()}function Ft(n,t){this.l2_1=n,this.m2_1=t}function Dt(n){for(;n.n2_1.g();){var t=n.n2_1.h();if(n.q2_1.t2_1(t)===n.q2_1.s2_1)return n.p2_1=t,n.o2_1=1,br()}n.o2_1=0}function Ot(n){this.q2_1=n,this.n2_1=n.r2_1.f(),this.o2_1=-1,this.p2_1=null}function Rt(n,t,r){t=t===A||t,this.r2_1=n,this.s2_1=t,this.t2_1=r}function Ht(){return null==o&&new $t,o}function $t(){o=this,this.u2_1=new ke(1993859828,793161749)}function Gt(n,t,r){return Ut(Ut(n,r)-Ut(t,r)|0,r)}function Ut(n,t){var r=n%t|0;return r>=0?r:r+t|0}function Vt(){f=this,this.p_1=new Zt(1,0)}function Qt(){return null==f&&new Vt,f}function Zt(n,t){Qt(),Xt.call(this,n,t,1)}function Yt(n,t,r){Lt.call(this),this.d3_1=r,this.e3_1=t,this.f3_1=this.d3_1>0?n<=t:n>=t,this.g3_1=this.f3_1?n:this.e3_1}function Wt(){s=this}function Kt(){return null==s&&new Wt,s}function Xt(n,t,r){if(Kt(),0===r)throw _u("Step must be non-zero.");if(r===mr().MIN_VALUE)throw _u("Step must be greater than Int.MIN_VALUE to avoid overflow on negation.");this.z2_1=n,this.a3_1=function(n,t,r){var i;if(r>0)i=n>=t?t:t-Gt(t,n,r)|0;else{if(!(r<0))throw _u("Step is zero.");i=n<=t?t:t+Gt(n,t,0|-r)|0}return i}(n,t,r),this.b3_1=r}function Jt(n,t,r){null!=r?n.e(r(t)):null==t||nu(t)?n.e(t):t instanceof Mi?n.i3(t.h3_1):n.e(Vi(t))}function nr(n,t,r){if(n===t)return!0;if(!(r=r!==A&&r))return!1;var i=xi(n),e=xi(t);return i===e||le(new Mi(ne(Li(i).toLowerCase(),0)),new Mi(ne(Li(e).toLowerCase(),0)))}function tr(n){return re(n)-1|0}function rr(n,t,r,i){return r=r===A?0:r,(i=i!==A&&i)||"string"!=typeof n?ir(n,t,r,re(n),i):n.indexOf(t,r)}function ir(n,t,r,i,e,u){var o=(u=u!==A&&u)?et(it(r,tr(n)),rt(i,0)):Ve(rt(r,0),it(i,re(n)));if("string"==typeof n&&"string"==typeof t){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a=f;if(f=f+c|0,Ti(t,0,n,a,re(t),e))return a}while(a!==s)}else{var h=o.z2_1,l=o.a3_1,_=o.b3_1;if(_>0&&h<=l||_<0&&l<=h)do{var v=h;if(h=h+_|0,fr(t,0,n,v,re(t),e))return v}while(v!==l)}return-1}function er(n){var t=0,r=re(n)-1|0,i=!1;n:for(;t<=r;){var e=ji(ne(n,i?r:t));if(i){if(!e)break n;r=r-1|0}else e?t=t+1|0:i=!0}return ie(n,t,r+1|0)}function ur(n,t){return ce(ie(n,t.y2(),t.c3()+1|0))}function or(n,t,r,i,e){r=r===A?0:r,i=i!==A&&i,sr(e=e===A?0:e);var u,o,f=ou(t);return new hr(n,r,e,(u=f,o=i,function(n,t){var r=function(n,t,r,i){if(!i&&1===t.k()){var e=function(n){if(Ke(n,Fi))return function(n){var t;switch(n.k()){case 0:throw xu("List is empty.");case 1:t=n.j(0);break;default:throw _u("List has more than one element.")}return t}(n);var t=n.f();if(!t.g())throw xu("Collection is empty.");var r=t.h();if(t.g())throw _u("Collection has more than one element.");return r}(t),u=rr(n,e,r);return u<0?null:_r(u,e)}var o=Ve(rt(r,0),re(n));if("string"==typeof n){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a,h=f;f=f+c|0;n:{for(var l=t.f();l.g();){var _=l.h();if(Ti(_,0,n,h,_.length,i)){a=_;break n}}a=null}if(null!=a)return _r(h,a)}while(h!==s)}else{var v=o.z2_1,d=o.a3_1,g=o.b3_1;if(g>0&&v<=d||g<0&&d<=v)do{var w,b=v;v=v+g|0;n:{for(var p=t.f();p.g();){var m=p.h();if(fr(m,0,n,b,m.length,i)){w=m;break n}}w=null}if(null!=w)return _r(b,w)}while(b!==d)}return null}(n,u,t,o);return null==r?null:_r(r.t3_1,r.u3_1.length)}))}function fr(n,t,r,i,e,u){if(i<0||t<0||t>(re(n)-e|0)||i>(re(r)-e|0))return!1;var o=0;if(o<e)do{var f=o;if(o=o+1|0,!nr(ne(n,t+f|0),ne(r,i+f|0),u))return!1}while(o<e);return!0}function sr(n){if(!(n>=0))throw _u(ce("Limit must be non-negative, but was "+n))}function cr(n){if(n.l3_1<0)n.j3_1=0,n.m3_1=null;else{var t;if(n.o3_1.r3_1>0?(n.n3_1=n.n3_1+1|0,t=n.n3_1>=n.o3_1.r3_1):t=!1,t||n.l3_1>re(n.o3_1.p3_1))n.m3_1=Ve(n.k3_1,tr(n.o3_1.p3_1)),n.l3_1=-1;else{var r=n.o3_1.s3_1(n.o3_1.p3_1,n.l3_1);if(null==r)n.m3_1=Ve(n.k3_1,tr(n.o3_1.p3_1)),n.l3_1=-1;else{var i=r.v3(),e=r.w3();n.m3_1=function(n,t){return t<=mr().MIN_VALUE?Qt().p_1:Ve(n,t-1|0)}(n.k3_1,i),n.k3_1=i+e|0,n.l3_1=n.k3_1+(0===e?1:0)|0}}n.j3_1=1}}function ar(n){this.o3_1=n,this.j3_1=-1,this.k3_1=function(n,t,r){if(0>r)throw _u("Cannot coerce value to an empty range: maximum "+r+" is less than minimum 0.");return n<0?0:n>r?r:n}(n.q3_1,0,re(n.p3_1)),this.l3_1=this.k3_1,this.m3_1=null,this.n3_1=0}function hr(n,t,r,i){this.p3_1=n,this.q3_1=t,this.r3_1=r,this.s3_1=i}function lr(n,t){this.t3_1=n,this.u3_1=t}function _r(n,t){return new lr(n,t)}function vr(){}function dr(){}function gr(){}function wr(){c=this}function br(){return null==c&&new wr,c}function pr(){a=this,this.MIN_VALUE=-2147483648,this.MAX_VALUE=2147483647,this.SIZE_BYTES=4,this.SIZE_BITS=32}function mr(){return null==a&&new pr,a}function kr(n){for(var t=[],r=n.f();r.g();)t.push(r.h());return t}function qr(n){return 0===(t=[n]).length?Or():Hr(new It(t,!0));var t}function yr(n){return n<0&&function(){throw Pu("Index overflow has happened.")}(),n}function Br(n){return void 0!==n.toArray?n.toArray():kr(n)}function Cr(n){return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,t.d(e)}return t}(t=[n],(r=t.length,i=de(ve(ni)),function(n,t,r){Mr.call(r),ni.call(r),r.y5_1=function(n){return Kr(n,0,de(ve(Xr)))}(n)}(r,0,i),i));var t,r,i}function xr(){ct.call(this)}function jr(n){this.j4_1=n,this.h4_1=0,this.i4_1=-1}function Pr(n,t){this.n4_1=n,jr.call(this,n),_t().b1(t,this.n4_1.k()),this.h4_1=t}function Ir(){xr.call(this),this.o4_1=0}function Sr(n){this.r4_1=n}function zr(n){this.s4_1=n}function Tr(n,t){this.t4_1=n,this.u4_1=t}function Er(){Mr.call(this)}function Lr(n){this.x4_1=n,Mr.call(this)}function Nr(n){this.e5_1=n,xr.call(this)}function Ar(){kt.call(this),this.c5_1=null,this.d5_1=null}function Mr(){xr.call(this)}function Fr(){h=this;var n=Rr();n.c_1=!0,this.i5_1=n}function Dr(){return null==h&&new Fr,h}function Or(){return n=de(ve(Gr)),t=[],Gr.call(n,t),n;var n,t}function Rr(n){return t=de(ve(Gr)),r=[],Gr.call(t,r),t;var t,r}function Hr(n){return function(n,t){var r;return r=Br(n),Gr.call(t,r),t}(n,de(ve(Gr)))}function $r(n,t){return _t().e1(t,n.k()),t}function Gr(n){Dr(),Ir.call(this),this.b_1=n,this.c_1=!1}function Ur(n,t,r,i,e){if(r===i)return n;var u=(r+i|0)/2|0,o=Ur(n,t,r,u,e),f=Ur(n,t,u+1|0,i,e),s=o===t?n:t,c=r,a=u+1|0,h=r;if(h<=i)do{var l=h;if(h=h+1|0,c<=u&&a<=i){var _=o[c],v=f[a];e.compare(_,v)<=0?(s[l]=_,c=c+1|0):(s[l]=v,a=a+1|0)}else c<=u?(s[l]=o[c],c=c+1|0):(s[l]=f[a],a=a+1|0)}while(l!==i);return s}function Vr(n,t){return(3&n)-(3&t)|0}function Qr(){_=this}function Zr(n){this.n5_1=n,Er.call(this)}function Yr(n){return function(n,t){Ar.call(t),Xr.call(t),t.t5_1=n,t.u5_1=n.w5()}(new ui((null==_&&new Qr,_)),n),n}function Wr(){return Yr(de(ve(Xr)))}function Kr(n,t,r){if(Yr(r),!(n>=0))throw _u(ce("Negative initial capacity: "+n));if(!(t>=0))throw _u(ce("Non-positive load factor: "+t));return r}function Xr(){this.v5_1=null}function Jr(n,t){return Mr.call(t),ni.call(t),t.y5_1=n,t}function ni(){}function ti(n,t){var r=ii(n,n.h6_1.m5(t));if(null==r)return null;var i=r;if(null!=i&&Xe(i))return ri(i,n,t);var e=i;return n.h6_1.l5(e.j1(),t)?e:null}function ri(n,t,r){var i;n:{for(var e=0,u=n.length;e<u;){var o=n[e];if(e=e+1|0,t.h6_1.l5(o.j1(),r)){i=o;break n}}i=null}return i}function ii(n,t){var r=n.i6_1[t];return void 0===r?null:r}function ei(n){this.g6_1=n,this.z5_1=-1,this.a6_1=Object.keys(n.i6_1),this.b6_1=-1,this.c6_1=null,this.d6_1=!1,this.e6_1=-1,this.f6_1=null}function ui(n){this.h6_1=n,this.i6_1=this.k6(),this.j6_1=0}function oi(){}function fi(n){this.n6_1=n,this.l6_1=null,this.m6_1=null,this.m6_1=this.n6_1.y6_1.v6_1}function si(){v=this;var n,t=(_i(0,0,n=de(ve(vi))),n);t.x6_1=!0,this.e7_1=t}function ci(){return null==v&&new si,v}function ai(n,t,r){this.d7_1=n,Tr.call(this,t,r),this.b7_1=null,this.c7_1=null}function hi(n){this.y6_1=n,Er.call(this)}function li(){return Yr(n=de(ve(vi))),vi.call(n),n.w6_1=Wr(),n;var n}function _i(n,t,r){return Kr(n,t,r),vi.call(r),r.w6_1=Wr(),r}function vi(){ci(),this.v6_1=null,this.x6_1=!1}function di(){d=this;var n=gi(0),t=n.y5_1;(t instanceof vi?t:pe()).j5(),this.f7_1=n}function gi(n){return function(n,t){return function(n,t,r){Jr(function(n,t){return _i(n,t,de(ve(vi)))}(n,t),r),wi.call(r)}(n,0,t),t}(n,de(ve(wi)))}function wi(){null==d&&new di}function bi(){}function pi(){}function mi(n){pi.call(this),this.k7_1=n}function ki(){qi.call(this)}function qi(){pi.call(this),this.m7_1=""}function yi(){if(!w){w=!0;var n="undefined"!=typeof process&&process.versions&&!!process.versions.node;g=n?new mi(process.stdout):new ki}}function Bi(){return n=de(ve(Ci)),Ci.call(n,""),n;var n}function Ci(n){this.o7_1=void 0!==n?n:""}function xi(n){var t=Li(n).toUpperCase();return t.length>1?n:ne(t,0)}function ji(n){return function(n){return 9<=n&&n<=13||28<=n&&n<=32||160===n||n>4096&&(5760===n||8192<=n&&n<=8202||8232===n||8233===n||8239===n||8287===n||12288===n)}(n)}function Pi(){b=this,this.q7_1=new RegExp("[\\\\^$*+?.()|[\\]{}]","g"),this.r7_1=new RegExp("[\\\\$]","g"),this.s7_1=new RegExp("\\$","g")}function Ii(){return null==b&&new Pi,b}function Si(n,t){Ii(),this.v7_1=n,this.w7_1=function(n){if(Ke(n,Di)){var t;switch(n.k()){case 0:t=Ht();break;case 1:t=Cr(Ke(n,Fi)?n.j(0):n.f().h());break;default:t=nt(n,gi(n.k()))}return t}return function(n){switch(n.k()){case 0:return Ht();case 1:return Cr(n.f().h());default:return n}}(nt(n,(r=de(ve(wi)),Jr(li(),r),wi.call(r),r)));var r}(t),this.x7_1=new RegExp(n,$n(t,"","gu",A,A,A,zi)),this.y7_1=null,this.z7_1=null}function zi(n){return n.d8_1}function Ti(n,t,r,i,e,u){return fr(n,t,r,i,e,u=u!==A&&u)}function Ei(n,t){return n-t|0}function Li(n){return String.fromCharCode(n)}function Ni(){p=this,this.e8_1=0,this.f8_1=65535,this.g8_1=55296,this.h8_1=56319,this.i8_1=56320,this.j8_1=57343,this.k8_1=55296,this.l8_1=57343,this.m8_1=2,this.n8_1=16}function Ai(){return null==p&&new Ni,p}function Mi(n){Ai(),this.h3_1=n}function Fi(){}function Di(){}function Oi(){}function Ri(){}function Hi(){}function $i(){}function Gi(){m=this}function Ui(n,t){null==m&&new Gi,this.p8_1=n,this.q8_1=t}function Vi(n){var t=null==n?null:ce(n);return null==t?"null":t}function Qi(n){return new Zi(n)}function Zi(n){this.t8_1=n,this.s8_1=0}function Yi(){return Ji(),k}function Wi(){return Ji(),q}function Ki(){return Ji(),y}function Xi(){return Ji(),B}function Ji(){x||(x=!0,k=new ArrayBuffer(8),q=new Float64Array(Yi()),new Float32Array(Yi()),y=new Int32Array(Yi()),Wi()[0]=-1,B=0!==Ki()[0]?1:0,C=1-Xi()|0)}function ne(n,t){var r;if(te(n)){var i,e=n.charCodeAt(t);if(Ai(),e<0?i=!0:(Ai(),i=e>65535),i)throw _u("Invalid Char code: "+e);r=Ue(e)}else r=n.y3(t);return r}function te(n){return"string"==typeof n}function re(n){return te(n)?n.length:n.x3()}function ie(n,t,r){return te(n)?n.substring(t,r):n.z3(t,r)}function ee(n){return ce(n)}function ue(n,t){var r;switch(typeof n){case"number":r="number"==typeof t?oe(n,t):t instanceof ke?oe(n,t.w8()):fe(n,t);break;case"string":case"boolean":r=fe(n,t);break;default:r=function(n,t){return n.a4(t)}(n,t)}return r}function oe(n,t){var r;if(n<t)r=-1;else if(n>t)r=1;else if(n===t){var i;if(0!==n)i=0;else{var e=1/n;i=e===1/t?0:e<0?-1:1}r=i}else r=n!=n?t!=t?0:1:-1;return r}function fe(n,t){return n<t?-1:n>t?1:0}function se(n){if(!("kotlinHashCodeValue$"in n)){var t=4294967296*Math.random()|0,r=new Object;r.value=t,r.enumerable=!1,Object.defineProperty(n,"kotlinHashCodeValue$",r)}return n.kotlinHashCodeValue$}function ce(n){return null==n?"null":function(n){return!!Ye(n)||Fn(n)}(n)?"[...]":n.toString()}function ae(n){if(null==n)return 0;var t;switch(typeof n){case"object":t="function"==typeof n.hashCode?n.hashCode():se(n);break;case"function":t=se(n);break;case"number":t=function(n){return Ji(),(0|n)===n?Ge(n):(Wi()[0]=n,Mn(Ki()[(Ji(),C)],31)+Ki()[Xi()]|0)}(n);break;case"boolean":t=n?1:0;break;default:t=he(String(n))}return t}function he(n){var t=0,r=0,i=n.length-1|0;if(r<=i)do{var e=r;r=r+1|0;var u=n.charCodeAt(e);t=Mn(t,31)+u|0}while(e!==i);return t}function le(n,t){return null==n?null==t:null!=t&&("object"==typeof n&&"function"==typeof n.equals?n.equals(t):n!=n?t!=t:"number"==typeof n&&"number"==typeof t?n===t&&(0!==n||1/n==1/t):n===t)}function _e(n,t){null!=Error.captureStackTrace?Error.captureStackTrace(n,t):n.stack=(new Error).stack}function ve(n){return n.prototype}function de(n){return Object.create(n)}function ge(n,t,r){Error.call(n),function(n,t,r){var i=eu(Object.getPrototypeOf(n));if(!(1&i)){var e;if(null==t){var u;if(null!==t){var o=null==r?null:r.toString();u=null==o?A:o}else u=A;e=u}else e=t;n.message=e}2&i||(n.cause=r),n.name=Object.getPrototypeOf(n).constructor.name}(n,t,r)}function we(n){var t;return null==n?function(){throw Eu()}():t=n,t}function be(){throw Nu()}function pe(){throw Mu()}function me(){j=this,this.x8_1=new ke(0,-2147483648),this.y8_1=new ke(-1,2147483647),this.z8_1=8,this.a9_1=64}function ke(n,t){null==j&&new me,gr.call(this),this.u8_1=n,this.v8_1=t}function qe(){return $e(),P}function ye(){return $e(),I}function Be(){return $e(),S}function Ce(){return $e(),T}function xe(){return $e(),E}function je(n,t){if($e(),Te(n,t))return 0;var r=Ne(n),i=Ne(t);return r&&!i?-1:!r&&i?1:Ne(Ie(n,t))?-1:1}function Pe(n,t){$e();var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=0,a=0,h=0,l=0;return c=(c=c+((a=(a=a+((h=(h=h+((l=l+(u+(65535&t.u8_1)|0)|0)>>>16|0)|0)+(e+s|0)|0)>>>16|0)|0)+(i+f|0)|0)>>>16|0)|0)+(r+o|0)|0,new ke((h&=65535)<<16|(l&=65535),(c&=65535)<<16|(a&=65535))}function Ie(n,t){return $e(),Pe(n,t.e9())}function Se(n,t){if($e(),Ae(n))return qe();if(Ae(t))return qe();if(Te(n,Ce()))return Me(t)?Ce():qe();if(Te(t,Ce()))return Me(n)?Ce():qe();if(Ne(n))return Ne(t)?Se(Fe(n),Fe(t)):Fe(Se(Fe(n),t));if(Ne(t))return Fe(Se(n,Fe(t)));if(De(n,xe())&&De(t,xe()))return Oe(ze(n)*ze(t));var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=65535&t.u8_1,a=0,h=0,l=0,_=0;return l=l+((_=_+Mn(u,c)|0)>>>16|0)|0,_&=65535,h=(h=h+((l=l+Mn(e,c)|0)>>>16|0)|0)+((l=(l&=65535)+Mn(u,s)|0)>>>16|0)|0,l&=65535,a=(a=(a=a+((h=h+Mn(i,c)|0)>>>16|0)|0)+((h=(h&=65535)+Mn(e,s)|0)>>>16|0)|0)+((h=(h&=65535)+Mn(u,f)|0)>>>16|0)|0,h&=65535,a=a+(((Mn(r,c)+Mn(i,s)|0)+Mn(e,f)|0)+Mn(u,o)|0)|0,new ke(l<<16|_,(a&=65535)<<16|h)}function ze(n){return $e(),4294967296*n.v8_1+function(n){return $e(),n.u8_1>=0?n.u8_1:4294967296+n.u8_1}(n)}function Te(n,t){return $e(),n.v8_1===t.v8_1&&n.u8_1===t.u8_1}function Ee(n,t){if($e(),t<2||36<t)throw mu("radix out of range: "+t);if(Ae(n))return"0";if(Ne(n)){if(Te(n,Ce())){var r=Le(t),i=n.d9(r),e=Ie(Se(i,r),n).g9();return Ee(i,t)+e.toString(t)}return"-"+Ee(Fe(n),t)}for(var u=2===t?31:t<=10?9:t<=21?7:t<=35?6:5,o=Oe(Math.pow(t,u)),f=n,s="";;){var c=f.d9(o),a=Ie(f,Se(c,o)).g9().toString(t);if(Ae(f=c))return a+s;for(;a.length<u;)a="0"+a;s=a+s}}function Le(n){return $e(),new ke(n,n<0?-1:0)}function Ne(n){return $e(),n.v8_1<0}function Ae(n){return $e(),0===n.v8_1&&0===n.u8_1}function Me(n){return $e(),!(1&~n.u8_1)}function Fe(n){return $e(),n.e9()}function De(n,t){return $e(),je(n,t)<0}function Oe(n){if($e(),(t=n)!=t)return qe();if(n<=-0x8000000000000000)return Ce();if(n+1>=0x8000000000000000)return $e(),z;if(n<0)return Fe(Oe(-n));var t,r=4294967296;return new ke(n%r|0,n/r|0)}function Re(n,t){return $e(),je(n,t)>0}function He(n,t){return $e(),je(n,t)>=0}function $e(){L||(L=!0,P=Le(0),I=Le(1),S=Le(-1),z=new ke(-1,2147483647),T=new ke(0,-2147483648),E=Le(16777216))}function Ge(n){return n instanceof ke?n.g9():function(n){return n>2147483647?2147483647:n<-2147483648?-2147483648:0|n}(n)}function Ue(n){var t;return t=function(n){return n<<16>>16}(Ge(n)),function(n){return 65535&n}(t)}function Ve(n,t){return new Zt(n,t)}function Qe(n,t,r,i){return Ze("class",n,t,r,i,null)}function Ze(n,t,r,i,e,u){return{kind:n,simpleName:t,associatedObjectKey:r,associatedObjects:i,suspendArity:e,$kClass$:A,iid:u}}function Ye(n){return Array.isArray(n)}function We(n,t,r,i,e,u,o,f){null!=i&&(n.prototype=Object.create(i.prototype),n.prototype.constructor=n);var s=r(t,u,o,null==f?[]:f);n.$metadata$=s,null!=e&&((null!=s.iid?n:n.prototype).$imask$=function(n){for(var t=1,r=[],i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o=t,f=u.prototype.$imask$,s=null==f?u.$imask$:f;null!=s&&(r.push(s),o=s.length);var c=u.$metadata$.iid,a=null==c?null:(l=void 0,v=1<<(31&(h=c)),(l=new Int32Array(1+(h>>5)|0))[_=h>>5]=l[_]|v,l);null!=a&&(r.push(a),o=Math.max(o,a.length)),o>t&&(t=o)}var h,l,_,v;return function(n,t){for(var r=0,i=new Int32Array(n);r<n;){for(var e=r,u=0,o=0,f=t.length;o<f;){var s=t[o];o=o+1|0,e<s.length&&(u|=s[e])}i[e]=u,r=r+1|0}return i}(t,r)}(e))}function Ke(n,t){return function(n,t){var r=n.$imask$;return null!=r&&function(n,t){var r=t>>5;if(r>n.length)return!1;var i=1<<(31&t);return!(0===(n[r]&i))}(r,t)}(n,t.$metadata$.iid)}function Xe(n){return!!Ye(n)&&!n.$type$}function Je(n){var t;switch(typeof n){case"string":case"number":case"boolean":case"function":t=!0;break;default:t=n instanceof Object}return t}function nu(n){return"string"==typeof n||Ke(n,vr)}function tu(n,t,r,i){return Ze("interface",n,t,r,i,(null==N&&(N=0),N=ru()+1|0,ru()))}function ru(){if(null!=N)return N;!function(){throw Du("lateinit property iid has not been initialized")}()}function iu(n,t,r,i){return Ze("object",n,t,r,i,null)}function eu(n){var t=n.constructor,r=null==t?null:t.$metadata$,i=null==r?null:r.errorInfo;if(null!=i)return i;var e,u=0;if(uu(n,"message")&&(u|=1),uu(n,"cause")&&(u|=2),3!==u){var o=(e=n,Object.getPrototypeOf(e));o!=Error.prototype&&(u|=eu(o))}return null!=r&&(r.errorInfo=u),u}function uu(n,t){return n.hasOwnProperty(t)}function ou(n){return new Gr(n)}function fu(n,t,r){for(var i=new Int32Array(r),e=0,u=0,o=0,f=0,s=n.length;f<s;){var c=ne(n,f);f=f+1|0;var a=t[c];if(u|=(31&a)<<o,a<32){var h=e;e=h+1|0,i[h]=u,u=0,o=0}else o=o+5|0}return i}function su(n,t){for(var r=0,i=n.length-1|0,e=-1,u=0;r<=i;)if(t>(u=n[e=(r+i|0)/2|0]))r=e+1|0;else{if(t===u)return e;i=e-1|0}return e-(t<u?1:0)|0}function cu(){M=this;var n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",t=new Int32Array(128),r=0,i=re(n)-1|0;if(r<=i)do{var e=r;r=r+1|0,t[ne(n,e)]=e}while(r<=i);var u=fu("hCgBpCQGYHZH5BRpBPPPPPPRMP5BPPlCPP6BkEPPPPcPXPzBvBrB3BOiDoBHwD+E3DauCnFmBmB2D6E1BlBTiBmBlBP5BhBiBrBvBjBqBnBPRtBiCmCtBlB0BmB5BiB7BmBgEmChBZgCoEoGVpBSfRhBPqKQ2BwBYoFgB4CJuTiEvBuCuDrF5DgEgFlJ1DgFmBQtBsBRGsB+BPiBlD1EIjDPRPPPQPPPPPGQSQS/DxENVNU+B9zCwBwBPPCkDPNnBPqDYY1R8B7FkFgTgwGgwUwmBgKwBuBScmEP/BPPPPPPrBP8B7F1B/ErBqC6B7BiBmBfQsBUwCw/KwqIwLwETPcPjQgJxFgBlBsD",t,222),o=new Int32Array(u.length),f=0,s=u.length-1|0;if(f<=s)do{var c=f;f=f+1|0,o[c]=0===c?u[c]:o[c-1|0]+u[c]|0}while(f<=s);this.h9_1=o,this.i9_1=fu("aaMBXHYH5BRpBPPPPPPRMP5BPPlCPPzBDOOPPcPXPzBvBjB3BOhDmBBpB7DoDYxB+EiBP1DoExBkBQhBekBPmBgBhBctBiBMWOOXhCsBpBkBUV3Ba4BkB0DlCgBXgBtD4FSdBfPhBPpKP0BvBXjEQ2CGsT8DhBtCqDpFvD1D3E0IrD2EkBJrBDOBsB+BPiBlB1EIjDPPPPPPPPPPPGPPMNLsBNPNPKCvBvBPPCkDPBmBPhDXXgD4B6FzEgDguG9vUtkB9JcuBSckEP/BPPPPPPBPf4FrBjEhBpC3B5BKaWPrBOwCk/KsCuLqDHPbPxPsFtEaaqDL",t,222),this.j9_1=fu("GFjgggUHGGFFZZZmzpz5qB6s6020B60ptltB6smt2sB60mz22B1+vv+8BZZ5s2850BW5q1ymtB506smzBF3q1q1qB1q1q1+Bgii4wDTm74g3KiggxqM60q1q1Bq1o1q1BF1qlrqrBZ2q5wprBGFZWWZGHFsjiooLowgmOowjkwCkgoiIk7ligGogiioBkwkiYkzj2oNoi+sbkwj04DghhkQ8wgiYkgoioDsgnkwC4gikQ//v+85BkwvoIsgoyI4yguI0whiwEowri4CoghsJowgqYowgm4DkwgsY/nwnzPowhmYkg6wI8yggZswikwHgxgmIoxgqYkwgk4DkxgmIkgoioBsgssoBgzgyI8g9gL8g9kI0wgwJoxgkoC0wgioFkw/wI0w53iF4gioYowjmgBHGq1qkgwBF1q1q8qBHwghuIwghyKk0goQkwgoQk3goQHGFHkyg0pBgxj6IoinkxDswno7Ikwhz9Bo0gioB8z48Rwli0xN0mpjoX8w78pDwltoqKHFGGwwgsIHFH3q1q16BFHWFZ1q10q1B2qlwq1B1q10q1B2q1yq1B6q1gq1Biq1qhxBir1qp1Bqt1q1qB1g1q1+B//3q16B///q1qBH/qlqq9Bholqq9B1i00a1q10qD1op1HkwmigEigiy6Cptogq1Bixo1kDq7/j00B2qgoBWGFm1lz50B6s5q1+BGWhggzhwBFFhgk4//Bo2jigE8wguI8wguI8wgugUog1qoB4qjmIwwi2KgkYHHH4lBgiFWkgIWoghssMmz5smrBZ3q1y50B5sm7gzBtz1smzB5smz50BqzqtmzB5sgzqzBF2/9//5BowgoIwmnkzPkwgk4C8ys65BkgoqI0wgy6FghquZo2giY0ghiIsgh24B4ghsQ8QF/v1q1OFs0O8iCHHF1qggz/B8wg6Iznv+//B08QgohsjK0QGFk7hsQ4gB",t,222)}function au(){return null==M&&new cu,M}function hu(){F=this,this.k9_1=new Int32Array([170,186,688,704,736,837,890,7468,7544,7579,8305,8319,8336,8560,9424,11388,42652,42864,43e3,43868]),this.l9_1=new Int32Array([1,1,9,2,5,1,1,63,1,37,1,1,13,16,26,2,2,1,2,4])}function lu(){return null==F&&new hu,F}function _u(n){var t=function(n,t){return yu(n,t),vu.call(t),t}(n,de(ve(vu)));return _e(t,_u),t}function vu(){_e(this,vu)}function du(n){var t=function(n,t){return yu(n,t),gu.call(t),t}(n,de(ve(gu)));return _e(t,du),t}function gu(){_e(this,gu)}function wu(n){var t=function(n,t){return yu(n,t),bu.call(t),t}(n,de(ve(bu)));return _e(t,wu),t}function bu(){_e(this,bu)}function pu(n,t){return ge(t,n),ku.call(t),t}function mu(n){var t=pu(n,de(ve(ku)));return _e(t,mu),t}function ku(){_e(this,ku)}function qu(n){return function(n){ge(n),ku.call(n)}(n),Bu.call(n),n}function yu(n,t){return pu(n,t),Bu.call(t),t}function Bu(){_e(this,Bu)}function Cu(){var n,t=(qu(n=de(ve(ju))),ju.call(n),n);return _e(t,Cu),t}function xu(n){var t=function(n,t){return yu(n,t),ju.call(t),t}(n,de(ve(ju)));return _e(t,xu),t}function ju(){_e(this,ju)}function Pu(n){var t=function(n,t){return yu(n,t),Iu.call(t),t}(n,de(ve(Iu)));return _e(t,Pu),t}function Iu(){_e(this,Iu)}function Su(){var n,t=(qu(n=de(ve(Tu))),Tu.call(n),n);return _e(t,Su),t}function zu(n){var t=function(n,t){return yu(n,t),Tu.call(t),t}(n,de(ve(Tu)));return _e(t,zu),t}function Tu(){_e(this,Tu)}function Eu(){var n,t=(qu(n=de(ve(Lu))),Lu.call(n),n);return _e(t,Eu),t}function Lu(){_e(this,Lu)}function Nu(){var n,t=(qu(n=de(ve(Au))),Au.call(n),n);return _e(t,Nu),t}function Au(){_e(this,Au)}function Mu(){var n,t=(qu(n=de(ve(Fu))),Fu.call(n),n);return _e(t,Mu),t}function Fu(){_e(this,Fu)}function Du(n){var t=function(n,t){return yu(n,t),Ou.call(t),t}(n,de(ve(Ou)));return _e(t,Du),t}function Ou(){_e(this,Ou)}function Ru(n,t){var r,i=n.className;return(r="(^|.*\\s+)"+t+"($|\\s+.*)",function(n,t){return Si.call(t,n,Ht()),t}(r,de(ve(Si)))).a8(i)}function Hu(n,t){this.o9_1=n,this.p9_1=t}function $u(n){this.q9_1=n}function Gu(n,t,r){var i,e=Gf(),u=ro(),o=$f().ga(t),f=ro();if(0===re(r))i=Of();else{var s=n.ia_1,c=null==s?null:new $u(s).v9(r,"Copy reference to the clipboard");i=null==c?Of():c}return e.ja([u,o,f,i])}function Uu(n){n=n===A?null:n,this.ia_1=n}function Vu(n,t,r){to.call(this),this.ma_1=n,this.na_1=t,this.oa_1=r}function Qu(n,t){this.ra_1=n,this.sa_1=t}function Zu(n,t){to.call(this),this.va_1=n,this.wa_1=t}function Yu(n,t){to.call(this),this.xa_1=n,this.ya_1=t}function Wu(n){to.call(this),this.za_1=n}function Ku(n){to.call(this),this.ab_1=n}function Xu(n){to.call(this),this.bb_1=n}function Ju(n,t){to.call(this),this.cb_1=n,this.db_1=t}function no(n){to.call(this),this.eb_1=n}function to(){}function ro(){return so(),D}function io(){return so(),O}function eo(){return so(),R}function uo(){return so(),H}function oo(n){return so(),Gf().fb(us(fo),n)}function fo(n){return so(),n.gb(["invisible-text","text-for-copy"]),br()}function so(){$||($=!0,D=oo("`"),O=oo(" "),R=oo("("),H=oo(")"))}function co(n,t){to.call(this),this.hb_1=n,this.ib_1=t}function ao(n){to.call(this),this.jb_1=n}function ho(n,t){to.call(this),this.kb_1=n,this.lb_1=t}function lo(n){to.call(this),this.mb_1=n}function _o(n){to.call(this),this.nb_1=n}function vo(n){to.call(this),this.ob_1=n}function go(n,t,r){to.call(this),this.pb_1=n,this.qb_1=t,this.rb_1=r}function wo(n){to.call(this),this.sb_1=n}function bo(n){to.call(this),this.tb_1=n}function po(n){return n.xb_1.vb_1.k()}function mo(){if(Z)return br();Z=!0,G=new jo("Inputs",0,"Build configuration inputs"),U=new jo("ByMessage",1,"Problems grouped by message"),V=new jo("ByLocation",2,"Problems grouped by location"),Q=new jo("IncompatibleTasks",3,"Incompatible tasks")}function ko(n){Fc.call(this),this.yb_1=n}function qo(n){Fc.call(this),this.ac_1=n}function yo(n){Fc.call(this),this.bc_1=n}function Bo(n){Fc.call(this),this.cc_1=n}function Co(n){Po.call(this),this.dc_1=n}function xo(n,t,r,i,e,u,o,f){this.ec_1=n,this.fc_1=t,this.gc_1=r,this.hc_1=i,this.ic_1=e,this.jc_1=u,this.kc_1=o,this.lc_1=f}function jo(n,t,r){Ui.call(this,n,t),this.qc_1=r}function Po(){Oc.call(this)}function Io(n,t){var r=Hf(),i=us(Oo),e=Hf().y9(us(Ro),[]),u=function(n,t){var r,i=Hf(),e=us(Vo),u=Gf().ga("Learn more about the "),o=Yf();return i.y9(e,[u,o.fb(us((r=t,function(n){return n.bd(r.tc_1),br()})),t.sc_1),Gf().ga(".")])}(0,t.gc_1),o=Hf().y9(us(Ho),[zo(0,t)]),f=Hf();return r.y9(i,[e,u,o,f.y9(us($o),[No(0,Qo(),t.lc_1,po(t.jc_1)),No(0,Zo(),t.lc_1,po(t.hc_1)),No(0,Yo(),t.lc_1,po(t.ic_1)),No(0,Wo(),t.lc_1,po(t.kc_1))])])}function So(n,t){var r,i,e=Hf(),u=us(Go);switch(t.lc_1.q8_1){case 0:r=Mo(0,t.jc_1,((i=function(n){return new yo(n)}).callableName="<init>",i));break;case 3:r=Mo(0,t.kc_1,function(){var n=function(n){return new Bo(n)};return n.callableName="<init>",n}());break;case 1:r=Mo(0,t.hc_1,function(){var n=function(n){return new qo(n)};return n.callableName="<init>",n}());break;case 2:r=Mo(0,t.ic_1,function(){var n=function(n){return new ko(n)};return n.callableName="<init>",n}());break;default:be()}return e.y9(u,[r])}function zo(n,t){return Hf().ja([Lo(0,t),To(0,t)])}function To(n,t){for(var r=Hf(),i=t.fc_1,e=Or(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,Et(e,0===yr(s)?qr(Eo(Xo(),f)):Bt([Wf().ja([]),Eo(Xo(),f)]))}return r.ha(e)}function Eo(n,t){return Uf().ja([Uc(t)])}function Lo(n,t){return Rf().ja([$c().ka(t.ec_1)])}function No(n,t,r,i){var e,u,o;return Hf().y9(us((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),br()):u.equals(o)?(n.t9("group-selector--active"),br()):(n.u9(function(n){return function(t){return new Co(n)}}(u)),br()),br()})),[Gf().rc(t.qc_1,[Ao(0,i)])])}function Ao(n,t){return Gf().y9(us(Uo),[io(),eo(),Gf().ga(""+t),uo()])}function Mo(n,t,r){return function(n,t,r){var i,e=Hf(),u=Vf();return e.ja([u.ha(Ps(t,(i=r,function(n){var t,r=n.cd().ub_1;return r instanceof Zu?Kc(i,(Xo(),(t=function(n){return Fo(0,n)}).callableName="viewNode",t),n,r.va_1,r.wa_1,Rc()):r instanceof Yu?Kc(i,function(){var n=function(n){return Fo(0,n)};return n.callableName="viewNode",n}(Xo()),n,r.xa_1,r.ya_1,Hc()):r instanceof co?Kc(i,function(){var n=function(n){return Fo(0,n)};return n.callableName="viewNode",n}(Xo()),n,r.hb_1,r.ib_1,A,Ao(Xo(),n.cd().vb_1.k())):r instanceof Vu?Wc(i,n,r):Kc(i,function(){var n=function(n){return Fo(0,n)};return n.callableName="viewNode",n}(Xo()),n,r)})))])}(0,t.xb_1.uc().vc(),r)}function Fo(n,t){var r;return t instanceof ao?Vc((r=t,function(n){return n.ed("project "),n.fd(r.jb_1),br()})):t instanceof go?Vc(function(n){return function(t){return t.ed(n.pb_1+" "),t.fd(n.qb_1),t.ed(" of "),t.fd(n.rb_1),br()}}(t)):t instanceof vo?Vc(function(n){return function(t){return t.ed("system property "),t.fd(n.ob_1),br()}}(t)):t instanceof ho?Vc(function(n){return function(t){return t.ed("task "),t.fd(n.kb_1),t.ed(" of type "),t.fd(n.lb_1),br()}}(t)):t instanceof _o?Vc(function(n){return function(t){return t.ed("bean of type "),t.fd(n.nb_1),br()}}(t)):t instanceof wo?Vc(function(n){return function(t){return t.ed(n.sb_1),br()}}(t)):t instanceof bo?Vc(function(n){return function(t){return t.ed("class "),t.fd(n.tb_1),br()}}(t)):t instanceof no?Vc(function(n){return function(t){return t.ed(n.eb_1),br()}}(t)):t instanceof Wu?Uc(t.za_1):t instanceof Ju?Jo(t):Gf().ga(ce(t))}function Do(n){return n.t9("report-wrapper"),br()}function Oo(n){return n.t9("header"),br()}function Ro(n){return n.t9("gradle-logo"),br()}function Ho(n){return n.t9("title"),br()}function $o(n){return n.t9("groups"),br()}function Go(n){return n.t9("content"),br()}function Uo(n){return n.t9("group-selector__count"),br()}function Vo(n){return n.t9("learn-more"),br()}function Qo(){return mo(),G}function Zo(){return mo(),U}function Yo(){return mo(),V}function Wo(){return mo(),Q}function Ko(){Y=this}function Xo(){return null==Y&&new Ko,Y}function Jo(n){var t;return Yf().fb(us((t=n,function(n){return n.t9("documentation-button"),n.bd(t.cb_1),br()})),n.db_1)}function nf(n,t,r){this.kd_1=n,this.ld_1=t,this.md_1=r}function tf(n,t,r){this.nd_1=n,this.od_1=t,this.pd_1=r}function rf(n,t){for(var r=mf(n),i=t.trace,e=Rr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=of(s),e.d(f)}return new nf(t,r,e)}function ef(n,t){var r,i=null==(r=t.kd_1.error)?null:ff(r);null==i||n.d(i)}function uf(n){return function(n,t,r){var i=null==n.error?null:new Zu(t,r);return null==i?new Yu(t,r):i}(n.kd_1,new Wu(n.ld_1),af(n.kd_1))}function of(n){var t;switch(n.kind){case"Project":t=new ao(n.path);break;case"Task":t=new ho(n.path,n.type);break;case"TaskPath":t=new lo(n.path);break;case"Bean":t=new _o(n.type);break;case"Field":t=new go("field",n.name,n.declaringType);break;case"InputProperty":t=new go("input property",n.name,n.task);break;case"OutputProperty":t=new go("output property",n.name,n.task);break;case"SystemProperty":t=new vo(n.name);break;case"PropertyUsage":t=new go("property",n.name,n.from);break;case"BuildLogic":t=new wo(n.location);break;case"BuildLogicClass":t=new bo(n.type);break;default:t=new no("Gradle runtime")}return t}function ff(n){var t=n.parts;if(null==t){var r=n.summary;return null==r?null:new Wu(mf(r))}for(var i=n.summary,e=null==i?null:mf(i),u=Or(),o=Qi(t);o.g();){var f=cf(o.h());null==f||u.d(f)}for(var s=$n(u,"\n"),c=Or(),a=Qi(t);a.g();){var h=sf(a.h());null==h||c.d(h)}return new Vu(e,s,c)}function sf(n){var t=cf(n);if(null==t)return null;var r,i,e=ot(new Rt(function(n,t,r,i){var e;return ut(or(n,["\r\n","\n","\r"],A,r=r!==A&&r,i=i===A?0:i),(e=n,function(n){return ur(e,n)}))}(t),!0,bf));return new Qu(e,(r=!(null==n.internalText),i=e.k(),r&&i>1?Cs():null))}function cf(n){var t=n.text;return null==t?n.internalText:t}function af(n){var t=n.documentationLink;return null==t?null:new Ju(t,"")}function hf(n,t){return new ds(lf(n,Ef().sd(t),Cs()))}function lf(n,t,r){return new js(n,function(n,t){var r,i=ut(Vn(n.o()),Nf);return ot(ut(new st(i,new _f(pf)),(r=t,function(n){return lf(n.v3(),n.w3().wd_1,r)})))}(t,1===Lf(t)?xs():Cs()),0===Lf(t)?Cs():r)}function _f(n){this.td_1=n}function vf(n){var t=Or(),r=n.ld_1,i=Un(r.ca_1).fa_1,e=ce(er(nu(i)?i:pe())),u=r.vd(function(n,t){var r;if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));if(0===t)return Qn(n);if(Ke(n,Di)){var i=n.k()-t|0;if(i<=0)return Ct();if(1===i)return qr(function(n){if(Ke(n,Fi))return Jn(n);var t=n.f();if(!t.g())throw xu("Collection is empty.");for(var r=t.h();t.g();)r=t.h();return r}(n));if(r=Rr(),Ke(n,Fi)){if(Ke(n,bi)){var e=t,u=n.k();if(e<u)do{var o=e;e=e+1|0,r.d(n.j(o))}while(e<u)}else for(var f=n.l(t);f.g();){var s=f.h();r.d(s)}return r}}else r=Or();for(var c=0,a=n.f();a.g();){var h=a.h();c>=t?r.d(h):c=c+1|0}return xt(r)}(r.ca_1,1));return t.d(new co(new no(e),af(n.kd_1))),t.d(new Wu(u)),t.m(n.md_1),t.j5()}function df(n){var t=Or(),r=n.ld_1,i=r.vd(r.ca_1);return t.d(new Yu(new Wu(i),af(n.kd_1))),t.j5()}function gf(n){var t=Or();return t.d(uf(n)),t.m(n.md_1),ef(t,n),t.j5()}function wf(n){var t=Or();return t.m(new At(n.md_1)),t.d(uf(n)),ef(t,n),t.j5()}function bf(n){return re(n)>0}function pf(n,t){return function(n,t){return n===t?0:null==n?-1:null==t?1:ue(null!=n&&("string"==(i=typeof(r=n))||"boolean"===i||function(n){return"number"==typeof n||n instanceof ke}(r)||Ke(r,dr))?n:pe(),t);var r,i}(Vi(n.v3()),Vi(t.v3()))}function mf(n){var t;return Sf().qd((t=n,function(n){for(var r=t,i=0,e=r.length;i<e;){var u=r[i];i=i+1|0;var o=u.text;null==o||n.ed(o);var f=u.name;null==f||(n.fd(f),br())}return br()}))}function kf(n,t){return(0!==(r=n)?r.toString():"No")+" "+qf(t,n)+" "+yf(n)+" found";var r}function qf(n,t){return t<2?n:n+"s"}function yf(n){return n<=1?"was":"were"}function Bf(n,t){this.sc_1=n,this.tc_1=t}function Cf(n){jf.call(this),this.fa_1=n}function xf(n,t){jf.call(this),this.da_1=n,this.ea_1=t}function jf(){}function Pf(){this.dd_1=Or()}function If(){W=this}function Sf(){return null==W&&new If,W}function zf(n){Sf(),this.ca_1=n}function Tf(){K=this}function Ef(){return null==K&&new Tf,K}function Lf(n){return n.k()}function Nf(n){var t=n.j1(),r=n.i1();return _r(t,new Af(Ke(r,Ri)?r:pe()))}function Af(n){Ef(),this.wd_1=n}function Mf(n,t,r){var i;Df(t,n,r),i="Component mounted at #"+n.id+".",yi(),(yi(),g).j7(i)}function Ff(n){var t=document.getElementById(n);if(null==t)throw wu("'"+n+"' element missing");return t}function Df(n,t,r){var i,e,u;i=n.z9(r),e=t,u=function(n,t,r){return function(i){return Df(n,r,n.ba(i,t)),br()}}(n,r,t),_s(),e.innerHTML="",hs(e,i,u)}function Of(){return _s(),X}function Rf(){return _s(),J}function Hf(){return _s(),nn}function $f(){return _s(),tn}function Gf(){return _s(),rn}function Uf(){return _s(),en}function Vf(){return _s(),un}function Qf(){return _s(),on}function Zf(){return _s(),fn}function Yf(){return _s(),sn}function Wf(){return _s(),cn}function Kf(n){this.x9_1=n}function Xf(){an=this}function Jf(){return null==an&&new Xf,an}function ns(){hn=this,es.call(this)}function ts(){return null==hn&&new ns,hn}function rs(n,t,r,i){t=t===A?Ct():t,r=r===A?null:r,i=i===A?Ct():i,es.call(this),this.be_1=n,this.ce_1=t,this.de_1=r,this.ee_1=i}function is(){}function es(){Jf()}function us(n){_s();var t,r=Or();return n(new os((t=r,function(n){return t.d(n),br()}))),r}function os(n){this.r9_1=n}function fs(n,t){as.call(this),this.fe_1=n,this.ge_1=t}function ss(n){as.call(this),this.he_1=n}function cs(n,t){as.call(this),this.ie_1=n,this.je_1=t}function as(){}function hs(n,t,r){if(_s(),t instanceof rs)!function(n,t,r){var i=function(n,t,r){var i=n.createElement(t);return r(i),i}(we(n.ownerDocument),t,r);n.appendChild(i)}(n,t.be_1,(e=t,u=r,function(n){for(var t=e.ce_1.f();t.g();)ls(n,t.h(),u);var r=e.de_1;null==r||function(n,t){n.appendChild(we(n.ownerDocument).createTextNode(t))}(n,r);for(var i=e.ee_1.f();i.g();)hs(n,i.h(),u);return br()}));else if(t instanceof is){var i=t instanceof is?t:pe();hs(n,i.ke_1,function(n,t){return function(r){return n(t.le_1(r)),br()}}(r,i))}else if(le(t,ts()))return br();var e,u}function ls(n,t,r){var i,e;_s(),t instanceof cs?n.setAttribute(t.ie_1,t.je_1):t instanceof ss?function(n,t){for(var r=Or(),i=0,e=t.length;i<e;){var u=t[i];i=i+1|0,Ru(n,u)||r.d(u)}var o=r;if(!o.i()){var f=n.className,s=ce(er(nu(f)?f:pe())),c=Bi();c.p7(s),0!==re(s)&&c.p7(" "),Gn(o,c," "),n.className=c.toString()}}(n,[t.he_1]):t instanceof fs&&n.addEventListener(t.fe_1,(i=r,e=t,function(n){return n.stopPropagation(),i(e.ge_1(n)),br()}))}function _s(){ln||(ln=!0,X=ts(),new Kf("hr"),J=new Kf("h1"),new Kf("h2"),nn=new Kf("div"),new Kf("pre"),tn=new Kf("code"),rn=new Kf("span"),en=new Kf("small"),un=new Kf("ol"),on=new Kf("ul"),fn=new Kf("li"),sn=new Kf("a"),cn=new Kf("br"),new Kf("p"))}function vs(n){gs.call(this),this.ne_1=n}function ds(n){this.xb_1=n}function gs(){}function ws(n){return n.me(A,A,n.wb_1.ad())}function bs(){_n=this}function ps(){return null==_n&&new bs,_n}function ms(){if(gn)return br();gn=!0,vn=new ys("Collapsed",0),dn=new ys("Expanded",1)}function ks(n){Bs.call(this),this.ve_1=n}function qs(n,t,r){Bs.call(this),this.se_1=n,this.te_1=t,this.ue_1=r}function ys(n,t){Ui.call(this,n,t)}function Bs(){}function Cs(){return ms(),vn}function xs(){return ms(),dn}function js(n,t,r){t=t===A?Ct():t,r=r===A?Cs():r,this.ub_1=n,this.vb_1=t,this.wb_1=r}function Ps(n,t){return ot(ut(n,(r=t,function(n){return function(n,t){var r,i=n.cd(),e=Zf(),u=t(n),o=i.vb_1;r=null==(i.wb_1.equals(xs())&&!o.i()?o:null)?null:function(n,t){return Qf().ha(function(n,t){return Ps(n.vc(),t)}(n,t))}(n,t);var f=r;return e.ja([u,null==f?Of():f])}(n,r)})));var r}function Is(){if(xn)return br();xn=!0,kn=new Ss("ByMessage",0,"Messages"),qn=new Ss("ByGroup",1,"Group"),yn=new Ss("ByFileLocation",2,"File Locations"),Bn=new Ss("ByPluginLocation",3,"Plugin Locations"),Cn=new Ss("ByTaskLocation",4,"Task Locations")}function Ss(n,t,r){Ui.call(this,n,t),this.cf_1=r}function zs(n,t){this.df_1=n,this.ef_1=t}function Ts(n,t){this.ff_1=n,this.gf_1=t}function Es(n,t,r){ec();for(var i=Or(),e=li(),u=0,o=n.length;u<o;){var f=n[u];u=u+1|0;var s=f.locations;null==s||0===s.length?i.d(Os(f)):r(f,e)||i.d(Os(f))}var c=function(n,t,r){ec();for(var i=n.w1(),e=Rr(Tt(i,10)),u=i.f();u.g();){var o;o=u.h().t3_1,e.d(o)}var f=Zn(e);return t.i()||f.d(new js(new oc(Sf().rd("no location"),!0),t)),r>0&&f.d(Ns(r)),f}(e,i,t);return new ds(new js(new uc("text"),c))}function Ls(n){return ec(),t=n,function(n,r){var i,e=n.locations;if(null==e)i=null;else{for(var u=Or(),o=Qi(e);o.g();){var f=o.h();null!=t(f)&&u.d(f)}i=u}var s,c=i;if(null==c||c.i())s=!1;else{for(var a=c.f();a.g();){var h=a.h();As(r,we(t(h)),n,h)}s=!0}return s};var t}function Ns(n){return ec(),new js(new Wu(Sf().rd(n+" more problem"+(n>1?"s have":" has")+" been skipped")))}function As(n,t,r,i){ec();var e,u,o=n.v1(t);if(null==o){var f=Or(),s=_r(new js(new oc(Sf().qd((u=t,function(n){return n.fd(u),br()}))),f,xs()),f);n.h5(t,s),e=s}else e=o;e.u3_1.d(Os(r,i))}function Ms(n,t,r,i){var e,u;if(t=t===A?Or():t,r=r===A?li():r,i===A){var o=(ec(),mn);u=o+1|0,ec(),mn=u,e=o}else e=i;i=e,this.hf_1=n,this.if_1=t,this.jf_1=r,this.kf_1=i}function Fs(n,t){if(ec(),t.i())return null;for(var r,i=n,e=null,u=t.f();u.g();){var o=u.h();r=e;var f,s=i,c=o.ef_1+" ("+o.df_1+")",a=s.v1(c);if(null==a){var h=Or(),l=new Ms(new js(new oc(Sf().qd(Ys(o))),h,xs()),h);s.h5(c,l),f=l}else f=a;e=f,null==r||we(r).if_1.u(we(e).hf_1)||we(r).if_1.d(we(e).hf_1),i=we(e).jf_1}return e}function Ds(n,t){if(ec(),n.k()===t.length){var r;n:{var i=function(n,t){var r=t.length,i=Tt(n,10),e=Rr(Math.min(i,r)),u=0,o=n.f();t:for(;o.g();){var f,s=o.h();if(u>=r)break t;var c=u;u=c+1|0,f=_r(s,t[c]),e.d(f)}return e}(n,t);if(Ke(i,Di)&&i.i())r=!0;else{for(var e=i.f();e.g();){var u=e.h();if(u.t3_1.df_1!==u.u3_1.name||u.t3_1.ef_1!==u.u3_1.displayName){r=!1;break n}}r=!0}}return r}return!1}function Os(n,t,r){t=t===A?null:t,r=r!==A&&r,ec();var i=function(n,t,r){t=t===A?null:t,r=r!==A&&r,ec();var i=$s(function(n,t){return ec(),n&&null!=t.contextualLabel?we(t.contextualLabel):Rs(t)}(r,n),t).j5();return Hs(n,new Wu(i))}(n,t,r),e=function(n,t,r){r=r!==A&&r,ec();var i,e=n.problemDetails;if(null==e)i=null;else{var u,o=e[0].text,f=null==o?null:function(n,t,r,i){if(r=r!==A&&r,i=i===A?0:i,1===t.length){var e=t[0];if(0!==re(e))return function(n,t,r,i){sr(i);var e=0,u=rr(n,t,e,r);if(-1===u||1===i)return qr(ce(n));var o,f=i>0,s=Rr(f&&it(i,10));n:do{var c;if(c=ce(ie(n,e,u)),s.d(c),e=u+t.length|0,f&&s.k()===(i-1|0))break n;u=rr(n,t,e,r)}while(-1!==u);return o=ce(ie(n,e,re(n))),s.d(o),s}(n,e,r,i)}for(var u=function(n){return new ft(n)}(or(n,t,A,r,i)),o=Rr(Tt(u,10)),f=u.f();f.g();){var s;s=ur(n,f.h()),o.d(s)}return o}(o,["\n"]);if(null==f)u=null;else{for(var s=Rr(Tt(f,10)),c=f.f();c.g();){var a,h=c.h();a=Us(n)?Sf().qd(Ks(h)):Sf().rd(h),s.d(a)}u=s}var l,_=u;if(null==_)l=null;else{for(var v=Rr(Tt(_,10)),d=_.f();d.g();){var g;g=new js(new Wu(d.h())),v.d(g)}l=v}var w=null==l?null:Zn(l);i=null==w?Or():w}var b=i,p=null==b?Or():b;r||null==n.contextualLabel||p.d(new js(new Wu(Sf().rd(we(n.contextualLabel)))));var m=function(n){ec();var t=n.solutions;if(null==t||0===t.length)return null;for(var r=new Xu(Sf().rd("Solutions")),i=we(n.solutions),e=Rr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=new js(new Ku(mf(s))),e.d(f)}return new js(r,e)}(n);null==m||p.d(m);var k,q=n.error,y=null==q?null:ff(q);if(null==y||p.d(new js(y)),t){var B=n.locations;k=!(null==B||0===B.length)}else k=!1;return k&&p.d(function(n){ec();var t,r=n.locations;if(null==r)t=null;else{for(var i=Rr(r.length),e=Qi(r);e.g();){var u,o=e.h();u=new js(new Wu(Sf().qd(Xs(o)))),i.d(u)}t=i}var f=t;return new js(new no("Locations"),null==f?Ct():f)}(n)),p}(n,null==t,r);return new js(i,e)}function Rs(n){return ec(),function(n){if(0===n.length)throw xu("Array is empty.");return n[Rn(n)]}(n.problemId).displayName}function Hs(n,t){var r;switch(ec(),n.severity){case"WARNING":var i=n.documentationLink;r=new Yu(t,null==i?null:new Ju(i,""));break;case"ERROR":var e=n.documentationLink;r=new Zu(t,null==e?null:new Ju(e,""));break;case"ADVICE":var u=n.documentationLink;r=new fc(t,null==u?null:new Ju(u,""));break;default:console.error("no severity "+n.severity),r=t}return r}function $s(n,t){t=t===A?null:t,ec();var r,i=new Pf;if(i.ed(n),null==t);else if(null!=t.line){var e=Gs(t);i.xd(e+(r=t,ec(),null==r.line||null==r.length?"":"-"+r.length),""+t.path+e),br()}else null!=t.taskPath?(i.fd(we(t.taskPath)),br()):null!=t.pluginId&&(i.fd(we(t.pluginId)),br());return i}function Gs(n){var t;if(ec(),null==n.line)t=null;else{var r,i=":"+n.line,e=n.column;t=i+(null==(r=null==e?null:":"+e)?"":r)}return null==t?"":t}function Us(n){var t;ec();var r,i=n.problemId;n:{for(var e=0,u=i.length;e<u;){var o=i[e];if(e=e+1|0,"compilation"===o.name){r=o;break n}}r=null}if(null!=r){var f,s=n.problemId;n:{for(var c=0,a=s.length;c<a;){var h=s[c];if(c=c+1|0,"java"===h.name){f=h;break n}}f=null}t=!(null==f)}else t=!1;return t}function Vs(n){return ec(),n.path}function Qs(n){return ec(),n.pluginId}function Zs(n){return ec(),n.taskPath}function Ys(n){return function(t){return t.ed(n.ef_1),t.fd(n.df_1),br()}}function Ws(n){return ec(),n.name}function Ks(n){return function(t){return t.xd(function(n,t,r,i){i=i!==A&&i;var e=new RegExp(Ii().t7(" "),i?"gui":"gu"),u=Ii().u7(" ");return n.replace(e,u)}(n),""),br()}}function Xs(n){return function(t){var r;return t.ed("- "),t.fd((r=n,ec(),null!=r.path?""+r.path+Gs(r):null!=r.taskPath?we(r.taskPath):null!=r.pluginId?we(r.pluginId):"<undefined>")),br()}}function Js(){return Is(),kn}function nc(){return Is(),qn}function tc(){return Is(),yn}function rc(){return Is(),Bn}function ic(){return Is(),Cn}function ec(){jn||(jn=!0,wn=Ls(Vs),bn=Ls(Qs),pn=Ls(Zs),mn=0)}function uc(n){sc.call(this),this.lf_1=n}function oc(n,t){t=t!==A&&t,sc.call(this),this.mf_1=n,this.nf_1=t}function fc(n,t){t=t===A?null:t,to.call(this),this.of_1=n,this.pf_1=t}function sc(){to.call(this)}function cc(n){Fc.call(this),this.qf_1=n}function ac(n){Fc.call(this),this.rf_1=n}function hc(n){Fc.call(this),this.sf_1=n}function lc(n){Fc.call(this),this.tf_1=n}function _c(n){Fc.call(this),this.uf_1=n}function vc(n){gc.call(this),this.vf_1=n}function dc(n,t,r,i,e,u,o,f,s,c){this.wf_1=n,this.xf_1=t,this.yf_1=r,this.zf_1=i,this.ag_1=e,this.bg_1=u,this.cg_1=o,this.dg_1=f,this.eg_1=s,this.fg_1=c}function gc(){Oc.call(this)}function wc(n,t){var r=Or();po(t.zf_1)>0&&r.d(yc(0,Js(),t.fg_1,t.eg_1)),po(t.ag_1)>0&&r.d(yc(0,nc(),t.fg_1,t.eg_1)),po(t.bg_1)>0&&r.d(yc(0,tc(),t.fg_1,t.eg_1)),po(t.cg_1)>0&&r.d(yc(0,rc(),t.fg_1,t.eg_1)),po(t.dg_1)>0&&r.d(yc(0,ic(),t.fg_1,t.eg_1));var i=Hf(),e=us(jc),u=Hf().y9(us(Pc),[]),o=function(n,t){var r,i=Hf(),e=us(Ec),u=Gf().ga("Learn more about "),o=Yf();return i.y9(e,[u,o.fb(us((r=t,function(n){return n.bd(r.tc_1),br()})),t.sc_1),Gf().ga(".")])}(0,t.yf_1),f=Hf().y9(us(Ic),[pc(0,t)]),s=Hf();return i.y9(e,[u,o,f,s.zd(us(Sc),r)])}function bc(n,t){var r,i,e=Hf(),u=us(zc);switch(t.fg_1.q8_1){case 0:r=Bc(0,t.zf_1,((i=function(n){return new cc(n)}).callableName="<init>",i));break;case 1:r=Bc(0,t.ag_1,function(){var n=function(n){return new ac(n)};return n.callableName="<init>",n}());break;case 2:r=Bc(0,t.bg_1,function(){var n=function(n){return new hc(n)};return n.callableName="<init>",n}());break;case 3:r=Bc(0,t.cg_1,function(){var n=function(n){return new lc(n)};return n.callableName="<init>",n}());break;case 4:r=Bc(0,t.dg_1,function(){var n=function(n){return new _c(n)};return n.callableName="<init>",n}());break;default:be()}return e.y9(u,[r])}function pc(n,t){return Hf().ja([qc(0,t),mc(0,t)])}function mc(n,t){for(var r=Hf(),i=t.xf_1,e=Or(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,Et(e,0===yr(s)?qr(kc(Nc(),f)):Bt([Wf().ja([]),kc(Nc(),f)]))}return r.ha(e)}function kc(n,t){return Uf().ja([Uc(t)])}function qc(n,t){return Rf().ja([$c().ka(t.wf_1)])}function yc(n,t,r,i){var e,u,o,f;return Hf().y9(us((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),br()):u.equals(o)?(n.t9("group-selector--active"),br()):(n.u9(function(n){return function(t){return new vc(n)}}(u)),br()),br()})),[Gf().rc(t.cf_1,[(f=i,Gf().y9(us(Tc),[io(),eo(),Gf().ga(""+f),uo()]))])])}function Bc(n,t,r){return function(n,t,r){var i,e=Hf(),u=Vf();return e.ja([u.ha(Ps(t,(i=r,function(n){return function(n,t,r,i){var e,u;return t instanceof uc?Uc(Sf().rd(t.lf_1)):t instanceof oc?Hf().y9(us((u=t,function(n){return u.nf_1&&(n.t9("uncategorized"),br()),br()})),[Hf().ja([Qc(r,i),Uc(t.mf_1)])]):t instanceof Vu?Wc(i,r,t):t instanceof Wu?Uc(t.za_1):t instanceof Ku?Hf().ja([(sa(),Tn),Uc(t.ab_1)]):t instanceof Xu?Hf().ja([Qc(r,i),Uc(t.bb_1)]):t instanceof Zu?Kc(i,((e=function(n){return Cc(0,n)}).callableName="viewIt",e),r,t.va_1,t.wa_1,Rc()):t instanceof fc?Kc(i,function(){var n=function(n){return Cc(0,n)};return n.callableName="viewIt",n}(),r,t.of_1,t.pf_1,(sa(),Sn)):t instanceof Yu?Kc(i,function(){var n=function(n){return Cc(0,n)};return n.callableName="viewIt",n}(),r,t.xa_1,t.ya_1,Hc()):t instanceof no?Hf().ja([Qc(r,i),Uc(Sf().rd(t.eb_1))]):Gf().ga("Unknown node type viewNode: "+t)}(Nc(),n.cd().ub_1,n,i)})))])}(0,t.xb_1.uc().vc(),r)}function Cc(n,t){var r;if(t instanceof Ju)r=Jo(t);else if(t instanceof no)r=Uc(Sf().rd(t.eb_1));else if(t instanceof Wu)r=Uc(t.za_1);else{var i="Unknown node type viewIt: "+t;console.error(i),r=Gf().ga(i)}return r}function xc(n){return n.t9("report-wrapper"),br()}function jc(n){return n.t9("header"),br()}function Pc(n){return n.t9("gradle-logo"),br()}function Ic(n){return n.t9("title"),br()}function Sc(n){return n.t9("groups"),br()}function zc(n){return n.t9("content"),br()}function Tc(n){return n.t9("group-selector__count"),br()}function Ec(n){return n.t9("learn-more"),br()}function Lc(){Pn=this,document.title="Gradle - Problems Report"}function Nc(){return null==Pn&&new Lc,Pn}function Ac(n,t,r){return n.pe(t.zb().oe(),r)}function Mc(n){Oc.call(this),this.hd_1=n}function Fc(){Oc.call(this)}function Dc(n,t){Oc.call(this),this.wc_1=n,this.xc_1=t}function Oc(){}function Rc(){return sa(),In}function Hc(){return sa(),zn}function $c(){return sa(),En}function Gc(){return sa(),Ln}function Uc(n){return sa(),Gc().ka(n)}function Vc(n){return sa(),Gc().ka(Sf().qd(n))}function Qc(n,t){return sa(),n.cd().ye()?Xc(n,t):function(n){return sa(),Gf().fb(us(oa),Jc(n))}(n)}function Zc(n,t,r,i){var e,u,o;return sa(),Gf().fb(us((e=r,u=t,o=i,function(n){return n.t9("java-exception-part-toggle"),n.u9(function(n,t){return function(r){return new Dc(n,t())}}(u,o)),n.s9("Click to "+function(n){var t;switch(sa(),n.q8_1){case 0:t="show";break;case 1:t="hide";break;default:be()}return t}(e)),br()})),"("+n+" internal "+qf("line",n)+" "+function(n){var t;switch(sa(),n.q8_1){case 0:t="hidden";break;case 1:t="shown";break;default:be()}return t}(r)+")")}function Yc(n,t){t=t===A?Of():t,sa();for(var r=Qf(),i=Rr(Tt(n,10)),e=0,u=n.f();u.g();){var o,f=e;e=f+1|0,s=u.h(),c=(c=0===yr(f)?t:Of())===A?Of():c,sa(),o=Zf().ja([$f().ga(s),c]),i.d(o)}var s,c;return r.ha(i)}function Wc(n,t,r){sa();var i,e,u,o=Hf(),f=Xc(t,n),s=Gf().ga("Exception"),c=Gf().ja([(sa(),Nn).v9(r.na_1,"Copy exception to the clipboard")]),a=null==r.ma_1?null:Gf().ga(" "),h=null==a?Of():a,l=r.ma_1,_=null==l?null:Uc(l),v=null==_?Of():_;switch(t.cd().wb_1.q8_1){case 0:i=Of();break;case 1:i=function(n,t){sa();for(var r=Hf(),i=us(fa),e=n.oa_1,u=Rr(Tt(e,10)),o=0,f=e.f();f.g();){var s,c=f.h(),a=o;o=a+1|0;var h,l=yr(a);if(null!=c.sa_1){var _,v=Zc(c.ra_1.k(),l,c.sa_1,t),d=c.sa_1;switch(null==d?-1:d.q8_1){case 0:_=Yc(Kn(c.ra_1,1),v);break;case 1:_=Yc(c.ra_1,v);break;default:be()}h=_}else h=Yc(c.ra_1);s=h,u.d(s)}return r.zd(i,u)}(r,(e=n,u=t,function(){return e(new vs(u))}));break;default:be()}return o.ja([f,s,c,h,v,i])}function Kc(n,t,r,i,e,u,o){e=e===A?null:e,u=u===A?Of():u,o=o===A?Of():o,sa();var f=Hf(),s=Qc(r,n),c=t(i),a=null==e?null:t(e);return f.ja([s,u,c,null==a?Of():a,o])}function Xc(n,t){var r,i;return sa(),Gf().fb(us((r=n,i=t,function(n){return n.gb(["invisible-text","tree-btn"]),r.cd().wb_1===Cs()&&(n.t9("collapsed"),br()),r.cd().wb_1===xs()&&(n.t9("expanded"),br()),n.s9("Click to "+function(n){var t;switch(sa(),n.q8_1){case 0:t="expand";break;case 1:t="collapse";break;default:be()}return t}(r.cd().wb_1)),n.u9(function(n,t){return function(r){return n(new vs(t))}}(i,r)),br()})),Jc(n))}function Jc(n){return sa(),function(n,t){var r;if(!(t>=0))throw _u(ce("Count 'n' must be non-negative, but was "+t+"."));switch(t){case 0:r="";break;case 1:r=ce(n);break;default:var i="";if(0!==re(n))for(var e=ce(n),u=t;1&~u||(i+=e),0!=(u=u>>>1|0);)e+=e;return i}return r}("    ",n.we()-1|0)+"- "}function na(n){return sa(),n.gb(["invisible-text","error-icon"]),br()}function ta(n){return sa(),n.gb(["invisible-text","advice-icon"]),br()}function ra(n){return sa(),n.gb(["invisible-text","warning-icon"]),br()}function ia(n){return sa(),n.gb(["invisible-text","enum-icon"]),br()}function ea(n){return sa(),new Mc(n)}function ua(n){return sa(),new Mc(n)}function oa(n){return sa(),n.gb(["invisible-text","leaf-icon"]),br()}function fa(n){return sa(),n.t9("java-exception"),br()}function sa(){if(!An){An=!0;var n=Gf();In=n.fb(us(na),"[error] ");var t=Gf();Sn=t.fb(us(ta),"[advice] ");var r=Gf();zn=r.fb(us(ra),"[warn]  ");var i=Gf();Tn=i.fb(us(ia),"[enum]  "),En=new Uu,Ln=new Uu(ea),Nn=new $u(ua)}}return We(tt,A,Qe),We(ft,A,Qe),We(st,A,Qe),We(Di,"Collection",tu),We(ct,"AbstractCollection",Qe,A,[Di]),We(at,"IteratorImpl",Qe),We(ht,"ListIteratorImpl",Qe,at),We(lt,"Companion",iu),We(Fi,"List",tu,A,[Di]),We(vt,"AbstractList",Qe,ct,[ct,Fi]),We(dt,A,Qe),We(bt,"Companion",iu),We(mt,A,Qe,ct),We(Ri,"Map",tu),We(kt,"AbstractMap",Qe,A,[Ri]),We(qt,"Companion",iu),We(bi,"RandomAccess",tu),We(Pt,"EmptyList",iu,A,[Fi,bi]),We(It,"ArrayAsCollection",Qe,A,[Di]),We(St,"EmptyIterator",iu),We(Lt,"IntIterator",Qe),We(Nt,A,Qe),We(At,"ReversedListReadOnly",Qe,vt),We(Mt,A,Qe),We(Ft,"TransformingSequence",Qe),We(Ot,A,Qe),We(Rt,"FilteringSequence",Qe),We($i,"Set",tu,A,[Di]),We($t,"EmptySet",iu,A,[$i]),We(Vt,"Companion",iu),We(Xt,"IntProgression",Qe),We(Zt,"IntRange",Qe,Xt),We(Yt,"IntProgressionIterator",Qe,Lt),We(Wt,"Companion",iu),We(ar,A,Qe),We(hr,"DelimitedRangesSequence",Qe),We(lr,"Pair",Qe),We(vr,"CharSequence",tu),We(dr,"Comparable",tu),We(gr,"Number",Qe),We(wr,"Unit",iu),We(pr,"IntCompanionObject",iu),We(xr,"AbstractMutableCollection",Qe,ct,[ct,Di]),We(jr,"IteratorImpl",Qe),We(Pr,"ListIteratorImpl",Qe,jr),We(Ir,"AbstractMutableList",Qe,xr,[xr,Fi,Di]),We(Sr,A,Qe),We(zr,A,Qe),We(Oi,"Entry",tu),We(Hi,"MutableEntry",tu,A,[Oi]),We(Tr,"SimpleEntry",Qe,A,[Hi]),We(Mr,"AbstractMutableSet",Qe,xr,[xr,$i,Di]),We(Er,"AbstractEntrySet",Qe,Mr),We(Lr,A,Qe,Mr),We(Nr,A,Qe,xr),We(Ar,"AbstractMutableMap",Qe,kt,[kt,Ri]),We(Fr,"Companion",iu),We(Gr,"ArrayList",Qe,Ir,[Ir,Fi,Di,bi]),We(Qr,"HashCode",iu),We(Zr,"EntrySet",Qe,Er),We(Xr,"HashMap",Qe,Ar,[Ar,Ri]),We(ni,"HashSet",Qe,Mr,[Mr,$i,Di]),We(ei,A,Qe),We(oi,"InternalMap",tu),We(ui,"InternalHashCodeMap",Qe,A,[oi]),We(fi,"EntryIterator",Qe),We(si,"Companion",iu),We(ai,"ChainEntry",Qe,Tr),We(hi,"EntrySet",Qe,Er),We(vi,"LinkedHashMap",Qe,Xr,[Xr,Ri]),We(di,"Companion",iu),We(wi,"LinkedHashSet",Qe,ni,[ni,$i,Di]),We(pi,"BaseOutput",Qe),We(mi,"NodeJsOutput",Qe,pi),We(qi,"BufferedOutput",Qe,pi),We(ki,"BufferedOutputToConsoleLog",Qe,qi),We(Ci,"StringBuilder",Qe,A,[vr]),We(Pi,"Companion",iu),We(Si,"Regex",Qe),We(Ni,"Companion",iu),We(Mi,"Char",Qe,A,[dr]),We(Gi,"Companion",iu),We(Ui,"Enum",Qe,A,[dr]),We(Zi,A,Qe),We(me,"Companion",iu),We(ke,"Long",Qe,gr,[gr,dr]),We(cu,"Letter",iu),We(hu,"OtherLowercase",iu),We(ku,"Exception",Qe,Error),We(Bu,"RuntimeException",Qe,ku),We(vu,"IllegalArgumentException",Qe,Bu),We(gu,"IndexOutOfBoundsException",Qe,Bu),We(bu,"IllegalStateException",Qe,Bu),We(ju,"NoSuchElementException",Qe,Bu),We(Iu,"ArithmeticException",Qe,Bu),We(Tu,"UnsupportedOperationException",Qe,Bu),We(Lu,"NullPointerException",Qe,Bu),We(Au,"NoWhenBranchMatchedException",Qe,Bu),We(Fu,"ClassCastException",Qe,Bu),We(Ou,"UninitializedPropertyAccessException",Qe,Bu),We(Hu,"Model",Qe),We($u,"CopyButtonComponent",Qe),We(Uu,"PrettyTextComponent",Qe),We(to,"ProblemNode",Qe),We(Vu,"Exception",Qe,to),We(Qu,"StackTracePart",Qe),We(Zu,"Error",Qe,to),We(Yu,"Warning",Qe,to),We(Wu,"Message",Qe,to),We(Ku,"ListElement",Qe,to),We(Xu,"TreeNode",Qe,to),We(Ju,"Link",Qe,to),We(no,"Label",Qe,to),We(co,"Info",Qe,to),We(ao,"Project",Qe,to),We(ho,"Task",Qe,to),We(lo,"TaskPath",Qe,to),We(_o,"Bean",Qe,to),We(vo,"SystemProperty",Qe,to),We(go,"Property",Qe,to),We(wo,"BuildLogic",Qe,to),We(bo,"BuildLogicClass",Qe,to),We(Oc,"BaseIntent",Qe),We(Fc,"TreeIntent",Qe,Oc),We(ko,"TaskTreeIntent",Qe,Fc),We(qo,"MessageTreeIntent",Qe,Fc),We(yo,"InputTreeIntent",Qe,Fc),We(Bo,"IncompatibleTaskTreeIntent",Qe,Fc),We(Po,"Intent",Qe,Oc),We(Co,"SetTab",Qe,Po),We(xo,"Model",Qe),We(jo,"Tab",Qe,Ui),We(Ko,"ConfigurationCacheReportPage",iu),We(nf,"ImportedProblem",Qe),We(tf,"ImportedDiagnostics",Qe),We(_f,"sam$kotlin_Comparator$0",Qe),We(Bf,"LearnMore",Qe),We(jf,"Fragment",Qe),We(Cf,"Text",Qe,jf),We(xf,"Reference",Qe,jf),We(Pf,"Builder",Qe),We(If,"Companion",iu),We(zf,"PrettyText",Qe),We(Tf,"Companion",iu),We(Af,"Trie",Qe),We(Kf,"ViewFactory",Qe),We(Xf,"Companion",iu),We(es,"View",Qe),We(ns,"Empty",iu,es),We(rs,"Element",Qe,es),We(is,"MappedView",Qe,es),We(os,"Attributes",Qe),We(as,"Attribute",Qe),We(fs,"OnEvent",Qe,as),We(ss,"ClassName",Qe,as),We(cs,"Named",Qe,as),We(gs,"Intent",Qe),We(vs,"Toggle",Qe,gs),We(ds,"Model",Qe),We(bs,"TreeView",iu),We(Bs,"Focus",Qe),We(ks,"Original",Qe,Bs),We(qs,"Child",Qe,Bs),We(ys,"ViewState",Qe,Ui),We(js,"Tree",Qe),We(Ss,"Tab",Qe,Ui),We(zs,"ProblemIdElement",Qe),We(Ts,"ProblemSummary",Qe),We(Ms,"ProblemNodeGroup",Qe),We(sc,"ProblemApiNode",Qe,to),We(uc,"Text",Qe,sc),We(oc,"ProblemIdNode",Qe,sc),We(fc,"Advice",Qe,to),We(cc,"MessageTreeIntent",Qe,Fc),We(ac,"ProblemIdTreeIntent",Qe,Fc),We(hc,"FileLocationTreeIntent",Qe,Fc),We(lc,"PluginLocationTreeIntent",Qe,Fc),We(_c,"TaskLocationTreeIntent",Qe,Fc),We(gc,"Intent",Qe,Oc),We(vc,"SetTab",Qe,gc),We(dc,"Model",Qe),We(Lc,"ProblemsReportPage",iu),We(Mc,"Copy",Qe,Oc),We(Dc,"ToggleStackTracePart",Qe,Oc),ve(tt).f=function(){return this.n_1.f()},ve(ft).f=function(){return this.r_1.f()},ve(st).f=function(){var n,t,r=function(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}(this.s_1,Or());return n=r,t=this.t_1,function(n,t){if(n.k()<=1)return br();var r=Br(n);!function(n,t){if(function(){if(null!=l)return l;l=!1;var n=[],t=0;if(t<600)do{var r=t;t=t+1|0,n.push(r)}while(t<600);var i=Vr;n.sort(i);var e=1,u=n.length;if(e<u)do{var o=e;e=e+1|0;var f=n[o-1|0],s=n[o];if((3&f)==(3&s)&&f>=s)return!1}while(e<u);return l=!0,!0}()){var r=(i=t,function(n,t){return i.compare(n,t)});n.sort(r)}else!function(n,t,r,i){var e=n.length,u=function(n){var t=0,r=n.length-1|0;if(t<=r)do{var i=t;t=t+1|0,n[i]=null}while(i!==r);return n}(Array(e)),o=Ur(n,u,0,r,i);if(o!==n){var f=0;if(f<=r)do{var s=f;f=f+1|0,n[s]=o[s]}while(s!==r)}}(n,0,Rn(n),t);var i}(r,t);var i=0,e=r.length;if(i<e)do{var u=i;i=i+1|0,n.f4(u,r[u])}while(i<e)}(n,t),r.f()},ve(ct).u=function(n){var t;n:if(Ke(this,Di)&&this.i())t=!1;else{for(var r=this.f();r.g();)if(le(r.h(),n)){t=!0;break n}t=!1}return t},ve(ct).v=function(n){var t;n:if(Ke(n,Di)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.u(i)){t=!1;break n}}t=!0}return t},ve(ct).i=function(){return 0===this.k()},ve(ct).toString=function(){return $n(this,", ","[","]",A,A,(n=this,function(t){return t===n?"(this Collection)":Vi(t)}));var n},ve(ct).toArray=function(){return kr(this)},ve(at).g=function(){return this.w_1<this.x_1.k()},ve(at).h=function(){if(!this.g())throw Cu();var n=this.w_1;return this.w_1=n+1|0,this.x_1.j(n)},ve(ht).c1=function(){return this.w_1>0},ve(ht).d1=function(){if(!this.c1())throw Cu();return this.w_1=this.w_1-1|0,this.a1_1.j(this.w_1)},ve(lt).e1=function(n,t){if(n<0||n>=t)throw du("index: "+n+", size: "+t)},ve(lt).b1=function(n,t){if(n<0||n>t)throw du("index: "+n+", size: "+t)},ve(lt).f1=function(n){for(var t=1,r=n.f();r.g();){var i=r.h(),e=Mn(31,t),u=null==i?null:ae(i);t=e+(null==u?0:u)|0}return t},ve(lt).g1=function(n,t){if(n.k()!==t.k())return!1;for(var r=t.f(),i=n.f();i.g();)if(!le(i.h(),r.h()))return!1;return!0},ve(vt).f=function(){return new at(this)},ve(vt).l=function(n){return new ht(this,n)},ve(vt).equals=function(n){return n===this||!(null==n||!Ke(n,Fi))&&_t().g1(this,n)},ve(vt).hashCode=function(){return _t().f1(this)},ve(dt).g=function(){return this.h1_1.g()},ve(dt).h=function(){return this.h1_1.h().i1()},ve(bt).k1=function(n){var t=n.j1(),r=null==t?null:ae(t),i=null==r?0:r,e=n.i1(),u=null==e?null:ae(e);return i^(null==u?0:u)},ve(bt).l1=function(n){return Vi(n.j1())+"="+Vi(n.i1())},ve(bt).m1=function(n,t){return!(null==t||!Ke(t,Oi))&&!!le(n.j1(),t.j1())&&le(n.i1(),t.i1())},ve(mt).r1=function(n){return this.q1_1.s1(n)},ve(mt).u=function(n){return!(null!=n&&!Je(n))&&this.r1(null==n||Je(n)?n:pe())},ve(mt).f=function(){return new dt(this.q1_1.o().f())},ve(mt).k=function(){return this.q1_1.k()},ve(kt).t1=function(n){return!(null==wt(this,n))},ve(kt).s1=function(n){var t;n:{var r=this.o();if(Ke(r,Di)&&r.i())t=!1;else{for(var i=r.f();i.g();)if(le(i.h().i1(),n)){t=!0;break n}t=!1}}return t},ve(kt).u1=function(n){if(null==n||!Ke(n,Oi))return!1;var t=n.j1(),r=n.i1(),i=(Ke(this,Ri)?this:pe()).v1(t);return!(!le(r,i)||null==i&&!(Ke(this,Ri)?this:pe()).t1(t))},ve(kt).equals=function(n){if(n===this)return!0;if(null==n||!Ke(n,Ri))return!1;if(this.k()!==n.k())return!1;var t;n:{var r=n.o();if(Ke(r,Di)&&r.i())t=!0;else{for(var i=r.f();i.g();){var e=i.h();if(!this.u1(e)){t=!1;break n}}t=!0}}return t},ve(kt).v1=function(n){var t=wt(this,n);return null==t?null:t.i1()},ve(kt).hashCode=function(){return ae(this.o())},ve(kt).i=function(){return 0===this.k()},ve(kt).k=function(){return this.o().k()},ve(kt).toString=function(){var n;return $n(this.o(),", ","{","}",A,A,(n=this,function(t){return n.p1(t)}))},ve(kt).p1=function(n){return gt(this,n.j1())+"="+gt(this,n.i1())},ve(kt).w1=function(){return null==this.o1_1&&(this.o1_1=new mt(this)),we(this.o1_1)},ve(qt).x1=function(n){for(var t=0,r=n.f();r.g();){var i=r.h(),e=t,u=null==i?null:ae(i);t=e+(null==u?0:u)|0}return t},ve(qt).y1=function(n,t){return n.k()===t.k()&&n.v(t)},ve(Pt).equals=function(n){return!(null==n||!Ke(n,Fi))&&n.i()},ve(Pt).hashCode=function(){return 1},ve(Pt).toString=function(){return"[]"},ve(Pt).k=function(){return 0},ve(Pt).i=function(){return!0},ve(Pt).a2=function(n){return n.i()},ve(Pt).v=function(n){return this.a2(n)},ve(Pt).j=function(n){throw du("Empty list doesn't contain element at index "+n+".")},ve(Pt).f=function(){return zt()},ve(Pt).l=function(n){if(0!==n)throw du("Index: "+n);return zt()},ve(It).k=function(){return this.b2_1.length},ve(It).i=function(){return 0===this.b2_1.length},ve(It).d2=function(n){return function(n,t){return Hn(n,t)>=0}(this.b2_1,n)},ve(It).e2=function(n){var t;n:if(Ke(n,Di)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.d2(i)){t=!1;break n}}t=!0}return t},ve(It).v=function(n){return this.e2(n)},ve(It).f=function(){return Qi(this.b2_1)},ve(St).g=function(){return!1},ve(St).c1=function(){return!1},ve(St).h=function(){throw Cu()},ve(St).d1=function(){throw Cu()},ve(Lt).h=function(){return this.f2()},ve(Nt).g=function(){return this.g2_1.c1()},ve(Nt).c1=function(){return this.g2_1.g()},ve(Nt).h=function(){return this.g2_1.d1()},ve(Nt).d1=function(){return this.g2_1.h()},ve(At).k=function(){return this.i2_1.k()},ve(At).j=function(n){return this.i2_1.j(function(n,t){if(!(0<=t&&t<=jt(n)))throw du("Element index "+t+" must be in range ["+Ve(0,jt(n))+"].");return jt(n)-t|0}(this,n))},ve(At).f=function(){return this.l(0)},ve(At).l=function(n){return new Nt(this,n)},ve(Mt).h=function(){return this.k2_1.m2_1(this.j2_1.h())},ve(Mt).g=function(){return this.j2_1.g()},ve(Ft).f=function(){return new Mt(this)},ve(Ot).h=function(){if(-1===this.o2_1&&Dt(this),0===this.o2_1)throw Cu();var n=this.p2_1;return this.p2_1=null,this.o2_1=-1,null==n||Je(n)?n:pe()},ve(Ot).g=function(){return-1===this.o2_1&&Dt(this),1===this.o2_1},ve(Rt).f=function(){return new Ot(this)},ve($t).equals=function(n){return!(null==n||!Ke(n,$i))&&n.i()},ve($t).hashCode=function(){return 0},ve($t).toString=function(){return"[]"},ve($t).k=function(){return 0},ve($t).i=function(){return!0},ve($t).a2=function(n){return n.i()},ve($t).v=function(n){return this.a2(n)},ve($t).f=function(){return zt()},ve(Zt).y2=function(){return this.z2_1},ve(Zt).c3=function(){return this.a3_1},ve(Zt).i=function(){return this.z2_1>this.a3_1},ve(Zt).equals=function(n){return n instanceof Zt&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1)},ve(Zt).hashCode=function(){return this.i()?-1:Mn(31,this.z2_1)+this.a3_1|0},ve(Zt).toString=function(){return this.z2_1+".."+this.a3_1},ve(Yt).g=function(){return this.f3_1},ve(Yt).f2=function(){var n=this.g3_1;if(n===this.e3_1){if(!this.f3_1)throw Cu();this.f3_1=!1}else this.g3_1=this.g3_1+this.d3_1|0;return n},ve(Wt).q=function(n,t,r){return new Xt(n,t,r)},ve(Xt).f=function(){return new Yt(this.z2_1,this.a3_1,this.b3_1)},ve(Xt).i=function(){return this.b3_1>0?this.z2_1>this.a3_1:this.z2_1<this.a3_1},ve(Xt).equals=function(n){return n instanceof Xt&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1&&this.b3_1===n.b3_1)},ve(Xt).hashCode=function(){return this.i()?-1:Mn(31,Mn(31,this.z2_1)+this.a3_1|0)+this.b3_1|0},ve(Xt).toString=function(){return this.b3_1>0?this.z2_1+".."+this.a3_1+" step "+this.b3_1:this.z2_1+" downTo "+this.a3_1+" step "+(0|-this.b3_1)},ve(ar).h=function(){if(-1===this.j3_1&&cr(this),0===this.j3_1)throw Cu();var n=this.m3_1,t=n instanceof Zt?n:pe();return this.m3_1=null,this.j3_1=-1,t},ve(ar).g=function(){return-1===this.j3_1&&cr(this),1===this.j3_1},ve(hr).f=function(){return new ar(this)},ve(lr).toString=function(){return"("+this.t3_1+", "+this.u3_1+")"},ve(lr).v3=function(){return this.t3_1},ve(lr).w3=function(){return this.u3_1},ve(lr).hashCode=function(){var n=null==this.t3_1?0:ae(this.t3_1);return Mn(n,31)+(null==this.u3_1?0:ae(this.u3_1))|0},ve(lr).equals=function(n){if(this===n)return!0;if(!(n instanceof lr))return!1;var t=n instanceof lr?n:pe();return!!le(this.t3_1,t.t3_1)&&!!le(this.u3_1,t.u3_1)},ve(wr).toString=function(){return"kotlin.Unit"},ve(pr).b4=function(){return this.MIN_VALUE},ve(pr).c4=function(){return this.MAX_VALUE},ve(pr).d4=function(){return this.SIZE_BYTES},ve(pr).e4=function(){return this.SIZE_BITS},ve(xr).m=function(n){this.g4();for(var t=!1,r=n.f();r.g();){var i=r.h();this.d(i)&&(t=!0)}return t},ve(xr).toJSON=function(){return this.toArray()},ve(xr).g4=function(){},ve(jr).g=function(){return this.h4_1<this.j4_1.k()},ve(jr).h=function(){if(!this.g())throw Cu();var n=this.h4_1;return this.h4_1=n+1|0,this.i4_1=n,this.j4_1.j(this.i4_1)},ve(Pr).c1=function(){return this.h4_1>0},ve(Pr).d1=function(){if(!this.c1())throw Cu();return this.h4_1=this.h4_1-1|0,this.i4_1=this.h4_1,this.n4_1.j(this.i4_1)},ve(Ir).d=function(n){return this.g4(),this.p4(this.k(),n),!0},ve(Ir).f=function(){return new jr(this)},ve(Ir).u=function(n){return this.q4(n)>=0},ve(Ir).q4=function(n){var t=0,r=jt(this);if(t<=r)do{var i=t;if(t=t+1|0,le(this.j(i),n))return i}while(i!==r);return-1},ve(Ir).l=function(n){return new Pr(this,n)},ve(Ir).equals=function(n){return n===this||!(null==n||!Ke(n,Fi))&&_t().g1(this,n)},ve(Ir).hashCode=function(){return _t().f1(this)},ve(Sr).g=function(){return this.r4_1.g()},ve(Sr).h=function(){return this.r4_1.h().j1()},ve(zr).g=function(){return this.s4_1.g()},ve(zr).h=function(){return this.s4_1.h().i1()},ve(Tr).j1=function(){return this.t4_1},ve(Tr).i1=function(){return this.u4_1},ve(Tr).v4=function(n){var t=this.u4_1;return this.u4_1=n,t},ve(Tr).hashCode=function(){return pt().k1(this)},ve(Tr).toString=function(){return pt().l1(this)},ve(Tr).equals=function(n){return pt().m1(this,n)},ve(Er).u=function(n){return this.w4(n)},ve(Lr).y4=function(n){throw zu("Add is not supported on keys")},ve(Lr).d=function(n){return this.y4(null==n||Je(n)?n:pe())},ve(Lr).z4=function(n){return this.x4_1.t1(n)},ve(Lr).u=function(n){return!(null!=n&&!Je(n))&&this.z4(null==n||Je(n)?n:pe())},ve(Lr).f=function(){return new Sr(this.x4_1.o().f())},ve(Lr).k=function(){return this.x4_1.k()},ve(Lr).g4=function(){return this.x4_1.g4()},ve(Nr).f5=function(n){throw zu("Add is not supported on values")},ve(Nr).d=function(n){return this.f5(null==n||Je(n)?n:pe())},ve(Nr).r1=function(n){return this.e5_1.s1(n)},ve(Nr).u=function(n){return!(null!=n&&!Je(n))&&this.r1(null==n||Je(n)?n:pe())},ve(Nr).f=function(){return new zr(this.e5_1.o().f())},ve(Nr).k=function(){return this.e5_1.k()},ve(Nr).g4=function(){return this.e5_1.g4()},ve(Ar).g5=function(){return null==this.c5_1&&(this.c5_1=new Lr(this)),we(this.c5_1)},ve(Ar).w1=function(){return null==this.d5_1&&(this.d5_1=new Nr(this)),we(this.d5_1)},ve(Ar).g4=function(){},ve(Mr).equals=function(n){return n===this||!(null==n||!Ke(n,$i))&&yt().y1(this,n)},ve(Mr).hashCode=function(){return yt().x1(this)},ve(Gr).j5=function(){return this.g4(),this.c_1=!0,this.k()>0?this:Dr().i5_1},ve(Gr).k=function(){return this.b_1.length},ve(Gr).j=function(n){var t=this.b_1[$r(this,n)];return null==t||Je(t)?t:pe()},ve(Gr).f4=function(n,t){this.g4(),$r(this,n);var r=this.b_1[n];this.b_1[n]=t;var i=r;return null==i||Je(i)?i:pe()},ve(Gr).d=function(n){return this.g4(),this.b_1.push(n),this.o4_1=this.o4_1+1|0,!0},ve(Gr).p4=function(n,t){this.g4(),this.b_1.splice(function(n,t){return _t().b1(t,n.k()),t}(this,n),0,t),this.o4_1=this.o4_1+1|0},ve(Gr).m=function(n){if(this.g4(),n.i())return!1;for(var t,r,i,e=(t=this,r=n.k(),i=t.k(),t.b_1.length=t.k()+r|0,i),u=0,o=n.f();o.g();){var f=o.h(),s=u;u=s+1|0;var c=yr(s);this.b_1[e+c|0]=f}return this.o4_1=this.o4_1+1|0,!0},ve(Gr).q4=function(n){return Hn(this.b_1,n)},ve(Gr).toString=function(){return On(this.b_1,", ","[","]",A,A,ee)},ve(Gr).k5=function(){return[].slice.call(this.b_1)},ve(Gr).toArray=function(){return this.k5()},ve(Gr).g4=function(){if(this.c_1)throw Su()},ve(Qr).l5=function(n,t){return le(n,t)},ve(Qr).m5=function(n){var t=null==n?null:ae(n);return null==t?0:t},ve(Zr).o5=function(n){throw zu("Add is not supported on entries")},ve(Zr).d=function(n){return this.o5(null!=n&&Ke(n,Hi)?n:pe())},ve(Zr).w4=function(n){return this.n5_1.u1(n)},ve(Zr).f=function(){return this.n5_1.t5_1.f()},ve(Zr).k=function(){return this.n5_1.k()},ve(Xr).t1=function(n){return this.t5_1.z4(n)},ve(Xr).s1=function(n){var t;n:{var r=this.t5_1;if(Ke(r,Di)&&r.i())t=!1;else{for(var i=r.f();i.g();){var e=i.h();if(this.u5_1.l5(e.i1(),n)){t=!0;break n}}t=!1}}return t},ve(Xr).o=function(){return null==this.v5_1&&(this.v5_1=this.x5()),we(this.v5_1)},ve(Xr).x5=function(){return new Zr(this)},ve(Xr).v1=function(n){return this.t5_1.v1(n)},ve(Xr).h5=function(n,t){return this.t5_1.h5(n,t)},ve(Xr).k=function(){return this.t5_1.k()},ve(ni).d=function(n){return null==this.y5_1.h5(n,this)},ve(ni).u=function(n){return this.y5_1.t1(n)},ve(ni).i=function(){return this.y5_1.i()},ve(ni).f=function(){return this.y5_1.g5().f()},ve(ni).k=function(){return this.y5_1.k()},ve(ei).g=function(){return-1===this.z5_1&&(this.z5_1=function(n){if(null!=n.c6_1&&n.d6_1){var t=n.c6_1.length;if(n.e6_1=n.e6_1+1|0,n.e6_1<t)return 0}if(n.b6_1=n.b6_1+1|0,n.b6_1<n.a6_1.length){n.c6_1=n.g6_1.i6_1[n.a6_1[n.b6_1]];var r=n,i=n.c6_1;return r.d6_1=null!=i&&Xe(i),n.e6_1=0,0}return n.c6_1=null,1}(this)),0===this.z5_1},ve(ei).h=function(){if(!this.g())throw Cu();var n=this.d6_1?this.c6_1[this.e6_1]:this.c6_1;return this.f6_1=n,this.z5_1=-1,n},ve(ui).w5=function(){return this.h6_1},ve(ui).k=function(){return this.j6_1},ve(ui).h5=function(n,t){var r=this.h6_1.m5(n),i=ii(this,r);if(null==i)this.i6_1[r]=new Tr(n,t);else{if(null==i||!Xe(i)){var e,u=i;return this.h6_1.l5(u.j1(),n)?u.v4(t):(e=[u,new Tr(n,t)],this.i6_1[r]=e,this.j6_1=this.j6_1+1|0,null)}var o=i,f=ri(o,this,n);if(null!=f)return f.v4(t);o.push(new Tr(n,t))}return this.j6_1=this.j6_1+1|0,null},ve(ui).z4=function(n){return!(null==ti(this,n))},ve(ui).v1=function(n){var t=ti(this,n);return null==t?null:t.i1()},ve(ui).f=function(){return new ei(this)},ve(fi).g=function(){return!(null===this.m6_1)},ve(fi).h=function(){if(!this.g())throw Cu();var n=we(this.m6_1);this.l6_1=n;var t,r=n.b7_1;return t=r!==this.n6_1.y6_1.v6_1?r:null,this.m6_1=t,n},ve(ai).v4=function(n){return this.d7_1.g4(),ve(Tr).v4.call(this,n)},ve(hi).o5=function(n){throw zu("Add is not supported on entries")},ve(hi).d=function(n){return this.o5(null!=n&&Ke(n,Hi)?n:pe())},ve(hi).w4=function(n){return this.y6_1.u1(n)},ve(hi).f=function(){return new fi(this)},ve(hi).k=function(){return this.y6_1.k()},ve(hi).g4=function(){return this.y6_1.g4()},ve(vi).j5=function(){var n;if(this.g4(),this.x6_1=!0,this.k()>0)n=this;else{var t=ci().e7_1;n=Ke(t,Ri)?t:pe()}return n},ve(vi).t1=function(n){return this.w6_1.t1(n)},ve(vi).s1=function(n){var t=this.v6_1;if(null==t)return!1;var r=t;do{if(le(r.i1(),n))return!0;r=we(r.b7_1)}while(r!==this.v6_1);return!1},ve(vi).x5=function(){return new hi(this)},ve(vi).v1=function(n){var t=this.w6_1.v1(n);return null==t?null:t.i1()},ve(vi).h5=function(n,t){this.g4();var r=this.w6_1.v1(n);if(null==r){var i=new ai(this,n,t);return this.w6_1.h5(n,i),function(n,t){if(null!=n.b7_1||null!=n.c7_1)throw wu(ce("Check failed."));var r=t.v6_1;if(null==r)t.v6_1=n,n.b7_1=n,n.c7_1=n;else{var i=r.c7_1;if(null==i)throw wu(ce("Required value was null."));var e=i;n.c7_1=e,n.b7_1=r,r.c7_1=n,e.b7_1=n}}(i,this),null}return r.v4(t)},ve(vi).k=function(){return this.w6_1.k()},ve(vi).g4=function(){if(this.x6_1)throw Su()},ve(wi).g4=function(){return this.y5_1.g4()},ve(pi).h7=function(){this.i7("\n")},ve(pi).j7=function(n){this.i7(n),this.h7()},ve(mi).i7=function(n){var t=String(n);this.k7_1.write(t)},ve(ki).i7=function(n){var t=String(n),r=t.lastIndexOf("\n",0);if(r>=0){var i=this.m7_1;this.m7_1=i+t.substring(0,r),this.n7();var e=r+1|0;t=t.substring(e)}this.m7_1=this.m7_1+t},ve(ki).n7=function(){console.log(this.m7_1),this.m7_1=""},ve(qi).i7=function(n){var t=this.m7_1;this.m7_1=t+String(n)},ve(Ci).x3=function(){return this.o7_1.length},ve(Ci).y3=function(n){var t=this.o7_1;if(!(n>=0&&n<=tr(t)))throw du("index: "+n+", length: "+this.x3()+"}");return ne(t,n)},ve(Ci).z3=function(n,t){return this.o7_1.substring(n,t)},ve(Ci).i3=function(n){return this.o7_1=this.o7_1+new Mi(n),this},ve(Ci).e=function(n){return this.o7_1=this.o7_1+Vi(n),this},ve(Ci).p7=function(n){var t=this.o7_1;return this.o7_1=t+(null==n?"null":n),this},ve(Ci).toString=function(){return this.o7_1},ve(Pi).t7=function(n){var t=this.q7_1;return n.replace(t,"\\$&")},ve(Pi).u7=function(n){var t=this.s7_1;return n.replace(t,"$$$$")},ve(Si).a8=function(n){this.x7_1.lastIndex=0;var t=this.x7_1.exec(ce(n));return null!=t&&0===t.index&&this.x7_1.lastIndex===re(n)},ve(Si).toString=function(){return this.x7_1.toString()},ve(Mi).o8=function(n){return Ei(this.h3_1,n)},ve(Mi).a4=function(n){return function(n,t){return Ei(n.h3_1,t instanceof Mi?t.h3_1:pe())}(this,n)},ve(Mi).equals=function(n){return function(n,t){return t instanceof Mi&&n===t.h3_1}(this.h3_1,n)},ve(Mi).hashCode=function(){return this.h3_1},ve(Mi).toString=function(){return Li(this.h3_1)},ve(Ui).r8=function(n){return ue(this.q8_1,n.q8_1)},ve(Ui).a4=function(n){return this.r8(n instanceof Ui?n:pe())},ve(Ui).equals=function(n){return this===n},ve(Ui).hashCode=function(){return se(this)},ve(Ui).toString=function(){return this.p8_1},ve(Zi).g=function(){return!(this.s8_1===this.t8_1.length)},ve(Zi).h=function(){if(this.s8_1===this.t8_1.length)throw xu(""+this.s8_1);var n=this.s8_1;return this.s8_1=n+1|0,this.t8_1[n]},ve(ke).b9=function(n){return je(this,n)},ve(ke).a4=function(n){return this.b9(n instanceof ke?n:pe())},ve(ke).c9=function(n){return Pe(this,n)},ve(ke).d9=function(n){return function(n,t){if($e(),Ae(t))throw mu("division by zero");if(Ae(n))return qe();if(Te(n,Ce())){if(Te(t,ye())||Te(t,Be()))return Ce();if(Te(t,Ce()))return ye();var r=function(n){$e();return new ke(n.u8_1>>>1|n.v8_1<<31,n.v8_1>>1)}(n),i=function(n){$e();return new ke(n.u8_1<<1,n.v8_1<<1|n.u8_1>>>31)}(r.d9(t));return Te(i,qe())?Ne(t)?ye():Be():Pe(i,Ie(n,Se(t,i)).d9(t))}if(Te(t,Ce()))return qe();if(Ne(n))return Ne(t)?Fe(n).d9(Fe(t)):Fe(Fe(n).d9(t));if(Ne(t))return Fe(n.d9(Fe(t)));for(var e=qe(),u=n;He(u,t);){for(var o=ze(u)/ze(t),f=Math.max(1,Math.floor(o)),s=Math.ceil(Math.log(f)/Math.LN2),c=s<=48?1:Math.pow(2,s-48),a=Oe(f),h=Se(a,t);Ne(h)||Re(h,u);)h=Se(a=Oe(f-=c),t);Ae(a)&&(a=ye()),e=Pe(e,a),u=Ie(u,h)}return e}(this,n)},ve(ke).e9=function(){return this.f9().c9(new ke(1,0))},ve(ke).f9=function(){return new ke(~this.u8_1,~this.v8_1)},ve(ke).g9=function(){return this.u8_1},ve(ke).w8=function(){return ze(this)},ve(ke).valueOf=function(){return this.w8()},ve(ke).equals=function(n){return n instanceof ke&&Te(this,n)},ve(ke).hashCode=function(){return $e(),this.u8_1^this.v8_1},ve(ke).toString=function(){return Ee(this,10)},ve(Hu).toString=function(){return"Model(text="+this.o9_1+", tooltip="+this.p9_1+")"},ve(Hu).hashCode=function(){var n=he(this.o9_1);return Mn(n,31)+he(this.p9_1)|0},ve(Hu).equals=function(n){if(this===n)return!0;if(!(n instanceof Hu))return!1;var t=n instanceof Hu?n:pe();return this.o9_1===t.o9_1&&this.p9_1===t.p9_1},ve($u).v9=function(n,t){return this.w9(new Hu(n,t))},ve($u).w9=function(n){var t,r;return Uf().y9(us((t=n,r=this,function(n){return n.s9(t.p9_1),n.t9("copy-button"),n.u9(function(n,t){return function(r){return n.q9_1(t.o9_1)}}(r,t)),br()})),[])},ve($u).z9=function(n){return this.w9(n instanceof Hu?n:pe())},ve($u).aa=function(n,t){return t},ve($u).ba=function(n,t){var r=null==n||Je(n)?n:pe();return this.aa(r,t instanceof Hu?t:pe())},ve(Uu).ka=function(n){return function(n,t){for(var r=Gf(),i=t.ca_1,e=Rr(Tt(i,10)),u=i.f();u.g();){var o,f,s=u.h();s instanceof Cf?f=Gf().ga(s.fa_1):s instanceof xf?f=Gu(n,s.da_1,s.ea_1):be(),o=f,e.d(o)}return r.ha(e)}(this,n)},ve(Uu).z9=function(n){return this.ka(n instanceof zf?n:pe())},ve(Uu).la=function(n,t){return t},ve(Uu).ba=function(n,t){var r=null==n||Je(n)?n:pe();return this.la(r,t instanceof zf?t:pe())},ve(Vu).pa=function(n,t,r){return new Vu(n,t,r)},ve(Vu).qa=function(n,t,r,i){return n=n===A?this.ma_1:n,t=t===A?this.na_1:t,r=r===A?this.oa_1:r,i===A?this.pa(n,t,r):i.pa.call(this,n,t,r)},ve(Vu).toString=function(){return"Exception(summary="+this.ma_1+", fullText="+this.na_1+", parts="+this.oa_1+")"},ve(Vu).hashCode=function(){var n=null==this.ma_1?0:this.ma_1.hashCode();return n=Mn(n,31)+he(this.na_1)|0,Mn(n,31)+ae(this.oa_1)|0},ve(Vu).equals=function(n){if(this===n)return!0;if(!(n instanceof Vu))return!1;var t=n instanceof Vu?n:pe();return!!le(this.ma_1,t.ma_1)&&this.na_1===t.na_1&&!!le(this.oa_1,t.oa_1)},ve(Qu).ta=function(n,t){return new Qu(n,t)},ve(Qu).ua=function(n,t,r){return n=n===A?this.ra_1:n,t=t===A?this.sa_1:t,r===A?this.ta(n,t):r.ta.call(this,n,t)},ve(Qu).toString=function(){return"StackTracePart(lines="+this.ra_1+", state="+this.sa_1+")"},ve(Qu).hashCode=function(){var n=ae(this.ra_1);return Mn(n,31)+(null==this.sa_1?0:this.sa_1.hashCode())|0},ve(Qu).equals=function(n){if(this===n)return!0;if(!(n instanceof Qu))return!1;var t=n instanceof Qu?n:pe();return!!le(this.ra_1,t.ra_1)&&!!le(this.sa_1,t.sa_1)},ve(Zu).toString=function(){return"Error(label="+this.va_1+", docLink="+this.wa_1+")"},ve(Zu).hashCode=function(){var n=ae(this.va_1);return Mn(n,31)+(null==this.wa_1?0:ae(this.wa_1))|0},ve(Zu).equals=function(n){if(this===n)return!0;if(!(n instanceof Zu))return!1;var t=n instanceof Zu?n:pe();return!!le(this.va_1,t.va_1)&&!!le(this.wa_1,t.wa_1)},ve(Yu).toString=function(){return"Warning(label="+this.xa_1+", docLink="+this.ya_1+")"},ve(Yu).hashCode=function(){var n=ae(this.xa_1);return Mn(n,31)+(null==this.ya_1?0:ae(this.ya_1))|0},ve(Yu).equals=function(n){if(this===n)return!0;if(!(n instanceof Yu))return!1;var t=n instanceof Yu?n:pe();return!!le(this.xa_1,t.xa_1)&&!!le(this.ya_1,t.ya_1)},ve(Wu).toString=function(){return"Message(prettyText="+this.za_1+")"},ve(Wu).hashCode=function(){return this.za_1.hashCode()},ve(Wu).equals=function(n){if(this===n)return!0;if(!(n instanceof Wu))return!1;var t=n instanceof Wu?n:pe();return!!this.za_1.equals(t.za_1)},ve(Ku).toString=function(){return"ListElement(prettyText="+this.ab_1+")"},ve(Ku).hashCode=function(){return this.ab_1.hashCode()},ve(Ku).equals=function(n){if(this===n)return!0;if(!(n instanceof Ku))return!1;var t=n instanceof Ku?n:pe();return!!this.ab_1.equals(t.ab_1)},ve(Xu).toString=function(){return"TreeNode(prettyText="+this.bb_1+")"},ve(Xu).hashCode=function(){return this.bb_1.hashCode()},ve(Xu).equals=function(n){if(this===n)return!0;if(!(n instanceof Xu))return!1;var t=n instanceof Xu?n:pe();return!!this.bb_1.equals(t.bb_1)},ve(Ju).toString=function(){return"Link(href="+this.cb_1+", label="+this.db_1+")"},ve(Ju).hashCode=function(){var n=he(this.cb_1);return Mn(n,31)+he(this.db_1)|0},ve(Ju).equals=function(n){if(this===n)return!0;if(!(n instanceof Ju))return!1;var t=n instanceof Ju?n:pe();return this.cb_1===t.cb_1&&this.db_1===t.db_1},ve(no).toString=function(){return"Label(text="+this.eb_1+")"},ve(no).hashCode=function(){return he(this.eb_1)},ve(no).equals=function(n){if(this===n)return!0;if(!(n instanceof no))return!1;var t=n instanceof no?n:pe();return this.eb_1===t.eb_1},ve(co).toString=function(){return"Info(label="+this.hb_1+", docLink="+this.ib_1+")"},ve(co).hashCode=function(){var n=ae(this.hb_1);return Mn(n,31)+(null==this.ib_1?0:ae(this.ib_1))|0},ve(co).equals=function(n){if(this===n)return!0;if(!(n instanceof co))return!1;var t=n instanceof co?n:pe();return!!le(this.hb_1,t.hb_1)&&!!le(this.ib_1,t.ib_1)},ve(ao).toString=function(){return"Project(path="+this.jb_1+")"},ve(ao).hashCode=function(){return he(this.jb_1)},ve(ao).equals=function(n){if(this===n)return!0;if(!(n instanceof ao))return!1;var t=n instanceof ao?n:pe();return this.jb_1===t.jb_1},ve(ho).toString=function(){return"Task(path="+this.kb_1+", type="+this.lb_1+")"},ve(ho).hashCode=function(){var n=he(this.kb_1);return Mn(n,31)+he(this.lb_1)|0},ve(ho).equals=function(n){if(this===n)return!0;if(!(n instanceof ho))return!1;var t=n instanceof ho?n:pe();return this.kb_1===t.kb_1&&this.lb_1===t.lb_1},ve(lo).toString=function(){return"TaskPath(path="+this.mb_1+")"},ve(lo).hashCode=function(){return he(this.mb_1)},ve(lo).equals=function(n){if(this===n)return!0;if(!(n instanceof lo))return!1;var t=n instanceof lo?n:pe();return this.mb_1===t.mb_1},ve(_o).toString=function(){return"Bean(type="+this.nb_1+")"},ve(_o).hashCode=function(){return he(this.nb_1)},ve(_o).equals=function(n){if(this===n)return!0;if(!(n instanceof _o))return!1;var t=n instanceof _o?n:pe();return this.nb_1===t.nb_1},ve(vo).toString=function(){return"SystemProperty(name="+this.ob_1+")"},ve(vo).hashCode=function(){return he(this.ob_1)},ve(vo).equals=function(n){if(this===n)return!0;if(!(n instanceof vo))return!1;var t=n instanceof vo?n:pe();return this.ob_1===t.ob_1},ve(go).toString=function(){return"Property(kind="+this.pb_1+", name="+this.qb_1+", owner="+this.rb_1+")"},ve(go).hashCode=function(){var n=he(this.pb_1);return n=Mn(n,31)+he(this.qb_1)|0,Mn(n,31)+he(this.rb_1)|0},ve(go).equals=function(n){if(this===n)return!0;if(!(n instanceof go))return!1;var t=n instanceof go?n:pe();return this.pb_1===t.pb_1&&this.qb_1===t.qb_1&&this.rb_1===t.rb_1},ve(wo).toString=function(){return"BuildLogic(location="+this.sb_1+")"},ve(wo).hashCode=function(){return he(this.sb_1)},ve(wo).equals=function(n){if(this===n)return!0;if(!(n instanceof wo))return!1;var t=n instanceof wo?n:pe();return this.sb_1===t.sb_1},ve(bo).toString=function(){return"BuildLogicClass(type="+this.tb_1+")"},ve(bo).hashCode=function(){return he(this.tb_1)},ve(bo).equals=function(n){if(this===n)return!0;if(!(n instanceof bo))return!1;var t=n instanceof bo?n:pe();return this.tb_1===t.tb_1},ve(ko).zb=function(){return this.yb_1},ve(ko).toString=function(){return"TaskTreeIntent(delegate="+this.yb_1+")"},ve(ko).hashCode=function(){return ae(this.yb_1)},ve(ko).equals=function(n){if(this===n)return!0;if(!(n instanceof ko))return!1;var t=n instanceof ko?n:pe();return!!le(this.yb_1,t.yb_1)},ve(qo).zb=function(){return this.ac_1},ve(qo).toString=function(){return"MessageTreeIntent(delegate="+this.ac_1+")"},ve(qo).hashCode=function(){return ae(this.ac_1)},ve(qo).equals=function(n){if(this===n)return!0;if(!(n instanceof qo))return!1;var t=n instanceof qo?n:pe();return!!le(this.ac_1,t.ac_1)},ve(yo).zb=function(){return this.bc_1},ve(yo).toString=function(){return"InputTreeIntent(delegate="+this.bc_1+")"},ve(yo).hashCode=function(){return ae(this.bc_1)},ve(yo).equals=function(n){if(this===n)return!0;if(!(n instanceof yo))return!1;var t=n instanceof yo?n:pe();return!!le(this.bc_1,t.bc_1)},ve(Bo).zb=function(){return this.cc_1},ve(Bo).toString=function(){return"IncompatibleTaskTreeIntent(delegate="+this.cc_1+")"},ve(Bo).hashCode=function(){return ae(this.cc_1)},ve(Bo).equals=function(n){if(this===n)return!0;if(!(n instanceof Bo))return!1;var t=n instanceof Bo?n:pe();return!!le(this.cc_1,t.cc_1)},ve(Co).toString=function(){return"SetTab(tab="+this.dc_1+")"},ve(Co).hashCode=function(){return this.dc_1.hashCode()},ve(Co).equals=function(n){if(this===n)return!0;if(!(n instanceof Co))return!1;var t=n instanceof Co?n:pe();return!!this.dc_1.equals(t.dc_1)},ve(xo).mc=function(n,t,r,i,e,u,o,f){return new xo(n,t,r,i,e,u,o,f)},ve(xo).nc=function(n,t,r,i,e,u,o,f,s){return n=n===A?this.ec_1:n,t=t===A?this.fc_1:t,r=r===A?this.gc_1:r,i=i===A?this.hc_1:i,e=e===A?this.ic_1:e,u=u===A?this.jc_1:u,o=o===A?this.kc_1:o,f=f===A?this.lc_1:f,s===A?this.mc(n,t,r,i,e,u,o,f):s.mc.call(this,n,t,r,i,e,u,o,f)},ve(xo).toString=function(){return"Model(heading="+this.ec_1+", summary="+this.fc_1+", learnMore="+this.gc_1+", messageTree="+this.hc_1+", locationTree="+this.ic_1+", inputTree="+this.jc_1+", incompatibleTaskTree="+this.kc_1+", tab="+this.lc_1+")"},ve(xo).hashCode=function(){var n=this.ec_1.hashCode();return n=Mn(n,31)+ae(this.fc_1)|0,n=Mn(n,31)+this.gc_1.hashCode()|0,n=Mn(n,31)+this.hc_1.hashCode()|0,n=Mn(n,31)+this.ic_1.hashCode()|0,n=Mn(n,31)+this.jc_1.hashCode()|0,n=Mn(n,31)+this.kc_1.hashCode()|0,Mn(n,31)+this.lc_1.hashCode()|0},ve(xo).equals=function(n){if(this===n)return!0;if(!(n instanceof xo))return!1;var t=n instanceof xo?n:pe();return!!(this.ec_1.equals(t.ec_1)&&le(this.fc_1,t.fc_1)&&this.gc_1.equals(t.gc_1)&&this.hc_1.equals(t.hc_1)&&this.ic_1.equals(t.ic_1)&&this.jc_1.equals(t.jc_1)&&this.kc_1.equals(t.kc_1)&&this.lc_1.equals(t.lc_1))},ve(Ko).gd=function(n,t){var r,i;return n instanceof ko?r=t.nc(A,A,A,A,ps().id(n.yb_1,t.ic_1)):n instanceof qo?r=t.nc(A,A,A,ps().id(n.ac_1,t.hc_1)):n instanceof yo?r=t.nc(A,A,A,A,A,ps().id(n.bc_1,t.jc_1)):n instanceof Bo?r=t.nc(A,A,A,A,A,A,ps().id(n.cc_1,t.kc_1)):n instanceof Dc?r=function(n,t,r,i){var e;return r instanceof qo?e=n.nc(A,A,A,Ac(n.hc_1,r,i)):r instanceof ko?e=n.nc(A,A,A,A,Ac(n.ic_1,r,i)):r instanceof yo?e=n.nc(A,A,A,A,A,Ac(n.jc_1,r,i)):r instanceof Bo?e=n.nc(A,A,A,A,A,A,Ac(n.kc_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Vu))throw _u(ce("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Rr(Tt(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===yr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof Mc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof Co?r=t.nc(A,A,A,A,A,A,A,n.dc_1):(console.error("Unhandled intent: "+n),r=t),r},ve(Ko).ba=function(n,t){var r=n instanceof Oc?n:pe();return this.gd(r,t instanceof xo?t:pe())},ve(Ko).jd=function(n){return Hf().y9(us(Do),[Io(0,n),So(0,n)])},ve(Ko).z9=function(n){return this.jd(n instanceof xo?n:pe())},ve(nf).toString=function(){return"ImportedProblem(problem="+this.kd_1+", message="+this.ld_1+", trace="+this.md_1+")"},ve(nf).hashCode=function(){var n=ae(this.kd_1);return n=Mn(n,31)+this.ld_1.hashCode()|0,Mn(n,31)+ae(this.md_1)|0},ve(nf).equals=function(n){if(this===n)return!0;if(!(n instanceof nf))return!1;var t=n instanceof nf?n:pe();return!!le(this.kd_1,t.kd_1)&&!!this.ld_1.equals(t.ld_1)&&!!le(this.md_1,t.md_1)},ve(_f).ud=function(n,t){return this.td_1(n,t)},ve(_f).compare=function(n,t){return this.ud(n,t)},ve(Bf).toString=function(){return"LearnMore(text="+this.sc_1+", documentationLink="+this.tc_1+")"},ve(Bf).hashCode=function(){var n=he(this.sc_1);return Mn(n,31)+he(this.tc_1)|0},ve(Bf).equals=function(n){if(this===n)return!0;if(!(n instanceof Bf))return!1;var t=n instanceof Bf?n:pe();return this.sc_1===t.sc_1&&this.tc_1===t.tc_1},ve(Cf).toString=function(){return"Text(text="+this.fa_1+")"},ve(Cf).hashCode=function(){return he(this.fa_1)},ve(Cf).equals=function(n){if(this===n)return!0;if(!(n instanceof Cf))return!1;var t=n instanceof Cf?n:pe();return this.fa_1===t.fa_1},ve(xf).toString=function(){return"Reference(name="+this.da_1+", clipboardString="+this.ea_1+")"},ve(xf).hashCode=function(){var n=he(this.da_1);return Mn(n,31)+he(this.ea_1)|0},ve(xf).equals=function(n){if(this===n)return!0;if(!(n instanceof xf))return!1;var t=n instanceof xf?n:pe();return this.da_1===t.da_1&&this.ea_1===t.ea_1},ve(Pf).ed=function(n){return this.dd_1.d(new Cf(n)),this},ve(Pf).xd=function(n,t){return this.dd_1.d(new xf(n,t)),this},ve(Pf).fd=function(n,t,r){return t=t===A?n:t,r===A?this.xd(n,t):r.xd.call(this,n,t)},ve(Pf).j5=function(){return new zf(Qn(this.dd_1))},ve(If).rd=function(n){return new zf(qr(new Cf(n)))},ve(If).qd=function(n){var t=new Pf;return n(t),t.j5()},ve(zf).vd=function(n){return new zf(n)},ve(zf).toString=function(){return"PrettyText(fragments="+this.ca_1+")"},ve(zf).hashCode=function(){return ae(this.ca_1)},ve(zf).equals=function(n){if(this===n)return!0;if(!(n instanceof zf))return!1;var t=n instanceof zf?n:pe();return!!le(this.ca_1,t.ca_1)},ve(Tf).sd=function(n){return function(n){for(var t=Wr(),r=n.f();r.g();)for(var i=t,e=r.h().f();e.g();){var u,o=e.h(),f=i,s=f.v1(o);if(null==s){var c=Wr();f.h5(o,c),u=c}else u=s;i=u instanceof Xr?u:pe()}return t}(n)},ve(Af).toString=function(){return"Trie(nestedMaps="+this.wd_1+")"},ve(Af).hashCode=function(){return ae(this.wd_1)},ve(Af).equals=function(n){return function(n,t){return t instanceof Af&&!!le(n,t instanceof Af?t.wd_1:pe())}(this.wd_1,n)},ve(Kf).ga=function(n){return Jf().yd(this.x9_1,A,n)},ve(Kf).ha=function(n){return Jf().yd(this.x9_1,A,A,n)},ve(Kf).ja=function(n){return Jf().yd(this.x9_1,A,A,ou(n))},ve(Kf).y9=function(n,t){return Jf().yd(this.x9_1,n,A,ou(t))},ve(Kf).zd=function(n,t){return Jf().yd(this.x9_1,n,A,t)},ve(Kf).fb=function(n,t){return Jf().yd(this.x9_1,n,t)},ve(Kf).rc=function(n,t){return Jf().yd(this.x9_1,A,n,ou(t))},ve(Kf).toString=function(){return"ViewFactory(elementName="+this.x9_1+")"},ve(Kf).hashCode=function(){return he(this.x9_1)},ve(Kf).equals=function(n){if(this===n)return!0;if(!(n instanceof Kf))return!1;var t=n instanceof Kf?n:pe();return this.x9_1===t.x9_1},ve(Xf).ae=function(n,t,r,i){return new rs(n,t,r,i)},ve(Xf).yd=function(n,t,r,i,e){return t=t===A?Ct():t,r=r===A?null:r,i=i===A?Ct():i,e===A?this.ae(n,t,r,i):e.ae.call(this,n,t,r,i)},ve(rs).toString=function(){return"Element(elementName="+this.be_1+", attributes="+this.ce_1+", innerText="+this.de_1+", children="+this.ee_1+")"},ve(rs).hashCode=function(){var n=he(this.be_1);return n=Mn(n,31)+ae(this.ce_1)|0,n=Mn(n,31)+(null==this.de_1?0:he(this.de_1))|0,Mn(n,31)+ae(this.ee_1)|0},ve(rs).equals=function(n){if(this===n)return!0;if(!(n instanceof rs))return!1;var t=n instanceof rs?n:pe();return this.be_1===t.be_1&&!!le(this.ce_1,t.ce_1)&&this.de_1==t.de_1&&!!le(this.ee_1,t.ee_1)},ve(os).u9=function(n){return this.r9_1(new fs("click",n))},ve(os).t9=function(n){return this.r9_1(new ss(n))},ve(os).gb=function(n){for(var t=0,r=n.length;t<r;){var i=n[t];t=t+1|0,this.r9_1(new ss(i))}return br()},ve(os).s9=function(n){return this.r9_1(new cs("title",n))},ve(os).bd=function(n){return this.r9_1(new cs("href",n))},ve(vs).oe=function(){return this.ne_1},ve(vs).toString=function(){return"Toggle(focus="+this.ne_1+")"},ve(vs).hashCode=function(){return ae(this.ne_1)},ve(vs).equals=function(n){if(this===n)return!0;if(!(n instanceof vs))return!1;var t=n instanceof vs?n:pe();return!!le(this.ne_1,t.ne_1)},ve(ds).pe=function(n,t){return this.re(n.qe((r=t,function(n){return n.me(r(n.ub_1))})));var r},ve(ds).re=function(n){return new ds(n)},ve(ds).toString=function(){return"Model(tree="+this.xb_1+")"},ve(ds).hashCode=function(){return this.xb_1.hashCode()},ve(ds).equals=function(n){if(this===n)return!0;if(!(n instanceof ds))return!1;var t=n instanceof ds?n:pe();return!!this.xb_1.equals(t.xb_1)},ve(bs).id=function(n,t){var r;if(n instanceof vs){var i=n.oe();r=t.re(i.qe(ws))}else be();return r},ve(ks).cd=function(){return this.ve_1},ve(ks).we=function(){return 0},ve(ks).qe=function(n){return n(this.ve_1)},ve(ks).toString=function(){return"Original(tree="+this.ve_1+")"},ve(ks).hashCode=function(){return this.ve_1.hashCode()},ve(ks).equals=function(n){if(this===n)return!0;if(!(n instanceof ks))return!1;var t=n instanceof ks?n:pe();return!!this.ve_1.equals(t.ve_1)},ve(qs).cd=function(){return this.ue_1},ve(qs).we=function(){return this.se_1.we()+1|0},ve(qs).qe=function(n){return this.se_1.qe((t=this,r=n,function(n){for(var i,e=n.vb_1,u=t.te_1,o=Rr(Tt(e,10)),f=0,s=e.f();s.g();){var c,a=s.h(),h=f;f=h+1|0,c=u===yr(h)?r(a):a,o.d(c)}return i=o,n.me(A,i)}));var t,r},ve(qs).toString=function(){return"Child(parent="+this.se_1+", index="+this.te_1+", tree="+this.ue_1+")"},ve(qs).hashCode=function(){var n=ae(this.se_1);return n=Mn(n,31)+this.te_1|0,Mn(n,31)+this.ue_1.hashCode()|0},ve(qs).equals=function(n){if(this===n)return!0;if(!(n instanceof qs))return!1;var t=n instanceof qs?n:pe();return!!le(this.se_1,t.se_1)&&this.te_1===t.te_1&&!!this.ue_1.equals(t.ue_1)},ve(ys).ad=function(){var n;switch(this.q8_1){case 0:n=xs();break;case 1:n=Cs();break;default:be()}return n},ve(Bs).vc=function(){var n,t;return ut(Vn(Ve(0,this.cd().vb_1.k()-1|0)),(n=this,(t=function(t){return n.xe(t)}).callableName="child",t))},ve(Bs).xe=function(n){return new qs(this,n,this.cd().vb_1.j(n))},ve(js).uc=function(){return new ks(this)},ve(js).ye=function(){return!this.vb_1.i()},ve(js).ze=function(n,t,r){return new js(n,t,r)},ve(js).me=function(n,t,r,i){return n=n===A?this.ub_1:n,t=t===A?this.vb_1:t,r=r===A?this.wb_1:r,i===A?this.ze(n,t,r):i.ze.call(this,n,t,r)},ve(js).toString=function(){return"Tree(label="+this.ub_1+", children="+this.vb_1+", state="+this.wb_1+")"},ve(js).hashCode=function(){var n=null==this.ub_1?0:ae(this.ub_1);return n=Mn(n,31)+ae(this.vb_1)|0,Mn(n,31)+this.wb_1.hashCode()|0},ve(js).equals=function(n){if(this===n)return!0;if(!(n instanceof js))return!1;var t=n instanceof js?n:pe();return!!le(this.ub_1,t.ub_1)&&!!le(this.vb_1,t.vb_1)&&!!this.wb_1.equals(t.wb_1)},ve(zs).toString=function(){return"ProblemIdElement(name="+this.df_1+", displayName="+this.ef_1+")"},ve(zs).hashCode=function(){var n=he(this.df_1);return Mn(n,31)+he(this.ef_1)|0},ve(zs).equals=function(n){if(this===n)return!0;if(!(n instanceof zs))return!1;var t=n instanceof zs?n:pe();return this.df_1===t.df_1&&this.ef_1===t.ef_1},ve(Ts).toString=function(){return"ProblemSummary(problemId="+this.ff_1+", count="+this.gf_1+")"},ve(Ts).hashCode=function(){var n=ae(this.ff_1);return Mn(n,31)+this.gf_1|0},ve(Ts).equals=function(n){if(this===n)return!0;if(!(n instanceof Ts))return!1;var t=n instanceof Ts?n:pe();return!!le(this.ff_1,t.ff_1)&&this.gf_1===t.gf_1},ve(Ms).toString=function(){return"ProblemNodeGroup(tree="+this.hf_1+", children="+this.if_1+", childGroups="+this.jf_1+", id="+this.kf_1+")"},ve(Ms).hashCode=function(){var n=this.hf_1.hashCode();return n=Mn(n,31)+ae(this.if_1)|0,n=Mn(n,31)+ae(this.jf_1)|0,Mn(n,31)+this.kf_1|0},ve(Ms).equals=function(n){if(this===n)return!0;if(!(n instanceof Ms))return!1;var t=n instanceof Ms?n:pe();return!!this.hf_1.equals(t.hf_1)&&!!le(this.if_1,t.if_1)&&!!le(this.jf_1,t.jf_1)&&this.kf_1===t.kf_1},ve(uc).toString=function(){return"Text(text="+this.lf_1+")"},ve(uc).hashCode=function(){return he(this.lf_1)},ve(uc).equals=function(n){if(this===n)return!0;if(!(n instanceof uc))return!1;var t=n instanceof uc?n:pe();return this.lf_1===t.lf_1},ve(oc).toString=function(){return"ProblemIdNode(prettyText="+this.mf_1+", separator="+this.nf_1+")"},ve(oc).hashCode=function(){var n=this.mf_1.hashCode();return Mn(n,31)+(0|this.nf_1)|0},ve(oc).equals=function(n){if(this===n)return!0;if(!(n instanceof oc))return!1;var t=n instanceof oc?n:pe();return!!this.mf_1.equals(t.mf_1)&&this.nf_1===t.nf_1},ve(fc).toString=function(){return"Advice(label="+this.of_1+", docLink="+this.pf_1+")"},ve(fc).hashCode=function(){var n=ae(this.of_1);return Mn(n,31)+(null==this.pf_1?0:ae(this.pf_1))|0},ve(fc).equals=function(n){if(this===n)return!0;if(!(n instanceof fc))return!1;var t=n instanceof fc?n:pe();return!!le(this.of_1,t.of_1)&&!!le(this.pf_1,t.pf_1)},ve(cc).zb=function(){return this.qf_1},ve(cc).toString=function(){return"MessageTreeIntent(delegate="+this.qf_1+")"},ve(cc).hashCode=function(){return ae(this.qf_1)},ve(cc).equals=function(n){if(this===n)return!0;if(!(n instanceof cc))return!1;var t=n instanceof cc?n:pe();return!!le(this.qf_1,t.qf_1)},ve(ac).zb=function(){return this.rf_1},ve(ac).toString=function(){return"ProblemIdTreeIntent(delegate="+this.rf_1+")"},ve(ac).hashCode=function(){return ae(this.rf_1)},ve(ac).equals=function(n){if(this===n)return!0;if(!(n instanceof ac))return!1;var t=n instanceof ac?n:pe();return!!le(this.rf_1,t.rf_1)},ve(hc).zb=function(){return this.sf_1},ve(hc).toString=function(){return"FileLocationTreeIntent(delegate="+this.sf_1+")"},ve(hc).hashCode=function(){return ae(this.sf_1)},ve(hc).equals=function(n){if(this===n)return!0;if(!(n instanceof hc))return!1;var t=n instanceof hc?n:pe();return!!le(this.sf_1,t.sf_1)},ve(lc).zb=function(){return this.tf_1},ve(lc).toString=function(){return"PluginLocationTreeIntent(delegate="+this.tf_1+")"},ve(lc).hashCode=function(){return ae(this.tf_1)},ve(lc).equals=function(n){if(this===n)return!0;if(!(n instanceof lc))return!1;var t=n instanceof lc?n:pe();return!!le(this.tf_1,t.tf_1)},ve(_c).zb=function(){return this.uf_1},ve(_c).toString=function(){return"TaskLocationTreeIntent(delegate="+this.uf_1+")"},ve(_c).hashCode=function(){return ae(this.uf_1)},ve(_c).equals=function(n){if(this===n)return!0;if(!(n instanceof _c))return!1;var t=n instanceof _c?n:pe();return!!le(this.uf_1,t.uf_1)},ve(vc).toString=function(){return"SetTab(tab="+this.vf_1+")"},ve(vc).hashCode=function(){return this.vf_1.hashCode()},ve(vc).equals=function(n){if(this===n)return!0;if(!(n instanceof vc))return!1;var t=n instanceof vc?n:pe();return!!this.vf_1.equals(t.vf_1)},ve(dc).gg=function(n,t,r,i,e,u,o,f,s,c){return new dc(n,t,r,i,e,u,o,f,s,c)},ve(dc).hg=function(n,t,r,i,e,u,o,f,s,c,a){return n=n===A?this.wf_1:n,t=t===A?this.xf_1:t,r=r===A?this.yf_1:r,i=i===A?this.zf_1:i,e=e===A?this.ag_1:e,u=u===A?this.bg_1:u,o=o===A?this.cg_1:o,f=f===A?this.dg_1:f,s=s===A?this.eg_1:s,c=c===A?this.fg_1:c,a===A?this.gg(n,t,r,i,e,u,o,f,s,c):a.gg.call(this,n,t,r,i,e,u,o,f,s,c)},ve(dc).toString=function(){return"Model(heading="+this.wf_1+", summary="+this.xf_1+", learnMore="+this.yf_1+", messageTree="+this.zf_1+", problemIdTree="+this.ag_1+", fileLocationTree="+this.bg_1+", pluginLocationTree="+this.cg_1+", taskLocationTree="+this.dg_1+", problemCount="+this.eg_1+", tab="+this.fg_1+")"},ve(dc).hashCode=function(){var n=this.wf_1.hashCode();return n=Mn(n,31)+ae(this.xf_1)|0,n=Mn(n,31)+this.yf_1.hashCode()|0,n=Mn(n,31)+this.zf_1.hashCode()|0,n=Mn(n,31)+this.ag_1.hashCode()|0,n=Mn(n,31)+this.bg_1.hashCode()|0,n=Mn(n,31)+this.cg_1.hashCode()|0,n=Mn(n,31)+this.dg_1.hashCode()|0,n=Mn(n,31)+this.eg_1|0,Mn(n,31)+this.fg_1.hashCode()|0},ve(dc).equals=function(n){if(this===n)return!0;if(!(n instanceof dc))return!1;var t=n instanceof dc?n:pe();return!!(this.wf_1.equals(t.wf_1)&&le(this.xf_1,t.xf_1)&&this.yf_1.equals(t.yf_1)&&this.zf_1.equals(t.zf_1)&&this.ag_1.equals(t.ag_1)&&this.bg_1.equals(t.bg_1)&&this.cg_1.equals(t.cg_1)&&this.dg_1.equals(t.dg_1)&&this.eg_1===t.eg_1&&this.fg_1.equals(t.fg_1))},ve(Lc).ig=function(n,t){var r,i;return n instanceof hc?r=t.hg(A,A,A,A,A,ps().id(n.sf_1,t.bg_1)):n instanceof lc?r=t.hg(A,A,A,A,A,A,ps().id(n.tf_1,t.cg_1)):n instanceof _c?r=t.hg(A,A,A,A,A,A,A,ps().id(n.uf_1,t.dg_1)):n instanceof ac?r=t.hg(A,A,A,A,ps().id(n.rf_1,t.ag_1)):n instanceof cc?r=t.hg(A,A,A,ps().id(n.qf_1,t.zf_1)):n instanceof Dc?r=function(n,t,r,i){var e;return r instanceof cc?e=n.hg(A,A,A,Ac(n.zf_1,r,i)):r instanceof ac?e=n.hg(A,A,A,A,Ac(n.ag_1,r,i)):r instanceof hc?e=n.hg(A,A,A,A,A,Ac(n.bg_1,r,i)):r instanceof lc?e=n.hg(A,A,A,A,A,A,Ac(n.cg_1,r,i)):r instanceof _c?e=n.hg(A,A,A,A,A,A,A,Ac(n.dg_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Vu))throw _u(ce("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Rr(Tt(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===yr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof Mc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof vc?r=t.hg(A,A,A,A,A,A,A,A,A,n.vf_1):(console.error("Unhandled intent: "+n),r=t),r},ve(Lc).ba=function(n,t){var r=n instanceof Oc?n:pe();return this.ig(r,t instanceof dc?t:pe())},ve(Lc).jg=function(n){return Hf().y9(us(xc),[wc(0,n),bc(0,n)])},ve(Lc).z9=function(n){return this.jg(n instanceof dc?n:pe())},ve(Mc).toString=function(){return"Copy(text="+this.hd_1+")"},ve(Mc).hashCode=function(){return he(this.hd_1)},ve(Mc).equals=function(n){if(this===n)return!0;if(!(n instanceof Mc))return!1;var t=n instanceof Mc?n:pe();return this.hd_1===t.hd_1},ve(Dc).toString=function(){return"ToggleStackTracePart(partIndex="+this.wc_1+", location="+this.xc_1+")"},ve(Dc).hashCode=function(){var n=this.wc_1;return Mn(n,31)+ae(this.xc_1)|0},ve(Dc).equals=function(n){if(this===n)return!0;if(!(n instanceof Dc))return!1;var t=n instanceof Dc?n:pe();return this.wc_1===t.wc_1&&!!le(this.xc_1,t.xc_1)},ve(ui).k6=function(){var n=Object.create(null);return n.foo=1,delete n.foo,br(),n},l=null,function(){var n=configurationCacheProblems();if(null==n.problemsReport)Mf(Ff("report"),Xo(),function(n){var t,r,i,e,u,o,f,s,c,a,h=function(n){for(var t=Or(),r=Or(),i=Or(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;var f,s=o.input,c=null==s?null:r.d(rf(s,o));if(null==c){var a=o.incompatibleTask;f=null==a?null:i.d(rf(a,o))}else f=c;if(null==f){var h=we(o.problem);t.d(rf(h,o))}}return new tf(t,r,i)}(n.diagnostics),l=n.totalProblemCount;return new xo((f=(t=n).buildName,s=t.requestedTasks,c=null==s?null:rr(s," ",A,r=r!==A&&r)>=0,a=null==c||c,Sf().qd((i=t,e=f,u=s,o=a,function(n){n.ed(function(n){var t;if(re(n)>0){var r,i=ne(n,0);r=function(n){return 97<=n&&n<=122||!(Ei(n,128)<0)&&function(n){var t;return t=1===function(n){var t=n,r=su(au().h9_1,t),i=au().h9_1[r],e=(i+au().i9_1[r]|0)-1|0,u=au().j9_1[r];if(t>e)return 0;var o=3&u;if(0===o){var f=2,s=i,c=0;if(c<=1)do{if(c=c+1|0,(s=s+(u>>f&127)|0)>t)return 3;if((s=s+(u>>(f=f+7|0)&127)|0)>t)return 0;f=f+7|0}while(c<=1);return 3}if(u<=7)return o;var a=t-i|0;return u>>Mn(2,u<=31?a%2|0:a)&3}(n)||function(n){var t=su(lu().k9_1,n);return t>=0&&n<(lu().k9_1[t]+lu().l9_1[t]|0)}(n),t}(n)}(i)?function(n){return function(n){var t=Li(n).toUpperCase();if(t.length>1){var r;if(329===n)r=t;else{var i=ne(t,0),e=t.substring(1).toLowerCase();r=Li(i)+e}return r}return Li(function(n){return function(n){var t=n;return 452<=t&&t<=460||497<=t&&t<=499?Ue(Mn(3,(t+1|0)/3|0)):4304<=t&&t<=4346||4349<=t&&t<=4351?n:xi(n)}(n)}(n))}(n)}(i):Li(i),t=ce(r)+n.substring(1)}else t=n;return t}(i.cacheAction)+" the configuration cache for ");var t=e;null==t||n.fd(t),null==e||n.ed(" build and ");var r=u;return null==(null==r?null:n.fd(r))&&n.ed("default"),n.ed(o?" tasks":" task"),br()}))),function(n,t){var r=n.cacheActionDescription,i=null==r?null:mf(r),e=Sf().rd(function(n){var t=n.od_1.k(),r=kf(t,"build configuration input");return t>0?r+" and will cause the cache to be discarded when "+(t<=1?"its":"their")+" value change":r}(t)),u=Sf().rd(function(n,t){var r=n.totalProblemCount,i=t.nd_1.k(),e=kf(r,"problem");return r>i?e+", only the first "+i+" "+yf(i)+" included in this report":e}(n,t));return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,null!=e&&t.d(e)}return t}([i,e,u],Or())}(n,h),new Bf("Gradle Configuration Cache",n.documentationLink),hf(new no(Zo().qc_1),ut(Vn(h.nd_1),gf)),hf(new no(Yo().qc_1),function(n){return ut(Vn(n),wf)}(h.nd_1)),hf(new no(Qo().qc_1),ut(Vn(h.od_1),vf)),hf(new no(Wo().qc_1),ut(Vn(h.pd_1),df)),0===l?Qo():Zo())}(n));else{var t=n.problemsReport;Mf(Ff("report"),Nc(),function(n,t){ec();for(var r=n.summaries,i=Rr(r.length),e=0,u=r.length;e<u;){var o,f=r[e];e=e+1|0;for(var s=f.problemId,c=Rr(s.length),a=0,h=s.length;a<h;){var l,_=s[a];a=a+1|0,l=new zs(_.name,_.displayName),c.d(l)}o=new Ts(c,f.count),i.d(o)}for(var v=i,d=function(n,t){ec();for(var r=li(),i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o,f=(a=u.problemId,ec(),On(a,":",A,A,A,A,Ws)),s=r.v1(f);if(null==s){var c=Or();r.h5(f,c),o=c}else o=s;o.d(u)}for(var a,h=r.o(),l=Rr(Tt(h,10)),_=h.f();_.g();){for(var v,d=_.h(),g=d.i1(),w=Rr(Tt(g,10)),b=g.f();b.g();){var p;p=Os(b.h(),null,!0),w.d(p)}var m,k=Zn(w),q=Un(d.i1()),y=Hs(q,new Wu($s(Rs(q)).ed(" ("+d.i1().k()+")").j5()));n:{for(var B=t.f();B.g();){var C=B.h();if(Ds(C.ff_1,q.problemId)){m=C;break n}}m=null}var x=m;null==x||k.d(Ns(x.gf_1)),v=new js(y,k),l.d(v)}var j=l;return new ds(new js(new uc("message tree root"),j))}(t,v),g=function(n,t){ec();for(var r=function(){ec();var n=Or();return new Ms(new js(new oc(Sf().rd("Ungrouped"),!0),n),n,li())}(),i=li(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;for(var f=Yn(Dn(o.problemId,1)),s=Rr(Tt(f,10)),c=f.f();c.g();){var a,h=c.h();a=new zs(h.name,h.displayName),s.d(a)}var l=Fs(i,s),_=Os(o);null==l?r.if_1.d(_):l.if_1.d(_)}for(var v=Rr(Tt(t,10)),d=t.f();d.g();){var g,w=d.h();g=new Ts(Yn(Wn(w.ff_1,1)),w.gf_1),v.d(g)}for(var b=li(),p=v.f();p.g();){var m,k=p.h(),q=k.ff_1,y=b.v1(q);if(null==y){var B=Or();b.h5(q,B),m=B}else m=y;m.d(k)}for(var C=b.o(),x=Rr(Tt(C,10)),j=C.f();j.g();){for(var P,I=j.h(),S=I.j1(),z=0,T=I.i1().f();T.g();)z=z+T.h().gf_1|0;P=new Ts(S,z),x.d(P)}for(var E=x.f();E.g();){var L=E.h(),N=Fs(i,L.ff_1),A=null==N?null:N.if_1;null==A||A.d(Ns(L.gf_1))}for(var M=i.w1(),F=Rr(Tt(M,10)),D=M.f();D.g();){var O;O=D.h().hf_1,F.d(O)}var R=function(n,t){var r=Rr(n.k());return r.m(n),r.d(t),r}(F,r.hf_1);return new ds(new js(new uc("group tree root"),R))}(t,v),w=0,b=v.f();b.g();)w=w+b.h().gf_1|0;for(var p=Es(t,w,(ec(),wn)),m=0,k=v.f();k.g();)m=m+k.h().gf_1|0;for(var q=Es(t,m,(ec(),bn)),y=0,B=v.f();B.g();)y=y+B.h().gf_1|0;var C=Es(t,y,(ec(),pn));return new dc(Sf().rd("Problems Report"),function(n,t){ec();var r,i,e,u=n.description,o=null==u?null:qr(mf(u));return r=null==o?qr(Sf().qd((i=t,e=n,function(n){n.ed(i.length+" problems have been reported during the execution");var t=e.buildName;null==t||(n.ed(" of build "),n.fd(t));var r=e.requestedTasks;return null==r||(n.ed(" for the following tasks:"),n.fd(r),br()),br()}))):o,r}(n,t),new Bf("reporting problems",n.documentationLink),d,g,p,q,C,t.length,function(n,t,r,i,e){return ec(),po(r)>0?tc():po(n)>0?Js():po(t)>0?nc():po(i)>0?rc():po(e)>0?ic():Js()}(d,g,p,q,C))}(t,n.diagnostics))}}(),n}(void 0===this["configuration-cache-report"]?{}:this["configuration-cache-report"])}}[70](),{}))));
-//# sourceMappingURL=configuration-cache-report.js.map
-                </script>
-
-</body>
-</html>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8bdaf60c75ab801e22807dde59e12a8735a34077..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45457
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

diff --git a/libs/common b/libs/common
index 1ee295e..28e4cb7 160000
--- a/libs/common
+++ b/libs/common
@@ -1 +1 @@
-Subproject commit 1ee295e6ff9bf25f15426b56603bfcb77f62d66a
+Subproject commit 28e4cb734695688a0f19e637f6608442d1edf3ac
diff --git a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
new file mode 100644
index 0000000..d75d64c
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
@@ -0,0 +1,11 @@
+package org.pgsg.reservation;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ReservationServiceApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(ReservationServiceApplication.class, args);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/query/ReservationSearchQuery.java b/src/main/java/org/pgsg/reservation/application/dto/query/ReservationSearchQuery.java
new file mode 100644
index 0000000..5925738
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/query/ReservationSearchQuery.java
@@ -0,0 +1,14 @@
+package org.pgsg.reservation.application.dto.query;
+
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationStatus;
+
+import java.util.UUID;
+
+
+public record ReservationSearchQuery(
+        String sellerName,
+        String buyerName,
+        String productName,
+        ReservationStatus status,
+        UUID productId
+) {}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
new file mode 100644
index 0000000..b3ce8c3
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
@@ -0,0 +1,16 @@
+package org.pgsg.reservation.application.dto.result;
+
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationStatus;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public record ReservationSearchResult(
+        UUID reservationId,
+        String productName,
+        String sellerName,
+        String buyerName,
+        ReservationStatus status, // 도메인 Enum 직접 사용
+        LocalDateTime createdAt
+) {
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 271f93e..f282c83 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -2,10 +2,14 @@
 
 import lombok.RequiredArgsConstructor;
 import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
+import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
+import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
 import org.pgsg.reservation.domain.model.reservation.*;
 import org.pgsg.reservation.domain.service.ReservationDomainService;
 import org.pgsg.reservation.domain.repository.ReservationRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -54,4 +58,19 @@ public ReservationCreateResult createReservation(ReservationCreateCommand comman
                 .status(savedReservation.getStatus().name())
                 .build();
     }
+
+    // 예약 목록 조회
+    @Transactional(readOnly = true)
+    public Page<ReservationSearchResult> getSearchReservations(
+            UUID userId,
+            String role,
+            ReservationSearchQuery query,
+            Pageable pageable
+    ) {
+        // 권한에 따른 조회 범위 결정 로직을 도메인 모델로 전달
+        SearchPolicy policy = reservationDomainService.getReservations(userId, role);
+
+        // Repository(QueryDSL)에 정책과 검색 조건을 함께 전달
+        return reservationRepository.searchReservations(policy, query, pageable);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
index b040d74..4a3b367 100644
--- a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
+++ b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
@@ -13,6 +13,9 @@ public enum ReservationErrorCode {
     INVALID_SELECT_STATUS(400, "잘못된 선정 상태입니다."),
     CANNOT_CHANGE_STATUS(400, "현재 상태에서는 변경할 수 없는 요청입니다."),
 
+    // 401 Unauthorized / 403 Forbidden
+    UNAUTHORIZED_ACCESS(403, "해당 요청에 대한 접근 권한이 없습니다."),
+
     // 404 Not Found
     RESERVATION_NOT_FOUND(404, "해당 예약을 찾을 수 없습니다."),
 
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java
new file mode 100644
index 0000000..6547336
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java
@@ -0,0 +1,9 @@
+package org.pgsg.reservation.domain.model.reservation;
+
+import java.util.UUID;
+
+public record SearchPolicy(
+        UUID accessUserId,
+        boolean isBuyerFilter,
+        boolean isSellerFilter
+) {}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
index f97def8..9b85783 100644
--- a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
+++ b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
@@ -1,9 +1,19 @@
 package org.pgsg.reservation.domain.repository;
 
+import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
+import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
-import java.util.Optional;
-import java.util.UUID;
+import org.pgsg.reservation.domain.model.reservation.SearchPolicy;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 
 public interface ReservationRepository {
     Reservation save(Reservation reservation);
+
+    // QueryDSL을 활용한 동적 검색 구현
+    Page<ReservationSearchResult> searchReservations(
+            SearchPolicy policy,
+            ReservationSearchQuery query,
+            Pageable pageable
+    );
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 16087e1..7fe1e56 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -1,12 +1,14 @@
 package org.pgsg.reservation.domain.service;
 
 import lombok.RequiredArgsConstructor;
-import org.pgsg.reservation.domain.model.reservation.Reservation;
-import org.pgsg.reservation.domain.model.reservation.BuyerInfo;
-import org.pgsg.reservation.domain.model.reservation.SellerInfo;
-import org.pgsg.reservation.domain.model.reservation.ProductInfo;
+import org.pgsg.reservation.domain.exception.ReservationErrorCode;
+import org.pgsg.reservation.domain.exception.ReservationException;
+import org.pgsg.reservation.domain.model.reservation.*;
 import org.springframework.stereotype.Service;
 
+import java.util.Locale;
+import java.util.UUID;
+
 
 @Service
 @RequiredArgsConstructor
@@ -24,4 +26,26 @@ public Reservation createReservation(BuyerInfo buyer, SellerInfo seller, Product
 
         return Reservation.create(buyer, seller, product);
     }
+
+    /**
+     * 예약 목록 조회 정책 획득 로직
+     * 권한에 따른 조회 범위를 검증하고 정책(Policy)을 결정
+     */
+    public SearchPolicy getReservations(UUID userId, String role) {
+        // 권한 데이터가 비어있는지 검증
+        reservationValidator.validateSearchRequest(userId, role);
+
+        // 역할에 따른 필터링
+        String normalizedRole = role.trim().toUpperCase(Locale.ROOT);
+        if ("ADMIN".equals(normalizedRole)) {
+            return new SearchPolicy(userId, false, false);
+        }
+        if ("SELLER".equals(normalizedRole)) {
+            return new SearchPolicy(userId, false, true);
+        }
+        if ("BUYER".equals(normalizedRole)) {
+            return new SearchPolicy(userId, true, false);
+        }
+        throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
index a8580ee..b15c505 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
@@ -4,6 +4,8 @@
 import org.pgsg.reservation.domain.exception.*;
 import org.springframework.stereotype.Component;
 
+import java.util.UUID;
+
 @Component
 
 public class ReservationValidator {
@@ -26,8 +28,16 @@ public void validate(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
         // 검증 규칙 추가 예정
     }
 
+    public void validateSearchRequest(UUID userId, String role) {
+        if (userId == null || role == null || role.isBlank()) {
+            // 권한 정보가 부족할 때 던지는 예외
+            throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
+        }
+    }
+
     // 본인 상품 예약 금지 규칙
     private boolean isSamePerson(BuyerInfo buyer, SellerInfo seller) {
         return buyer.getBuyerId().equals(seller.getSellerId());
     }
+
 }
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/QuerydslConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/QuerydslConfig.java
new file mode 100644
index 0000000..d92373a
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/QuerydslConfig.java
@@ -0,0 +1,19 @@
+package org.pgsg.reservation.infrastructure.config;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class QuerydslConfig {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Bean
+    public JPAQueryFactory jpaQueryFactory() {
+        return new JPAQueryFactory(entityManager);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
index e739a30..b480c9f 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
@@ -1,18 +1,121 @@
 package org.pgsg.reservation.infrastructure.repository;
 
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
+import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
+import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.domain.model.reservation.SearchPolicy;
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationStatus;
 import org.pgsg.reservation.domain.repository.ReservationRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.UUID;
+
 @Repository
 @RequiredArgsConstructor
 public class ReservationRepositoryImpl implements ReservationRepository {
 
     private final ReservationJpaRepository reservationJpaRepository;
+    private final JPAQueryFactory queryFactory;
+
+    private final PathBuilder<Reservation> reservation =
+            new PathBuilder<>(Reservation.class, "reservation");
+
+    @Override
+    public Reservation save(Reservation reservationEntity) {
+        return reservationJpaRepository.save(reservationEntity);
+    }
 
     @Override
-    public Reservation save(Reservation reservation) {
-        return reservationJpaRepository.save(reservation);
+    public Page<ReservationSearchResult> searchReservations(
+            SearchPolicy policy,
+            ReservationSearchQuery query,
+            Pageable pageable
+    ) {
+        // 검색 조건 공통화
+        BooleanExpression[] predicates = {
+                applyPolicyFilter(policy),
+                statusEq(query.status()),
+                productNameContains(query.productName()),
+                productIdEq(query.productId()),
+                sellerNameEq(query.sellerName()),
+                buyerNameEq(query.buyerName())
+        };
+
+        List<ReservationSearchResult> content = queryFactory
+                .select(Projections.constructor(ReservationSearchResult.class,
+                        reservation.get("id", UUID.class),
+                        reservation.get("productInfo").get("productName", String.class),
+                        reservation.get("sellerInfo").get("sellerName", String.class),
+                        reservation.get("buyerInfo").get("buyerName", String.class),
+                        reservation.get("status", ReservationStatus.class),
+                        reservation.get("createdAt", java.time.LocalDateTime.class)
+                ))
+                .from(reservation)
+                .where(predicates) // 정리된 조건 적용
+                .offset(pageable.getOffset())
+                .limit(pageable.getPageSize())
+                .orderBy(reservation.getDateTime("createdAt", java.time.LocalDateTime.class).desc())
+                .fetch();
+
+        Long total = queryFactory
+                .select(reservation.count())
+                .from(reservation)
+                .where(predicates) // 정리된 조건 적용
+                .fetchOne();
+
+        return new PageImpl<>(content, pageable, total != null ? total : 0L);
+    }
+
+    private BooleanExpression applyPolicyFilter(SearchPolicy policy) {
+        if (policy == null) return null;
+        if (policy.isBuyerFilter()) {
+            return reservation.get("buyerInfo").get("buyerId", UUID.class).eq(policy.accessUserId());
+        }
+        if (policy.isSellerFilter()) {
+            return reservation.get("sellerInfo").get("sellerId", UUID.class).eq(policy.accessUserId());
+        }
+        return null;
+    }
+
+    private BooleanExpression statusEq(ReservationStatus status) {
+        return status != null ? reservation.get("status", ReservationStatus.class).eq(status) : null;
+    }
+
+    private BooleanExpression productNameContains(String productName) {
+        String normalized = productName == null ? null : productName.trim();
+        return (normalized != null && !normalized.isBlank())
+                ? reservation.get("productInfo").getString("productName").containsIgnoreCase(productName)
+                : null;
+    }
+
+    private BooleanExpression productIdEq(UUID productId) {
+        return productId != null
+                ? reservation.get("productInfo").get("productId", UUID.class).eq(productId)
+                : null;
+    }
+
+    private BooleanExpression sellerNameEq(String sellerName) {
+        String normalized = sellerName == null ? null : sellerName.trim();
+        return (normalized != null && !normalized.isBlank())
+                ? get("sellerInfo").getString("sellerName").containsIgnoreCase(sellerName)
+                : null;
+    }
+
+    private BooleanExpression buyerNameEq(String buyerName) {
+        String normalized = buyerName == null ? null : buyerName.trim();
+        return (normalized != null && !normalized.isBlank())
+                ? get("buyerInfo").getString("buyerName").containsIgnoreCase(buyerName)
+                : null;
+    }
+                : null;
     }
 }
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index b737222..cf29733 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -3,10 +3,15 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
+import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
 import org.pgsg.reservation.application.service.ReservationService;
 import org.pgsg.reservation.presentation.dto.request.ReservationCreateRequest;
+import org.pgsg.reservation.presentation.dto.request.ReservationSearchRequest;
 import org.pgsg.reservation.presentation.dto.response.ReservationResponse;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,6 +25,7 @@ public class ReservationController {
 
     private final ReservationService reservationService;
 
+    // 예약 생성
     @PostMapping
     public ResponseEntity<ReservationResponse> createReservation(
             @Valid @RequestBody ReservationCreateRequest request,
@@ -39,4 +45,30 @@ public ResponseEntity<ReservationResponse> createReservation(
                 .status(HttpStatus.CREATED)
                 .body(ReservationResponse.from(result));
     }
+
+    // 예약 목록 조회
+    @GetMapping
+    public ResponseEntity<Page<ReservationResponse>> getReservations(
+            @RequestHeader("X-User-Id") UUID userId,
+            @RequestHeader("X-User-Role") String role,
+            @ModelAttribute ReservationSearchRequest request,
+            @PageableDefault(size = 10) Pageable pageable
+    ) {
+
+        ReservationSearchQuery query = new ReservationSearchQuery(
+                request.getSellerName(),
+                request.getBuyerName(),
+                request.getProductName(),
+                request.getStatus(),
+                request.getProductId()
+        );
+
+        Page<ReservationResponse> responses = reservationService.getSearchReservations(userId, role, query, pageable)
+                .map(ReservationResponse::from);
+
+        // 3. 통일된 응답 규격으로 반환 (조회는 200 OK)
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(responses);
+    }
 }
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationSearchRequest.java b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationSearchRequest.java
new file mode 100644
index 0000000..066aee6
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationSearchRequest.java
@@ -0,0 +1,18 @@
+package org.pgsg.reservation.presentation.dto.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationStatus;
+import java.util.UUID;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class ReservationSearchRequest {
+    private String sellerName;
+    private String buyerName;
+    private String productName;
+    private ReservationStatus status;
+    private UUID productId;
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
index 29b1f60..b71b42b 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
@@ -5,7 +5,9 @@
 import lombok.Builder;
 import lombok.Getter;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
+import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
 
+import java.time.LocalDateTime;
 import java.util.UUID;
 
 @Getter
@@ -16,10 +18,33 @@ public class ReservationResponse {
     private UUID reservationId;
     private String status;
 
+    // 목록 조회를 위해 추가된 필드들
+    private String productName;
+    private String sellerName;
+    private String buyerName;
+    private LocalDateTime createdAt;
+
+    /**
+     * 예약 생성 결과로부터 변환
+     */
     public static ReservationResponse from(ReservationCreateResult result) {
         return ReservationResponse.builder()
                 .reservationId(result.getReservationId())
                 .status(result.getStatus())
                 .build();
     }
-}
+
+    /**
+     * 예약 목록 조회 결과로부터 변환
+     */
+    public static ReservationResponse from(ReservationSearchResult result) {
+        return ReservationResponse.builder()
+                .reservationId(result.reservationId())
+                .status(result.status().name())
+                .productName(result.productName())
+                .sellerName(result.sellerName())
+                .buyerName(result.buyerName())
+                .createdAt(result.createdAt())
+                .build();
+    }
+}
\ No newline at end of file

From be72d891ae01bcc77ea6bcd1d30626713a19349b Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Mon, 27 Apr 2026 21:46:19 +0900
Subject: [PATCH 004/142] =?UTF-8?q?fix=20:=20=EC=83=81=ED=83=9C=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20(#8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ReservationCandidateStatus 와 ReservationStatus 내용 반대로 변경
- 결재 완료 paid 상태 추가 및 검증 로직 작성
---
 .../dto/query/ReservationSearchQuery.java     |  2 +-
 .../dto/result/ReservationSearchResult.java   |  2 +-
 .../domain/model/reservation/Reservation.java | 45 ++++++++++++++-----
 .../ReservationStatus.java                    |  4 +-
 .../ReservationCandidate.java                 | 12 ++---
 .../ReservationCandidateStatus.java}          |  6 +--
 .../repository/ReservationRepositoryImpl.java |  8 ++--
 .../dto/request/ReservationSearchRequest.java |  2 +-
 8 files changed, 50 insertions(+), 31 deletions(-)
 rename src/main/java/org/pgsg/reservation/domain/model/{reservationcandidate => reservation}/ReservationStatus.java (83%)
 rename src/main/java/org/pgsg/reservation/domain/model/{reservation/SelectStatus.java => reservationcandidate/ReservationCandidateStatus.java} (79%)

diff --git a/src/main/java/org/pgsg/reservation/application/dto/query/ReservationSearchQuery.java b/src/main/java/org/pgsg/reservation/application/dto/query/ReservationSearchQuery.java
index 5925738..3c5a35e 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/query/ReservationSearchQuery.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/query/ReservationSearchQuery.java
@@ -1,6 +1,6 @@
 package org.pgsg.reservation.application.dto.query;
 
-import org.pgsg.reservation.domain.model.reservationcandidate.ReservationStatus;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 
 import java.util.UUID;
 
diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
index b3ce8c3..2d50789 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
@@ -1,6 +1,6 @@
 package org.pgsg.reservation.application.dto.result;
 
-import org.pgsg.reservation.domain.model.reservationcandidate.ReservationStatus;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 
 import java.time.LocalDateTime;
 import java.util.UUID;
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index 960ac22..7c57a68 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -6,7 +6,8 @@
 import org.pgsg.reservation.domain.exception.ReservationException;
 import org.pgsg.reservation.domain.exception.ReservationErrorCode;
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
-import org.pgsg.reservation.domain.model.reservationcandidate.ReservationStatus;
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidateStatus;
+
 import java.util.Objects;
 
 import java.util.ArrayList;
@@ -49,12 +50,12 @@ public List<ReservationCandidate> getCandidates() {
     }
 
     public void addCandidate(ReservationCandidate candidate) {
-        validatePendingStatus();
+        validateStatus(ReservationStatus.PENDING);
         this.candidates.add(candidate);
     }
 
     public void removeCandidate(ReservationCandidate candidate) {
-        validatePendingStatus();
+        validateStatus(ReservationStatus.PENDING);
         this.candidates.remove(candidate);
     }
 
@@ -71,38 +72,52 @@ public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo
         return reservation;
     }
 
-    // 예약 완료: PENDING 상태일 때만 가능
+    // 결제 완료: PENDING 상태일 때만 가능
+    public void markAsPaid() {
+        validateStatus(ReservationStatus.PENDING);
+        this.status = ReservationStatus.PAID;
+    }
+
+    // 예약 완료: PAID(결제 완료) 상태일 때만 가능
     public void complete() {
-        validatePendingStatus();
+        validateStatus(ReservationStatus.PAID);
         this.status = ReservationStatus.COMPLETED;
     }
 
     // 예약 만료: PENDING 상태일 때만 가능
+    public void rollbackToPending() {
+        validateStatus(ReservationStatus.COMPLETED);
+        this.status = ReservationStatus.PENDING;
+        // 추후 기존 구매자의 후보자 상태를 'CANCELLED'로 바꾸는 로직 추가 예정
+    }
+
+    // 시간 만료: PENDING 상태일 때만 가능
     public void expire() {
-        validatePendingStatus();
+        validateStatus(ReservationStatus.PENDING);
         this.status = ReservationStatus.EXPIRED;
     }
 
     // 예약 취소: 취소 사유 업데이트 포함
     public void cancel() {
-        validatePendingStatus();
+        validateStatus(ReservationStatus.PENDING);
         this.status = ReservationStatus.CANCELLED;
     }
 
     // 다음 순번 구매자로 교체
     public void changeToNextBuyer(ReservationCandidate nextCandidate) {
         // 예약 자체가 변경 가능한 상태인지 확인
-        validatePendingStatus();
+        validateStatus(ReservationStatus.PENDING);
+
         // 인자 유효성 검사
         if (nextCandidate == null) {
             throw new IllegalArgumentException("nextBuyer must not be null");
         }
         // 해당 후보자가 실제 이 예약의 후보 명단에 포함되어 있는지 검증
         if (!this.candidates.contains(nextCandidate)) {
-            throw new ReservationException(ReservationErrorCode.INVALID_STATUS); // 혹은 "후보자가 아닙니다" 에러
+            throw new ReservationException(ReservationErrorCode.INVALID_STATUS);
         }
         // 후보자의 상태가 '대기' 중인지 확인
-        if (nextCandidate.getStatus() != SelectStatus.WAITING) {
+        if (nextCandidate.getStatus() != ReservationCandidateStatus.WAITING) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
         nextCandidate.selected();
@@ -110,9 +125,15 @@ public void changeToNextBuyer(ReservationCandidate nextCandidate) {
         this.buyerInfo = BuyerInfo.of(nextCandidate.getCandidateId(), nextCandidate.getCandidateNickname());
     }
 
-    private void validatePendingStatus() {
-        if (this.status != ReservationStatus.PENDING) {
+    private void validateStatus(ReservationStatus expectedStatus) {
+        // 결제가 취소이면 변경 불가
+        if (this.status == ReservationStatus.CANCELLED) {
+            throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
+        }
+
+        if (this.status != expectedStatus) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationStatus.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
similarity index 83%
rename from src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationStatus.java
rename to src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
index cc9cdfd..71632f4 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationStatus.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
@@ -1,4 +1,4 @@
-package org.pgsg.reservation.domain.model.reservationcandidate;
+package org.pgsg.reservation.domain.model.reservation;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -11,13 +11,13 @@
 @AllArgsConstructor
 public enum ReservationStatus {
     PENDING("임시 예약"),
+    PAID("결제 완료"),
     EXPIRED("예약 만료"),
     CANCELLED("예약 취소"),
     COMPLETED("예약 완료");
 
     private final String description;
 
-    // 설계서의 "행위" 부분 구현: 문자열로 enum을 찾는 기능
     public static ReservationStatus find(String statusName) {
         return Arrays.stream(values())
                 .filter(s -> s.name().equalsIgnoreCase(statusName))
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
index f506cd1..1822b9a 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
@@ -6,7 +6,7 @@
 import org.pgsg.reservation.domain.exception.ReservationErrorCode;
 import org.pgsg.reservation.domain.exception.ReservationException;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
-import org.pgsg.reservation.domain.model.reservation.SelectStatus;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 import java.util.Objects;
 
 import java.util.UUID;
@@ -34,7 +34,7 @@ public class ReservationCandidate extends BaseEntity {
     private String candidateNickname; // 후보자 닉네임
 
     @Enumerated(EnumType.STRING)
-    private SelectStatus status = SelectStatus.WAITING;
+    private ReservationCandidateStatus status = ReservationCandidateStatus.WAITING;
 
     // 예약 후보 생성
     public static ReservationCandidate of(Reservation reservation, UUID candidateId, String candidateNickname) {
@@ -58,18 +58,18 @@ private static void verify(Reservation reservation, UUID candidateId, String can
     // 후보 선정: 판매자가 후보를 구매자로 최종 선택했을 때 사용
     public void selected() {
         validateReservationPendingStatus();
-        if (this.status != SelectStatus.WAITING) {
+        if (this.status != ReservationCandidateStatus.WAITING) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
-        this.status = SelectStatus.SELECTED;
+        this.status = ReservationCandidateStatus.SELECTED;
     }
 
     // 후보 취소: 후보자가 대기를 철회하거나 선정에서 제외될 때 사용
     public void cancel() {
-        if (this.status == SelectStatus.CANCELLED) {
+        if (this.status == ReservationCandidateStatus.CANCELLED) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
-        this.status = SelectStatus.CANCELLED;
+        this.status = ReservationCandidateStatus.CANCELLED;
     }
 
     // Reservation에서 예약 상태(PENDING)이어야 후보자 선정 가능
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/SelectStatus.java b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidateStatus.java
similarity index 79%
rename from src/main/java/org/pgsg/reservation/domain/model/reservation/SelectStatus.java
rename to src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidateStatus.java
index 9224b53..e1022c9 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/SelectStatus.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidateStatus.java
@@ -1,4 +1,4 @@
-package org.pgsg.reservation.domain.model.reservation;
+package org.pgsg.reservation.domain.model.reservationcandidate;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -8,14 +8,14 @@
 
 @Getter
 @AllArgsConstructor
-public enum SelectStatus {
+public enum ReservationCandidateStatus {
     WAITING("예약후보 선정 대기 중"),
     SELECTED("예약후보로 선정 완료됨"),
     CANCELLED("예약후보로 선정되었다가 취소");
 
     private final String description;
 
-    public static SelectStatus find(String statusName) {
+    public static ReservationCandidateStatus find(String statusName) {
         return Arrays.stream(values())
                 .filter(s -> s.name().equalsIgnoreCase(statusName))
                 .findFirst()
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
index b480c9f..9632aa8 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
@@ -9,7 +9,7 @@
 import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
 import org.pgsg.reservation.domain.model.reservation.SearchPolicy;
-import org.pgsg.reservation.domain.model.reservationcandidate.ReservationStatus;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 import org.pgsg.reservation.domain.repository.ReservationRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -106,16 +106,14 @@ private BooleanExpression productIdEq(UUID productId) {
     private BooleanExpression sellerNameEq(String sellerName) {
         String normalized = sellerName == null ? null : sellerName.trim();
         return (normalized != null && !normalized.isBlank())
-                ? get("sellerInfo").getString("sellerName").containsIgnoreCase(sellerName)
+                ? reservation.get("sellerInfo").getString("sellerName").containsIgnoreCase(sellerName)
                 : null;
     }
 
     private BooleanExpression buyerNameEq(String buyerName) {
         String normalized = buyerName == null ? null : buyerName.trim();
         return (normalized != null && !normalized.isBlank())
-                ? get("buyerInfo").getString("buyerName").containsIgnoreCase(buyerName)
-                : null;
-    }
+                ? reservation.get("buyerInfo").getString("buyerName").containsIgnoreCase(buyerName)
                 : null;
     }
 }
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationSearchRequest.java b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationSearchRequest.java
index 066aee6..36e9658 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationSearchRequest.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationSearchRequest.java
@@ -3,7 +3,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.pgsg.reservation.domain.model.reservationcandidate.ReservationStatus;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 import java.util.UUID;
 
 @Getter

From 357d82d4ba06601d447717bc60a1d471ac67ca65 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Wed, 29 Apr 2026 14:38:33 +0900
Subject: [PATCH 005/142] =?UTF-8?q?fix=20:=20=EC=98=88=EC=95=BD=20?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=20=EC=84=B8=EB=B6=84=ED=99=94=20(#12)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

예약 상태 세분화
---
 libs/common                                   |  2 +-
 .../domain/model/reservation/Reservation.java | 80 ++++++++++---------
 .../model/reservation/ReservationStatus.java  | 20 +++--
 .../controller/ReservationController.java     |  2 +-
 4 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/libs/common b/libs/common
index 28e4cb7..2ef28dc 160000
--- a/libs/common
+++ b/libs/common
@@ -1 +1 @@
-Subproject commit 28e4cb734695688a0f19e637f6608442d1edf3ac
+Subproject commit 2ef28dc9081ac4ca2fcb00e5b33d223e48947635
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index 7c57a68..c0f6f54 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -8,12 +8,7 @@
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidateStatus;
 
-import java.util.Objects;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 @Entity
 @Getter
@@ -25,7 +20,7 @@ public class Reservation extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.UUID)
     private UUID id;
 
-    //낙관적 락을 위한 버전 추가(추후 분산 락으로 수정예정)
+    // 낙관적 락을 위한 버전 추가(추후 분산 락으로 수정 예정)
     @Version
     private Long version;
 
@@ -50,16 +45,16 @@ public List<ReservationCandidate> getCandidates() {
     }
 
     public void addCandidate(ReservationCandidate candidate) {
-        validateStatus(ReservationStatus.PENDING);
+        validateStatus(ReservationStatus.AVAILABLE);
         this.candidates.add(candidate);
     }
 
     public void removeCandidate(ReservationCandidate candidate) {
-        validateStatus(ReservationStatus.PENDING);
+        validateStatus(ReservationStatus.AVAILABLE);
         this.candidates.remove(candidate);
     }
 
-    // 예약 생성
+    // 예약 생성: 초기 상태 AVAILABLE
     public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
         Objects.requireNonNull(buyer, "buyer must not be null");
         Objects.requireNonNull(seller, "seller must not be null");
@@ -68,72 +63,85 @@ public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo
         reservation.buyerInfo = buyer;
         reservation.sellerInfo = seller;
         reservation.productInfo = product;
-        reservation.status = ReservationStatus.PENDING;
+        reservation.status = ReservationStatus.AVAILABLE;
         return reservation;
     }
 
-    // 결제 완료: PENDING 상태일 때만 가능
+    // 임시 예약: AVAILABLE 상태에서 결제 대기(점유) 단계로 진입
+    public void markAsPending() {
+        validateStatus(ReservationStatus.AVAILABLE);
+        this.status = ReservationStatus.PENDING;
+    }
+
+    // 결제 완료: PENDING(임시 예약) 상태일 때만 가능
     public void markAsPaid() {
         validateStatus(ReservationStatus.PENDING);
         this.status = ReservationStatus.PAID;
     }
 
-    // 예약 완료: PAID(결제 완료) 상태일 때만 가능
+    // 예약 완료: PAID(결제 완료) 상태에서 채팅 수락 시
     public void complete() {
         validateStatus(ReservationStatus.PAID);
         this.status = ReservationStatus.COMPLETED;
     }
 
-    // 예약 만료: PENDING 상태일 때만 가능
-    public void rollbackToPending() {
+    // 최종 종료: 완료된 거래를 아카이브 상태로 변경
+    public void close() {
         validateStatus(ReservationStatus.COMPLETED);
-        this.status = ReservationStatus.PENDING;
-        // 추후 기존 구매자의 후보자 상태를 'CANCELLED'로 바꾸는 로직 추가 예정
+        this.status = ReservationStatus.CLOSED;
     }
 
-    // 시간 만료: PENDING 상태일 때만 가능
-    public void expire() {
-        validateStatus(ReservationStatus.PENDING);
-        this.status = ReservationStatus.EXPIRED;
+    // 거래 복구: COMPLETED 상태에서 취소 발생 시 AVAILABLE로 복구
+    public void rollbackToAvailable() {
+        validateStatus(ReservationStatus.COMPLETED);
+        this.status = ReservationStatus.AVAILABLE;
     }
 
-    // 예약 취소: 취소 사유 업데이트 포함
-    public void cancel() {
-        validateStatus(ReservationStatus.PENDING);
-        this.status = ReservationStatus.CANCELLED;
+    // 구매자 취소: PENDING 또는 PAID 상태에서 구매자가 취소
+    public void cancelByBuyer() {
+        validateStatus(ReservationStatus.PENDING, ReservationStatus.PAID);
+        this.status = ReservationStatus.CANCELLED_BY_BUYER;
+    }
+
+    // 판매자 취소: PENDING 또는 PAID 상태에서 판매자가 취소(영구 종료)
+    public void cancelBySeller() {
+        validateStatus(ReservationStatus.PENDING, ReservationStatus.PAID);
+        this.status = ReservationStatus.CANCELLED_BY_SELLER;
     }
 
     // 다음 순번 구매자로 교체
     public void changeToNextBuyer(ReservationCandidate nextCandidate) {
-        // 예약 자체가 변경 가능한 상태인지 확인
-        validateStatus(ReservationStatus.PENDING);
+        // AVAILABLE 상태거나, 이전 구매자가 취소하여 기회가 생긴 경우에만 가능
+        validateStatus(ReservationStatus.AVAILABLE, ReservationStatus.CANCELLED_BY_BUYER);
 
-        // 인자 유효성 검사
         if (nextCandidate == null) {
             throw new IllegalArgumentException("nextBuyer must not be null");
         }
-        // 해당 후보자가 실제 이 예약의 후보 명단에 포함되어 있는지 검증
         if (!this.candidates.contains(nextCandidate)) {
             throw new ReservationException(ReservationErrorCode.INVALID_STATUS);
         }
-        // 후보자의 상태가 '대기' 중인지 확인
         if (nextCandidate.getStatus() != ReservationCandidateStatus.WAITING) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
+
         nextCandidate.selected();
-        // 검증 완료 후 구매자 정보 교체
+        // 새 구매자 정보로 교체 후 다시 임시 예약(PENDING) 상태로 변경
         this.buyerInfo = BuyerInfo.of(nextCandidate.getCandidateId(), nextCandidate.getCandidateNickname());
+        this.status = ReservationStatus.PENDING;
     }
 
-    private void validateStatus(ReservationStatus expectedStatus) {
-        // 결제가 취소이면 변경 불가
-        if (this.status == ReservationStatus.CANCELLED) {
+    // 상태 검증: 여러 허용 상태 중 하나라도 만족하는지 확인
+    private void validateStatus(ReservationStatus... expectedStatuses) {
+        // 판매자 취소나 최종 종료 상태인 경우 절대 변경 불가
+        if (this.status != null && !this.status.isMutable()) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
 
-        if (this.status != expectedStatus) {
+        boolean isValid = Arrays.stream(expectedStatuses)
+                .anyMatch(expected -> this.status == expected);
+
+        if (!isValid) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
index 71632f4..710e8b0 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
@@ -10,13 +10,16 @@
 @Getter
 @AllArgsConstructor
 public enum ReservationStatus {
-    PENDING("임시 예약"),
-    PAID("결제 완료"),
-    EXPIRED("예약 만료"),
-    CANCELLED("예약 취소"),
-    COMPLETED("예약 완료");
+    AVAILABLE("예약 활성화", true),
+    PENDING("임시 예약(결제 전)", true),
+    PAID("결제 완료(채팅 전)", true),
+    COMPLETED("예약 완료(채팅 수락)", true),
+    CANCELLED_BY_BUYER("구매자 사유 취소", true),  // 변경 가능
+    CANCELLED_BY_SELLER("판매자 사유 취소", false), // 변경 불가
+    CLOSED("최종 종료", false);                   // 변경 불가
 
     private final String description;
+    private final boolean isMutable; // 상태 변경이 가능한 상태인지 여부
 
     public static ReservationStatus find(String statusName) {
         return Arrays.stream(values())
@@ -24,4 +27,11 @@ public static ReservationStatus find(String statusName) {
                 .findFirst()
                 .orElseThrow(() -> new ReservationException(ReservationErrorCode.INVALID_STATUS));
     }
+
+    /**
+     * 판매자 취소와 같은 종료 상태인지 확인
+     */
+    public boolean isFinalStatus() {
+        return !this.isMutable;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index cf29733..69ca3e0 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -66,7 +66,7 @@ public ResponseEntity<Page<ReservationResponse>> getReservations(
         Page<ReservationResponse> responses = reservationService.getSearchReservations(userId, role, query, pageable)
                 .map(ReservationResponse::from);
 
-        // 3. 통일된 응답 규격으로 반환 (조회는 200 OK)
+        // 통일된 응답 규격으로 반환 (조회는 200 OK)
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(responses);

From eee8e161553fe8f0bdf018b2e01787c0d73071c5 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Tue, 28 Apr 2026 16:04:18 +0900
Subject: [PATCH 006/142] Feat/9 reservation detaillist (#10)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat : 예약 검색 기능 추가 (#6)

* fix : 예약 검색 기능 추가 및 빌드 파일 제거

* Update src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Refactor product, seller, and buyer name retrieval

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix : 상태 파일 추가 및 변경
- ReservationCandidateStatus 와 ReservationStatus 내용 반대로 변경
- 결재 완료 paid 상태 추가 및 검증 로직 작성

* feat : 상세 검색 기능 추가
- common 파일 업데이트

* feat : 상세 검색 기능 추가
- common 파일 업데이트

* fix : 버그 수정
- common 파일 업데이트
-  common에 build.gradle에서 annotationProcessor 'io.github.openfeign.querydsl:querydsl-apt:6.8:jpa' 추가

* fix : 코드 래빗 제안 수정
- 도메인이 application에 dto 의존 변경
- 검색에서 trim한 값 사용
- response 필드명 불일치 수정

* fix : 코드 래빗 제안 수정
- 권한 검증 로직 추가

* fix : 코드 래빗 제안 수정
- 권한 검증 로직 추가

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 build.gradle                                  | 20 +++--
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 settings.gradle                               |  6 +-
 .../dto/result/ReservationSearchResult.java   | 11 +++
 .../service/ReservationService.java           | 33 +++++++-
 .../domain/dto/ReservationSearchCriteria.java | 19 +++++
 .../domain/model/reservation/Reservation.java | 80 +++++++++----------
 .../model/reservation/ReservationStatus.java  | 20 ++---
 .../model/reservation/SearchPolicy.java       | 28 ++++++-
 .../repository/ReservationRepository.java     | 15 ++--
 .../service/ReservationDomainService.java     | 22 +++++
 .../repository/ReservationRepositoryImpl.java | 49 +++++-------
 .../controller/ReservationController.java     | 21 ++++-
 .../response/ReservationDetailResponse.java   | 55 +++++++++++++
 14 files changed, 271 insertions(+), 110 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/domain/dto/ReservationSearchCriteria.java
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java

diff --git a/build.gradle b/build.gradle
index 4a35933..e497af4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,36 +38,40 @@ dependencies {
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
 
-    implementation 'io.github.openfeign.querydsl:querydsl-core:6.10.1'
-    implementation 'io.github.openfeign.querydsl:querydsl-jpa:6.10.1'
-    annotationProcessor 'io.github.openfeign.querydsl:querydsl-apt:6.10.1:jpa'
+    implementation 'io.github.openfeign.querydsl:querydsl-core:6.8'
+    implementation 'io.github.openfeign.querydsl:querydsl-jpa:6.8'
+    annotationProcessor 'io.github.openfeign.querydsl:querydsl-apt:6.8:jpa'
     annotationProcessor "jakarta.annotation:jakarta.annotation-api"
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
     implementation project(':common')
+    annotationProcessor project(':common')
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
-
     runtimeOnly 'com.mysql:mysql-connector-j'
 }
 
 def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
 
 sourceSets {
-    main.java.srcDirs += [ querydslDir ]
+    main.java.srcDirs += [querydslDir]
 }
 
 tasks.withType(JavaCompile).configureEach {
     options.getGeneratedSourceOutputDirectory().set(querydslDir)
-}
+    options.annotationProcessorPath = configurations.annotationProcessor
 
-jar {
-    enabled = false
+    dependsOn ':common:jar'
+    def commonJar = project(':common').tasks.named('jar').get().archiveFile
+    classpath = files(commonJar) + classpath
 }
 
+bootJar { enabled = true }
+jar { enabled = false }
+
 clean {
     delete querydslDir
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a84e18..aaaabb3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index c78afd4..af0625f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,6 @@
-rootProject.name = 'reservation-service'
+rootProject.name = 'reservation-root'
 
 include ':common'
-project(':common').projectDir = new File(settingsDir, 'libs/common')
\ No newline at end of file
+project(':common').projectDir = new File(settingsDir, 'libs/common')
+
+include ':reservation-service'
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
index 2d50789..b1d4ad8 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
@@ -1,5 +1,6 @@
 package org.pgsg.reservation.application.dto.result;
 
+import org.pgsg.reservation.domain.model.reservation.Reservation;
 import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 
 import java.time.LocalDateTime;
@@ -13,4 +14,14 @@ public record ReservationSearchResult(
         ReservationStatus status, // 도메인 Enum 직접 사용
         LocalDateTime createdAt
 ) {
+    public static ReservationSearchResult from(Reservation reservation) {
+        return new ReservationSearchResult(
+                reservation.getId(),
+                reservation.getProductInfo().getProductName(),
+                reservation.getSellerInfo().getSellerName(),
+                reservation.getBuyerInfo().getBuyerName(),
+                reservation.getStatus(),
+                reservation.getCreatedAt()
+        );
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index f282c83..c93d061 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -5,9 +5,11 @@
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
 import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
+import org.pgsg.reservation.domain.dto.ReservationSearchCriteria;
 import org.pgsg.reservation.domain.model.reservation.*;
 import org.pgsg.reservation.domain.service.ReservationDomainService;
 import org.pgsg.reservation.domain.repository.ReservationRepository;
+import org.pgsg.reservation.presentation.dto.response.ReservationDetailResponse;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -52,7 +54,7 @@ public ReservationCreateResult createReservation(ReservationCreateCommand comman
         // DB 저장
         Reservation savedReservation = reservationRepository.save(reservation);
 
-        // 5. [결과 반환] Result DTO로 변환하여 Controller로 전달
+        // Result DTO로 변환하여 Controller로 전달
         return ReservationCreateResult.builder()
                 .reservationId(savedReservation.getId())
                 .status(savedReservation.getStatus().name())
@@ -70,7 +72,34 @@ public Page<ReservationSearchResult> getSearchReservations(
         // 권한에 따른 조회 범위 결정 로직을 도메인 모델로 전달
         SearchPolicy policy = reservationDomainService.getReservations(userId, role);
 
+        ReservationSearchCriteria criteria = new ReservationSearchCriteria(
+                query.sellerName(),
+                query.buyerName(),
+                query.productName(),
+                query.status(),
+                query.productId(),
+                null, // startDateTime
+                null, // endDateTime
+                policy
+        );
+
+        Page<Reservation> reservations = reservationRepository.findByCriteria(criteria, pageable);
+
         // Repository(QueryDSL)에 정책과 검색 조건을 함께 전달
-        return reservationRepository.searchReservations(policy, query, pageable);
+        return reservations.map(ReservationSearchResult::from);
+    }
+    
+    
+    // 예약 상세 조회
+    @Transactional(readOnly = true)
+    public ReservationDetailResponse getReservationDetail(UUID reservationId, UUID userId, String role) {
+        // 엔티티 조회
+        Reservation reservation = reservationRepository.findById(reservationId)
+                .orElseThrow(() -> new RuntimeException("해당 예약을 찾을 수 없습니다. ID: " + reservationId));
+
+        // 도메인 서비스를 통한 권한 검증
+        reservationDomainService.validateDetailAccess(reservation, userId, role);
+
+        return ReservationDetailResponse.from(reservation);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/dto/ReservationSearchCriteria.java b/src/main/java/org/pgsg/reservation/domain/dto/ReservationSearchCriteria.java
new file mode 100644
index 0000000..26846e8
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/dto/ReservationSearchCriteria.java
@@ -0,0 +1,19 @@
+package org.pgsg.reservation.domain.dto;
+
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
+import org.pgsg.reservation.domain.model.reservation.SearchPolicy;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public record ReservationSearchCriteria(
+        String sellerName,
+        String buyerName,
+        String productName,
+        ReservationStatus status,
+        UUID productId,
+        LocalDateTime startDateTime,
+        LocalDateTime endDateTime,
+        SearchPolicy policy
+) {
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index c0f6f54..7c57a68 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -8,7 +8,12 @@
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidateStatus;
 
-import java.util.*;
+import java.util.Objects;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
 
 @Entity
 @Getter
@@ -20,7 +25,7 @@ public class Reservation extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.UUID)
     private UUID id;
 
-    // 낙관적 락을 위한 버전 추가(추후 분산 락으로 수정 예정)
+    //낙관적 락을 위한 버전 추가(추후 분산 락으로 수정예정)
     @Version
     private Long version;
 
@@ -45,16 +50,16 @@ public List<ReservationCandidate> getCandidates() {
     }
 
     public void addCandidate(ReservationCandidate candidate) {
-        validateStatus(ReservationStatus.AVAILABLE);
+        validateStatus(ReservationStatus.PENDING);
         this.candidates.add(candidate);
     }
 
     public void removeCandidate(ReservationCandidate candidate) {
-        validateStatus(ReservationStatus.AVAILABLE);
+        validateStatus(ReservationStatus.PENDING);
         this.candidates.remove(candidate);
     }
 
-    // 예약 생성: 초기 상태 AVAILABLE
+    // 예약 생성
     public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
         Objects.requireNonNull(buyer, "buyer must not be null");
         Objects.requireNonNull(seller, "seller must not be null");
@@ -63,85 +68,72 @@ public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo
         reservation.buyerInfo = buyer;
         reservation.sellerInfo = seller;
         reservation.productInfo = product;
-        reservation.status = ReservationStatus.AVAILABLE;
+        reservation.status = ReservationStatus.PENDING;
         return reservation;
     }
 
-    // 임시 예약: AVAILABLE 상태에서 결제 대기(점유) 단계로 진입
-    public void markAsPending() {
-        validateStatus(ReservationStatus.AVAILABLE);
-        this.status = ReservationStatus.PENDING;
-    }
-
-    // 결제 완료: PENDING(임시 예약) 상태일 때만 가능
+    // 결제 완료: PENDING 상태일 때만 가능
     public void markAsPaid() {
         validateStatus(ReservationStatus.PENDING);
         this.status = ReservationStatus.PAID;
     }
 
-    // 예약 완료: PAID(결제 완료) 상태에서 채팅 수락 시
+    // 예약 완료: PAID(결제 완료) 상태일 때만 가능
     public void complete() {
         validateStatus(ReservationStatus.PAID);
         this.status = ReservationStatus.COMPLETED;
     }
 
-    // 최종 종료: 완료된 거래를 아카이브 상태로 변경
-    public void close() {
-        validateStatus(ReservationStatus.COMPLETED);
-        this.status = ReservationStatus.CLOSED;
-    }
-
-    // 거래 복구: COMPLETED 상태에서 취소 발생 시 AVAILABLE로 복구
-    public void rollbackToAvailable() {
+    // 예약 만료: PENDING 상태일 때만 가능
+    public void rollbackToPending() {
         validateStatus(ReservationStatus.COMPLETED);
-        this.status = ReservationStatus.AVAILABLE;
+        this.status = ReservationStatus.PENDING;
+        // 추후 기존 구매자의 후보자 상태를 'CANCELLED'로 바꾸는 로직 추가 예정
     }
 
-    // 구매자 취소: PENDING 또는 PAID 상태에서 구매자가 취소
-    public void cancelByBuyer() {
-        validateStatus(ReservationStatus.PENDING, ReservationStatus.PAID);
-        this.status = ReservationStatus.CANCELLED_BY_BUYER;
+    // 시간 만료: PENDING 상태일 때만 가능
+    public void expire() {
+        validateStatus(ReservationStatus.PENDING);
+        this.status = ReservationStatus.EXPIRED;
     }
 
-    // 판매자 취소: PENDING 또는 PAID 상태에서 판매자가 취소(영구 종료)
-    public void cancelBySeller() {
-        validateStatus(ReservationStatus.PENDING, ReservationStatus.PAID);
-        this.status = ReservationStatus.CANCELLED_BY_SELLER;
+    // 예약 취소: 취소 사유 업데이트 포함
+    public void cancel() {
+        validateStatus(ReservationStatus.PENDING);
+        this.status = ReservationStatus.CANCELLED;
     }
 
     // 다음 순번 구매자로 교체
     public void changeToNextBuyer(ReservationCandidate nextCandidate) {
-        // AVAILABLE 상태거나, 이전 구매자가 취소하여 기회가 생긴 경우에만 가능
-        validateStatus(ReservationStatus.AVAILABLE, ReservationStatus.CANCELLED_BY_BUYER);
+        // 예약 자체가 변경 가능한 상태인지 확인
+        validateStatus(ReservationStatus.PENDING);
 
+        // 인자 유효성 검사
         if (nextCandidate == null) {
             throw new IllegalArgumentException("nextBuyer must not be null");
         }
+        // 해당 후보자가 실제 이 예약의 후보 명단에 포함되어 있는지 검증
         if (!this.candidates.contains(nextCandidate)) {
             throw new ReservationException(ReservationErrorCode.INVALID_STATUS);
         }
+        // 후보자의 상태가 '대기' 중인지 확인
         if (nextCandidate.getStatus() != ReservationCandidateStatus.WAITING) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
-
         nextCandidate.selected();
-        // 새 구매자 정보로 교체 후 다시 임시 예약(PENDING) 상태로 변경
+        // 검증 완료 후 구매자 정보 교체
         this.buyerInfo = BuyerInfo.of(nextCandidate.getCandidateId(), nextCandidate.getCandidateNickname());
-        this.status = ReservationStatus.PENDING;
     }
 
-    // 상태 검증: 여러 허용 상태 중 하나라도 만족하는지 확인
-    private void validateStatus(ReservationStatus... expectedStatuses) {
-        // 판매자 취소나 최종 종료 상태인 경우 절대 변경 불가
-        if (this.status != null && !this.status.isMutable()) {
+    private void validateStatus(ReservationStatus expectedStatus) {
+        // 결제가 취소이면 변경 불가
+        if (this.status == ReservationStatus.CANCELLED) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
 
-        boolean isValid = Arrays.stream(expectedStatuses)
-                .anyMatch(expected -> this.status == expected);
-
-        if (!isValid) {
+        if (this.status != expectedStatus) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
index 710e8b0..71632f4 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
@@ -10,16 +10,13 @@
 @Getter
 @AllArgsConstructor
 public enum ReservationStatus {
-    AVAILABLE("예약 활성화", true),
-    PENDING("임시 예약(결제 전)", true),
-    PAID("결제 완료(채팅 전)", true),
-    COMPLETED("예약 완료(채팅 수락)", true),
-    CANCELLED_BY_BUYER("구매자 사유 취소", true),  // 변경 가능
-    CANCELLED_BY_SELLER("판매자 사유 취소", false), // 변경 불가
-    CLOSED("최종 종료", false);                   // 변경 불가
+    PENDING("임시 예약"),
+    PAID("결제 완료"),
+    EXPIRED("예약 만료"),
+    CANCELLED("예약 취소"),
+    COMPLETED("예약 완료");
 
     private final String description;
-    private final boolean isMutable; // 상태 변경이 가능한 상태인지 여부
 
     public static ReservationStatus find(String statusName) {
         return Arrays.stream(values())
@@ -27,11 +24,4 @@ public static ReservationStatus find(String statusName) {
                 .findFirst()
                 .orElseThrow(() -> new ReservationException(ReservationErrorCode.INVALID_STATUS));
     }
-
-    /**
-     * 판매자 취소와 같은 종료 상태인지 확인
-     */
-    public boolean isFinalStatus() {
-        return !this.isMutable;
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java
index 6547336..eb531a7 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java
@@ -6,4 +6,30 @@ public record SearchPolicy(
         UUID accessUserId,
         boolean isBuyerFilter,
         boolean isSellerFilter
-) {}
\ No newline at end of file
+) {
+    public SearchPolicy {
+        if (isBuyerFilter && isSellerFilter) {
+            throw new IllegalArgumentException("Filter flags are mutually exclusive.");
+        }
+
+        if ((isBuyerFilter || isSellerFilter) && accessUserId == null) {
+            throw new IllegalArgumentException("accessUserId is required for buyer/seller filter.");
+        }
+
+        if (!isBuyerFilter && !isSellerFilter && accessUserId != null) {
+            throw new IllegalArgumentException("accessUserId must be null when no filter is applied.");
+        }
+    }
+
+    public static SearchPolicy buyer(UUID userId) {
+        return new SearchPolicy(userId, true, false);
+    }
+
+    public static SearchPolicy seller(UUID userId) {
+        return new SearchPolicy(userId, false, true);
+    }
+
+    public static SearchPolicy all() {
+        return new SearchPolicy(null, false, false);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
index 9b85783..459554e 100644
--- a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
+++ b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
@@ -1,19 +1,18 @@
 package org.pgsg.reservation.domain.repository;
 
-import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
-import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
+import org.pgsg.reservation.domain.dto.ReservationSearchCriteria;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
-import org.pgsg.reservation.domain.model.reservation.SearchPolicy;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import java.util.Optional;
+import java.util.UUID;
+
 public interface ReservationRepository {
     Reservation save(Reservation reservation);
 
     // QueryDSL을 활용한 동적 검색 구현
-    Page<ReservationSearchResult> searchReservations(
-            SearchPolicy policy,
-            ReservationSearchQuery query,
-            Pageable pageable
-    );
+    Page<Reservation> findByCriteria(ReservationSearchCriteria criteria, Pageable pageable);
+
+    Optional<Reservation> findById(UUID id);
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 7fe1e56..3db0184 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -48,4 +48,26 @@ public SearchPolicy getReservations(UUID userId, String role) {
         }
         throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
     }
+
+    /**
+     * 상세 조회 권한 검증
+     * 특정 사용자가 해당 예약에 접근할 수 있는지 비즈니스 규칙 검사
+     */
+    public void validateDetailAccess(Reservation reservation, UUID userId, String role) {
+        // 정책 획득
+        SearchPolicy policy = this.getReservations(userId, role);
+
+        // 관리자 판단 로직
+        boolean isAdmin = !policy.isBuyerFilter() && !policy.isSellerFilter();
+
+        if (!isAdmin) {
+            // 본인 확인 (구매자 혹은 판매자 본인인지 체크)
+            boolean isOwner = reservation.getBuyerInfo().getBuyerId().equals(userId) ||
+                    reservation.getSellerInfo().getSellerId().equals(userId);
+
+            if (!isOwner) {
+                throw new RuntimeException("해당 예약을 조회할 권한이 없습니다.");
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
index 9632aa8..bb4aaa6 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
@@ -1,12 +1,10 @@
 package org.pgsg.reservation.infrastructure.repository;
 
-import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.PathBuilder;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
-import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
-import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
+import org.pgsg.reservation.domain.dto.ReservationSearchCriteria;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
 import org.pgsg.reservation.domain.model.reservation.SearchPolicy;
 import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
@@ -17,6 +15,7 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 @Repository
@@ -35,32 +34,28 @@ public Reservation save(Reservation reservationEntity) {
     }
 
     @Override
-    public Page<ReservationSearchResult> searchReservations(
-            SearchPolicy policy,
-            ReservationSearchQuery query,
+    public Optional<Reservation> findById(UUID id) {
+        return reservationJpaRepository.findById(id);
+    }
+
+    @Override
+    public Page<Reservation> findByCriteria(
+            ReservationSearchCriteria criteria,
             Pageable pageable
     ) {
         // 검색 조건 공통화
         BooleanExpression[] predicates = {
-                applyPolicyFilter(policy),
-                statusEq(query.status()),
-                productNameContains(query.productName()),
-                productIdEq(query.productId()),
-                sellerNameEq(query.sellerName()),
-                buyerNameEq(query.buyerName())
+                applyPolicyFilter(criteria.policy()),
+                statusEq(criteria.status()),
+                productNameContains(criteria.productName()),
+                productIdEq(criteria.productId()),
+                sellerNameEq(criteria.sellerName()),
+                buyerNameEq(criteria.buyerName())
         };
 
-        List<ReservationSearchResult> content = queryFactory
-                .select(Projections.constructor(ReservationSearchResult.class,
-                        reservation.get("id", UUID.class),
-                        reservation.get("productInfo").get("productName", String.class),
-                        reservation.get("sellerInfo").get("sellerName", String.class),
-                        reservation.get("buyerInfo").get("buyerName", String.class),
-                        reservation.get("status", ReservationStatus.class),
-                        reservation.get("createdAt", java.time.LocalDateTime.class)
-                ))
-                .from(reservation)
-                .where(predicates) // 정리된 조건 적용
+        List<Reservation> content = queryFactory
+                .selectFrom(reservation)
+                .where(predicates)
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .orderBy(reservation.getDateTime("createdAt", java.time.LocalDateTime.class).desc())
@@ -93,7 +88,7 @@ private BooleanExpression statusEq(ReservationStatus status) {
     private BooleanExpression productNameContains(String productName) {
         String normalized = productName == null ? null : productName.trim();
         return (normalized != null && !normalized.isBlank())
-                ? reservation.get("productInfo").getString("productName").containsIgnoreCase(productName)
+                ? reservation.get("productInfo").getString("productName").containsIgnoreCase(normalized)
                 : null;
     }
 
@@ -106,14 +101,14 @@ private BooleanExpression productIdEq(UUID productId) {
     private BooleanExpression sellerNameEq(String sellerName) {
         String normalized = sellerName == null ? null : sellerName.trim();
         return (normalized != null && !normalized.isBlank())
-                ? reservation.get("sellerInfo").getString("sellerName").containsIgnoreCase(sellerName)
+                ? reservation.get("sellerInfo").getString("sellerName").containsIgnoreCase(normalized)
                 : null;
     }
 
     private BooleanExpression buyerNameEq(String buyerName) {
         String normalized = buyerName == null ? null : buyerName.trim();
         return (normalized != null && !normalized.isBlank())
-                ? reservation.get("buyerInfo").getString("buyerName").containsIgnoreCase(buyerName)
+                ? reservation.get("buyerInfo").getString("buyerName").containsIgnoreCase(normalized)
                 : null;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index 69ca3e0..a91e6d0 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -6,16 +6,20 @@
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
 import org.pgsg.reservation.application.service.ReservationService;
+import org.pgsg.reservation.domain.model.reservation.SearchPolicy;
 import org.pgsg.reservation.presentation.dto.request.ReservationCreateRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationSearchRequest;
+import org.pgsg.reservation.presentation.dto.response.ReservationDetailResponse;
 import org.pgsg.reservation.presentation.dto.response.ReservationResponse;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
+import java.nio.file.attribute.UserPrincipal;
 import java.util.UUID;
 
 @RestController
@@ -66,9 +70,22 @@ public ResponseEntity<Page<ReservationResponse>> getReservations(
         Page<ReservationResponse> responses = reservationService.getSearchReservations(userId, role, query, pageable)
                 .map(ReservationResponse::from);
 
-        // 통일된 응답 규격으로 반환 (조회는 200 OK)
+        // 3. 통일된 응답 규격으로 반환 (조회는 200 OK)
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(responses);
     }
-}
+
+    // 예약 상세 목록 조회
+    @GetMapping("/{reservationId}")
+    public ResponseEntity<ReservationDetailResponse> getReservationDetail(
+            @PathVariable UUID reservationId,
+            @RequestHeader("X-User-Id") UUID userId,
+            @RequestHeader("X-User-Role") String role
+    ) {
+
+        ReservationDetailResponse response = reservationService.getReservationDetail(reservationId, userId, role);
+
+        return ResponseEntity.ok(response);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
new file mode 100644
index 0000000..3adafea
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
@@ -0,0 +1,55 @@
+package org.pgsg.reservation.presentation.dto.response;
+
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public record ReservationDetailResponse(
+        UUID reservationId,
+        ReservationStatus status,
+        ProductDetailInfo product,
+        SellerDetailInfo seller,
+        BuyerDetailInfo buyer,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt
+) {
+    public record ProductDetailInfo(
+            UUID productId,
+            String productName,
+            int price
+    ) {}
+
+    public record SellerDetailInfo(
+            UUID sellerId,
+            String sellerName
+    ) {}
+
+    public record BuyerDetailInfo(
+            UUID buyerId,
+            String buyerName
+    ) {}
+
+    public static ReservationDetailResponse from(Reservation reservation) {
+        return new ReservationDetailResponse(
+                reservation.getId(),
+                reservation.getStatus(),
+                new ProductDetailInfo(
+                        reservation.getProductInfo().getProductId(),
+                        reservation.getProductInfo().getProductName(),
+                        reservation.getProductInfo().getProductPrice()
+                ),
+                new SellerDetailInfo(
+                        reservation.getSellerInfo().getSellerId(),
+                        reservation.getSellerInfo().getSellerName()
+                ),
+                new BuyerDetailInfo(
+                        reservation.getBuyerInfo().getBuyerId(),
+                        reservation.getBuyerInfo().getBuyerName()
+                ),
+                reservation.getCreatedAt(),
+                reservation.getModifiedAt()
+        );
+    }
+}

From 5df53122e5796e61ab4beca13f565891589dc7bb Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Wed, 29 Apr 2026 21:52:53 +0900
Subject: [PATCH 007/142] Feat/13 reservation applyreservation (#14)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fit : 상태 pr 다시 추가

* feat : 예약 신청 기능 추가
- 예약 신청 및 후보자 저장
- 도메인 서비스에서 첫 번째 후보자라면 바로 저장

* fix : 오타 수정

* fix : 코드 래빗 수정 사항 반영
- saveAndFlush()를 사용하여 dto 매핑 전 id 생성 보장

* fix : 코드 래빗 수정 사항 반영
- 엔티티 유니크 제약 조건 변경 candidateNickname -> candidateId

* fix : 코드 래빗 수정 사항 반영
- 첫번째 후보자인지 확인하는 로직 추가

* fix : 코드 래빗 수정 사항 반영
- 예약 신청 X-User-Nickname로 이름 변경

* fix : 현빈님 제안 사항 반영
- cancel부분에 데이터 일관성을 위해 후보 리스트 제거 로직 반영

* fix : 코드래빗 제안 사항 반영
- 레이스 컨디션 문제 해결 로직 작성

* fix : 코드래빗 제안 사항 반영
- 레이스 컨디션 문제 해결 로직 작성
---
 gradle/wrapper/gradle-wrapper.jar             | Bin 0 -> 45457 bytes
 .../service/ReservationService.java           |  47 +++++++++-
 .../exception/ReservationErrorCode.java       |   3 +-
 .../domain/model/reservation/Reservation.java |  85 ++++++++++--------
 .../model/reservation/ReservationStatus.java  |  20 +++--
 .../ReservationCandidate.java                 |  13 ++-
 .../repository/ReservationRepository.java     |   3 +
 .../service/ReservationDomainService.java     |  33 +++++++
 .../repository/ReservationRepositoryImpl.java |   5 ++
 .../controller/ReservationController.java     |  18 +++-
 .../ReservationCandidateResponse.java         |  23 +++++
 11 files changed, 197 insertions(+), 53 deletions(-)
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCandidateResponse.java

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077
GIT binary patch
literal 45457
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

literal 0
HcmV?d00001

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index c93d061..bcdc6d6 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -6,10 +6,15 @@
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
 import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
 import org.pgsg.reservation.domain.dto.ReservationSearchCriteria;
+import org.pgsg.reservation.domain.exception.ReservationErrorCode;
+import org.pgsg.reservation.domain.exception.ReservationException;
 import org.pgsg.reservation.domain.model.reservation.*;
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
 import org.pgsg.reservation.domain.service.ReservationDomainService;
 import org.pgsg.reservation.domain.repository.ReservationRepository;
+import org.pgsg.reservation.presentation.dto.response.ReservationCandidateResponse;
 import org.pgsg.reservation.presentation.dto.response.ReservationDetailResponse;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -54,7 +59,7 @@ public ReservationCreateResult createReservation(ReservationCreateCommand comman
         // DB 저장
         Reservation savedReservation = reservationRepository.save(reservation);
 
-        // Result DTO로 변환하여 Controller로 전달
+        // 5. [결과 반환] Result DTO로 변환하여 Controller로 전달
         return ReservationCreateResult.builder()
                 .reservationId(savedReservation.getId())
                 .status(savedReservation.getStatus().name())
@@ -88,8 +93,8 @@ public Page<ReservationSearchResult> getSearchReservations(
         // Repository(QueryDSL)에 정책과 검색 조건을 함께 전달
         return reservations.map(ReservationSearchResult::from);
     }
-    
-    
+
+
     // 예약 상세 조회
     @Transactional(readOnly = true)
     public ReservationDetailResponse getReservationDetail(UUID reservationId, UUID userId, String role) {
@@ -102,4 +107,40 @@ public ReservationDetailResponse getReservationDetail(UUID reservationId, UUID u
 
         return ReservationDetailResponse.from(reservation);
     }
+
+    // 예약 신청
+    @Transactional
+    public ReservationCandidateResponse applyReservation(UUID reservationId, UUID userId, String nickname) {
+        Reservation savedReservation;
+
+        // 예약 엔티티 조회
+        Reservation reservation = reservationRepository.findById(reservationId)
+                .orElseThrow(() -> new ReservationException(ReservationErrorCode.RESERVATION_NOT_FOUND));
+
+        // 도메인 서비스를 통한 신청 로직 (후보자 생성 및 추가)
+        ReservationCandidate candidate = reservationDomainService.addCandidate(reservation, userId, nickname);
+
+        // 변경사항 저장과 예외 감시
+        try {
+            savedReservation = reservationRepository.saveAndFlush(reservation);
+        } catch (DataIntegrityViolationException e) {
+            if (isDuplicateApplyViolation(e)) {
+                throw new ReservationException(ReservationErrorCode.ALREADY_APPLIED);
+            }
+            throw e;
+        }
+
+        // 방금 저장된 예약에서 추하한 후보자 찾기
+        ReservationCandidate savedCandidate = savedReservation.getCandidates().stream()
+                .filter(c -> c.getCandidateId().equals(userId))
+                .findFirst()
+                .orElse(candidate);
+
+        return ReservationCandidateResponse.from(savedCandidate);
+    }
+
+    private boolean isDuplicateApplyViolation(DataIntegrityViolationException e) {
+        String message = e.getMostSpecificCause().getMessage();
+        return message != null && message.contains("uk_reservation_candidate_user_id");
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
index 4a3b367..cd0a4e1 100644
--- a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
+++ b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
@@ -20,7 +20,8 @@ public enum ReservationErrorCode {
     RESERVATION_NOT_FOUND(404, "해당 예약을 찾을 수 없습니다."),
 
     // 409 Conflict (중복 등 비즈니스 규칙 위반)
-    DUPLICATE_RESERVATION(409, "이미 해당 상품에 대한 예약 진행 내역이 존재합니다.");
+    DUPLICATE_RESERVATION(409, "이미 해당 상품에 대한 예약 진행 내역이 존재합니다."),
+    ALREADY_APPLIED(409, "이미 해당 예약에 신청한 후보자입니다.");
 
     private final int status;
     private final String message;
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index 7c57a68..25a061c 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -8,12 +8,7 @@
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidateStatus;
 
-import java.util.Objects;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 @Entity
 @Getter
@@ -25,7 +20,7 @@ public class Reservation extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.UUID)
     private UUID id;
 
-    //낙관적 락을 위한 버전 추가(추후 분산 락으로 수정예정)
+    // 낙관적 락을 위한 버전 추가(추후 분산 락으로 수정 예정)
     @Version
     private Long version;
 
@@ -50,16 +45,16 @@ public List<ReservationCandidate> getCandidates() {
     }
 
     public void addCandidate(ReservationCandidate candidate) {
-        validateStatus(ReservationStatus.PENDING);
+        validateStatus(ReservationStatus.AVAILABLE);
         this.candidates.add(candidate);
     }
 
     public void removeCandidate(ReservationCandidate candidate) {
-        validateStatus(ReservationStatus.PENDING);
+        //validateStatus(ReservationStatus.AVAILABLE);
         this.candidates.remove(candidate);
     }
 
-    // 예약 생성
+    // 예약 생성: 초기 상태 AVAILABLE
     public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
         Objects.requireNonNull(buyer, "buyer must not be null");
         Objects.requireNonNull(seller, "seller must not be null");
@@ -68,72 +63,88 @@ public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo
         reservation.buyerInfo = buyer;
         reservation.sellerInfo = seller;
         reservation.productInfo = product;
-        reservation.status = ReservationStatus.PENDING;
+        reservation.status = ReservationStatus.AVAILABLE;
         return reservation;
     }
 
-    // 결제 완료: PENDING 상태일 때만 가능
+    // 임시 예약: AVAILABLE 상태에서 결제 대기(점유) 단계로 진입
+    public void markAsPending() {
+        validateStatus(ReservationStatus.AVAILABLE);
+        this.status = ReservationStatus.PENDING;
+    }
+
+    // 결제 완료: PENDING(임시 예약) 상태일 때만 가능
     public void markAsPaid() {
         validateStatus(ReservationStatus.PENDING);
         this.status = ReservationStatus.PAID;
     }
 
-    // 예약 완료: PAID(결제 완료) 상태일 때만 가능
+    // 예약 완료: PAID(결제 완료) 상태에서 채팅 수락 시
     public void complete() {
         validateStatus(ReservationStatus.PAID);
         this.status = ReservationStatus.COMPLETED;
     }
 
-    // 예약 만료: PENDING 상태일 때만 가능
-    public void rollbackToPending() {
+    // 최종 종료: 완료된 거래를 아카이브 상태로 변경
+    public void close() {
         validateStatus(ReservationStatus.COMPLETED);
-        this.status = ReservationStatus.PENDING;
-        // 추후 기존 구매자의 후보자 상태를 'CANCELLED'로 바꾸는 로직 추가 예정
+        this.status = ReservationStatus.CLOSED;
     }
 
-    // 시간 만료: PENDING 상태일 때만 가능
-    public void expire() {
-        validateStatus(ReservationStatus.PENDING);
-        this.status = ReservationStatus.EXPIRED;
+    // 거래 복구: COMPLETED 상태에서 취소 발생 시 AVAILABLE로 복구
+    public void rollbackToAvailable() {
+        validateStatus(ReservationStatus.COMPLETED);
+        this.status = ReservationStatus.AVAILABLE;
     }
 
-    // 예약 취소: 취소 사유 업데이트 포함
-    public void cancel() {
-        validateStatus(ReservationStatus.PENDING);
-        this.status = ReservationStatus.CANCELLED;
+    // 구매자 취소: PENDING 또는 PAID 상태에서 구매자가 취소
+    public void cancelByBuyer() {
+        validateStatus(ReservationStatus.PENDING, ReservationStatus.PAID);
+        this.status = ReservationStatus.CANCELLED_BY_BUYER;
+    }
+
+    // 판매자 취소: PENDING 또는 PAID 상태에서 판매자가 취소(영구 종료)
+    public void cancelBySeller() {
+        validateStatus(ReservationStatus.PENDING, ReservationStatus.PAID);
+        this.status = ReservationStatus.CANCELLED_BY_SELLER;
     }
 
     // 다음 순번 구매자로 교체
     public void changeToNextBuyer(ReservationCandidate nextCandidate) {
-        // 예약 자체가 변경 가능한 상태인지 확인
-        validateStatus(ReservationStatus.PENDING);
+        // 현재 변경 가능한 상태인지 검증 (AVAILABLE 혹은 이전 구매자 취소 상태)
+        validateStatus(ReservationStatus.AVAILABLE, ReservationStatus.CANCELLED_BY_BUYER);
 
-        // 인자 유효성 검사
+        // 인자 및 후보자 유효성 검증
         if (nextCandidate == null) {
             throw new IllegalArgumentException("nextBuyer must not be null");
         }
-        // 해당 후보자가 실제 이 예약의 후보 명단에 포함되어 있는지 검증
         if (!this.candidates.contains(nextCandidate)) {
             throw new ReservationException(ReservationErrorCode.INVALID_STATUS);
         }
-        // 후보자의 상태가 '대기' 중인지 확인
         if (nextCandidate.getStatus() != ReservationCandidateStatus.WAITING) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
-        nextCandidate.selected();
-        // 검증 완료 후 구매자 정보 교체
+
+        // 순서 변경: 먼저 예약 상태를 PENDING으로 전환하여 selected()의 검증을 통과시킴
+        this.status = ReservationStatus.PENDING;
         this.buyerInfo = BuyerInfo.of(nextCandidate.getCandidateId(), nextCandidate.getCandidateNickname());
+
+        // 후보자 상태를 SELECTED로 변경
+        nextCandidate.selected();
     }
 
-    private void validateStatus(ReservationStatus expectedStatus) {
-        // 결제가 취소이면 변경 불가
-        if (this.status == ReservationStatus.CANCELLED) {
+    // 상태 검증: 여러 허용 상태 중 하나라도 만족하는지 확인
+    private void validateStatus(ReservationStatus... expectedStatuses) {
+        // 판매자 취소나 최종 종료 상태인 경우 절대 변경 불가
+        if (this.status != null && !this.status.isMutable()) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
 
-        if (this.status != expectedStatus) {
+        boolean isValid = Arrays.stream(expectedStatuses)
+                .anyMatch(expected -> this.status == expected);
+
+        if (!isValid) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
index 71632f4..2dbb8cd 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/ReservationStatus.java
@@ -10,13 +10,16 @@
 @Getter
 @AllArgsConstructor
 public enum ReservationStatus {
-    PENDING("임시 예약"),
-    PAID("결제 완료"),
-    EXPIRED("예약 만료"),
-    CANCELLED("예약 취소"),
-    COMPLETED("예약 완료");
+    AVAILABLE("예약 활성화", true),
+    PENDING("임시 예약(결제 전)", true),
+    PAID("결제 완료(채팅 전)", true),
+    COMPLETED("예약 완료(채팅 수락)", true),
+    CANCELLED_BY_BUYER("구매자 사유 취소", true),  // 변경 가능 (AVAILABLE로 복구 등)
+    CANCELLED_BY_SELLER("판매자 사유 취소", false), // 변경 불가 (종료)
+    CLOSED("최종 종료", false);                   // 변경 불가
 
     private final String description;
+    private final boolean isMutable; // 상태 변경이 가능한 상태인지 여부
 
     public static ReservationStatus find(String statusName) {
         return Arrays.stream(values())
@@ -24,4 +27,11 @@ public static ReservationStatus find(String statusName) {
                 .findFirst()
                 .orElseThrow(() -> new ReservationException(ReservationErrorCode.INVALID_STATUS));
     }
+
+    /**
+     * 판매자 취소와 같은 종료 상태인지 확인
+     */
+    public boolean isFinalStatus() {
+        return !this.isMutable;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
index 1822b9a..eced6b1 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
@@ -15,8 +15,8 @@
 @Getter
 @Table(name = "p_reservation_candidates", uniqueConstraints = {
         @UniqueConstraint(
-                name = "uk_reservation_candidate_nickname",
-                columnNames = {"reservation_id", "candidateNickname"}
+                name = "uk_reservation_candidate_user_id",
+                columnNames = {"reservation_id", "candidateId"}
         )
 })
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -37,7 +37,7 @@ public class ReservationCandidate extends BaseEntity {
     private ReservationCandidateStatus status = ReservationCandidateStatus.WAITING;
 
     // 예약 후보 생성
-    public static ReservationCandidate of(Reservation reservation, UUID candidateId, String candidateNickname) {
+    public static ReservationCandidate create(Reservation reservation, UUID candidateId, String candidateNickname) {
         verify(reservation, candidateId, candidateNickname);
         ReservationCandidate candidate = new ReservationCandidate();
         candidate.reservation = reservation;
@@ -69,7 +69,14 @@ public void cancel() {
         if (this.status == ReservationCandidateStatus.CANCELLED) {
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
+
+        // 상태 변경
         this.status = ReservationCandidateStatus.CANCELLED;
+
+        // 부모 예약 엔티티의 후보 리스트에서 제거
+        if (this.reservation != null) {
+            this.reservation.removeCandidate(this);
+        }
     }
 
     // Reservation에서 예약 상태(PENDING)이어야 후보자 선정 가능
diff --git a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
index 459554e..a1be2d7 100644
--- a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
+++ b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
@@ -11,6 +11,9 @@
 public interface ReservationRepository {
     Reservation save(Reservation reservation);
 
+    // 즉시 DB에 반영하고 ID를 확보하기 위한 메서드
+    Reservation saveAndFlush(Reservation reservation);
+
     // QueryDSL을 활용한 동적 검색 구현
     Page<Reservation> findByCriteria(ReservationSearchCriteria criteria, Pageable pageable);
 
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 3db0184..060d7af 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -4,6 +4,7 @@
 import org.pgsg.reservation.domain.exception.ReservationErrorCode;
 import org.pgsg.reservation.domain.exception.ReservationException;
 import org.pgsg.reservation.domain.model.reservation.*;
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
 import org.springframework.stereotype.Service;
 
 import java.util.Locale;
@@ -70,4 +71,36 @@ public void validateDetailAccess(Reservation reservation, UUID userId, String ro
             }
         }
     }
+
+    /**
+     * 구매자 예약 신청
+     * 특정 사용자가 해당 예약에 접근할 수 있는지 비즈니스 규칙 검사
+     */
+    public ReservationCandidate addCandidate(Reservation reservation, UUID userId, String nickname) {
+        // 이미 후보자로 등록되어 있는지 확인
+        boolean isAlreadyApplied = reservation.getCandidates().stream()
+                .anyMatch(c -> c.getCandidateId().equals(userId));
+        if (isAlreadyApplied) {
+            throw new ReservationException(ReservationErrorCode.ALREADY_APPLIED);
+        }
+
+        // 예약이 활성 상태(AVAILABLE)인지 확인
+        if (reservation.getStatus() != ReservationStatus.AVAILABLE) {
+            throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
+        }
+
+        // 후보자 생성 및 애그리거트에 추가
+        ReservationCandidate candidate = ReservationCandidate.create(reservation, userId, nickname);
+        // 현재 후보자가 없을 경우 첫 번째 신청자로 생각
+        boolean isFirstCandidate = reservation.getCandidates().isEmpty();
+
+        reservation.addCandidate(candidate);
+
+        // 만약 첫 번째 후보자라면 바로 구매자로 선정하는 로직
+        if (isFirstCandidate) {
+            reservation.changeToNextBuyer(candidate);
+        }
+
+        return candidate;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
index bb4aaa6..5216f01 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
@@ -33,6 +33,11 @@ public Reservation save(Reservation reservationEntity) {
         return reservationJpaRepository.save(reservationEntity);
     }
 
+    @Override
+    public Reservation saveAndFlush(Reservation reservationEntity) {
+        return reservationJpaRepository.saveAndFlush(reservationEntity);
+    }
+
     @Override
     public Optional<Reservation> findById(UUID id) {
         return reservationJpaRepository.findById(id);
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index a91e6d0..c7b7ff4 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -6,9 +6,9 @@
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
 import org.pgsg.reservation.application.service.ReservationService;
-import org.pgsg.reservation.domain.model.reservation.SearchPolicy;
 import org.pgsg.reservation.presentation.dto.request.ReservationCreateRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationSearchRequest;
+import org.pgsg.reservation.presentation.dto.response.ReservationCandidateResponse;
 import org.pgsg.reservation.presentation.dto.response.ReservationDetailResponse;
 import org.pgsg.reservation.presentation.dto.response.ReservationResponse;
 import org.springframework.data.domain.Page;
@@ -16,10 +16,8 @@
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-import java.nio.file.attribute.UserPrincipal;
 import java.util.UUID;
 
 @RestController
@@ -88,4 +86,16 @@ public ResponseEntity<ReservationDetailResponse> getReservationDetail(
 
         return ResponseEntity.ok(response);
     }
-}
\ No newline at end of file
+
+    //예약 신청
+    @PostMapping("/{reservationId}")
+    public ResponseEntity<ReservationCandidateResponse> applyReservation(
+            @PathVariable UUID reservationId,
+            @RequestHeader("X-User-Id") UUID userId,
+            @RequestHeader("X-User-Nickname") String nickname
+    ) {
+        ReservationCandidateResponse response = reservationService.applyReservation(reservationId, userId, nickname);
+
+        return ResponseEntity.status(HttpStatus.CREATED).body(response);
+    }
+}
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCandidateResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCandidateResponse.java
new file mode 100644
index 0000000..cf9abf3
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCandidateResponse.java
@@ -0,0 +1,23 @@
+package org.pgsg.reservation.presentation.dto.response;
+
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public record ReservationCandidateResponse(
+        Long id,                        // 예약후보 고유 순번
+        UUID candidateId,              // 예약후보자 회원 ID
+        String candidateNickname,      // 예약후보자 닉네임
+        String status,                 // 선정 상태 (WAITING, SELECTED, CANCELLED)
+        LocalDateTime createdAt        // 예약후보 등록 일자
+) {
+    public static ReservationCandidateResponse from(ReservationCandidate candidate) {
+        return new ReservationCandidateResponse(
+                candidate.getId(),               // 엔티티의 id 필드 매핑
+                candidate.getCandidateId(),       // 후보자 UUID 매핑
+                candidate.getCandidateNickname(), // 후보자 닉네임 매핑
+                candidate.getStatus().name(),     // Enum을 String으로 변환
+                candidate.getCreatedAt()          // BaseEntity로부터 상속받은 생성일자
+        );
+    }
+}
\ No newline at end of file

From ef32c7ba69749a6ffe0e64cfa67a0c4f5de5ab61 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Thu, 30 Apr 2026 12:36:35 +0900
Subject: [PATCH 008/142] Feat/15 reservation cancel (#16)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat : reservationhistory vo 및 엔티티 추가

* feat : 예약 취소 기능 구현
- 판매자,구매자에 따라 상품 상태 변경
- 뭐가 되든 간에 예약 관리 작성
- infrastructure Reservation폴더 분리

* Update src/main/java/org/pgsg/reservation/domain/model/reservationhistory/ReservationHistory.java

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update src/main/java/org/pgsg/reservation/domain/model/reservationhistory/ReservationHistory.java

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix : 코드 래빗 제안 수정
- 대기자가 없으면 예약이 다시 안열리는 문제 수정

* fix : 코드 래빗 제안 수정
- NPE 방어 로직 작성

* fix : 코드 래빗 제안 수정
- 취소 사유 검증 로직 추가

* fix : 구매자,판매자 로직 분리

* fix : 코드래빗 제안 수정
- ReservationCancelInfo로 파라미터 타입 명시

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .../dto/command/ReservationCancelCommand.java | 14 +++
 .../dto/info/ReservationCancelInfo.java       | 22 +++++
 .../service/ReservationService.java           | 47 ++++++++++
 .../domain/model/reservation/Reservation.java |  9 ++
 .../ReservationCandidate.java                 |  6 +-
 .../ReservationHistory.java                   | 47 ++++++++++
 .../ReservationHistoryRepository.java         |  7 ++
 .../service/ReservationDomainService.java     | 90 ++++++++++++++++++-
 .../domain/service/ReservationValidator.java  | 41 +++++++++
 .../ReservationHistoryRepositoryImpl.java     | 19 ++++
 .../ReservationJpaRepository.java             |  2 +-
 .../ReservationRepositoryImpl.java            |  2 +-
 .../JpaReservationHistoryRepository.java      |  8 ++
 .../controller/ReservationController.java     | 50 ++++++++++-
 .../dto/request/ReservationCancelRequest.java |  8 ++
 .../response/ReservationCancelResponse.java   | 25 ++++++
 16 files changed, 389 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/command/ReservationCancelCommand.java
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/info/ReservationCancelInfo.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/model/reservationhistory/ReservationHistory.java
 create mode 100644 src/main/java/org/pgsg/reservation/domain/repository/ReservationHistoryRepository.java
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationHistoryRepositoryImpl.java
 rename src/main/java/org/pgsg/reservation/infrastructure/repository/{ => reservation}/ReservationJpaRepository.java (77%)
 rename src/main/java/org/pgsg/reservation/infrastructure/repository/{ => reservation}/ReservationRepositoryImpl.java (98%)
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/repository/reservationhistory/JpaReservationHistoryRepository.java
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCancelRequest.java
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCancelResponse.java

diff --git a/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCancelCommand.java b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCancelCommand.java
new file mode 100644
index 0000000..c24cd4c
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCancelCommand.java
@@ -0,0 +1,14 @@
+package org.pgsg.reservation.application.dto.command;
+
+import java.util.UUID;
+
+public record ReservationCancelCommand(
+        UUID reservationId,
+        UUID userId,
+        String role,
+        String reason
+) {
+    public static ReservationCancelCommand of(UUID id, UUID userId, String role, String reason) {
+        return new ReservationCancelCommand(id, userId, role, reason);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCancelInfo.java b/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCancelInfo.java
new file mode 100644
index 0000000..4cf88f1
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCancelInfo.java
@@ -0,0 +1,22 @@
+package org.pgsg.reservation.application.dto.info;
+
+import lombok.Builder;
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+@Builder
+public record ReservationCancelInfo(
+        UUID reservationId,
+        ReservationStatus status,
+        LocalDateTime updatedAt
+) {
+    public static ReservationCancelInfo from(Reservation reservation) {
+        return ReservationCancelInfo.builder()
+                .reservationId(reservation.getId())
+                .status(reservation.getStatus())
+                .updatedAt(reservation.getModifiedAt())
+                .build();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index bcdc6d6..0d7129d 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -1,7 +1,9 @@
 package org.pgsg.reservation.application.service;
 
 import lombok.RequiredArgsConstructor;
+import org.pgsg.reservation.application.dto.command.ReservationCancelCommand;
 import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
+import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
 import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
@@ -10,6 +12,8 @@
 import org.pgsg.reservation.domain.exception.ReservationException;
 import org.pgsg.reservation.domain.model.reservation.*;
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
+import org.pgsg.reservation.domain.model.reservationhistory.ReservationHistory;
+import org.pgsg.reservation.domain.repository.ReservationHistoryRepository;
 import org.pgsg.reservation.domain.service.ReservationDomainService;
 import org.pgsg.reservation.domain.repository.ReservationRepository;
 import org.pgsg.reservation.presentation.dto.response.ReservationCandidateResponse;
@@ -28,6 +32,7 @@ public class ReservationService {
 
     private final ReservationRepository reservationRepository;
     private final ReservationDomainService reservationDomainService;
+    private final ReservationHistoryRepository reservationHistoryRepository;
     // private final ProductClient productClient; // 추후 구현 예정
 
     // 도메인 서비스 호출 전까지의 작업은 트랜잭션 밖으로 분리(추후 고도화 작업시)
@@ -139,6 +144,48 @@ public ReservationCandidateResponse applyReservation(UUID reservationId, UUID us
         return ReservationCandidateResponse.from(savedCandidate);
     }
 
+    // 구매자 취소 처리 로직
+    @Transactional
+    public ReservationCancelInfo cancelByBuyer(ReservationCancelCommand command) {
+        Reservation reservation = findById(command.reservationId());
+
+        ReservationHistory history = reservationDomainService.cancelByBuyer(
+                reservation,
+                command.userId(),
+                command.role(),
+                command.reason()
+        );
+
+        reservationHistoryRepository.save(history);
+
+        return ReservationCancelInfo.from(reservation);
+    }
+
+    // 판매자 취소 로직
+    @Transactional
+    public ReservationCancelInfo cancelBySeller(ReservationCancelCommand command) {
+        Reservation reservation = findById(command.reservationId());
+
+        ReservationHistory history = reservationDomainService.cancelBySeller(
+                reservation,
+                command.userId(),
+                command.role(),
+                command.reason()
+        );
+
+        reservationHistoryRepository.save(history);
+
+        return ReservationCancelInfo.from(reservation);
+    }
+
+    /**
+     * 공통 ID 조회 메서드
+     */
+    private Reservation findById(UUID reservationId) {
+        return reservationRepository.findById(reservationId)
+                .orElseThrow(() -> new ReservationException(ReservationErrorCode.RESERVATION_NOT_FOUND));
+    }
+
     private boolean isDuplicateApplyViolation(DataIntegrityViolationException e) {
         String message = e.getMostSpecificCause().getMessage();
         return message != null && message.contains("uk_reservation_candidate_user_id");
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index 25a061c..19cd326 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -103,6 +103,15 @@ public void cancelByBuyer() {
         this.status = ReservationStatus.CANCELLED_BY_BUYER;
     }
 
+    // 대기자가 없을 경우, 다시 누구나 신청 가능한 상태로 복구
+    public void reopen() {
+        // 현재 상태가 취소된 상태여야 재오픈 가능 (보안 및 로직 검증)
+        validateStatus(ReservationStatus.CANCELLED_BY_BUYER);
+
+        this.status = ReservationStatus.AVAILABLE;
+        this.buyerInfo = null; // 기존 구매자 정보 제거
+    }
+
     // 판매자 취소: PENDING 또는 PAID 상태에서 판매자가 취소(영구 종료)
     public void cancelBySeller() {
         validateStatus(ReservationStatus.PENDING, ReservationStatus.PAID);
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
index eced6b1..1552bf7 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservationcandidate/ReservationCandidate.java
@@ -16,7 +16,7 @@
 @Table(name = "p_reservation_candidates", uniqueConstraints = {
         @UniqueConstraint(
                 name = "uk_reservation_candidate_user_id",
-                columnNames = {"reservation_id", "candidateId"}
+                columnNames = {"reservation_id", "candidate_id"}
         )
 })
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -30,10 +30,14 @@ public class ReservationCandidate extends BaseEntity {
     @JoinColumn(name = "reservation_id")
     private Reservation reservation;
 
+    @Column(name = "candidate_id", nullable = false)
     private UUID candidateId;      // 후보자 식별자
+
+    @Column(nullable = false)
     private String candidateNickname; // 후보자 닉네임
 
     @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
     private ReservationCandidateStatus status = ReservationCandidateStatus.WAITING;
 
     // 예약 후보 생성
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservationhistory/ReservationHistory.java b/src/main/java/org/pgsg/reservation/domain/model/reservationhistory/ReservationHistory.java
new file mode 100644
index 0000000..41a9a14
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservationhistory/ReservationHistory.java
@@ -0,0 +1,47 @@
+package org.pgsg.reservation.domain.model.reservationhistory;
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
+
+import java.util.UUID;
+
+@Entity
+@Getter
+@Table(name = "p_reservation_histories")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class ReservationHistory {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    private UUID id;
+
+    @Column(nullable = false)
+    private UUID reservationId;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private ReservationStatus previousStatus;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private ReservationStatus newStatus;
+
+    private String comment; // 변경 사유
+
+    @Column(nullable = false)
+    private UUID changedBy; // 상태를 변경한 사용자 ID
+
+    // 상태 변경 이력을 생성
+    public static ReservationHistory of(UUID reservationId, ReservationStatus previousStatus,
+                                        ReservationStatus newStatus, String comment, UUID changedBy) {
+        if (comment == null || comment.isBlank()) {
+            throw new IllegalArgumentException("comment must not be blank");
+        }
+        return new ReservationHistory(null, reservationId, previousStatus, newStatus, comment, changedBy);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/repository/ReservationHistoryRepository.java b/src/main/java/org/pgsg/reservation/domain/repository/ReservationHistoryRepository.java
new file mode 100644
index 0000000..083e6c8
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/repository/ReservationHistoryRepository.java
@@ -0,0 +1,7 @@
+package org.pgsg.reservation.domain.repository;
+
+import org.pgsg.reservation.domain.model.reservationhistory.ReservationHistory;
+
+public interface ReservationHistoryRepository {
+    ReservationHistory save(ReservationHistory history);
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 060d7af..27b10e3 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -5,9 +5,13 @@
 import org.pgsg.reservation.domain.exception.ReservationException;
 import org.pgsg.reservation.domain.model.reservation.*;
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidateStatus;
+import org.pgsg.reservation.domain.model.reservationhistory.ReservationHistory;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.UUID;
 
 
@@ -89,18 +93,98 @@ public ReservationCandidate addCandidate(Reservation reservation, UUID userId, S
             throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
         }
 
+        // 현재 구매자가 없는 상태(reopen된 상태)라면 내가 바로 구매자가 변경
+        boolean shouldBeSelectedImmediately = (reservation.getBuyerInfo() == null);
+
         // 후보자 생성 및 애그리거트에 추가
         ReservationCandidate candidate = ReservationCandidate.create(reservation, userId, nickname);
-        // 현재 후보자가 없을 경우 첫 번째 신청자로 생각
-        boolean isFirstCandidate = reservation.getCandidates().isEmpty();
 
         reservation.addCandidate(candidate);
 
         // 만약 첫 번째 후보자라면 바로 구매자로 선정하는 로직
-        if (isFirstCandidate) {
+        if (shouldBeSelectedImmediately) {
             reservation.changeToNextBuyer(candidate);
         }
 
         return candidate;
     }
+
+    /**
+     * 구매자 사유 취소 도메인 로직
+     * 구매자 혹은 관리자가 호출하며, 취소 후 다음 대기자에게 예약 권한을 승계함
+     */
+    public ReservationHistory cancelByBuyer(Reservation reservation, UUID userId, String role, String reason) {
+        validateReason(reason);
+
+        // 권한 및 상태 검증
+        reservationValidator.validateCancelByBuyer(reservation, userId, role);
+
+        ReservationStatus previousStatus = reservation.getStatus();
+
+        // 엔티티 상태 변경
+        reservation.cancelByBuyer();
+
+        // 다음 구매자 승계 처리
+        handleNextBuyerSequence(reservation);
+
+        // 이력 객체 생성
+        return ReservationHistory.of(
+                reservation.getId(),
+                previousStatus,
+                reservation.getStatus(),
+                reason,
+                userId
+        );
+    }
+
+    /**
+     * 판매자 사유 취소 도메인 로직
+     * 판매자 혹은 관리자가 호출하며, 취소 후 예약 비활성화 후 상품 삭제 요청
+     */
+    public ReservationHistory cancelBySeller(Reservation reservation, UUID userId, String role, String reason) {
+        validateReason(reason);
+
+        // 권한 및 상태 검증
+        reservationValidator.validateCancelBySeller(reservation, userId, role);
+
+        ReservationStatus previousStatus = reservation.getStatus();
+
+        // 엔티티 상태 변경
+        reservation.cancelBySeller();
+
+        // 이력 객체 생성
+        return ReservationHistory.of(
+                reservation.getId(),
+                previousStatus,
+                reservation.getStatus(),
+                reason,
+                userId
+        );
+    }
+
+    /**
+     * 다음 구매자 승계 내부 로직
+     */
+    private void handleNextBuyerSequence(Reservation reservation) {
+        // WAITING 상태 중 생성일 오름차순 -> ID 오름차순
+        // 대기자 중 가장 우선 우선순위가 높은 사람을 찾음
+        Optional<ReservationCandidate> nextCandidate = reservation.getCandidates().stream()
+                .filter(c -> c.getStatus() == ReservationCandidateStatus.WAITING)
+                .min(Comparator.comparing(ReservationCandidate::getCreatedAt)
+                        .thenComparing(ReservationCandidate::getId));
+
+        if (nextCandidate.isPresent()) {
+            // a. 대기자가 있으면 승계 처리
+            reservation.changeToNextBuyer(nextCandidate.get());
+        } else {
+            // b. 대기자가 없으면 다시 누구나 신청 가능한 상태로 복구
+            reservation.reopen();
+        }
+    }
+
+    private void validateReason(String reason) {
+        if (reason == null || reason.isBlank()) {
+            throw new ReservationException(ReservationErrorCode.INVALID_INPUT);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
index b15c505..96fb5f0 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
@@ -4,6 +4,7 @@
 import org.pgsg.reservation.domain.exception.*;
 import org.springframework.stereotype.Component;
 
+import java.util.Objects;
 import java.util.UUID;
 
 @Component
@@ -35,6 +36,46 @@ public void validateSearchRequest(UUID userId, String role) {
         }
     }
 
+    // 구매자,관리자 취소 권한 및 상태 검증
+    public void validateCancelByBuyer(Reservation reservation, UUID userId, String role) {
+        validateCommonCancel(reservation, userId);
+
+        boolean isBuyer = reservation.getBuyerInfo() != null &&
+                Objects.equals(reservation.getBuyerInfo().getBuyerId(), userId);
+
+        boolean isAdmin = "ADMIN".equalsIgnoreCase(role);
+
+        if (!isBuyer && !isAdmin) {
+            throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
+        }
+    }
+
+    // 판매자,관리자 취소 권한 및 상태 검증
+    public void validateCancelBySeller(Reservation reservation, UUID userId, String role) {
+        validateCommonCancel(reservation, userId);
+
+        boolean isSeller = reservation.getSellerInfo() != null &&
+                Objects.equals(reservation.getSellerInfo().getSellerId(), userId);
+
+        boolean isAdmin = "ADMIN".equalsIgnoreCase(role);
+
+        if (!isSeller && !isAdmin) {
+            throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
+        }
+    }
+
+    // 공통 취소 가능 상태 검증
+    private void validateCommonCancel(Reservation reservation, UUID userId) {
+        if (reservation == null || userId == null) {
+            throw new ReservationException(ReservationErrorCode.INVALID_INPUT);
+        }
+
+        // 이미 종료된 상태이거나 취소 불가능한 상태인지 확인
+        if (reservation.getStatus() == null || !reservation.getStatus().isMutable()) {
+            throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
+        }
+    }
+
     // 본인 상품 예약 금지 규칙
     private boolean isSamePerson(BuyerInfo buyer, SellerInfo seller) {
         return buyer.getBuyerId().equals(seller.getSellerId());
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationHistoryRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationHistoryRepositoryImpl.java
new file mode 100644
index 0000000..9113de4
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationHistoryRepositoryImpl.java
@@ -0,0 +1,19 @@
+package org.pgsg.reservation.infrastructure.repository;
+
+import lombok.RequiredArgsConstructor;
+import org.pgsg.reservation.domain.model.reservationhistory.ReservationHistory;
+import org.pgsg.reservation.domain.repository.ReservationHistoryRepository;
+import org.pgsg.reservation.infrastructure.repository.reservationhistory.JpaReservationHistoryRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class ReservationHistoryRepositoryImpl implements ReservationHistoryRepository {
+
+    private final JpaReservationHistoryRepository jpaRepository;
+
+    @Override
+    public ReservationHistory save(ReservationHistory history) {
+        return jpaRepository.save(history);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationJpaRepository.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationJpaRepository.java
similarity index 77%
rename from src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationJpaRepository.java
rename to src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationJpaRepository.java
index 797a746..777d3f2 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationJpaRepository.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationJpaRepository.java
@@ -1,4 +1,4 @@
-package org.pgsg.reservation.infrastructure.repository;
+package org.pgsg.reservation.infrastructure.repository.reservation;
 
 import org.pgsg.reservation.domain.model.reservation.Reservation;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
similarity index 98%
rename from src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
rename to src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
index 5216f01..7901463 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
@@ -1,4 +1,4 @@
-package org.pgsg.reservation.infrastructure.repository;
+package org.pgsg.reservation.infrastructure.repository.reservation;
 
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.PathBuilder;
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservationhistory/JpaReservationHistoryRepository.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservationhistory/JpaReservationHistoryRepository.java
new file mode 100644
index 0000000..4520d2e
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservationhistory/JpaReservationHistoryRepository.java
@@ -0,0 +1,8 @@
+package org.pgsg.reservation.infrastructure.repository.reservationhistory;
+
+import org.pgsg.reservation.domain.model.reservationhistory.ReservationHistory;
+import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.UUID;
+
+public interface JpaReservationHistoryRepository extends JpaRepository<ReservationHistory, UUID> {
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index c7b7ff4..0152f8c 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -2,12 +2,17 @@
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.pgsg.config.security.UserDetailsImpl;
+import org.pgsg.reservation.application.dto.command.ReservationCancelCommand;
 import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
+import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
 import org.pgsg.reservation.application.service.ReservationService;
+import org.pgsg.reservation.presentation.dto.request.ReservationCancelRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationCreateRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationSearchRequest;
+import org.pgsg.reservation.presentation.dto.response.ReservationCancelResponse;
 import org.pgsg.reservation.presentation.dto.response.ReservationCandidateResponse;
 import org.pgsg.reservation.presentation.dto.response.ReservationDetailResponse;
 import org.pgsg.reservation.presentation.dto.response.ReservationResponse;
@@ -16,6 +21,7 @@
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.UUID;
@@ -68,7 +74,7 @@ public ResponseEntity<Page<ReservationResponse>> getReservations(
         Page<ReservationResponse> responses = reservationService.getSearchReservations(userId, role, query, pageable)
                 .map(ReservationResponse::from);
 
-        // 3. 통일된 응답 규격으로 반환 (조회는 200 OK)
+        // 통일된 응답 규격으로 반환 (조회는 200 OK)
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(responses);
@@ -87,7 +93,7 @@ public ResponseEntity<ReservationDetailResponse> getReservationDetail(
         return ResponseEntity.ok(response);
     }
 
-    //예약 신청
+    // 예약 신청
     @PostMapping("/{reservationId}")
     public ResponseEntity<ReservationCandidateResponse> applyReservation(
             @PathVariable UUID reservationId,
@@ -98,4 +104,44 @@ public ResponseEntity<ReservationCandidateResponse> applyReservation(
 
         return ResponseEntity.status(HttpStatus.CREATED).body(response);
     }
+
+    // 구매자 사유 취소 (구매자/관리자)
+    @PatchMapping("/{reservationId}/cancel/buyer")
+    public ResponseEntity<ReservationCancelResponse> cancelByBuyer(
+            @PathVariable UUID reservationId,
+            @RequestBody ReservationCancelRequest request,
+            @AuthenticationPrincipal UserDetailsImpl userDetails // AuthUser를 UserDetailsImpl로 통일
+    ) {
+        ReservationCancelCommand command = ReservationCancelCommand.of(
+                reservationId,
+                userDetails.getUuid(),
+                userDetails.getUserRole(),
+                request.reason()
+        );
+
+        ReservationCancelInfo info = reservationService.cancelByBuyer(command);
+        ReservationCancelResponse response = ReservationCancelResponse.of(info, "구매자 사유 취소가 완료되었습니다.");
+
+        return ResponseEntity.status(HttpStatus.OK).body(response);
+    }
+
+    // 판매자 사유로 인한 취소(판매자,관리자)
+    @PatchMapping("/{reservationId}/cancel/seller")
+    public ResponseEntity<ReservationCancelResponse> cancelBySeller(
+            @PathVariable UUID reservationId,
+            @RequestBody ReservationCancelRequest request,
+            @AuthenticationPrincipal UserDetailsImpl userDetails
+    ) {
+        ReservationCancelCommand command = ReservationCancelCommand.of(
+                reservationId,
+                userDetails.getUuid(),
+                userDetails.getUserRole(),
+                request.reason()
+        );
+
+        ReservationCancelInfo info = reservationService.cancelBySeller(command);
+        ReservationCancelResponse response = ReservationCancelResponse.of(info, "판매자 사유 취소가 완료되었습니다.");
+
+        return ResponseEntity.status(HttpStatus.OK).body(response);
+    }
 }
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCancelRequest.java b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCancelRequest.java
new file mode 100644
index 0000000..eef6408
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCancelRequest.java
@@ -0,0 +1,8 @@
+package org.pgsg.reservation.presentation.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record ReservationCancelRequest(
+        @NotBlank(message = "취소 사유를 입력해주세요.")
+        String reason
+) {}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCancelResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCancelResponse.java
new file mode 100644
index 0000000..35ad3d8
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCancelResponse.java
@@ -0,0 +1,25 @@
+package org.pgsg.reservation.presentation.dto.response;
+
+import lombok.Builder;
+import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+@Builder
+public record ReservationCancelResponse(
+        UUID reservationId,
+        ReservationStatus status,
+        LocalDateTime updatedAt,
+        String message
+) {
+    public static ReservationCancelResponse of(ReservationCancelInfo info, String message) {
+        return ReservationCancelResponse.builder()
+                .reservationId(info.reservationId())
+                .status(info.status())
+                .updatedAt(info.updatedAt())
+                .message(message)
+                .build();
+    }
+}
\ No newline at end of file

From f40502b6ca0b5442c42683587d4651e81f7553cc Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Thu, 30 Apr 2026 15:49:06 +0900
Subject: [PATCH 009/142] Feat/17 reservation expire (#18)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat : 예약 만료
- 예약 만료 구현
- 관리자만 수정이 가능하도록 작성

* feat : 예약 만료 자동 스케줄링
- ReservationStatus가 PENDING,PAID으로 업데이트 된 이후 상태가 변경이 없다면 1시간 후 자동 상태 변경

* fix : 코드래빗 제안 사안 수정
- 사유 누락 확인 및 관리자 전용 제약을 도메인에서 명시적으로 강제

* fix : 코드래빗 제안 사안 수정
- 사용되지 않고 존재하지 않는 필드를 참조하는 메서드 삭제

* fix : 코드래빗 제안 사안 수정
- 대상 건수가 많아지면 락 유지 시간/메모리 부담으로 인하여  서비스 계층에서 건별 트랜잭션 처리
- 지연 로딩 에러해결을 위해 해당 조회 메서드에만 readOnly = true 트랜잭션 처리

* fix : 코드래빗 제안 사안 수정
- 입력 누락 시 전체 조회로 확장되는 경로를 차단
- PAID를 명시 분기하고 나머지는 예외 처리
---
 .../service/ReservationService.java           | 25 ++++++
 .../repository/ReservationRepository.java     |  6 ++
 .../service/ReservationDomainService.java     | 49 +++++++++++
 .../domain/service/ReservationValidator.java  |  2 +-
 ...ory.java => JpaReservationRepository.java} |  6 +-
 .../ReservationRepositoryImpl.java            | 34 +++++++-
 .../ReservationHistoryRepositoryImpl.java     |  3 +-
 .../scheduler/ReservationExpiryScheduler.java | 85 +++++++++++++++++++
 .../controller/ReservationController.java     | 24 ++++++
 .../ReservationAdminCancelRequest.java        |  8 ++
 10 files changed, 237 insertions(+), 5 deletions(-)
 rename src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/{ReservationJpaRepository.java => JpaReservationRepository.java} (55%)
 rename src/main/java/org/pgsg/reservation/infrastructure/repository/{ => reservationhistory}/ReservationHistoryRepositoryImpl.java (77%)
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationAdminCancelRequest.java

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 0d7129d..7d933d5 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -16,6 +16,7 @@
 import org.pgsg.reservation.domain.repository.ReservationHistoryRepository;
 import org.pgsg.reservation.domain.service.ReservationDomainService;
 import org.pgsg.reservation.domain.repository.ReservationRepository;
+import org.pgsg.reservation.presentation.dto.request.ReservationAdminCancelRequest;
 import org.pgsg.reservation.presentation.dto.response.ReservationCandidateResponse;
 import org.pgsg.reservation.presentation.dto.response.ReservationDetailResponse;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -178,6 +179,29 @@ public ReservationCancelInfo cancelBySeller(ReservationCancelCommand command) {
         return ReservationCancelInfo.from(reservation);
     }
 
+    // 예약 만료
+    @Transactional
+    public ReservationCancelInfo expireByAdmin(
+            UUID reservationId,
+            ReservationAdminCancelRequest request,
+            UUID adminId,
+            String role
+    ) {
+        Reservation reservation = findById(reservationId);
+
+        ReservationHistory history = reservationDomainService.expireByAdmin(
+                reservation,
+                adminId,
+                role,
+                request.targetStatus(),
+                request.reason()
+        );
+
+        reservationHistoryRepository.save(history);
+
+        return ReservationCancelInfo.from(reservation);
+    }
+
     /**
      * 공통 ID 조회 메서드
      */
@@ -190,4 +214,5 @@ private boolean isDuplicateApplyViolation(DataIntegrityViolationException e) {
         String message = e.getMostSpecificCause().getMessage();
         return message != null && message.contains("uk_reservation_candidate_user_id");
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
index a1be2d7..d8a464c 100644
--- a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
+++ b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
@@ -2,9 +2,12 @@
 
 import org.pgsg.reservation.domain.dto.ReservationSearchCriteria;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -18,4 +21,7 @@ public interface ReservationRepository {
     Page<Reservation> findByCriteria(ReservationSearchCriteria criteria, Pageable pageable);
 
     Optional<Reservation> findById(UUID id);
+
+    // 예약 만료 스케줄링용
+    List<Reservation> findAllByStatusInAndModifiedAtBefore(List<ReservationStatus> statuses, LocalDateTime threshold);
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 27b10e3..8021037 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -162,6 +162,55 @@ public ReservationHistory cancelBySeller(Reservation reservation, UUID userId, S
         );
     }
 
+    /**
+     * 예약 만료 로직
+     * 예약이 만료 될 시 작동 혹은 시스템 문제로 관리자 임의 실행
+     */
+    public ReservationHistory expireByAdmin(
+            Reservation reservation,
+            UUID adminId,
+            String role,
+            ReservationStatus targetStatus,
+            String reason
+    ) {
+        validateReason(reason);
+
+        // 관리자 권한 및 취소 가능 상태인지 확인
+        reservationValidator.validateSearchRequest(adminId, role);
+        if (!"ADMIN".equalsIgnoreCase(role == null ? null : role.trim())) {
+            throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
+        }
+        reservationValidator.validateCommonCancel(reservation, adminId);
+
+        // 이력 기록을 위해 변경 전 상태 보관
+        ReservationStatus previousStatus = reservation.getStatus();
+
+        // 상태 변경
+        if (targetStatus == ReservationStatus.CANCELLED_BY_BUYER) {
+            // 구매자 사유 취소로 취급 -> 차순위 승계(handleNextBuyer) 로직 작동
+            reservation.cancelByBuyer();
+
+            // 여기서 직접 차순위 로직을 호출하거나, 이벤트를 발행
+            handleNextBuyerSequence(reservation);
+
+        } else if (targetStatus == ReservationStatus.CANCELLED_BY_SELLER) {
+            // 판매자 사유 취소로 취급 -> 승계 없이 최종 종료
+            reservation.cancelBySeller();
+        } else {
+            // 그 외 정의되지 않은 상태 변경 시도 시 예외
+            throw new ReservationException(ReservationErrorCode.INVALID_INPUT);
+        }
+
+        // 3. 결과물(History) 생성 및 반환
+        return ReservationHistory.of(
+                reservation.getId(),
+                previousStatus,
+                reservation.getStatus(),
+                reason,
+                adminId
+        );
+    }
+
     /**
      * 다음 구매자 승계 내부 로직
      */
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
index 96fb5f0..2935f0d 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
@@ -65,7 +65,7 @@ public void validateCancelBySeller(Reservation reservation, UUID userId, String
     }
 
     // 공통 취소 가능 상태 검증
-    private void validateCommonCancel(Reservation reservation, UUID userId) {
+    public void validateCommonCancel(Reservation reservation, UUID userId) {
         if (reservation == null || userId == null) {
             throw new ReservationException(ReservationErrorCode.INVALID_INPUT);
         }
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationJpaRepository.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/JpaReservationRepository.java
similarity index 55%
rename from src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationJpaRepository.java
rename to src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/JpaReservationRepository.java
index 777d3f2..7fb1cc8 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationJpaRepository.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/JpaReservationRepository.java
@@ -1,8 +1,12 @@
 package org.pgsg.reservation.infrastructure.repository.reservation;
 
 import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.UUID;
 
-public interface ReservationJpaRepository extends JpaRepository<Reservation, UUID> {
+public interface JpaReservationRepository extends JpaRepository<Reservation, UUID> {
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
index 7901463..f54d872 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
@@ -13,7 +13,9 @@
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -22,7 +24,7 @@
 @RequiredArgsConstructor
 public class ReservationRepositoryImpl implements ReservationRepository {
 
-    private final ReservationJpaRepository reservationJpaRepository;
+    private final JpaReservationRepository reservationJpaRepository;
     private final JPAQueryFactory queryFactory;
 
     private final PathBuilder<Reservation> reservation =
@@ -38,6 +40,24 @@ public Reservation saveAndFlush(Reservation reservationEntity) {
         return reservationJpaRepository.saveAndFlush(reservationEntity);
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public List<Reservation> findAllByStatusInAndModifiedAtBefore(
+            List<ReservationStatus> statuses,
+            LocalDateTime threshold
+    ){
+        if (statuses == null || statuses.isEmpty() || threshold == null) {
+            return List.of();
+        }
+        return queryFactory
+                .selectFrom(reservation)
+                .where(
+                        statusIn(statuses),
+                        modifiedAtBefore(threshold)
+                )
+                .fetch();
+    }
+
     @Override
     public Optional<Reservation> findById(UUID id) {
         return reservationJpaRepository.findById(id);
@@ -116,4 +136,16 @@ private BooleanExpression buyerNameEq(String buyerName) {
                 ? reservation.get("buyerInfo").getString("buyerName").containsIgnoreCase(normalized)
                 : null;
     }
+
+    private BooleanExpression statusIn(List<ReservationStatus> statuses) {
+        return statuses != null && !statuses.isEmpty()
+                ? reservation.get("status", ReservationStatus.class).in(statuses)
+                : null;
+    }
+
+    private BooleanExpression modifiedAtBefore(LocalDateTime threshold) {
+        return threshold != null
+                ? reservation.getDateTime("modifiedAt", LocalDateTime.class).before(threshold)
+                : null;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationHistoryRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservationhistory/ReservationHistoryRepositoryImpl.java
similarity index 77%
rename from src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationHistoryRepositoryImpl.java
rename to src/main/java/org/pgsg/reservation/infrastructure/repository/reservationhistory/ReservationHistoryRepositoryImpl.java
index 9113de4..3b720dd 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/ReservationHistoryRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservationhistory/ReservationHistoryRepositoryImpl.java
@@ -1,9 +1,8 @@
-package org.pgsg.reservation.infrastructure.repository;
+package org.pgsg.reservation.infrastructure.repository.reservationhistory;
 
 import lombok.RequiredArgsConstructor;
 import org.pgsg.reservation.domain.model.reservationhistory.ReservationHistory;
 import org.pgsg.reservation.domain.repository.ReservationHistoryRepository;
-import org.pgsg.reservation.infrastructure.repository.reservationhistory.JpaReservationHistoryRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java b/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java
new file mode 100644
index 0000000..602ec8d
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java
@@ -0,0 +1,85 @@
+package org.pgsg.reservation.infrastructure.scheduler;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.pgsg.reservation.application.service.ReservationService;
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
+import org.pgsg.reservation.domain.repository.ReservationRepository;
+import org.pgsg.reservation.presentation.dto.request.ReservationAdminCancelRequest;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ReservationExpiryScheduler {
+
+    private final ReservationService reservationService;
+    private final ReservationRepository reservationRepository;
+
+    // 시스템 자동 처리를 위한 가상의 관리자 ID (추후 시스템 관리자 용 id 따로 추가)
+    private static final UUID SYSTEM_ID = UUID.fromString("00000000-0000-0000-0000-000000000000");
+    private static final String SYSTEM_ROLE = "ADMIN";
+
+    /**
+     * 매 1분마다 만료된 예약을 체크하여 자동 취소 처리
+     */
+    @Scheduled(cron = "0 * * * * *")
+    public void autoExpireReservations() {
+        LocalDateTime threshold = LocalDateTime.now().minusMinutes(60);
+        List<ReservationStatus> targetStatuses = List.of(ReservationStatus.PENDING, ReservationStatus.PAID);
+
+        List<Reservation> expiredReservations = reservationRepository.findAllByStatusInAndModifiedAtBefore(
+                targetStatuses,
+                threshold
+        );
+
+        if (expiredReservations.isEmpty()) return;
+
+        log.info("시스템 자동 만료 처리 시작: {}건", expiredReservations.size());
+
+        for (Reservation reservation : expiredReservations) {
+            try {
+                // 현재 예약 상태에 맞는 요청 객체를 생성
+                ReservationAdminCancelRequest request = createCancelRequest(reservation);
+
+                reservationService.expireByAdmin(
+                        reservation.getId(),
+                        request,
+                        SYSTEM_ID,
+                        SYSTEM_ROLE
+                );
+            } catch (Exception e) {
+                log.error("예약 자동 만료 처리 중 오류 발생 (ID: {}): {}", reservation.getId(), e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * 예약 상태에 따른 적절한 취소 요청 객체를 생성하는 메서드
+     */
+    private ReservationAdminCancelRequest createCancelRequest(Reservation reservation) {
+
+        //
+        if (reservation.getStatus() == ReservationStatus.PENDING) {
+            return new ReservationAdminCancelRequest(
+                    ReservationStatus.CANCELLED_BY_BUYER,
+                    "결제 제한 시간(1시간) 초과로 인한 자동 취소"
+            );
+        }
+
+        // PAID 상태일 때
+        if (reservation.getStatus() == ReservationStatus.PAID) {
+            return new ReservationAdminCancelRequest(
+                    ReservationStatus.CANCELLED_BY_SELLER,
+                    "채팅 수락 제한 시간(1시간) 초과로 인한 자동 취소"
+            );
+        }
+        throw new IllegalStateException("자동 만료 대상이 아닌 상태입니다: " + reservation.getStatus());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index 0152f8c..c8e6746 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -9,6 +9,8 @@
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
 import org.pgsg.reservation.application.service.ReservationService;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
+import org.pgsg.reservation.presentation.dto.request.ReservationAdminCancelRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationCancelRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationCreateRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationSearchRequest;
@@ -144,4 +146,26 @@ public ResponseEntity<ReservationCancelResponse> cancelBySeller(
 
         return ResponseEntity.status(HttpStatus.OK).body(response);
     }
+
+    // 예약 만료(관리자만 조정 가능)
+    @PatchMapping("/{reservationId}/admin-force")
+    public ResponseEntity<ReservationCancelResponse> expireByAdmin(
+            @PathVariable UUID reservationId,
+            @RequestBody ReservationAdminCancelRequest request,
+            @AuthenticationPrincipal UserDetailsImpl userDetails
+    ) {
+        ReservationCancelInfo info = reservationService.expireByAdmin(
+                reservationId,
+                request,
+                userDetails.getUuid(),
+                userDetails.getUserRole()
+        );
+
+        // targetStatus에 따른 맞춤형 메시지 생성
+        String message = (request.targetStatus() == ReservationStatus.CANCELLED_BY_BUYER)
+                ? "관리자 권한으로 구매자 사유 취소(승계) 처리가 완료되었습니다."
+                : "관리자 권한으로 판매자 사유 취소(종료) 처리가 완료되었습니다.";
+
+        return ResponseEntity.ok(ReservationCancelResponse.of(info, message));
+    }
 }
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationAdminCancelRequest.java b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationAdminCancelRequest.java
new file mode 100644
index 0000000..184fff8
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationAdminCancelRequest.java
@@ -0,0 +1,8 @@
+package org.pgsg.reservation.presentation.dto.request;
+
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
+
+public record ReservationAdminCancelRequest(
+        ReservationStatus targetStatus,
+        String reason
+) {}
\ No newline at end of file

From b7c6770c3d46d5fa987b8fbf48fa57d3bb3b4a30 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Fri, 1 May 2026 03:34:36 +0900
Subject: [PATCH 010/142] =?UTF-8?q?feat=20:=20=EC=98=88=EC=95=BD=20?=
 =?UTF-8?q?=EB=A7=8C=EB=A3=8C=20=EA=B5=AC=ED=98=84=20(#20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat : 예약 만료 구현
- 예약 만료 기능 구현

* fix : 코드래빗 제안 수정
- 권한 검증 로직 추가
---
 .../service/ReservationService.java           | 15 +++++++-
 .../service/ReservationDomainService.java     | 34 ++++++++++++++++---
 .../controller/ReservationController.java     | 20 +++++++++--
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 7d933d5..ad1383b 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -65,7 +65,7 @@ public ReservationCreateResult createReservation(ReservationCreateCommand comman
         // DB 저장
         Reservation savedReservation = reservationRepository.save(reservation);
 
-        // 5. [결과 반환] Result DTO로 변환하여 Controller로 전달
+        // [결과 반환] Result DTO로 변환하여 Controller로 전달
         return ReservationCreateResult.builder()
                 .reservationId(savedReservation.getId())
                 .status(savedReservation.getStatus().name())
@@ -202,6 +202,19 @@ public ReservationCancelInfo expireByAdmin(
         return ReservationCancelInfo.from(reservation);
     }
 
+    // 예약 완료
+    @Transactional
+    public ReservationCancelInfo completeReservation(UUID reservationId, UUID userId, String role) {
+        // 예약 엔티티 조회
+        Reservation reservation = findById(reservationId);
+
+        ReservationHistory history = reservationDomainService.completeReservation(reservation,userId,role);
+
+        reservationHistoryRepository.save(history);
+
+        return ReservationCancelInfo.from(reservation);
+    }
+
     /**
      * 공통 ID 조회 메서드
      */
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 8021037..68d9293 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -9,10 +9,7 @@
 import org.pgsg.reservation.domain.model.reservationhistory.ReservationHistory;
 import org.springframework.stereotype.Service;
 
-import java.util.Comparator;
-import java.util.Locale;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
 
 
 @Service
@@ -211,6 +208,34 @@ public ReservationHistory expireByAdmin(
         );
     }
 
+    /**
+     * 예약 완료
+     * 예약 완료 도메인 로직 및 이력 객체 생성
+     */
+    public ReservationHistory completeReservation(Reservation reservation, UUID userId ,String role) {
+        // 권한 검증 로직
+        boolean isSeller = reservation.getSellerInfo() != null && Objects.equals(reservation.getSellerInfo().getSellerId(), userId);
+        boolean isAdmin = "ADMIN".equalsIgnoreCase(role);
+        if (!isAdmin && !isSeller) {
+            throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
+        }
+
+        ReservationStatus previousStatus = reservation.getStatus();
+
+        // 엔티티 비즈니스 로직 실행 (PAID -> COMPLETED)
+        // 규칙: 예약 대기 상태일 때만 완료 가능
+        reservation.complete();
+
+        // 저장할 이력 객체 생성 및 반환
+        return ReservationHistory.of(
+                reservation.getId(),
+                previousStatus,
+                ReservationStatus.COMPLETED,
+                "판매자 채팅 수락으로 인한 예약 완료",
+                userId
+        );
+    }
+
     /**
      * 다음 구매자 승계 내부 로직
      */
@@ -236,4 +261,5 @@ private void validateReason(String reason) {
             throw new ReservationException(ReservationErrorCode.INVALID_INPUT);
         }
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index c8e6746..baf45d9 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -148,7 +148,7 @@ public ResponseEntity<ReservationCancelResponse> cancelBySeller(
     }
 
     // 예약 만료(관리자만 조정 가능)
-    @PatchMapping("/{reservationId}/admin-force")
+    @PatchMapping("/{reservationId}/expire")
     public ResponseEntity<ReservationCancelResponse> expireByAdmin(
             @PathVariable UUID reservationId,
             @RequestBody ReservationAdminCancelRequest request,
@@ -161,11 +161,27 @@ public ResponseEntity<ReservationCancelResponse> expireByAdmin(
                 userDetails.getUserRole()
         );
 
-        // targetStatus에 따른 맞춤형 메시지 생성
         String message = (request.targetStatus() == ReservationStatus.CANCELLED_BY_BUYER)
                 ? "관리자 권한으로 구매자 사유 취소(승계) 처리가 완료되었습니다."
                 : "관리자 권한으로 판매자 사유 취소(종료) 처리가 완료되었습니다.";
 
         return ResponseEntity.ok(ReservationCancelResponse.of(info, message));
     }
+
+    // 예약 완료
+    @PatchMapping("/{reservationId}/complete")
+    public ResponseEntity<ReservationCancelResponse> completeReservation(
+            @PathVariable UUID reservationId,
+            @AuthenticationPrincipal UserDetailsImpl userDetails
+    ) {
+        ReservationCancelInfo info = reservationService.completeReservation(
+                reservationId,
+                userDetails.getUuid(),
+                userDetails.getUserRole()
+        );
+
+        String message = "판매자 채팅 수락에 따라 예약 완료 처리가 완료되었습니다.";
+
+        return ResponseEntity.ok(ReservationCancelResponse.of(info, message));
+    }
 }

From e351cbb503c299f5572eaa6092dfdbdebd3dc85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 1 May 2026 03:35:23 +0900
Subject: [PATCH 011/142] =?UTF-8?q?chore=20:=20yml=20=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                       |  1 +
 src/main/resources/application.yml | 67 ++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 src/main/resources/application.yml

diff --git a/build.gradle b/build.gradle
index e497af4..83c748d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,6 +52,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     runtimeOnly 'com.mysql:mysql-connector-j'
+    runtimeOnly 'org.postgresql:postgresql'
 }
 
 def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 0000000..64454f3
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -0,0 +1,67 @@
+server:
+  port: ${SERVER_PORT:8085}
+
+spring:
+  application:
+    name: reservation-service
+
+  profiles:
+    active: dev
+    include: error, reservation-error
+
+  # [필수 1] 설정 로드 순서
+  # .env 파일을 먼저 읽고, 그 다음 외부 Config Server에 접속합니다.
+  config:
+    import:
+      - "optional:file:.env[.properties]"
+      - "optional:configserver:${CONFIG_SERVER:http://34.50.50.170:13100}"
+
+  # [필수 2] 로컬 우선순위 설정
+  cloud:
+    config:
+      allow-override: true
+      override-none: true
+      override-system-properties: false
+      discovery:
+        service-id: config-server
+
+  # [필수 3] 빈 중복 정의 허용
+  main:
+    allow-bean-definition-overriding: true
+
+  # 데이터베이스 설정 (PostgreSQL)
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    username: ${DB_USERNAME}
+    password: ${DB_PASSWORD}
+    url: ${DB_URL}
+
+  # [필수 4] Kafka 설정 (주신 group-id 반영)
+  kafka:
+    bootstrap-servers: ${KAFKA_HOST:localhost}:${KAFKA_PORT:9092}
+    consumer:
+      group-id: reservation-service
+      auto-offset-reset: earliest
+      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+    producer:
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: org.apache.kafka.common.serialization.StringSerializer
+
+  jpa:
+    hibernate:
+      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:validate}
+    show-sql: ${SPRING_JPA_SHOW_SQL:false}
+    defer-datasource-initialization: true
+
+# [필수 5] 보안 및 유레카 설정
+jwt:
+  secret: ${JWT_SECRET}
+
+eureka:
+  instance:
+    instance-id: ${spring.application.name}:${random.value}
+    prefer-ip-address: true
+  client:
+    service-url:
+      default_zone: ${EUREKA_SERVER:http://localhost:8761/eureka/}
\ No newline at end of file

From b38698f3d2cd9cf4df32b73f0d545f1752f5a36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 1 May 2026 03:47:13 +0900
Subject: [PATCH 012/142] =?UTF-8?q?chore=20:=20=EC=9C=A0=EB=A0=88=EC=B9=B4?=
 =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20=EB=B0=8F=20Kafka=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                       | 22 ++++++++++++++++++++--
 src/main/resources/application.yml | 12 ++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 83c748d..d5e242a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2025.0.1")
+    set('springCloudVersion', "2025.0.2")
 }
 
 dependencyManagement {
@@ -35,23 +35,41 @@ dependencyManagement {
 }
 
 dependencies {
+    // [Lombok]
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
 
+    // [Spring Cloud] - Config 및 Eureka 연동 필수
+    implementation 'org.springframework.cloud:spring-cloud-starter-config'
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
+
+    // [Actuator] - 상태 확인 (management 설정용)
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+
+    // [Dotenv] - .env 파일 인식용 (추천)
+    implementation 'io.github.cdimascio:dotenv-spring-boot-starter:3.0.0'
+
+    // [Kafka]
+    implementation 'org.springframework.kafka:spring-kafka'
+
+    // [Querydsl]
     implementation 'io.github.openfeign.querydsl:querydsl-core:6.8'
     implementation 'io.github.openfeign.querydsl:querydsl-jpa:6.8'
     annotationProcessor 'io.github.openfeign.querydsl:querydsl-apt:6.8:jpa'
     annotationProcessor "jakarta.annotation:jakarta.annotation-api"
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
+    // [Common Module]
     implementation project(':common')
     annotationProcessor project(':common')
 
+    // [Spring Starters]
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
-    runtimeOnly 'com.mysql:mysql-connector-j'
+
+    // [Database]
     runtimeOnly 'org.postgresql:postgresql'
 }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 64454f3..0bdd817 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -36,7 +36,7 @@ spring:
     password: ${DB_PASSWORD}
     url: ${DB_URL}
 
-  # [필수 4] Kafka 설정 (주신 group-id 반영)
+  # [필수 4] Kafka 설정
   kafka:
     bootstrap-servers: ${KAFKA_HOST:localhost}:${KAFKA_PORT:9092}
     consumer:
@@ -54,6 +54,12 @@ spring:
     show-sql: ${SPRING_JPA_SHOW_SQL:false}
     defer-datasource-initialization: true
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include: health, info, refresh
+
 # [필수 5] 보안 및 유레카 설정
 jwt:
   secret: ${JWT_SECRET}
@@ -63,5 +69,7 @@ eureka:
     instance-id: ${spring.application.name}:${random.value}
     prefer-ip-address: true
   client:
+    register-with-eureka: true
+    fetch-registry: true
     service-url:
-      default_zone: ${EUREKA_SERVER:http://localhost:8761/eureka/}
\ No newline at end of file
+      defaultZone: ${EUREKA_SERVER:http://localhost:8761/eureka/}
\ No newline at end of file

From a053b0d816d415ef028c676270f5bdadb968af6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 1 May 2026 03:52:35 +0900
Subject: [PATCH 013/142] =?UTF-8?q?fix=20:=20cdimascio=20=EB=B2=84?=
 =?UTF-8?q?=EC=A0=84=203.0.0=20->=205.1.1=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d5e242a..c434c09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     // [Dotenv] - .env 파일 인식용 (추천)
-    implementation 'io.github.cdimascio:dotenv-spring-boot-starter:3.0.0'
+    implementation 'io.github.cdimascio:java-dotenv:5.1.1'
 
     // [Kafka]
     implementation 'org.springframework.kafka:spring-kafka'

From 4e0758cb519993c6a642929a3d0c983bdf95e1e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 1 May 2026 11:36:50 +0900
Subject: [PATCH 014/142] =?UTF-8?q?chore=20:=20docker=20=EC=97=B0=EB=8F=99?=
 =?UTF-8?q?=20-=20=EC=9C=A0=EB=A0=88=EC=B9=B4=20=EC=84=9C=EB=B2=84=20?=
 =?UTF-8?q?=EC=95=84=EC=A7=81=20=EC=9E=91=EB=8F=99=EC=A0=84=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=B6=94=ED=9B=84=20yml=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD=20=ED=95=84=EC=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dockerignore                                 |  7 ++
 Dockerfile                                    | 17 +++++
 build.gradle                                  |  6 +-
 docker-compose.yml                            | 71 +++++++++++++++++++
 .../ReservationServiceApplication.java        |  2 +
 src/main/resources/application.yml            | 27 ++++---
 6 files changed, 116 insertions(+), 14 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..a90b46f
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+.git
+.gradle
+build/
+out/
+.env
+.idea
+*.log
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..a7a5706
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,17 @@
+FROM eclipse-temurin:21-jdk-alpine AS build
+WORKDIR /app
+
+COPY . .
+
+RUN chmod +x ./gradlew
+RUN ./gradlew bootJar -x test
+
+FROM eclipse-temurin:21-jre-alpine
+WORKDIR /app
+
+COPY --from=build /app/build/libs/*.jar app.jar
+
+ENV SPRING_PROFILES_ACTIVE=dev
+EXPOSE 8085
+
+ENTRYPOINT ["java", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c434c09..99f4bf5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,14 +39,14 @@ dependencies {
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
 
-    // [Spring Cloud] - Config 및 Eureka 연동 필수
+    // [Spring Cloud]
     implementation 'org.springframework.cloud:spring-cloud-starter-config'
     implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
 
-    // [Actuator] - 상태 확인 (management 설정용)
+    // [Actuator] - 상태 확인
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
-    // [Dotenv] - .env 파일 인식용 (추천)
+    // [Dotenv] - .env 파일 인식용
     implementation 'io.github.cdimascio:java-dotenv:5.1.1'
 
     // [Kafka]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..e663d8a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,71 @@
+version: '3.8'
+
+services:
+  reservation-service:
+    container_name: reservation-service
+    build:
+      context: .
+      dockerfile: Dockerfile
+      secrets:
+        - GPR_USER
+        - GPR_TOKEN
+    environment:
+      - "SERVER_PORT=${SERVER_PORT:-8085}"
+      - "SPRING_PROFILES_ACTIVE=dev"
+    ports:
+      - "${SERVER_PORT:-8085}:${SERVER_PORT:-8085}"
+    env_file:
+      - .env
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - pgsg-network
+
+  db:
+    image: postgres:17
+    container_name: reservation-db
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_DB: ${DB_NAME:-reservation_db}
+      POSTGRES_USER: ${DB_USERNAME:-postgres}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+    volumes:
+      - postgres-reservation-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-postgres}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - pgsg-network
+
+  redis:
+    image: redis:7.2
+    container_name: reservation-redis
+    ports:
+      - "6379:6379"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - pgsg-network
+
+networks:
+  pgsg-network:
+    name: pgsg-network
+    external: true
+
+volumes:
+  postgres-reservation-data:
+
+secrets:
+  GPR_USER:
+    environment: GPR_USER
+  GPR_TOKEN:
+    environment: GPR_TOKEN
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
index d75d64c..b7962b0 100644
--- a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
+++ b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
@@ -2,7 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
+@EnableDiscoveryClient
 @SpringBootApplication
 public class ReservationServiceApplication {
     public static void main(String[] args) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0bdd817..9b741cd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,16 +14,12 @@ spring:
   config:
     import:
       - "optional:file:.env[.properties]"
-      - "optional:configserver:${CONFIG_SERVER:http://34.50.50.170:13100}"
+      # - "optional:configserver:${CONFIG_SERVER:http://34.50.50.170:13100}"
 
   # [필수 2] 로컬 우선순위 설정
   cloud:
     config:
-      allow-override: true
-      override-none: true
-      override-system-properties: false
-      discovery:
-        service-id: config-server
+      enabled: false
 
   # [필수 3] 빈 중복 정의 허용
   main:
@@ -34,11 +30,11 @@ spring:
     driver-class-name: org.postgresql.Driver
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
-    url: ${DB_URL}
+    url: ${DB_URL:jdbc:postgresql://reservation-db:5432/reservation_db}
 
   # [필수 4] Kafka 설정
   kafka:
-    bootstrap-servers: ${KAFKA_HOST:localhost}:${KAFKA_PORT:9092}
+    bootstrap-servers: ${KAFKA_HOST:kafka}:${KAFKA_PORT:9092}
     consumer:
       group-id: reservation-service
       auto-offset-reset: earliest
@@ -48,9 +44,15 @@ spring:
       key-serializer: org.apache.kafka.common.serialization.StringSerializer
       value-serializer: org.apache.kafka.common.serialization.StringSerializer
 
+  # [필수 5] Redis 설정
+  data:
+    redis:
+      host: ${REDIS_HOST:redis}
+      port: ${REDIS_PORT:6379}
+
   jpa:
     hibernate:
-      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:validate}
+      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
     show-sql: ${SPRING_JPA_SHOW_SQL:false}
     defer-datasource-initialization: true
 
@@ -60,7 +62,7 @@ management:
       exposure:
         include: health, info, refresh
 
-# [필수 5] 보안 및 유레카 설정
+# [필수 6] 보안 및 유레카 설정
 jwt:
   secret: ${JWT_SECRET}
 
@@ -68,8 +70,11 @@ eureka:
   instance:
     instance-id: ${spring.application.name}:${random.value}
     prefer-ip-address: true
+    hostname: ${spring.application.name}
   client:
+    enabled: false
     register-with-eureka: true
     fetch-registry: true
     service-url:
-      defaultZone: ${EUREKA_SERVER:http://localhost:8761/eureka/}
\ No newline at end of file
+      defaultZone: ${EUREKA_SERVER:http://host.docker.internal:8761/eureka/}
+    registry-fetch-interval-seconds: 30
\ No newline at end of file

From d8f2167ee87636195b79853dfbe9b87a0c763ddb Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Sun, 3 May 2026 20:57:38 +0900
Subject: [PATCH 015/142] Feat/22 reservation complete event (#23)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Feat : Kafka 설정 및 예약 완료 부분 작성

* Feat : Kafka docker 연동

* Fix : 카프카 이벤트 발송 확인

* Fix : 현빈님 제안 사항 수정
- OutboxEvent 추가
- common파일 github에서 연결

* Fix : RequestHeader로 통일

* Fix : 코드 래빗 제안 수정
- SSL 인증서 ro로 변경(읽기 전용)

* Fix : kafka 발송 확인

* Fix : 코드래빗 제안 수정
---
 .gitignore                                    |   9 ++-
 Dockerfile                                    |  14 ++++-
 build.gradle                                  |  20 +++++--
 docker-compose.yml                            |   2 +
 libs/common                                   |   1 -
 .../ReservationServiceApplication.java        |  14 ++++-
 .../dto/event/ReservationCompletedEvent.java  |  31 +++++++++++
 .../dto/event/ReservationEventPublisher.java  |   7 +++
 .../service/ReservationService.java           |   4 ++
 .../service/ReservationDomainService.java     |   2 +-
 .../infrastructure/config/OutboxConfig.java   |  21 +++++++
 .../infrastructure/config/SecurityConfig.java |  35 ++++++++++++
 .../event/ReservationEventBridge.java         |  52 ++++++++++++++++++
 .../MyReservationOutboxRepository.java        |  12 ++++
 .../controller/ReservationController.java     |  30 +++++-----
 src/main/resources/application.yml            |  26 +++++----
 .../resources/ssl/kafka.server.truststore.jks | Bin 0 -> 1158 bytes
 17 files changed, 243 insertions(+), 37 deletions(-)
 delete mode 160000 libs/common
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/event/ReservationCompletedEvent.java
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/event/ReservationEventPublisher.java
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/config/OutboxConfig.java
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/config/SecurityConfig.java
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/repository/MyReservationOutboxRepository.java
 create mode 100644 src/main/resources/ssl/kafka.server.truststore.jks

diff --git a/.gitignore b/.gitignore
index 588af4e..dfe3f5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,4 +45,11 @@ out/
 /.nb-gradle/
 
 ### VS Code ###
-.vscode/
\ No newline at end of file
+.vscode/
+
+### Security & Certificates ###
+*.jks
+kafka.server.truststore.jks
+
+# Gradle credentials
+gradle.properties
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a7a5706..e250316 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,13 +4,25 @@ WORKDIR /app
 COPY . .
 
 RUN chmod +x ./gradlew
-RUN ./gradlew bootJar -x test
+
+RUN --mount=type=secret,id=GPR_USER \
+    --mount=type=secret,id=GPR_TOKEN \
+    GPR_USER=$(cat /run/secrets/GPR_USER) && \
+    GPR_TOKEN=$(cat /run/secrets/GPR_TOKEN) && \
+    ./gradlew bootJar -x test \
+    -Pgpr.user="${GPR_USER}" \
+    -Pgpr.token="${GPR_TOKEN}"
 
 FROM eclipse-temurin:21-jre-alpine
 WORKDIR /app
 
+# 빌드 결과물 복사
 COPY --from=build /app/build/libs/*.jar app.jar
 
+# SSL 인증서 등 리소스 복사
+RUN mkdir -p /app/resources
+COPY src/main/resources/ssl/*.jks /app/resources/
+
 ENV SPRING_PROFILES_ACTIVE=dev
 EXPOSE 8085
 
diff --git a/build.gradle b/build.gradle
index 99f4bf5..6106293 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.5.13'
     id 'io.spring.dependency-management' version '1.1.7'
+    id 'org.jetbrains.kotlin.jvm' version '1.9.22'
 }
 
 group = 'org.pgsg'
@@ -22,6 +23,13 @@ configurations {
 repositories {
     mavenCentral()
     maven { url 'https://repo.spring.io/milestone' }
+    maven {
+        url = uri("https://maven.pkg.github.com/89-49/common")
+        credentials {
+            username = findProperty('gpr.user') ?: System.getenv('GPR_USER')
+            password = findProperty('gpr.token') ?: System.getenv('GPR_TOKEN')
+        }
+    }
 }
 
 ext {
@@ -60,8 +68,7 @@ dependencies {
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
     // [Common Module]
-    implementation project(':common')
-    annotationProcessor project(':common')
+    implementation 'org.pgsg:common:0.2.6-SNAPSHOT'
 
     // [Spring Starters]
     implementation 'org.springframework.boot:spring-boot-starter-web'
@@ -69,6 +76,11 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
+    // [ swagger]
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.22'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'
+
     // [Database]
     runtimeOnly 'org.postgresql:postgresql'
 }
@@ -82,10 +94,6 @@ sourceSets {
 tasks.withType(JavaCompile).configureEach {
     options.getGeneratedSourceOutputDirectory().set(querydslDir)
     options.annotationProcessorPath = configurations.annotationProcessor
-
-    dependsOn ':common:jar'
-    def commonJar = project(':common').tasks.named('jar').get().archiveFile
-    classpath = files(commonJar) + classpath
 }
 
 bootJar { enabled = true }
diff --git a/docker-compose.yml b/docker-compose.yml
index e663d8a..9a4abf2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,8 @@ services:
       - "${SERVER_PORT:-8085}:${SERVER_PORT:-8085}"
     env_file:
       - .env
+    volumes:
+      - ./src/main/resources/ssl:/app/ssl:ro
     depends_on:
       db:
         condition: service_healthy
diff --git a/libs/common b/libs/common
deleted file mode 160000
index 2ef28dc..0000000
--- a/libs/common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2ef28dc9081ac4ca2fcb00e5b33d223e48947635
diff --git a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
index b7962b0..767f59f 100644
--- a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
+++ b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
@@ -2,10 +2,18 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
-@EnableDiscoveryClient
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"org.pgsg.reservation", "org.pgsg.common"})
+@EntityScan(basePackages = {
+        "org.pgsg.reservation",
+        "org.pgsg.common.domain"
+})
+@EnableJpaRepositories(basePackages = {
+        "org.pgsg.reservation",
+        "org.pgsg.common.domain"
+})
 public class ReservationServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(ReservationServiceApplication.class, args);
diff --git a/src/main/java/org/pgsg/reservation/application/dto/event/ReservationCompletedEvent.java b/src/main/java/org/pgsg/reservation/application/dto/event/ReservationCompletedEvent.java
new file mode 100644
index 0000000..8ee76c4
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/event/ReservationCompletedEvent.java
@@ -0,0 +1,31 @@
+package org.pgsg.reservation.application.dto.event;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+
+import java.util.UUID;
+
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+public record ReservationCompletedEvent(
+        UUID reservationId,
+        UUID productId,
+        String productName,
+        Integer productPrice,
+        UUID sellerId,
+        String sellerNickName,
+        UUID buyerId,
+        String buyerNickName
+) {
+    public static ReservationCompletedEvent from(Reservation reservation) {
+        return new ReservationCompletedEvent(
+                reservation.getId(),
+                reservation.getProductInfo().getProductId(),
+                reservation.getProductInfo().getProductName(),
+                reservation.getProductInfo().getProductPrice(),
+                reservation.getSellerInfo().getSellerId(),
+                reservation.getSellerInfo().getSellerName(),
+                reservation.getBuyerInfo().getBuyerId(),
+                reservation.getBuyerInfo().getBuyerName()
+        );
+    }
+}
diff --git a/src/main/java/org/pgsg/reservation/application/dto/event/ReservationEventPublisher.java b/src/main/java/org/pgsg/reservation/application/dto/event/ReservationEventPublisher.java
new file mode 100644
index 0000000..f828054
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/event/ReservationEventPublisher.java
@@ -0,0 +1,7 @@
+package org.pgsg.reservation.application.dto.event;
+
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+
+public interface ReservationEventPublisher {
+    void publishReservationCompleted(Reservation reservation);
+}
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index ad1383b..bebade8 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.pgsg.reservation.application.dto.command.ReservationCancelCommand;
 import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
+import org.pgsg.reservation.application.dto.event.ReservationEventPublisher;
 import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
@@ -34,6 +35,7 @@ public class ReservationService {
     private final ReservationRepository reservationRepository;
     private final ReservationDomainService reservationDomainService;
     private final ReservationHistoryRepository reservationHistoryRepository;
+    private final ReservationEventPublisher reservationEventPublisher;
     // private final ProductClient productClient; // 추후 구현 예정
 
     // 도메인 서비스 호출 전까지의 작업은 트랜잭션 밖으로 분리(추후 고도화 작업시)
@@ -212,6 +214,8 @@ public ReservationCancelInfo completeReservation(UUID reservationId, UUID userId
 
         reservationHistoryRepository.save(history);
 
+        reservationEventPublisher.publishReservationCompleted(reservation);
+
         return ReservationCancelInfo.from(reservation);
     }
 
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 68d9293..1befb69 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -40,7 +40,7 @@ public SearchPolicy getReservations(UUID userId, String role) {
         // 역할에 따른 필터링
         String normalizedRole = role.trim().toUpperCase(Locale.ROOT);
         if ("ADMIN".equals(normalizedRole)) {
-            return new SearchPolicy(userId, false, false);
+            return new SearchPolicy(null, false, false);
         }
         if ("SELLER".equals(normalizedRole)) {
             return new SearchPolicy(userId, false, true);
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/OutboxConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/OutboxConfig.java
new file mode 100644
index 0000000..15e86fd
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/OutboxConfig.java
@@ -0,0 +1,21 @@
+package org.pgsg.reservation.infrastructure.config;
+
+import org.pgsg.common.domain.OutboxRepository;
+import org.pgsg.common.event.OutboxService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.kafka.core.KafkaTemplate;
+
+@Configuration
+public class OutboxConfig {
+
+    @Bean
+    @Primary
+    public OutboxService outboxService(
+            OutboxRepository outboxRepository,
+            KafkaTemplate<String, Object> kafkaTemplate
+    ) {
+        return new OutboxService(outboxRepository, kafkaTemplate);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/SecurityConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/SecurityConfig.java
new file mode 100644
index 0000000..2da76a9
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/SecurityConfig.java
@@ -0,0 +1,35 @@
+package org.pgsg.reservation.infrastructure.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.annotation.Order;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig {
+
+    @Primary
+    @Order(1) // 다른 보안 설정보다 먼저 적용되도록 강제
+    @Bean(name = "reservationDevFilterChain")
+    @Profile({"local", "dev"})
+    // 핵심: static 키워드를 추가하여 인스턴스 불일치 문제를 해결합니다.
+    public static SecurityFilterChain devFilterChain(HttpSecurity http) throws Exception {
+        http
+                .csrf(AbstractHttpConfigurer::disable)
+                .httpBasic(AbstractHttpConfigurer::disable)
+                .formLogin(AbstractHttpConfigurer::disable)
+                .authorizeHttpRequests(auth -> auth
+                        .requestMatchers("/api/v1/reservations/**").permitAll()
+                        .requestMatchers("/v3/api-docs/**", "/swagger-ui/**").permitAll()
+                        .anyRequest().authenticated()
+                );
+
+        return http.build();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java b/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
new file mode 100644
index 0000000..c6d4793
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
@@ -0,0 +1,52 @@
+package org.pgsg.reservation.infrastructure.event;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.pgsg.common.event.Events;
+import org.pgsg.common.event.OutboxEvent;
+import org.pgsg.reservation.application.dto.event.ReservationCompletedEvent;
+import org.pgsg.reservation.application.dto.event.ReservationEventPublisher;
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class ReservationEventBridge implements ReservationEventPublisher {
+
+    @Value("${topics.reservation.completed}")
+    private String topicName;
+
+    @Override
+    public void publishReservationCompleted(Reservation reservation) {
+        try {
+            log.info("예약 완료 Outbox 등록 시작 - 예약 ID: {}", reservation.getId());
+
+            // Product 서비스에서 식별자로 쓸 ID (상품 ID)
+            UUID correlationId = UUID.fromString(reservation.getProductInfo().getProductId().toString());
+
+            // Outbox 테이블의 PK로 저장될 ID (예약 ID)
+            UUID domainId = UUID.fromString(reservation.getId().toString());
+
+            // 페이로드 준비
+            ReservationCompletedEvent event = ReservationCompletedEvent.from(reservation);
+
+            Events.trigger(new OutboxEvent(
+                    correlationId,    // 1. correlationId
+                    domainId,         // 2. domainId (UUID 타입)
+                    "RESERVATION",    // 3. domainType
+                    topicName,        // 4. eventType (토픽명)
+                    event             // 5. payload
+            ));
+
+            log.info("예약 완료 Outbox 등록 완료 - correlationId: {}", correlationId);
+
+        } catch (Exception e) {
+            log.error("Outbox 등록 실패 - 예약 ID: {}", reservation.getId(), e);
+            throw new RuntimeException("이벤트 발행 중 오류 발생", e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/MyReservationOutboxRepository.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/MyReservationOutboxRepository.java
new file mode 100644
index 0000000..42c017a
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/MyReservationOutboxRepository.java
@@ -0,0 +1,12 @@
+package org.pgsg.reservation.infrastructure.repository;
+
+import org.pgsg.common.domain.Outbox;
+import org.pgsg.common.domain.OutboxRepository; // 중요: 공통 모듈의 인터페이스
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import java.util.UUID;
+
+@Repository
+public interface MyReservationOutboxRepository
+        extends JpaRepository<Outbox, UUID>, OutboxRepository {
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index baf45d9..482e512 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -2,7 +2,6 @@
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.pgsg.config.security.UserDetailsImpl;
 import org.pgsg.reservation.application.dto.command.ReservationCancelCommand;
 import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
 import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
@@ -23,7 +22,6 @@
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.UUID;
@@ -112,12 +110,13 @@ public ResponseEntity<ReservationCandidateResponse> applyReservation(
     public ResponseEntity<ReservationCancelResponse> cancelByBuyer(
             @PathVariable UUID reservationId,
             @RequestBody ReservationCancelRequest request,
-            @AuthenticationPrincipal UserDetailsImpl userDetails // AuthUser를 UserDetailsImpl로 통일
+            @RequestHeader("X-User-Id") UUID userId,
+            @RequestHeader("X-User-Role") String role
     ) {
         ReservationCancelCommand command = ReservationCancelCommand.of(
                 reservationId,
-                userDetails.getUuid(),
-                userDetails.getUserRole(),
+                userId,
+                role,
                 request.reason()
         );
 
@@ -132,12 +131,13 @@ public ResponseEntity<ReservationCancelResponse> cancelByBuyer(
     public ResponseEntity<ReservationCancelResponse> cancelBySeller(
             @PathVariable UUID reservationId,
             @RequestBody ReservationCancelRequest request,
-            @AuthenticationPrincipal UserDetailsImpl userDetails
+            @RequestHeader("X-User-Id") UUID userId,
+            @RequestHeader("X-User-Role") String role
     ) {
         ReservationCancelCommand command = ReservationCancelCommand.of(
                 reservationId,
-                userDetails.getUuid(),
-                userDetails.getUserRole(),
+                userId,
+                role,
                 request.reason()
         );
 
@@ -152,13 +152,14 @@ public ResponseEntity<ReservationCancelResponse> cancelBySeller(
     public ResponseEntity<ReservationCancelResponse> expireByAdmin(
             @PathVariable UUID reservationId,
             @RequestBody ReservationAdminCancelRequest request,
-            @AuthenticationPrincipal UserDetailsImpl userDetails
+            @RequestHeader("X-User-Id") UUID userId,
+            @RequestHeader("X-User-Role") String role
     ) {
         ReservationCancelInfo info = reservationService.expireByAdmin(
                 reservationId,
                 request,
-                userDetails.getUuid(),
-                userDetails.getUserRole()
+                userId,
+                role
         );
 
         String message = (request.targetStatus() == ReservationStatus.CANCELLED_BY_BUYER)
@@ -172,12 +173,13 @@ public ResponseEntity<ReservationCancelResponse> expireByAdmin(
     @PatchMapping("/{reservationId}/complete")
     public ResponseEntity<ReservationCancelResponse> completeReservation(
             @PathVariable UUID reservationId,
-            @AuthenticationPrincipal UserDetailsImpl userDetails
+            @RequestHeader("X-User-Id") UUID userId,
+            @RequestHeader("X-User-Role") String role
     ) {
         ReservationCancelInfo info = reservationService.completeReservation(
                 reservationId,
-                userDetails.getUuid(),
-                userDetails.getUserRole()
+                userId,
+                role
         );
 
         String message = "판매자 채팅 수락에 따라 예약 완료 처리가 완료되었습니다.";
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9b741cd..6b2d27b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,7 +6,7 @@ spring:
     name: reservation-service
 
   profiles:
-    active: dev
+    active: dev , kafka
     include: error, reservation-error
 
   # [필수 1] 설정 로드 순서
@@ -14,12 +14,14 @@ spring:
   config:
     import:
       - "optional:file:.env[.properties]"
-      # - "optional:configserver:${CONFIG_SERVER:http://34.50.50.170:13100}"
+      - "optional:configserver:${CONFIG_SERVER:http://34.50.50.170:13100}"
 
   # [필수 2] 로컬 우선순위 설정
   cloud:
     config:
       enabled: false
+      allow-override: true
+      override-none: false
 
   # [필수 3] 빈 중복 정의 허용
   main:
@@ -34,15 +36,15 @@ spring:
 
   # [필수 4] Kafka 설정
   kafka:
-    bootstrap-servers: ${KAFKA_HOST:kafka}:${KAFKA_PORT:9092}
-    consumer:
-      group-id: reservation-service
-      auto-offset-reset: earliest
-      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
-      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+    bootstrap-servers: ${KAFKA_HOST}
+    properties:
+      security.protocol: SSL
+      ssl.truststore.location: "/app/ssl/kafka.server.truststore.jks"
+      ssl.truststore.password: _aA123456
+      ssl.endpoint.identification.algorithm: ""
     producer:
       key-serializer: org.apache.kafka.common.serialization.StringSerializer
-      value-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: org.springframework.kafka.support.serializer.JsonSerializer
 
   # [필수 5] Redis 설정
   data:
@@ -77,4 +79,8 @@ eureka:
     fetch-registry: true
     service-url:
       defaultZone: ${EUREKA_SERVER:http://host.docker.internal:8761/eureka/}
-    registry-fetch-interval-seconds: 30
\ No newline at end of file
+    registry-fetch-interval-seconds: 30
+
+topics:
+  reservation:
+    completed: prod-reservation-completed
\ No newline at end of file
diff --git a/src/main/resources/ssl/kafka.server.truststore.jks b/src/main/resources/ssl/kafka.server.truststore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..17266ad08d368888a3eabb113fbebcf738ce77d1
GIT binary patch
literal 1158
zcmV;11bO=~f&_vB0Ru3C1S|##Duzgg_YDCD0ic2e9Rz{|88Ctb6)=JX5e5k=hDe6@
z4FLxRpn?PfFoFaA0s#Opf&=#k2`Yw2hW8Bt2LUi<1_>&LNQU<f0R;^(Sui*T2`Yw2
zhW8Bt1q?7N1Qcdy8Pm^k#af&ARBs=*71llyCd~o@ClCSwATSID2r7n1hW8Bu2?YQ!
z9R>+thDZTr0|Wso1Q6x$ipT31!A-}C1#rxuw8Vgd1AzDSxiYOg0o*a$-0sDwo|SPX
zQJ<)H`^|u?lSJ0Jp4X0qG|U0Mv;<y`>SOR=&hc%E@ZRyO1^0|BW@s49Lh2B}?(bAi
zfn^E@CHd|ljO^!g0_goULbp70czHd94nN8&?m^{&jp4wrG+qlrX~CaW;cK$)w@201
z!|5N6jw;}TcQ0r8_d%Ja4c%mXjZa@=t`qO9-8aA#m$-Zgnm3|nl>+HhteZHy!~z|1
z-eZ(%i)Hc)@f_SBV}XRyOWyDU(W)?=gqI`!8aJ)WXUGnVE+X?VJZgHY#Zwa?xnJ8%
z?SI|o39ENlh%*3Jl9fqr3!Kl1m`Je96eJsC?)WENH2-a6kNcPPAS&AvCd*j)(=u_t
z=E@<VVLYas<aJK7y&!IDt8sb`m7O~XE-5f;Q{7N#CJ*&NgVk8Ug)EsoegX3Dyc_NP
zS`r3aOVd{}OUn*aTgRRPy^bb2G<Tc@-*0GUe6LR0<Z#cvKG@2)c838!2i;Lt)Hw}A
zhZ@wm3V|QccD=r|xLJGaHSe!KTPyzAqPl;K9&&GL3+~Nr%iy~RR#*L#@c|+xkZsez
zR>TMb<&?zj7V)ahK4NHZKu}t451ke_NdAizvb}QY2-dFer<CQB?VJ!b#2yixTGJ9E
z@4NMJXRd8*F?yzt=;La!QbP+iUfEiSKWq2s4D3v5&PQkNpzWdg`Li)t4q})m5-3RY
zMOSN(OI5P9597#?8%WeqL9vUs1q2|;dfEct-^6Eqxj@uOv?<}_(13P#l7}UTYx$Q;
z7$0J9Ld3>*0oes{CSRif6Q0$nfQq#azy@ib>2AP>Fdnv=PC7M7V5a5~SA;%?$ep#d
z3RYR$-8I&|M4YR@`8@1II9TpzU5P-#Z`e@JwsFdFw6<n3sRS!w=STVt|JDQqUDJTS
zw-dvXYHaQQWe-a4o5<!7BzlJL!VL-1$mjz+%ON^W41F@6ZnL%4y|j--hf=`HSK<zT
z@8Vt#1t1<#HO9mr*v}(PJEm-V;1*Nv)S&%RY9Yg^=5rz~sQKWh1T%`&n$h>g%Eg><
zQY2$iVc@(!K3}w|);e3zfho#dDTK40<&nuvO@W^2ufxXk#?p5>o`J{ONLx)*hcqe8
z(Ae+HL*YTRZ7=LY2j4xG)G(*fXy2xR2E5vJr8!?QPga}gV45kKaXy@2h59f}FflL<
z1_@w>NC9O71OfpC00ba|N4kfe@&D#xQz|3?g33c(&Q8;p**PlOc>9Z<{Y1G06qFIi
Y$l(@t$#5ep(znujH=a4D9s&X<5XWU1FaQ7m

literal 0
HcmV?d00001


From 8745e4546d5b3d3ddf2c0b9169881b23176c4633 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Mon, 4 May 2026 11:02:01 +0900
Subject: [PATCH 016/142] =?UTF-8?q?Feat=20:=20=EC=98=88=EC=95=BD=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EA=B0=9C=EB=85=90=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?(#25)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Feat : 예약 생성 개념 변경
- 기존 예약 생성 삭제 및 리뉴얼

* Fix : 데이터 저장 오류 수정

* Fix : 코드래빗 제안 수정
- non-root 사용자를 추가

* Fix : 코드래빗 제안 수정
- 중복 체크와 저장이 원자적이지 않아 동시 요청에서 중복 생성 문제 해결

* Fix : 코드래빗 제안 수정
- 중복 이벤트 처리

* Fix : 코드래빗 제안 수정
- 중복 생성 방지 처리

* Fix : 코드래빗 제안 수정
- endTime은 null을 불가처리
---
 Dockerfile                                    | 37 +++++++-----
 .../dto/command/ReservationCreateCommand.java | 10 +++-
 .../dto/event/ReservationCompletedEvent.java  |  9 +--
 .../dto/event/TimeDealProductEvent.java       | 24 ++++++++
 .../dto/result/ReservationCreateResult.java   | 18 ++++++
 .../service/ReservationService.java           | 60 ++++++++++---------
 .../exception/ReservationErrorCode.java       |  3 +-
 .../domain/model/reservation/ProductInfo.java |  6 ++
 .../domain/model/reservation/Reservation.java | 11 +++-
 .../repository/ReservationRepository.java     |  3 +
 .../service/ReservationDomainService.java     |  9 ++-
 .../domain/service/ReservationValidator.java  | 18 +-----
 .../listener/ProductListener.java             | 45 ++++++++++++++
 .../reservation/JpaReservationRepository.java |  4 +-
 .../ReservationRepositoryImpl.java            |  5 ++
 .../controller/ReservationController.java     | 12 ++--
 .../dto/request/ReservationCreateRequest.java | 17 ++++++
 .../dto/response/ReservationResponse.java     |  5 ++
 src/main/resources/application.yml            |  2 +-
 19 files changed, 216 insertions(+), 82 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/event/TimeDealProductEvent.java
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java

diff --git a/Dockerfile b/Dockerfile
index e250316..87b8e58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,38 @@
+# 빌드 단계
 FROM eclipse-temurin:21-jdk-alpine AS build
 WORKDIR /app
 
+# 소스 코드 복사
 COPY . .
 
+# gradlew 실행 권한 부여 및 빌드 (plain jar 생성 방지 설정이 없으면 필터링 필요)
 RUN chmod +x ./gradlew
+RUN ./gradlew clean bootJar -x test
 
-RUN --mount=type=secret,id=GPR_USER \
-    --mount=type=secret,id=GPR_TOKEN \
-    GPR_USER=$(cat /run/secrets/GPR_USER) && \
-    GPR_TOKEN=$(cat /run/secrets/GPR_TOKEN) && \
-    ./gradlew bootJar -x test \
-    -Pgpr.user="${GPR_USER}" \
-    -Pgpr.token="${GPR_TOKEN}"
-
+# 실행 단계
 FROM eclipse-temurin:21-jre-alpine
 WORKDIR /app
 
-# 빌드 결과물 복사
-COPY --from=build /app/build/libs/*.jar app.jar
+# 보안을 위해 실행 단계에서 사용자 생성
+RUN addgroup -S appuser && adduser -S appuser -G appuser
+
+# 빌드 결과물 복사 (plain.jar를 제외하고 딱 하나만 복사되도록 명시)
+COPY --from=build /app/build/libs/*-SNAPSHOT.jar app.jar
+# 또는 명확하게 하나만 남도록 빌드 설정이 되어있다면 그대로 사용 가능합니다.
 
-# SSL 인증서 등 리소스 복사
-RUN mkdir -p /app/resources
-COPY src/main/resources/ssl/*.jks /app/resources/
+# SSL 인증서 폴더 생성 및 복사
+RUN mkdir -p /app/ssl
+# 파일이 있을 때만 복사하도록 구성하거나, 확실히 존재해야 함을 명시
+COPY src/main/resources/ssl/*.jks /app/ssl/
 
+# 권한 설정 (사용자 생성 후 일괄 변경)
+RUN chown -R appuser:appuser /app
+
+# 환경 변수 및 포트 설정
 ENV SPRING_PROFILES_ACTIVE=dev
 EXPOSE 8085
 
-ENTRYPOINT ["java", "-jar", "app.jar"]
\ No newline at end of file
+USER appuser
+
+# 최적화된 Java 실행 옵션 (Container 환경 인식)
+ENTRYPOINT ["java", "-XX:+UseContainerSupport", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java
index 7bed285..e6feb26 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java
@@ -2,12 +2,18 @@
 
 import lombok.Builder;
 import lombok.Getter;
+
+import java.time.LocalDateTime;
 import java.util.UUID;
 
 @Getter
 @Builder
 public class ReservationCreateCommand {
     private UUID productId;
-    private UUID buyerId;
-    private String buyerNickname;
+
+    private UUID sellerId;      // 판매자 ID
+    private String sellerName;  // 판매자 이름 (또는 닉네임)
+    private String productName; // 상품명
+    private Integer price;      // 가격
+    private LocalDateTime endTime; // 종료 시간
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/event/ReservationCompletedEvent.java b/src/main/java/org/pgsg/reservation/application/dto/event/ReservationCompletedEvent.java
index 8ee76c4..6a0d246 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/event/ReservationCompletedEvent.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/event/ReservationCompletedEvent.java
@@ -1,11 +1,8 @@
 package org.pgsg.reservation.application.dto.event;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
-
 import java.util.UUID;
 
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
 public record ReservationCompletedEvent(
         UUID reservationId,
         UUID productId,
@@ -24,8 +21,8 @@ public static ReservationCompletedEvent from(Reservation reservation) {
                 reservation.getProductInfo().getProductPrice(),
                 reservation.getSellerInfo().getSellerId(),
                 reservation.getSellerInfo().getSellerName(),
-                reservation.getBuyerInfo().getBuyerId(),
-                reservation.getBuyerInfo().getBuyerName()
+                reservation.getBuyerInfo() != null ? reservation.getBuyerInfo().getBuyerId() : null,
+                reservation.getBuyerInfo() != null ? reservation.getBuyerInfo().getBuyerName() : "Unknown"
         );
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/event/TimeDealProductEvent.java b/src/main/java/org/pgsg/reservation/application/dto/event/TimeDealProductEvent.java
new file mode 100644
index 0000000..f3bb555
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/event/TimeDealProductEvent.java
@@ -0,0 +1,24 @@
+package org.pgsg.reservation.application.dto.event;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty; // 추가됨
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public record TimeDealProductEvent(
+        UUID productId,
+
+        @JsonProperty("productName")
+        String name,
+
+        @JsonProperty("productPrice")
+        Integer price,
+
+        @JsonFormat(shape = JsonFormat.Shape.ARRAY)
+        LocalDateTime endTime,
+
+        UUID sellerId,
+
+        @JsonProperty("sellerNickName")
+        String sellerName
+) {}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java
index 55e03f3..ffdd8d2 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java
@@ -2,6 +2,9 @@
 
 import lombok.Builder;
 import lombok.Getter;
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+
+import java.time.LocalDateTime;
 import java.util.UUID;
 
 @Getter
@@ -9,4 +12,19 @@
 public class ReservationCreateResult {
     private UUID reservationId;
     private String status;
+    private String productName;
+    private String sellerName;
+    private String buyerName;
+    private LocalDateTime createdAt;
+
+    public static ReservationCreateResult from(Reservation reservation) {
+        return ReservationCreateResult.builder()
+                .reservationId(reservation.getId())
+                .status(reservation.getStatus().name())
+                .productName(reservation.getProductInfo().getProductName())
+                .sellerName(reservation.getSellerInfo().getSellerName())
+                .buyerName(reservation.getBuyerInfo() != null ? reservation.getBuyerInfo().getBuyerName() : null)
+                .createdAt(reservation.getCreatedAt())
+                .build();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index bebade8..9bc6aad 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -1,6 +1,7 @@
 package org.pgsg.reservation.application.service;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.pgsg.reservation.application.dto.command.ReservationCancelCommand;
 import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
 import org.pgsg.reservation.application.dto.event.ReservationEventPublisher;
@@ -30,48 +31,49 @@
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class ReservationService {
 
     private final ReservationRepository reservationRepository;
     private final ReservationDomainService reservationDomainService;
     private final ReservationHistoryRepository reservationHistoryRepository;
     private final ReservationEventPublisher reservationEventPublisher;
-    // private final ProductClient productClient; // 추후 구현 예정
 
     // 도메인 서비스 호출 전까지의 작업은 트랜잭션 밖으로 분리(추후 고도화 작업시)
     @Transactional
     public ReservationCreateResult createReservation(ReservationCreateCommand command) {
+        try {
+            if (reservationRepository.existsByProductId(command.getProductId())) {
+                throw new ReservationException(ReservationErrorCode.ALREADY_EXISTS);
+            }
 
-        // 구매자 정보(VO) 생성
-        BuyerInfo buyer = BuyerInfo.of(command.getBuyerId(), command.getBuyerNickname());
-
-        // 상품 및 판매자 정보 조회(추후 구현 예정)
-        // ProductResponse productResponse = productClient.getProductDetails(command.getProductId());
-
-        // 임시로 생성(추후 상품 판매 정보 조회시 수정 필요)
-        SellerInfo seller = SellerInfo.of(
-                UUID.randomUUID(), // productResponse.getSellerId()
-                "임시 판매자" // productResponse.getSellerName()
-        );
-        ProductInfo product = ProductInfo.of(
-                command.getProductId(),
-                50000,             // productResponse.getPrice()
-                "타임딜 특가 상품"    // productResponse.getName()
-        );
-
-        // 도메인 서비스 호출
-        Reservation reservation = reservationDomainService.createReservation(buyer, seller, product);
-
-        // ransaction outbox 패턴에 기반한 이벤트 발송 로직 추가 예정
+            SellerInfo seller = SellerInfo.of(command.getSellerId(), "test");
+            ProductInfo product = ProductInfo.of(
+                    command.getProductId(),
+                    command.getPrice(),
+                    command.getProductName(),
+                    command.getEndTime()
+            );
+
+            Reservation reservation = reservationDomainService.createReservation(
+                    seller,
+                    product,
+                    command.getEndTime()
+            );
+
+            Reservation saved;
+            try {
+                saved = reservationRepository.save(reservation);
+            }catch (DataIntegrityViolationException e) {
+                throw new ReservationException(ReservationErrorCode.ALREADY_EXISTS);
+            }
 
-        // DB 저장
-        Reservation savedReservation = reservationRepository.save(reservation);
+            return ReservationCreateResult.from(saved);
 
-        // [결과 반환] Result DTO로 변환하여 Controller로 전달
-        return ReservationCreateResult.builder()
-                .reservationId(savedReservation.getId())
-                .status(savedReservation.getStatus().name())
-                .build();
+        } catch (DataIntegrityViolationException e) {
+            // 동시에 들어온 요청으로 인해 유니크 제약 조건 위반 시 409 에러 발생
+            throw new ReservationException(ReservationErrorCode.ALREADY_EXISTS);
+        }
     }
 
     // 예약 목록 조회
diff --git a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
index cd0a4e1..0d55b41 100644
--- a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
+++ b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
@@ -21,7 +21,8 @@ public enum ReservationErrorCode {
 
     // 409 Conflict (중복 등 비즈니스 규칙 위반)
     DUPLICATE_RESERVATION(409, "이미 해당 상품에 대한 예약 진행 내역이 존재합니다."),
-    ALREADY_APPLIED(409, "이미 해당 예약에 신청한 후보자입니다.");
+    ALREADY_APPLIED(409, "이미 해당 예약에 신청한 후보자입니다."),
+    ALREADY_EXISTS(409, "해당 상품으로 이미 생성된 예약 데이터가 존재합니다.");
 
     private final int status;
     private final String message;
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/ProductInfo.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/ProductInfo.java
index 3cd41a9..be6fb0d 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/ProductInfo.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/ProductInfo.java
@@ -1,7 +1,10 @@
 package org.pgsg.reservation.domain.model.reservation;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import lombok.*;
+
+import java.time.LocalDateTime;
 import java.util.UUID;
 
 @Embeddable
@@ -9,7 +12,10 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor(staticName = "of")
 public class ProductInfo {
+    @Column(nullable = false, unique = true)
     private UUID productId;
     private Integer productPrice;
     private String productName;
+    @Column(nullable = false)
+    private LocalDateTime endTime;
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index 19cd326..76a7d3f 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -8,6 +8,7 @@
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidateStatus;
 
+import java.time.LocalDateTime;
 import java.util.*;
 
 @Entity
@@ -28,6 +29,10 @@ public class Reservation extends BaseEntity {
     private ReservationStatus status;
 
     @Embedded
+    @AttributeOverrides({
+            @AttributeOverride(name = "buyerId", column = @Column(name = "buyer_id", nullable = true)),
+            @AttributeOverride(name = "buyerName", column = @Column(name = "buyer_name", nullable = true))
+    })
     private BuyerInfo buyerInfo;
 
     @Embedded
@@ -55,15 +60,17 @@ public void removeCandidate(ReservationCandidate candidate) {
     }
 
     // 예약 생성: 초기 상태 AVAILABLE
-    public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
-        Objects.requireNonNull(buyer, "buyer must not be null");
+    public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo product, LocalDateTime endTime) {
         Objects.requireNonNull(seller, "seller must not be null");
         Objects.requireNonNull(product, "product must not be null");
+
         Reservation reservation = new Reservation();
         reservation.buyerInfo = buyer;
         reservation.sellerInfo = seller;
         reservation.productInfo = product;
         reservation.status = ReservationStatus.AVAILABLE;
+        reservation.createdAt = LocalDateTime.now();
+
         return reservation;
     }
 
diff --git a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
index d8a464c..e71e84f 100644
--- a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
+++ b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
@@ -24,4 +24,7 @@ public interface ReservationRepository {
 
     // 예약 만료 스케줄링용
     List<Reservation> findAllByStatusInAndModifiedAtBefore(List<ReservationStatus> statuses, LocalDateTime threshold);
+
+    // 상품 존재 여부 확인
+    boolean existsByProductId(UUID productId);
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 1befb69..0d6cc3a 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -9,6 +9,7 @@
 import org.pgsg.reservation.domain.model.reservationhistory.ReservationHistory;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.*;
 
 
@@ -22,11 +23,13 @@ public class ReservationDomainService {
      * 예약 생성 로직
      * 각 VO들을 조합하여 예약 엔티티를 생성하고, 도메인 규칙을 검증
      */
-    public Reservation createReservation(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
+    public Reservation createReservation(SellerInfo seller, ProductInfo product, LocalDateTime endTime) {
 
-        reservationValidator.validate(buyer, seller, product);
+        // 검증 로직
+        reservationValidator.validate(seller, product);
 
-        return Reservation.create(buyer, seller, product);
+        // 엔티티 생성
+        return Reservation.create(null, seller, product, endTime);
     }
 
     /**
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
index 2935f0d..a7f3f8d 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
@@ -11,22 +11,11 @@
 
 public class ReservationValidator {
 
-    public void validate(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
-
-        if (buyer == null || seller == null || product == null) {
-            throw new ReservationException(ReservationErrorCode.INVALID_INPUT);
-        }
-
-        if (buyer.getBuyerId() == null || seller.getSellerId() == null) {
+    // 예약 생성
+    public void validate(SellerInfo seller, ProductInfo product) {
+        if (seller == null || product == null || seller.getSellerId() == null) {
             throw new ReservationException(ReservationErrorCode.INVALID_INPUT);
         }
-
-        // 본인 상품 예약 금지 규칙
-        if (isSamePerson(buyer, seller)) {
-            throw new ReservationException(ReservationErrorCode.INVALID_STATUS);
-        }
-
-        // 검증 규칙 추가 예정
     }
 
     public void validateSearchRequest(UUID userId, String role) {
@@ -80,5 +69,4 @@ public void validateCommonCancel(Reservation reservation, UUID userId) {
     private boolean isSamePerson(BuyerInfo buyer, SellerInfo seller) {
         return buyer.getBuyerId().equals(seller.getSellerId());
     }
-
 }
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
new file mode 100644
index 0000000..ef121be
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
@@ -0,0 +1,45 @@
+package org.pgsg.reservation.infrastructure.listener;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
+import org.pgsg.reservation.application.dto.event.TimeDealProductEvent;
+import org.pgsg.reservation.application.service.ReservationService;
+import org.pgsg.reservation.domain.exception.ReservationErrorCode;
+import org.pgsg.reservation.domain.exception.ReservationException;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ProductListener {
+
+    private final ReservationService reservationService;
+
+    /**
+     * 상품 서비스에서 타임딜 상품이 생성되었을 때의 이벤트를 수신합니다.
+     */
+    @KafkaListener(topics = "prod-product-created",groupId = "product-group")
+    public void handleTimeDealEvent(TimeDealProductEvent event) {
+        ReservationCreateCommand command = ReservationCreateCommand.builder()
+                .productId(event.productId())
+                .productName(event.name())
+                .price(event.price())
+                .endTime(event.endTime())
+                .sellerId(event.sellerId())
+                .sellerName(event.sellerName())
+                .build();
+
+        try {
+            reservationService.createReservation(command);
+        }catch (ReservationException e){
+            if (e.getErrorCode() == ReservationErrorCode.ALREADY_EXISTS) {
+                log.info("중복 예약 생성 이벤트 무시: productId={}", event.productId());
+                return;
+            }
+            throw e;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/JpaReservationRepository.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/JpaReservationRepository.java
index 7fb1cc8..8998a56 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/JpaReservationRepository.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/JpaReservationRepository.java
@@ -1,12 +1,10 @@
 package org.pgsg.reservation.infrastructure.repository.reservation;
 
 import org.pgsg.reservation.domain.model.reservation.Reservation;
-import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.time.LocalDateTime;
-import java.util.List;
 import java.util.UUID;
 
 public interface JpaReservationRepository extends JpaRepository<Reservation, UUID> {
+    boolean existsByProductInfoProductId(UUID productId);
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
index f54d872..84854a4 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
@@ -40,6 +40,11 @@ public Reservation saveAndFlush(Reservation reservationEntity) {
         return reservationJpaRepository.saveAndFlush(reservationEntity);
     }
 
+    @Override
+    public boolean existsByProductId(UUID productId) {
+        return reservationJpaRepository.existsByProductInfoProductId(productId);
+    }
+
     @Override
     @Transactional(readOnly = true)
     public List<Reservation> findAllByStatusInAndModifiedAtBefore(
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index 482e512..c2ad73f 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -36,15 +36,15 @@ public class ReservationController {
     // 예약 생성
     @PostMapping
     public ResponseEntity<ReservationResponse> createReservation(
-            @Valid @RequestBody ReservationCreateRequest request,
-            @RequestHeader(value = "X-User-Id") UUID userId,
-            @RequestHeader(value = "X-User-Nickname") String nickname
+            @Valid @RequestBody ReservationCreateRequest request
     ) {
-
         ReservationCreateCommand command = ReservationCreateCommand.builder()
                 .productId(request.getProductId())
-                .buyerId(userId)
-                .buyerNickname(nickname)
+                .productName(request.getProductName())
+                .price(request.getPrice())
+                .endTime(request.getEndTime())
+                .sellerId(request.getSellerId())
+                .sellerName(request.getSellerNickname())
                 .build();
 
         ReservationCreateResult result = reservationService.createReservation(command);
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java
index 650f5f4..8fd8ab5 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java
@@ -4,6 +4,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
 import java.util.UUID;
 
 @Getter
@@ -12,4 +13,20 @@ public class ReservationCreateRequest {
 
     @NotNull(message = "상품 ID는 필수입니다.")
     private UUID productId;
+
+    @NotNull(message = "상품 이름은 필수입니다.")
+    private String productName;
+
+    @NotNull(message = "가격은 필수입니다.")
+    private Integer price;
+
+    @NotNull(message = "종료 시간은 필수 입니다.")
+    private LocalDateTime endTime;
+
+    @NotNull(message = "판매자 ID는 필수입니다.")
+    private UUID sellerId;
+
+    @NotNull(message = "판매자 닉네임은 필수입니다.")
+    private String sellerNickname;
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
index b71b42b..8d9a120 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
@@ -1,5 +1,6 @@
 package org.pgsg.reservation.presentation.dto.response;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -13,6 +14,7 @@
 @Getter
 @Builder
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ReservationResponse {
 
     private UUID reservationId;
@@ -31,6 +33,9 @@ public static ReservationResponse from(ReservationCreateResult result) {
         return ReservationResponse.builder()
                 .reservationId(result.getReservationId())
                 .status(result.getStatus())
+                .productName(result.getProductName())
+                .sellerName(result.getSellerName())
+                .buyerName(result.getBuyerName())
                 .build();
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6b2d27b..17689d4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -44,7 +44,7 @@ spring:
       ssl.endpoint.identification.algorithm: ""
     producer:
       key-serializer: org.apache.kafka.common.serialization.StringSerializer
-      value-serializer: org.springframework.kafka.support.serializer.JsonSerializer
+      value-serializer: org.apache.kafka.common.serialization.StringSerializer
 
   # [필수 5] Redis 설정
   data:

From 0946a2fd6ca8b314f2d6de63868deac1c7c037a3 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Mon, 4 May 2026 15:29:08 +0900
Subject: [PATCH 017/142] =?UTF-8?q?Feat=20:=20=EA=B1=B0=EB=9E=98=20?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EC=B2=98=EB=A6=AC=20(#28)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ReservationService.java           | 15 +++++-
 .../event/ReservationEventBridge.java         |  2 +-
 .../listener/ProductListener.java             | 42 +++++++++++------
 .../listener/ReservationEventListener.java    | 46 +++++++++++++++++++
 .../dto}/ReservationEventPublisher.java       |  2 +-
 .../listener/dto}/TimeDealProductEvent.java   |  4 +-
 .../listener/dto/TradeCompletedEvent.java     |  9 ++++
 .../controller/ReservationController.java     | 16 +++++++
 src/main/resources/application.yml            | 18 ++++++--
 9 files changed, 131 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java
 rename src/main/java/org/pgsg/reservation/{application/dto/event => infrastructure/listener/dto}/ReservationEventPublisher.java (75%)
 rename src/main/java/org/pgsg/reservation/{application/dto/event => infrastructure/listener/dto}/TimeDealProductEvent.java (78%)
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/listener/dto/TradeCompletedEvent.java

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 9bc6aad..66eab85 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -4,7 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.pgsg.reservation.application.dto.command.ReservationCancelCommand;
 import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
-import org.pgsg.reservation.application.dto.event.ReservationEventPublisher;
+import org.pgsg.reservation.infrastructure.listener.dto.ReservationEventPublisher;
 import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
@@ -221,6 +221,18 @@ public ReservationCancelInfo completeReservation(UUID reservationId, UUID userId
         return ReservationCancelInfo.from(reservation);
     }
 
+    // 거래 완료
+    @Transactional
+    public ReservationCancelInfo confirmTrade(UUID reservationId) {
+
+        Reservation reservation = reservationRepository.findById(reservationId)
+                .orElseThrow(() -> new ReservationException(ReservationErrorCode.RESERVATION_NOT_FOUND));
+
+        reservation.close();
+
+        return ReservationCancelInfo.from(reservation);
+    }
+
     /**
      * 공통 ID 조회 메서드
      */
@@ -233,5 +245,4 @@ private boolean isDuplicateApplyViolation(DataIntegrityViolationException e) {
         String message = e.getMostSpecificCause().getMessage();
         return message != null && message.contains("uk_reservation_candidate_user_id");
     }
-
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java b/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
index c6d4793..9d18dee 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
@@ -5,7 +5,7 @@
 import org.pgsg.common.event.Events;
 import org.pgsg.common.event.OutboxEvent;
 import org.pgsg.reservation.application.dto.event.ReservationCompletedEvent;
-import org.pgsg.reservation.application.dto.event.ReservationEventPublisher;
+import org.pgsg.reservation.infrastructure.listener.dto.ReservationEventPublisher;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
index ef121be..fa49343 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
@@ -1,9 +1,12 @@
 package org.pgsg.reservation.infrastructure.listener;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.pgsg.common.messaging.annotation.IdempotentConsumer;
 import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
-import org.pgsg.reservation.application.dto.event.TimeDealProductEvent;
+import org.pgsg.reservation.infrastructure.listener.dto.TimeDealProductEvent;
 import org.pgsg.reservation.application.service.ReservationService;
 import org.pgsg.reservation.domain.exception.ReservationErrorCode;
 import org.pgsg.reservation.domain.exception.ReservationException;
@@ -16,29 +19,42 @@
 public class ProductListener {
 
     private final ReservationService reservationService;
+    private final ObjectMapper objectMapper;
 
     /**
      * 상품 서비스에서 타임딜 상품이 생성되었을 때의 이벤트를 수신합니다.
      */
+    @IdempotentConsumer("product-completed:product-service")
     @KafkaListener(topics = "prod-product-created",groupId = "product-group")
-    public void handleTimeDealEvent(TimeDealProductEvent event) {
-        ReservationCreateCommand command = ReservationCreateCommand.builder()
-                .productId(event.productId())
-                .productName(event.name())
-                .price(event.price())
-                .endTime(event.endTime())
-                .sellerId(event.sellerId())
-                .sellerName(event.sellerName())
-                .build();
+    public void handleTimeDealEvent(ConsumerRecord<String, String> record) {
+        TimeDealProductEvent event = null;
 
         try {
+            event = objectMapper.readValue(record.value(), TimeDealProductEvent.class);
+            log.info("타임딜 상품 생성 이벤트 수신 - Product ID: {}, Name: {}",
+                    event.productId(), event.name());
+
+            ReservationCreateCommand command = ReservationCreateCommand.builder()
+                    .productId(event.productId())
+                    .productName(event.name())
+                    .price(event.price())
+                    .endTime(event.endTime())
+                    .sellerId(event.sellerId())
+                    .sellerName(event.sellerName())
+                    .build();
+
             reservationService.createReservation(command);
-        }catch (ReservationException e){
+        }catch (ReservationException e) {
             if (e.getErrorCode() == ReservationErrorCode.ALREADY_EXISTS) {
-                log.info("중복 예약 생성 이벤트 무시: productId={}", event.productId());
+                log.info("중복 예약 생성 이벤트 무시: productId={}",
+                        (event != null) ? event.productId() : "Unknown");
                 return;
             }
-            throw e;
+            log.error("예약 생성 중 비즈니스 오류 발생: {}", e.getMessage());
+            throw e; // 재시도가 필요한 경우 던짐
+        } catch (Exception e) {
+            log.error("상품 생성 이벤트 처리 실패 - Topic: {}, Error: {}",
+                    record.topic(), e.getMessage());
         }
     }
 
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java
new file mode 100644
index 0000000..4e8341d
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java
@@ -0,0 +1,46 @@
+package org.pgsg.reservation.infrastructure.listener;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.pgsg.common.messaging.annotation.IdempotentConsumer;
+import org.pgsg.reservation.application.service.ReservationService;
+import org.pgsg.reservation.infrastructure.listener.dto.TradeCompletedEvent;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Component;
+
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ReservationEventListener {
+
+    private final ReservationService reservationService;
+    private final ObjectMapper objectMapper;
+
+    /**
+     * 거래 서비스로부터 거래 완료 이벤트를 수신
+     */
+    @IdempotentConsumer("reservation-completed:trade-service")
+    @KafkaListener(
+            topics = "prod-trade-completed",
+            groupId = "reservation-group"
+    )
+    public void handleTradeCompleted(ConsumerRecord<String, String> record) {
+
+        try {
+            TradeCompletedEvent event = objectMapper.readValue(record.value(), TradeCompletedEvent.class);
+            log.info("거래 완료 이벤트 수신 - Trade ID: {}, Reservation ID: {}",
+                    event.tradeId(), event.reservationId());
+            reservationService.confirmTrade(
+                    event.reservationId()
+            );
+
+            log.info("예약 확정 처리 성공 - Reservation ID: {}", event.reservationId());
+        }catch (Exception e) {
+            log.error("예약 확정 처리 실패 - Reservation ID: {}, Error: {}",
+                    record.topic(), e.getMessage());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/event/ReservationEventPublisher.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/ReservationEventPublisher.java
similarity index 75%
rename from src/main/java/org/pgsg/reservation/application/dto/event/ReservationEventPublisher.java
rename to src/main/java/org/pgsg/reservation/infrastructure/listener/dto/ReservationEventPublisher.java
index f828054..b0283cb 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/event/ReservationEventPublisher.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/ReservationEventPublisher.java
@@ -1,4 +1,4 @@
-package org.pgsg.reservation.application.dto.event;
+package org.pgsg.reservation.infrastructure.listener.dto;
 
 import org.pgsg.reservation.domain.model.reservation.Reservation;
 
diff --git a/src/main/java/org/pgsg/reservation/application/dto/event/TimeDealProductEvent.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/TimeDealProductEvent.java
similarity index 78%
rename from src/main/java/org/pgsg/reservation/application/dto/event/TimeDealProductEvent.java
rename to src/main/java/org/pgsg/reservation/infrastructure/listener/dto/TimeDealProductEvent.java
index f3bb555..f9a5d7b 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/event/TimeDealProductEvent.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/TimeDealProductEvent.java
@@ -1,4 +1,4 @@
-package org.pgsg.reservation.application.dto.event;
+package org.pgsg.reservation.infrastructure.listener.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty; // 추가됨
@@ -8,10 +8,8 @@
 public record TimeDealProductEvent(
         UUID productId,
 
-        @JsonProperty("productName")
         String name,
 
-        @JsonProperty("productPrice")
         Integer price,
 
         @JsonFormat(shape = JsonFormat.Shape.ARRAY)
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/TradeCompletedEvent.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/TradeCompletedEvent.java
new file mode 100644
index 0000000..dcb6d43
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/TradeCompletedEvent.java
@@ -0,0 +1,9 @@
+package org.pgsg.reservation.infrastructure.listener.dto;
+
+import java.util.UUID;
+
+public record TradeCompletedEvent(
+        UUID tradeId,
+        UUID reservationId,
+        UUID productId
+) {}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index c2ad73f..ca53065 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -186,4 +186,20 @@ public ResponseEntity<ReservationCancelResponse> completeReservation(
 
         return ResponseEntity.ok(ReservationCancelResponse.of(info, message));
     }
+
+    // 거래 완료
+    @PatchMapping("/{reservationId}/tradeconfirm")
+    public ResponseEntity<ReservationCancelResponse> confirmTrade(
+            @PathVariable UUID reservationId,
+            @RequestHeader("X-User-Id") UUID userId,
+            @RequestHeader("X-User-Role") String role
+    ) {
+        ReservationCancelInfo info = reservationService.confirmTrade(
+                reservationId
+        );
+
+        String message = "거래가 성공적으로 완료되어 확정 처리되었습니다.";
+
+        return ResponseEntity.ok(ReservationCancelResponse.of(info, message));
+    }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 17689d4..ea16038 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,7 +6,7 @@ spring:
     name: reservation-service
 
   profiles:
-    active: dev , kafka
+    active: dev,kafka
     include: error, reservation-error
 
   # [필수 1] 설정 로드 순서
@@ -55,7 +55,11 @@ spring:
   jpa:
     hibernate:
       ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
-    show-sql: ${SPRING_JPA_SHOW_SQL:false}
+    show-sql: false
+    properties:
+      hibernate:
+        format_sql: true
+        use_sql_comments: true
     defer-datasource-initialization: true
 
 management:
@@ -83,4 +87,12 @@ eureka:
 
 topics:
   reservation:
-    completed: prod-reservation-completed
\ No newline at end of file
+    completed: prod-reservation-completed
+  product:
+    created: prod-product-created
+
+logging:
+  level:
+    org.hibernate.SQL: DEBUG
+    org.hibernate.orm.jdbc.bind: TRACE
+    org.pgsg.common.domain.OutboxRepository: OFF
\ No newline at end of file

From 22a3954ab3347fcc2fb8766dca416a6644b65d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Mon, 4 May 2026 16:01:41 +0900
Subject: [PATCH 018/142] =?UTF-8?q?fix=20:=20idle=EA=B3=BC=20docker?=
 =?UTF-8?q?=EB=91=98=EB=8B=A4=20=EA=B0=80=EB=8A=A5=ED=95=98=EA=B2=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                 |  4 ++++
 src/main/resources/application.yml | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9a4abf2..1ab2a6c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,10 @@ services:
     environment:
       - "SERVER_PORT=${SERVER_PORT:-8085}"
       - "SPRING_PROFILES_ACTIVE=dev"
+      - "DB_URL=jdbc:postgresql://reservation-db:5432/${DB_NAME:-reservation_db}"
+      - "REDIS_HOST=reservation-redis"
+      - "EUREKA_SERVER=http://host.docker.internal:8761/eureka/"
+      - "KAFKA_SSL_PATH=/app/ssl/kafka.server.truststore.jks"
     ports:
       - "${SERVER_PORT:-8085}:${SERVER_PORT:-8085}"
     env_file:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ea16038..b637e77 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -30,16 +30,16 @@ spring:
   # 데이터베이스 설정 (PostgreSQL)
   datasource:
     driver-class-name: org.postgresql.Driver
-    username: ${DB_USERNAME}
-    password: ${DB_PASSWORD}
-    url: ${DB_URL:jdbc:postgresql://reservation-db:5432/reservation_db}
+    url: ${DB_URL:jdbc:postgresql://localhost:5432/reservation_db}
+    username: ${DB_USERNAME:postgres} # 추가
+    password: ${DB_PASSWORD:postgres}
 
   # [필수 4] Kafka 설정
   kafka:
     bootstrap-servers: ${KAFKA_HOST}
     properties:
       security.protocol: SSL
-      ssl.truststore.location: "/app/ssl/kafka.server.truststore.jks"
+      ssl.truststore.location: ${KAFKA_SSL_PATH:/app/ssl/kafka.server.truststore.jks}
       ssl.truststore.password: _aA123456
       ssl.endpoint.identification.algorithm: ""
     producer:
@@ -49,7 +49,7 @@ spring:
   # [필수 5] Redis 설정
   data:
     redis:
-      host: ${REDIS_HOST:redis}
+      host: ${REDIS_HOST:localhost}
       port: ${REDIS_PORT:6379}
 
   jpa:
@@ -82,7 +82,7 @@ eureka:
     register-with-eureka: true
     fetch-registry: true
     service-url:
-      defaultZone: ${EUREKA_SERVER:http://host.docker.internal:8761/eureka/}
+      defaultZone: ${EUREKA_SERVER:http://localhost:8761/eureka/}
     registry-fetch-interval-seconds: 30
 
 topics:

From a557abeaa41c0bfd06f48c100697813b37226a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Tue, 5 May 2026 10:52:00 +0900
Subject: [PATCH 019/142] =?UTF-8?q?=EC=98=88=EC=95=BD=20=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                            |  8 +++++++-
 build.gradle                                          |  5 ++---
 docker-compose.yml                                    |  6 +++---
 .../reservation/ReservationServiceApplication.java    |  2 ++
 .../dto/result/ReservationCreateResult.java           |  5 +++--
 .../dto/result/ReservationSearchResult.java           |  4 ++--
 .../application/service/ReservationService.java       |  3 +--
 .../domain/model/reservation/Reservation.java         |  3 +--
 .../domain/service/ReservationDomainService.java      |  4 ++--
 .../dto/response/ReservationResponse.java             |  5 +----
 src/main/resources/application.yml                    | 11 ++++++++---
 11 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 87b8e58..445e916 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,11 +2,17 @@
 FROM eclipse-temurin:21-jdk-alpine AS build
 WORKDIR /app
 
+# dos2unix 설치 (줄바꿈 문자 변환 도구)
+RUN apk add --no-cache dos2unix
+
 # 소스 코드 복사
 COPY . .
 
-# gradlew 실행 권한 부여 및 빌드 (plain jar 생성 방지 설정이 없으면 필터링 필요)
+# gradlew 파일의 줄바꿈 문자를 CRLF -> LF로 변환 및 권한 부여
+RUN dos2unix gradlew
 RUN chmod +x ./gradlew
+
+# 빌드 실행 (인증 정보 주입 필요 - 아래 설명 참고)
 RUN ./gradlew clean bootJar -x test
 
 # 실행 단계
diff --git a/build.gradle b/build.gradle
index 6106293..3ea4e1a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,12 +22,11 @@ configurations {
 
 repositories {
     mavenCentral()
-    maven { url 'https://repo.spring.io/milestone' }
     maven {
         url = uri("https://maven.pkg.github.com/89-49/common")
         credentials {
-            username = findProperty('gpr.user') ?: System.getenv('GPR_USER')
-            password = findProperty('gpr.token') ?: System.getenv('GPR_TOKEN')
+            username = project.findProperty("gpr.user") ?: System.getenv("GPR_USER")
+            password = project.findProperty("gpr.key") ?: System.getenv("GPR_TOKEN")
         }
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 1ab2a6c..a9fd2f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,9 +6,9 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-      secrets:
-        - GPR_USER
-        - GPR_TOKEN
+      args:
+        - GPR_USER=${GPR_USER}
+        - GPR_TOKEN=${GPR_TOKEN}
     environment:
       - "SERVER_PORT=${SERVER_PORT:-8085}"
       - "SPRING_PROFILES_ACTIVE=dev"
diff --git a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
index 767f59f..39b22a3 100644
--- a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
+++ b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
@@ -3,8 +3,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
+@EnableJpaAuditing
 @SpringBootApplication(scanBasePackages = {"org.pgsg.reservation", "org.pgsg.common"})
 @EntityScan(basePackages = {
         "org.pgsg.reservation",
diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java
index ffdd8d2..6703276 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationCreateResult.java
@@ -14,16 +14,17 @@ public class ReservationCreateResult {
     private String status;
     private String productName;
     private String sellerName;
-    private String buyerName;
     private LocalDateTime createdAt;
 
+    /**
+     * 예약 생성 엔티티로부터 Result DTO 변환
+     */
     public static ReservationCreateResult from(Reservation reservation) {
         return ReservationCreateResult.builder()
                 .reservationId(reservation.getId())
                 .status(reservation.getStatus().name())
                 .productName(reservation.getProductInfo().getProductName())
                 .sellerName(reservation.getSellerInfo().getSellerName())
-                .buyerName(reservation.getBuyerInfo() != null ? reservation.getBuyerInfo().getBuyerName() : null)
                 .createdAt(reservation.getCreatedAt())
                 .build();
     }
diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
index b1d4ad8..7abe1ee 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
@@ -11,7 +11,7 @@ public record ReservationSearchResult(
         String productName,
         String sellerName,
         String buyerName,
-        ReservationStatus status, // 도메인 Enum 직접 사용
+        ReservationStatus status,
         LocalDateTime createdAt
 ) {
     public static ReservationSearchResult from(Reservation reservation) {
@@ -19,7 +19,7 @@ public static ReservationSearchResult from(Reservation reservation) {
                 reservation.getId(),
                 reservation.getProductInfo().getProductName(),
                 reservation.getSellerInfo().getSellerName(),
-                reservation.getBuyerInfo().getBuyerName(),
+                reservation.getBuyerInfo() != null ? reservation.getBuyerInfo().getBuyerName() : null,
                 reservation.getStatus(),
                 reservation.getCreatedAt()
         );
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 66eab85..cf3d650 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -57,8 +57,7 @@ public ReservationCreateResult createReservation(ReservationCreateCommand comman
 
             Reservation reservation = reservationDomainService.createReservation(
                     seller,
-                    product,
-                    command.getEndTime()
+                    product
             );
 
             Reservation saved;
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index 76a7d3f..f97a854 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -60,7 +60,7 @@ public void removeCandidate(ReservationCandidate candidate) {
     }
 
     // 예약 생성: 초기 상태 AVAILABLE
-    public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo product, LocalDateTime endTime) {
+    public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo product) {
         Objects.requireNonNull(seller, "seller must not be null");
         Objects.requireNonNull(product, "product must not be null");
 
@@ -69,7 +69,6 @@ public static Reservation create(BuyerInfo buyer, SellerInfo seller, ProductInfo
         reservation.sellerInfo = seller;
         reservation.productInfo = product;
         reservation.status = ReservationStatus.AVAILABLE;
-        reservation.createdAt = LocalDateTime.now();
 
         return reservation;
     }
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 0d6cc3a..349a320 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -23,13 +23,13 @@ public class ReservationDomainService {
      * 예약 생성 로직
      * 각 VO들을 조합하여 예약 엔티티를 생성하고, 도메인 규칙을 검증
      */
-    public Reservation createReservation(SellerInfo seller, ProductInfo product, LocalDateTime endTime) {
+    public Reservation createReservation(SellerInfo seller, ProductInfo product ) {
 
         // 검증 로직
         reservationValidator.validate(seller, product);
 
         // 엔티티 생성
-        return Reservation.create(null, seller, product, endTime);
+        return Reservation.create(null, seller, product);
     }
 
     /**
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
index 8d9a120..7c9263d 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationResponse.java
@@ -1,6 +1,5 @@
 package org.pgsg.reservation.presentation.dto.response;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -14,7 +13,6 @@
 @Getter
 @Builder
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ReservationResponse {
 
     private UUID reservationId;
@@ -35,7 +33,6 @@ public static ReservationResponse from(ReservationCreateResult result) {
                 .status(result.getStatus())
                 .productName(result.getProductName())
                 .sellerName(result.getSellerName())
-                .buyerName(result.getBuyerName())
                 .build();
     }
 
@@ -48,7 +45,7 @@ public static ReservationResponse from(ReservationSearchResult result) {
                 .status(result.status().name())
                 .productName(result.productName())
                 .sellerName(result.sellerName())
-                .buyerName(result.buyerName())
+                .buyerName(result.buyerName() != null ? result.buyerName() : "NULL")
                 .createdAt(result.createdAt())
                 .build();
     }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b637e77..f59dc12 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,13 @@
 server:
   port: ${SERVER_PORT:8085}
+  error:
+    include-message: always
+    include-stacktrace: always
 
 spring:
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
   application:
     name: reservation-service
 
@@ -93,6 +99,5 @@ topics:
 
 logging:
   level:
-    org.hibernate.SQL: DEBUG
-    org.hibernate.orm.jdbc.bind: TRACE
-    org.pgsg.common.domain.OutboxRepository: OFF
\ No newline at end of file
+    org.springframework.web: DEBUG
+    org.hibernate.type.descriptor.sql: TRACE
\ No newline at end of file

From daa9f726903521bd5ba638ce0a7d740cd56440a7 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Tue, 5 May 2026 11:40:58 +0900
Subject: [PATCH 020/142] =?UTF-8?q?Feat=20:=20=EA=B2=B0=EC=A0=9C=20?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?(#30)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Feat : 결제 완료 기능 추가
- 결재 완료 상태로 변경

* fix : 코드 래빗 제안 수정
- 멱등성 처리 추가

* fix : 코드 래빗 제안 수정
- SYSTEM도 가능하게 수정
---
 .../service/ReservationService.java           | 21 ++++++++++++++++
 .../domain/model/reservation/Reservation.java |  3 +--
 .../service/ReservationDomainService.java     | 25 ++++++++++++++++++-
 .../domain/service/ReservationValidator.java  | 20 +++++++++++++++
 .../controller/ReservationController.java     | 17 +++++++++++++
 5 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index cf3d650..c45125a 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -165,6 +165,26 @@ public ReservationCancelInfo cancelByBuyer(ReservationCancelCommand command) {
         return ReservationCancelInfo.from(reservation);
     }
 
+    // 추후 결제 시스템 연동시 트리거 발동
+    @Transactional
+    public ReservationCancelInfo confirmPayment(UUID reservationId, UUID userId, String role) {
+        Reservation reservation = findById(reservationId);
+
+        ReservationHistory history = reservationDomainService.confirmPayment(
+                reservation,
+                userId,
+                role
+        );
+
+        if (history != null) {
+            reservationHistoryRepository.save(history);
+        } else {
+            log.info("이미 결제 완료 처리된 예약입니다(중복 요청 무시): reservationId={}", reservationId);
+        }
+
+        return ReservationCancelInfo.from(reservation);
+    }
+
     // 판매자 취소 로직
     @Transactional
     public ReservationCancelInfo cancelBySeller(ReservationCancelCommand command) {
@@ -244,4 +264,5 @@ private boolean isDuplicateApplyViolation(DataIntegrityViolationException e) {
         String message = e.getMostSpecificCause().getMessage();
         return message != null && message.contains("uk_reservation_candidate_user_id");
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index f97a854..0757be5 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -8,7 +8,6 @@
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
 import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidateStatus;
 
-import java.time.LocalDateTime;
 import java.util.*;
 
 @Entity
@@ -55,7 +54,7 @@ public void addCandidate(ReservationCandidate candidate) {
     }
 
     public void removeCandidate(ReservationCandidate candidate) {
-        //validateStatus(ReservationStatus.AVAILABLE);
+        validateStatus(ReservationStatus.AVAILABLE);
         this.candidates.remove(candidate);
     }
 
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 349a320..e74eb3c 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -9,7 +9,6 @@
 import org.pgsg.reservation.domain.model.reservationhistory.ReservationHistory;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.*;
 
 
@@ -137,6 +136,29 @@ public ReservationHistory cancelByBuyer(Reservation reservation, UUID userId, St
         );
     }
 
+    /**
+     * 결제 완료 로직
+     * 관리자가 호출 or 결제 서비스에서 이벤트를 받을 경우, 상품 상태를 (PENDING -> PAID)로 변경
+     */
+    public ReservationHistory confirmPayment(Reservation reservation, UUID userId, String role) {
+
+        // 권한 검증 (관리자 혹은 시스템 권한)
+        reservationValidator.validateConfirmPayment(reservation, userId, role);
+
+        ReservationStatus previousStatus = reservation.getStatus();
+
+        // 상태 전이 검증 (PENDING일 때만 결제 완료 가능)
+        reservation.markAsPaid();
+
+        return ReservationHistory.of(
+                reservation.getId(),
+                previousStatus,
+                reservation.getStatus(),
+                "결제 승인 완료: 상태가 PAID로 변경되었습니다.", // reason
+                userId
+        );
+    }
+
     /**
      * 판매자 사유 취소 도메인 로직
      * 판매자 혹은 관리자가 호출하며, 취소 후 예약 비활성화 후 상품 삭제 요청
@@ -265,4 +287,5 @@ private void validateReason(String reason) {
         }
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
index a7f3f8d..106afc8 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
@@ -39,6 +39,26 @@ public void validateCancelByBuyer(Reservation reservation, UUID userId, String r
         }
     }
 
+    // 시스템,관리자 결제 완료 권한 및 상태 검증
+    public void validateConfirmPayment(Reservation reservation, UUID userId, String role) {
+        if (reservation == null || userId == null) {
+            throw new ReservationException(ReservationErrorCode.INVALID_INPUT);
+        }
+
+        // 권한 검증: 관리자,SYSTEM만 허용함
+        String normalizedRole = role == null ? "" : role.trim();
+        boolean isAdmin = "ADMIN".equalsIgnoreCase(normalizedRole);
+        boolean isSystem = "SYSTEM".equalsIgnoreCase(normalizedRole);
+        if (!isAdmin && !isSystem) {
+            throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
+        }
+
+        // 상태 검증: 오직 PENDING 상태에서만 결제 확인이 가능함
+        if (reservation.getStatus() != ReservationStatus.PENDING) {
+            throw new ReservationException(ReservationErrorCode.CANNOT_CHANGE_STATUS);
+        }
+    }
+
     // 판매자,관리자 취소 권한 및 상태 검증
     public void validateCancelBySeller(Reservation reservation, UUID userId, String role) {
         validateCommonCancel(reservation, userId);
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index ca53065..be7be85 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -126,6 +126,23 @@ public ResponseEntity<ReservationCancelResponse> cancelByBuyer(
         return ResponseEntity.status(HttpStatus.OK).body(response);
     }
 
+    // 결제 완료
+    @PatchMapping("/{reservationId}/paymentconfirm")
+    public ResponseEntity<ReservationCancelInfo> confirmPayment(
+            @PathVariable UUID reservationId,
+            @RequestHeader("X-User-Id") UUID userId,
+            @RequestHeader("X-User-Role") String role
+    ) {
+
+        ReservationCancelInfo result = reservationService.confirmPayment(
+                reservationId,
+                userId,
+                role
+        );
+
+        return ResponseEntity.ok(result);
+    }
+
     // 판매자 사유로 인한 취소(판매자,관리자)
     @PatchMapping("/{reservationId}/cancel/seller")
     public ResponseEntity<ReservationCancelResponse> cancelBySeller(

From 80a0dddc5af65abd353b96465a9e7202442ad563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Tue, 5 May 2026 12:20:52 +0900
Subject: [PATCH 021/142] =?UTF-8?q?idel,docker=20=EC=97=B0=EB=8F=99=20?=
 =?UTF-8?q?=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                    | 35 +++++------
 docker-compose.yml                            | 19 ++----
 .../ReservationServiceApplication.java        |  2 -
 .../dto/request/ReservationCreateRequest.java |  1 -
 src/main/resources/application.yml            | 62 +++++--------------
 5 files changed, 38 insertions(+), 81 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 445e916..fd51551 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,43 +2,42 @@
 FROM eclipse-temurin:21-jdk-alpine AS build
 WORKDIR /app
 
-# dos2unix 설치 (줄바꿈 문자 변환 도구)
+# dos2unix 설치
 RUN apk add --no-cache dos2unix
 
-# 소스 코드 복사
+# 1. 모든 소스 코드 복사
 COPY . .
 
-# gradlew 파일의 줄바꿈 문자를 CRLF -> LF로 변환 및 권한 부여
-RUN dos2unix gradlew
-RUN chmod +x ./gradlew
+# 2. 복사된 파일 중 gradlew만 골라서 줄바꿈 변환 및 실행 권한 부여
+# (COPY . . 이후에 수행해야 덮어쓰기 문제를 방지할 수 있습니다)
+RUN dos2unix gradlew && chmod +x gradlew
 
-# 빌드 실행 (인증 정보 주입 필요 - 아래 설명 참고)
+# 3. 빌드 실행
 RUN ./gradlew clean bootJar -x test
 
 # 실행 단계
 FROM eclipse-temurin:21-jre-alpine
 WORKDIR /app
 
-# 보안을 위해 실행 단계에서 사용자 생성
+# 실행 전용 사용자 생성
 RUN addgroup -S appuser && adduser -S appuser -G appuser
 
-# 빌드 결과물 복사 (plain.jar를 제외하고 딱 하나만 복사되도록 명시)
+# 4. 빌드 결과물 복사
 COPY --from=build /app/build/libs/*-SNAPSHOT.jar app.jar
-# 또는 명확하게 하나만 남도록 빌드 설정이 되어있다면 그대로 사용 가능합니다.
 
-# SSL 인증서 폴더 생성 및 복사
+# 5. SSL 인증서 복사 (물리 경로 확보)
 RUN mkdir -p /app/ssl
-# 파일이 있을 때만 복사하도록 구성하거나, 확실히 존재해야 함을 명시
-COPY src/main/resources/ssl/*.jks /app/ssl/
+COPY --from=build /app/src/main/resources/ssl/*.jks /app/ssl/
 
-# 권한 설정 (사용자 생성 후 일괄 변경)
+# 6. 권한 설정
 RUN chown -R appuser:appuser /app
 
-# 환경 변수 및 포트 설정
-ENV SPRING_PROFILES_ACTIVE=dev
-EXPOSE 8085
+# 7. 환경 변수 설정 (Kafka SSL 비밀번호 강제 주입)
+ENV SPRING_PROFILES_ACTIVE=dev,kafka
+ENV SPRING_KAFKA_SSL_TRUST_STORE_LOCATION=file:/app/ssl/kafka.server.truststore.jks
+ENV SPRING_KAFKA_SSL_TRUST_STORE_PASSWORD=_aA123456
 
+EXPOSE 8085
 USER appuser
 
-# 최적화된 Java 실행 옵션 (Container 환경 인식)
-ENTRYPOINT ["java", "-XX:+UseContainerSupport", "-jar", "app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-XX:+UseContainerSupport", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index a9fd2f6..536cf04 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,23 +5,22 @@ services:
     container_name: reservation-service
     build:
       context: .
-      dockerfile: Dockerfile
       args:
         - GPR_USER=${GPR_USER}
         - GPR_TOKEN=${GPR_TOKEN}
     environment:
-      - "SERVER_PORT=${SERVER_PORT:-8085}"
-      - "SPRING_PROFILES_ACTIVE=dev"
-      - "DB_URL=jdbc:postgresql://reservation-db:5432/${DB_NAME:-reservation_db}"
+      - "SERVER_PORT=${SERVER_PORT}"
+      - "DB_URL=jdbc:postgresql://reservation-db:5432/${DB_NAME}"
       - "REDIS_HOST=reservation-redis"
       - "EUREKA_SERVER=http://host.docker.internal:8761/eureka/"
       - "KAFKA_SSL_PATH=/app/ssl/kafka.server.truststore.jks"
-    ports:
-      - "${SERVER_PORT:-8085}:${SERVER_PORT:-8085}"
     env_file:
       - .env
     volumes:
+      # 로컬의 resources/ssl 폴더를 컨테이너의 /app/ssl 폴더로 연결
       - ./src/main/resources/ssl:/app/ssl:ro
+    ports:
+      - "${SERVER_PORT}:${SERVER_PORT}"
     depends_on:
       db:
         condition: service_healthy
@@ -68,10 +67,4 @@ networks:
     external: true
 
 volumes:
-  postgres-reservation-data:
-
-secrets:
-  GPR_USER:
-    environment: GPR_USER
-  GPR_TOKEN:
-    environment: GPR_TOKEN
\ No newline at end of file
+  postgres-reservation-data:
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
index 39b22a3..767f59f 100644
--- a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
+++ b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
@@ -3,10 +3,8 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
-@EnableJpaAuditing
 @SpringBootApplication(scanBasePackages = {"org.pgsg.reservation", "org.pgsg.common"})
 @EntityScan(basePackages = {
         "org.pgsg.reservation",
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java
index 8fd8ab5..ea19d16 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/request/ReservationCreateRequest.java
@@ -28,5 +28,4 @@ public class ReservationCreateRequest {
 
     @NotNull(message = "판매자 닉네임은 필수입니다.")
     private String sellerNickname;
-
 }
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f59dc12..9383d81 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,62 +1,38 @@
 server:
   port: ${SERVER_PORT:8085}
-  error:
-    include-message: always
-    include-stacktrace: always
 
 spring:
-  jackson:
-    serialization:
-      write-dates-as-timestamps: false
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: reservation-service
-
   profiles:
-    active: dev,kafka
-    include: error, reservation-error
+    active: ${SPRING_PROFILES_ACTIVE:dev,kafka}
 
-  # [필수 1] 설정 로드 순서
-  # .env 파일을 먼저 읽고, 그 다음 외부 Config Server에 접속합니다.
   config:
     import:
       - "optional:file:.env[.properties]"
       - "optional:configserver:${CONFIG_SERVER:http://34.50.50.170:13100}"
 
-  # [필수 2] 로컬 우선순위 설정
-  cloud:
-    config:
-      enabled: false
-      allow-override: true
-      override-none: false
-
-  # [필수 3] 빈 중복 정의 허용
-  main:
-    allow-bean-definition-overriding: true
-
-  # 데이터베이스 설정 (PostgreSQL)
   datasource:
-    driver-class-name: org.postgresql.Driver
-    url: ${DB_URL:jdbc:postgresql://localhost:5432/reservation_db}
-    username: ${DB_USERNAME:postgres} # 추가
-    password: ${DB_PASSWORD:postgres}
+    url: ${DB_URL}
+    username: ${DB_USERNAME}
+    password: ${DB_PASSWORD}
 
-  # [필수 4] Kafka 설정
   kafka:
-    bootstrap-servers: ${KAFKA_HOST}
+    bootstrap-servers: ${KAFKA_HOST:34.64.35.152:9092,34.22.94.155:9092,34.50.28.59:9092}
+    ssl:
+      # Docker 환경(file:/app/...)과 로컬 환경(C:/...)을 환경 변수 하나로 제어합니다.
+      trust-store-location: ${KAFKA_SSL_PATH:file:/app/ssl/kafka.server.truststore.jks}
+      trust-store-password: _aA123456
     properties:
       security.protocol: SSL
-      ssl.truststore.location: ${KAFKA_SSL_PATH:/app/ssl/kafka.server.truststore.jks}
-      ssl.truststore.password: _aA123456
       ssl.endpoint.identification.algorithm: ""
-    producer:
-      key-serializer: org.apache.kafka.common.serialization.StringSerializer
-      value-serializer: org.apache.kafka.common.serialization.StringSerializer
 
-  # [필수 5] Redis 설정
   data:
     redis:
-      host: ${REDIS_HOST:localhost}
-      port: ${REDIS_PORT:6379}
+      host: ${REDIS_HOST}
+      port: ${REDIS_PORT}
 
   jpa:
     hibernate:
@@ -74,7 +50,6 @@ management:
       exposure:
         include: health, info, refresh
 
-# [필수 6] 보안 및 유레카 설정
 jwt:
   secret: ${JWT_SECRET}
 
@@ -82,22 +57,15 @@ eureka:
   instance:
     instance-id: ${spring.application.name}:${random.value}
     prefer-ip-address: true
-    hostname: ${spring.application.name}
   client:
-    enabled: false
+    enabled: ${EUREKA_ENABLED:true} # 도커/로컬 상황에 따라 토글 가능
     register-with-eureka: true
     fetch-registry: true
     service-url:
       defaultZone: ${EUREKA_SERVER:http://localhost:8761/eureka/}
-    registry-fetch-interval-seconds: 30
 
 topics:
   reservation:
     completed: prod-reservation-completed
   product:
-    created: prod-product-created
-
-logging:
-  level:
-    org.springframework.web: DEBUG
-    org.hibernate.type.descriptor.sql: TRACE
\ No newline at end of file
+    created: prod-product-created
\ No newline at end of file

From 8fbd695b080d89948271a88e84e5bdb5d418ffa8 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Thu, 7 May 2026 11:29:56 +0900
Subject: [PATCH 022/142] =?UTF-8?q?fix=20:=20=EC=9D=91=EB=8B=B5=20?=
 =?UTF-8?q?=EB=AA=A8=EB=93=88=20=EA=B3=B5=ED=86=B5=ED=99=94=20(#32)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.gradle                               |  7 +-
 .../dto/result/ReservationDetailResult.java   | 55 ++++++++++++++
 .../service/ReservationService.java           |  6 +-
 .../controller/ReservationController.java     | 75 +++++++------------
 .../response/ReservationDetailResponse.java   | 28 +++----
 .../dto/response/ReservationPageResponse.java | 24 ++++++
 6 files changed, 119 insertions(+), 76 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java

diff --git a/settings.gradle b/settings.gradle
index af0625f..192c37c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1 @@
-rootProject.name = 'reservation-root'
-
-include ':common'
-project(':common').projectDir = new File(settingsDir, 'libs/common')
-
-include ':reservation-service'
\ No newline at end of file
+rootProject.name = 'reservation-root'
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
new file mode 100644
index 0000000..86c7f8d
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
@@ -0,0 +1,55 @@
+package org.pgsg.reservation.application.dto.result;
+
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public record ReservationDetailResult(
+        UUID reservationId,
+        ReservationStatus status,
+        ProductInfo product,
+        SellerInfo seller,
+        BuyerInfo buyer,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt
+) {
+    // 내부 record로 데이터를 구조화합니다.
+    public record ProductInfo(
+            UUID productId,
+            String productName,
+            int price
+    ) {}
+
+    public record SellerInfo(
+            UUID sellerId,
+            String sellerName
+    ) {}
+
+    public record BuyerInfo(
+            UUID buyerId,
+            String buyerName
+    ) {}
+    public static ReservationDetailResult from(Reservation reservation) {
+        return new ReservationDetailResult(
+                reservation.getId(),
+                reservation.getStatus(),
+                new ProductInfo(
+                        reservation.getProductInfo().getProductId(),
+                        reservation.getProductInfo().getProductName(),
+                        reservation.getProductInfo().getProductPrice()
+                ),
+                new SellerInfo(
+                        reservation.getSellerInfo().getSellerId(),
+                        reservation.getSellerInfo().getSellerName()
+                ),
+                new BuyerInfo(
+                        reservation.getBuyerInfo() != null ? reservation.getBuyerInfo().getBuyerId() : null,
+                        reservation.getBuyerInfo() != null ? reservation.getBuyerInfo().getBuyerName() : "N/A"
+                ),
+                reservation.getCreatedAt(),
+                reservation.getModifiedAt()
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index c45125a..315217c 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -4,6 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.pgsg.reservation.application.dto.command.ReservationCancelCommand;
 import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
+import org.pgsg.reservation.application.dto.result.ReservationDetailResult;
 import org.pgsg.reservation.infrastructure.listener.dto.ReservationEventPublisher;
 import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
@@ -20,7 +21,6 @@
 import org.pgsg.reservation.domain.repository.ReservationRepository;
 import org.pgsg.reservation.presentation.dto.request.ReservationAdminCancelRequest;
 import org.pgsg.reservation.presentation.dto.response.ReservationCandidateResponse;
-import org.pgsg.reservation.presentation.dto.response.ReservationDetailResponse;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -106,7 +106,7 @@ public Page<ReservationSearchResult> getSearchReservations(
 
     // 예약 상세 조회
     @Transactional(readOnly = true)
-    public ReservationDetailResponse getReservationDetail(UUID reservationId, UUID userId, String role) {
+    public ReservationDetailResult getReservationDetail(UUID reservationId, UUID userId, String role) {
         // 엔티티 조회
         Reservation reservation = reservationRepository.findById(reservationId)
                 .orElseThrow(() -> new RuntimeException("해당 예약을 찾을 수 없습니다. ID: " + reservationId));
@@ -114,7 +114,7 @@ public ReservationDetailResponse getReservationDetail(UUID reservationId, UUID u
         // 도메인 서비스를 통한 권한 검증
         reservationDomainService.validateDetailAccess(reservation, userId, role);
 
-        return ReservationDetailResponse.from(reservation);
+        return ReservationDetailResult.from(reservation);
     }
 
     // 예약 신청
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index be7be85..f125069 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -7,21 +7,16 @@
 import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
+import org.pgsg.reservation.application.dto.result.ReservationDetailResult;
 import org.pgsg.reservation.application.service.ReservationService;
 import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 import org.pgsg.reservation.presentation.dto.request.ReservationAdminCancelRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationCancelRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationCreateRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationSearchRequest;
-import org.pgsg.reservation.presentation.dto.response.ReservationCancelResponse;
-import org.pgsg.reservation.presentation.dto.response.ReservationCandidateResponse;
-import org.pgsg.reservation.presentation.dto.response.ReservationDetailResponse;
-import org.pgsg.reservation.presentation.dto.response.ReservationResponse;
-import org.springframework.data.domain.Page;
+import org.pgsg.reservation.presentation.dto.response.*;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.UUID;
@@ -35,7 +30,7 @@ public class ReservationController {
 
     // 예약 생성
     @PostMapping
-    public ResponseEntity<ReservationResponse> createReservation(
+    public ReservationResponse createReservation(
             @Valid @RequestBody ReservationCreateRequest request
     ) {
         ReservationCreateCommand command = ReservationCreateCommand.builder()
@@ -49,14 +44,12 @@ public ResponseEntity<ReservationResponse> createReservation(
 
         ReservationCreateResult result = reservationService.createReservation(command);
 
-        return ResponseEntity
-                .status(HttpStatus.CREATED)
-                .body(ReservationResponse.from(result));
+        return ReservationResponse.from(result);
     }
 
     // 예약 목록 조회
     @GetMapping
-    public ResponseEntity<Page<ReservationResponse>> getReservations(
+    public ReservationPageResponse<ReservationResponse> getReservations(
             @RequestHeader("X-User-Id") UUID userId,
             @RequestHeader("X-User-Role") String role,
             @ModelAttribute ReservationSearchRequest request,
@@ -71,43 +64,38 @@ public ResponseEntity<Page<ReservationResponse>> getReservations(
                 request.getProductId()
         );
 
-        Page<ReservationResponse> responses = reservationService.getSearchReservations(userId, role, query, pageable)
-                .map(ReservationResponse::from);
-
-        // 통일된 응답 규격으로 반환 (조회는 200 OK)
-        return ResponseEntity
-                .status(HttpStatus.OK)
-                .body(responses);
+        return ReservationPageResponse.from(
+                reservationService.getSearchReservations(userId, role, query, pageable)
+                        .map(ReservationResponse::from)
+        );
     }
 
     // 예약 상세 목록 조회
     @GetMapping("/{reservationId}")
-    public ResponseEntity<ReservationDetailResponse> getReservationDetail(
+    public ReservationDetailResponse getReservationDetail(
             @PathVariable UUID reservationId,
             @RequestHeader("X-User-Id") UUID userId,
             @RequestHeader("X-User-Role") String role
     ) {
 
-        ReservationDetailResponse response = reservationService.getReservationDetail(reservationId, userId, role);
+        ReservationDetailResult result = reservationService.getReservationDetail(reservationId, userId, role);
 
-        return ResponseEntity.ok(response);
+        return ReservationDetailResponse.from(result);
     }
 
     // 예약 신청
     @PostMapping("/{reservationId}")
-    public ResponseEntity<ReservationCandidateResponse> applyReservation(
+    public ReservationCandidateResponse applyReservation(
             @PathVariable UUID reservationId,
             @RequestHeader("X-User-Id") UUID userId,
             @RequestHeader("X-User-Nickname") String nickname
     ) {
-        ReservationCandidateResponse response = reservationService.applyReservation(reservationId, userId, nickname);
-
-        return ResponseEntity.status(HttpStatus.CREATED).body(response);
+        return reservationService.applyReservation(reservationId, userId, nickname);
     }
 
     // 구매자 사유 취소 (구매자/관리자)
     @PatchMapping("/{reservationId}/cancel/buyer")
-    public ResponseEntity<ReservationCancelResponse> cancelByBuyer(
+    public ReservationCancelResponse cancelByBuyer(
             @PathVariable UUID reservationId,
             @RequestBody ReservationCancelRequest request,
             @RequestHeader("X-User-Id") UUID userId,
@@ -121,31 +109,27 @@ public ResponseEntity<ReservationCancelResponse> cancelByBuyer(
         );
 
         ReservationCancelInfo info = reservationService.cancelByBuyer(command);
-        ReservationCancelResponse response = ReservationCancelResponse.of(info, "구매자 사유 취소가 완료되었습니다.");
 
-        return ResponseEntity.status(HttpStatus.OK).body(response);
+        return ReservationCancelResponse.of(info, "구매자 사유 취소가 완료되었습니다.");
     }
 
     // 결제 완료
     @PatchMapping("/{reservationId}/paymentconfirm")
-    public ResponseEntity<ReservationCancelInfo> confirmPayment(
+    public ReservationCancelInfo confirmPayment(
             @PathVariable UUID reservationId,
             @RequestHeader("X-User-Id") UUID userId,
             @RequestHeader("X-User-Role") String role
     ) {
-
-        ReservationCancelInfo result = reservationService.confirmPayment(
+        return reservationService.confirmPayment(
                 reservationId,
                 userId,
                 role
         );
-
-        return ResponseEntity.ok(result);
     }
 
     // 판매자 사유로 인한 취소(판매자,관리자)
     @PatchMapping("/{reservationId}/cancel/seller")
-    public ResponseEntity<ReservationCancelResponse> cancelBySeller(
+    public ReservationCancelResponse cancelBySeller(
             @PathVariable UUID reservationId,
             @RequestBody ReservationCancelRequest request,
             @RequestHeader("X-User-Id") UUID userId,
@@ -159,14 +143,13 @@ public ResponseEntity<ReservationCancelResponse> cancelBySeller(
         );
 
         ReservationCancelInfo info = reservationService.cancelBySeller(command);
-        ReservationCancelResponse response = ReservationCancelResponse.of(info, "판매자 사유 취소가 완료되었습니다.");
 
-        return ResponseEntity.status(HttpStatus.OK).body(response);
+        return ReservationCancelResponse.of(info, "판매자 사유 취소가 완료되었습니다.");
     }
 
     // 예약 만료(관리자만 조정 가능)
     @PatchMapping("/{reservationId}/expire")
-    public ResponseEntity<ReservationCancelResponse> expireByAdmin(
+    public ReservationCancelResponse expireByAdmin(
             @PathVariable UUID reservationId,
             @RequestBody ReservationAdminCancelRequest request,
             @RequestHeader("X-User-Id") UUID userId,
@@ -183,12 +166,12 @@ public ResponseEntity<ReservationCancelResponse> expireByAdmin(
                 ? "관리자 권한으로 구매자 사유 취소(승계) 처리가 완료되었습니다."
                 : "관리자 권한으로 판매자 사유 취소(종료) 처리가 완료되었습니다.";
 
-        return ResponseEntity.ok(ReservationCancelResponse.of(info, message));
+        return ReservationCancelResponse.of(info, message);
     }
 
     // 예약 완료
     @PatchMapping("/{reservationId}/complete")
-    public ResponseEntity<ReservationCancelResponse> completeReservation(
+    public ReservationCancelResponse completeReservation(
             @PathVariable UUID reservationId,
             @RequestHeader("X-User-Id") UUID userId,
             @RequestHeader("X-User-Role") String role
@@ -199,14 +182,12 @@ public ResponseEntity<ReservationCancelResponse> completeReservation(
                 role
         );
 
-        String message = "판매자 채팅 수락에 따라 예약 완료 처리가 완료되었습니다.";
-
-        return ResponseEntity.ok(ReservationCancelResponse.of(info, message));
+        return ReservationCancelResponse.of(info, "판매자 채팅 수락에 따라 예약 완료 처리가 완료되었습니다.");
     }
 
     // 거래 완료
     @PatchMapping("/{reservationId}/tradeconfirm")
-    public ResponseEntity<ReservationCancelResponse> confirmTrade(
+    public ReservationCancelResponse confirmTrade(
             @PathVariable UUID reservationId,
             @RequestHeader("X-User-Id") UUID userId,
             @RequestHeader("X-User-Role") String role
@@ -215,8 +196,6 @@ public ResponseEntity<ReservationCancelResponse> confirmTrade(
                 reservationId
         );
 
-        String message = "거래가 성공적으로 완료되어 확정 처리되었습니다.";
-
-        return ResponseEntity.ok(ReservationCancelResponse.of(info, message));
+        return ReservationCancelResponse.of(info, "거래가 성공적으로 완료되어 확정 처리되었습니다.");
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
index 3adafea..a049974 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
@@ -1,6 +1,6 @@
 package org.pgsg.reservation.presentation.dto.response;
 
-import org.pgsg.reservation.domain.model.reservation.Reservation;
+import org.pgsg.reservation.application.dto.result.ReservationDetailResult;
 import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 
 import java.time.LocalDateTime;
@@ -31,25 +31,15 @@ public record BuyerDetailInfo(
             String buyerName
     ) {}
 
-    public static ReservationDetailResponse from(Reservation reservation) {
+    public static ReservationDetailResponse from(ReservationDetailResult result) {
         return new ReservationDetailResponse(
-                reservation.getId(),
-                reservation.getStatus(),
-                new ProductDetailInfo(
-                        reservation.getProductInfo().getProductId(),
-                        reservation.getProductInfo().getProductName(),
-                        reservation.getProductInfo().getProductPrice()
-                ),
-                new SellerDetailInfo(
-                        reservation.getSellerInfo().getSellerId(),
-                        reservation.getSellerInfo().getSellerName()
-                ),
-                new BuyerDetailInfo(
-                        reservation.getBuyerInfo().getBuyerId(),
-                        reservation.getBuyerInfo().getBuyerName()
-                ),
-                reservation.getCreatedAt(),
-                reservation.getModifiedAt()
+                result.reservationId(),
+                result.status(),
+                new ProductDetailInfo(result.product().productId(), result.product().productName(), result.product().price()),
+                new SellerDetailInfo(result.seller().sellerId(), result.seller().sellerName()),
+                new BuyerDetailInfo(result.buyer().buyerId(), result.buyer().buyerName()),
+                result.createdAt(),
+                result.updatedAt()
         );
     }
 }
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java
new file mode 100644
index 0000000..702c863
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java
@@ -0,0 +1,24 @@
+package org.pgsg.reservation.presentation.dto.response;
+
+import lombok.Getter;
+import org.springframework.data.domain.Page;
+import java.util.List;
+
+@Getter
+public class ReservationPageResponse<T> {
+    private final List<T> content;
+    private final int pageNumber;
+    private final long totalElements;
+    private final int totalPages;
+
+    private ReservationPageResponse(Page<T> page) {
+        this.content = page.getContent();
+        this.pageNumber = page.getNumber();
+        this.totalElements = page.getTotalElements();
+        this.totalPages = page.getTotalPages();
+    }
+
+    public static <T> ReservationPageResponse<T> from(Page<T> page) {
+        return new ReservationPageResponse<>(page);
+    }
+}
\ No newline at end of file

From fdec99560696b4fe4f3216a330fef221ee01acee Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Thu, 7 May 2026 14:58:08 +0900
Subject: [PATCH 023/142] =?UTF-8?q?fix=20:=20=EC=97=90=EB=9F=AC=20yml?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=A1=9C=20=EC=88=98=EC=A0=95=20(#34)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exception/ReservationErrorCode.java       |  46 ++++---
 .../exception/ReservationException.java       |  20 ++--
 .../ReservationExceptionHandler.java          | 112 ++++++++++++++++++
 .../application-reservation-error.yml         |  49 ++++++++
 src/main/resources/application.yml            |   3 +
 5 files changed, 205 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/domain/exception/ReservationExceptionHandler.java
 create mode 100644 src/main/resources/application-reservation-error.yml

diff --git a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
index 0d55b41..b7effa8 100644
--- a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
+++ b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
@@ -1,29 +1,39 @@
 package org.pgsg.reservation.domain.exception;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.pgsg.common.exception.ErrorCode;
 
 @Getter
-@AllArgsConstructor
-public enum ReservationErrorCode {
+@RequiredArgsConstructor
+public enum ReservationErrorCode implements ErrorCode {
 
-    // 400 Bad Request
-    INVALID_INPUT(400, "입력값이 누락되었습니다."),
-    INVALID_STATUS(400, "잘못된 예약 상태입니다."),
-    INVALID_SELECT_STATUS(400, "잘못된 선정 상태입니다."),
-    CANNOT_CHANGE_STATUS(400, "현재 상태에서는 변경할 수 없는 요청입니다."),
+    // 유효성 검사 (R001~R003 계열)
+    INVALID_INPUT("[reservation.validation.invalid-input]", "input"),
+    INVALID_STATUS("[reservation.validation.invalid-status]", "status"),
+    INVALID_SELECT_STATUS("[reservation.validation.invalid-select-status]", "selectStatus"),
 
-    // 401 Unauthorized / 403 Forbidden
-    UNAUTHORIZED_ACCESS(403, "해당 요청에 대한 접근 권한이 없습니다."),
+    // 서비스 예외 - 권한 및 상태 (R004~R005 계열)
+    CANNOT_CHANGE_STATUS("[reservation.exception.cannot-change-status]", "status"),
+    UNAUTHORIZED_ACCESS("[reservation.exception.access-denied]", "role"),
 
-    // 404 Not Found
-    RESERVATION_NOT_FOUND(404, "해당 예약을 찾을 수 없습니다."),
+    // 서비스 예외 - 조회 실패 (R006 계열)
+    RESERVATION_NOT_FOUND("[reservation.exception.not-found.reservation]", "reservationId"),
 
-    // 409 Conflict (중복 등 비즈니스 규칙 위반)
-    DUPLICATE_RESERVATION(409, "이미 해당 상품에 대한 예약 진행 내역이 존재합니다."),
-    ALREADY_APPLIED(409, "이미 해당 예약에 신청한 후보자입니다."),
-    ALREADY_EXISTS(409, "해당 상품으로 이미 생성된 예약 데이터가 존재합니다.");
+    // 서비스 예외 - 충돌 및 중복 (R007~R009 계열)
+    DUPLICATE_RESERVATION("[reservation.exception.conflict.duplicate-reservation]", "productId"),
+    ALREADY_APPLIED("[reservation.exception.conflict.already-applied]", "buyerId"),
+    ALREADY_EXISTS("[reservation.exception.conflict.already-exists]", "productId");
 
-    private final int status;
-    private final String message;
+    private final String errorKey;
+    private final String field;
+
+    public static ReservationErrorCode fromErrorKey(String errorKey) {
+        for (ReservationErrorCode errorCode : values()) {
+            if (errorCode.getErrorKey().equals(errorKey)) {
+                return errorCode;
+            }
+        }
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/exception/ReservationException.java b/src/main/java/org/pgsg/reservation/domain/exception/ReservationException.java
index 902cbee..863bc48 100644
--- a/src/main/java/org/pgsg/reservation/domain/exception/ReservationException.java
+++ b/src/main/java/org/pgsg/reservation/domain/exception/ReservationException.java
@@ -1,14 +1,20 @@
 package org.pgsg.reservation.domain.exception;
 
-import lombok.Getter;
+import org.pgsg.common.exception.CustomException;
+import org.pgsg.common.exception.ErrorCode;
 
-@Getter
-public class ReservationException extends RuntimeException {
+public class ReservationException extends CustomException {
 
-    private final ReservationErrorCode errorCode;
+    public ReservationException(ErrorCode errorCode) {
+        super(errorCode, null);
+    }
+
+    public ReservationException(ErrorCode errorCode, String field) {
+        super(errorCode, field);
+    }
 
-    public ReservationException(ReservationErrorCode errorCode) {
-        super(errorCode.getMessage());
-        this.errorCode = errorCode;
+    public ReservationException(ErrorCode errorCode, Throwable cause) {
+        super(errorCode, null);
+        this.initCause(cause);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/exception/ReservationExceptionHandler.java b/src/main/java/org/pgsg/reservation/domain/exception/ReservationExceptionHandler.java
new file mode 100644
index 0000000..2cc4e02
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/domain/exception/ReservationExceptionHandler.java
@@ -0,0 +1,112 @@
+package org.pgsg.reservation.domain.exception;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.pgsg.common.exception.CustomException;
+import org.pgsg.common.exception.ErrorConfigProperties;
+import org.pgsg.common.exception.GlobalExceptionAdvice;
+import org.pgsg.common.response.ErrorResponse;
+import org.slf4j.MDC;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.Map;
+
+@Slf4j
+@RestControllerAdvice
+@RequiredArgsConstructor
+public class ReservationExceptionHandler implements GlobalExceptionAdvice {
+
+    private final ErrorConfigProperties errorConfigProperties;
+
+    /**
+     * @Valid 검증 예외 처리
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<ErrorResponse> handleValidationException(MethodArgumentNotValidException e) {
+        FieldError fieldError = e.getBindingResult().getFieldError();
+
+        if (fieldError == null) {
+            String globalErrorKey = e.getBindingResult().getGlobalError() != null
+                    ? e.getBindingResult().getGlobalError().getDefaultMessage() : null;
+            return buildResponse(globalErrorKey, null, e);
+        }
+
+        String errorKey = fieldError.getDefaultMessage();
+        ReservationErrorCode errorCode = ReservationErrorCode.fromErrorKey(errorKey);
+
+        if (errorCode != null) {
+            return buildResponse(errorCode.getErrorKey(), errorCode.getField(), e);
+        }
+
+        return buildResponse(errorKey, fieldError.getField(), e);
+    }
+
+    /**
+     * 예약 도메인 비즈니스 예외 처리
+     */
+    @ExceptionHandler(ReservationException.class)
+    public ResponseEntity<ErrorResponse> handleReservationException(CustomException e) {
+        String field = e.getField();
+        if (field == null && e.getErrorCode() instanceof ReservationErrorCode rec) {
+            field = rec.getField();
+        }
+        return buildResponse(e.getErrorCode().getErrorKey(), field, e);
+    }
+
+    /**
+     * 공통 에러 응답 빌더
+     */
+    private ResponseEntity<ErrorResponse> buildResponse(String errorKey, String field, Exception e) {
+        // errorKey가 null인 경우 시스템 에러 응답을 직접 생성하여 리턴합니다.
+        if (errorKey == null) {
+            return ResponseEntity
+                    .status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(ErrorResponse.of(HttpStatus.INTERNAL_SERVER_ERROR, "SYSTEM-500", field, "정의되지 않은 서버 에러가 발생했습니다."));
+        }
+
+        // 양 끝의 대괄호를 제거한 키를 생성합니다.
+        String normalizedKey = (errorKey.startsWith("[") && errorKey.endsWith("]"))
+                ? errorKey.substring(1, errorKey.length() - 1)
+                : errorKey;
+
+        // 반대로 대괄호가 포함된 형태의 키도 준비하여 바인딩 유연성을 확보합니다.
+        String bracketKey = "[" + normalizedKey + "]";
+
+        // 우선 대괄호가 없는 키로 조회를 시도하고, 결과가 없으면 대괄호가 포함된 키로 다시 조회합니다.
+        ErrorConfigProperties.ErrorDetail detail = errorConfigProperties.getConfigs().entrySet().stream()
+                .filter(entry -> entry.getKey().equals(normalizedKey) || ("[" + entry.getKey() + "]").equals(errorKey))
+                .map(Map.Entry::getValue)
+                .findFirst()
+                .orElse(null);
+
+        // 두 가지 방식 모두 설정값 조회에 실패한 경우 KEY-NOT-FOUND 응답을 반환합니다.
+        if (detail == null) {
+            // 디버깅을 위해 현재 맵에 들어있는 키들을 로그로 찍어보세요.
+            log.error("현재 로드된 설정 키 목록: {}", errorConfigProperties.getConfigs().keySet());
+            log.error("[TraceID: {}] Undefined Error Key: {}", MDC.get("traceId"), normalizedKey);
+
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(ErrorResponse.of(HttpStatus.INTERNAL_SERVER_ERROR, "KEY-NOT-FOUND", field, "설정에서 찾을 수 없는 키입니다: " + normalizedKey));
+        }
+
+        log.error("[TraceID: {}] Exception: field={}, code={}, message={}",
+                MDC.get("traceId"), field, detail.getCode(), detail.getMessage());
+
+        // 설정된 status 값을 바탕으로 HttpStatus 객체를 생성하며 유효하지 않을 경우 500 에러를 기본값으로 사용합니다.
+        HttpStatus status = HttpStatus.resolve(detail.getStatus());
+        if (status == null) {
+            log.warn("[TraceID: {}] Invalid HTTP Status Code in config: status={}, errorKey={}",
+                    MDC.get("traceId"), detail.getStatus(), normalizedKey);
+            status = HttpStatus.INTERNAL_SERVER_ERROR;
+        }
+
+        return ResponseEntity
+                .status(status)
+                .body(ErrorResponse.of(status, detail.getCode(), field, detail.getMessage()));
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/application-reservation-error.yml b/src/main/resources/application-reservation-error.yml
new file mode 100644
index 0000000..fcbd76f
--- /dev/null
+++ b/src/main/resources/application-reservation-error.yml
@@ -0,0 +1,49 @@
+error:
+  configs:
+    # 예약 정보 유효성
+    "[reservation.validation.invalid-input]":
+      code: "R001"
+      message: "입력값이 누락되었습니다."
+      status: 400
+
+    "[reservation.validation.invalid-status]":
+      code: "R002"
+      message: "잘못된 예약 상태입니다."
+      status: 400
+
+    "[reservation.validation.invalid-select-status]":
+      code: "R003"
+      message: "잘못된 선정 상태입니다."
+      status: 400
+
+    # 비즈니스 예외
+    "[reservation.exception.cannot-change-status]":
+      code: "R004"
+      message: "현재 상태에서는 변경할 수 없는 요청입니다."
+      status: 400
+
+    "[reservation.exception.access-denied]":
+      code: "R005"
+      message: "해당 요청에 대한 접근 권한이 없습니다."
+      status: 403
+
+    "[reservation.exception.not-found.reservation]":
+      code: "R006"
+      message: "해당 예약을 찾을 수 없습니다."
+      status: 404
+
+    # 중복 및 충돌
+    "[reservation.exception.conflict.duplicate-reservation]":
+      code: "R007"
+      message: "이미 해당 상품에 대한 예약 진행 내역이 존재합니다."
+      status: 409
+
+    "[reservation.exception.conflict.already-applied]":
+      code: "R008"
+      message: "이미 해당 예약에 신청한 후보자입니다."
+      status: 409
+
+    "[reservation.exception.conflict.already-exists]":
+      code: "R009"
+      message: "해당 상품으로 이미 생성된 예약 데이터가 존재합니다."
+      status: 409
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9383d81..56cf233 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,6 +8,9 @@ spring:
     name: reservation-service
   profiles:
     active: ${SPRING_PROFILES_ACTIVE:dev,kafka}
+    include:
+      - error
+      - reservation-error
 
   config:
     import:

From fd9d794cbf801299bceb5bacb19ff48aaa9a586d Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Fri, 8 May 2026 10:32:13 +0900
Subject: [PATCH 024/142] =?UTF-8?q?refactor=20:=20=EC=BB=A8=ED=8A=B8?=
 =?UTF-8?q?=EB=A1=A4=EB=9F=AC=20=EB=B0=8F=20=EC=84=9C=EB=B9=84=EC=8A=A4=20?=
 =?UTF-8?q?=EC=9D=91=EB=8B=B5=20=ED=86=B5=EC=9D=BC=ED=99=94=20(#38)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor : 컨트롤러 응답 통일화

* refactor : ReservationCreateCommand 수정

* refactor : confirmPayment에서 에러시 id값만 보이게 수정

* refactor : confirmTrade command로 받게 수정

* refactor : role -> roles로 변경
---
 .../dto/command/ReservationApplyCommand.java  |  13 +++
 .../command/ReservationConfirmCommand.java    |  13 +++
 .../dto/command/ReservationCreateCommand.java |  21 ++--
 .../dto/command/ReservationExpireCommand.java |  24 ++++
 .../dto/info/ReservationCandidateInfo.java    |  23 ++++
 ...celInfo.java => ReservationStateInfo.java} |   6 +-
 .../service/ReservationService.java           |  85 +++++++-------
 .../listener/ProductListener.java             |  12 +-
 .../listener/ReservationEventListener.java    |  15 ++-
 .../scheduler/ReservationExpiryScheduler.java |  47 ++++----
 .../controller/ReservationController.java     | 104 ++++++++++--------
 .../ReservationCandidateResponse.java         |  21 +---
 ...nse.java => ReservationStateResponse.java} |   8 +-
 13 files changed, 229 insertions(+), 163 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/command/ReservationApplyCommand.java
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/command/ReservationConfirmCommand.java
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/command/ReservationExpireCommand.java
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/info/ReservationCandidateInfo.java
 rename src/main/java/org/pgsg/reservation/application/dto/info/{ReservationCancelInfo.java => ReservationStateInfo.java} (78%)
 rename src/main/java/org/pgsg/reservation/presentation/dto/response/{ReservationCancelResponse.java => ReservationStateResponse.java} (67%)

diff --git a/src/main/java/org/pgsg/reservation/application/dto/command/ReservationApplyCommand.java b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationApplyCommand.java
new file mode 100644
index 0000000..6b44b2a
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationApplyCommand.java
@@ -0,0 +1,13 @@
+package org.pgsg.reservation.application.dto.command;
+
+import java.util.UUID;
+
+public record ReservationApplyCommand(
+        UUID reservationId,
+        UUID userId,
+        String nickname
+) {
+    public static ReservationApplyCommand of(UUID reservationId, UUID userId, String nickname) {
+        return new ReservationApplyCommand(reservationId, userId, nickname);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/command/ReservationConfirmCommand.java b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationConfirmCommand.java
new file mode 100644
index 0000000..0f418da
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationConfirmCommand.java
@@ -0,0 +1,13 @@
+package org.pgsg.reservation.application.dto.command;
+
+import java.util.UUID;
+
+public record ReservationConfirmCommand(
+    UUID reservationId,
+    UUID userId,
+    String role
+){
+    public static ReservationConfirmCommand of(UUID reservationId, UUID userId, String role) {
+        return new ReservationConfirmCommand(reservationId,userId,role);
+    }
+}
diff --git a/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java
index e6feb26..4cf92a4 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationCreateCommand.java
@@ -1,19 +1,14 @@
 package org.pgsg.reservation.application.dto.command;
 
-import lombok.Builder;
-import lombok.Getter;
-
 import java.time.LocalDateTime;
 import java.util.UUID;
 
-@Getter
-@Builder
-public class ReservationCreateCommand {
-    private UUID productId;
-
-    private UUID sellerId;      // 판매자 ID
-    private String sellerName;  // 판매자 이름 (또는 닉네임)
-    private String productName; // 상품명
-    private Integer price;      // 가격
-    private LocalDateTime endTime; // 종료 시간
+public record ReservationCreateCommand (
+        UUID productId,
+        UUID sellerId,
+        String sellerName,
+        String productName,
+        Integer price,
+        LocalDateTime endTime
+){
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/command/ReservationExpireCommand.java b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationExpireCommand.java
new file mode 100644
index 0000000..a0f5c92
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/command/ReservationExpireCommand.java
@@ -0,0 +1,24 @@
+package org.pgsg.reservation.application.dto.command;
+
+import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
+import org.pgsg.reservation.presentation.dto.request.ReservationAdminCancelRequest;
+
+import java.util.UUID;
+
+public record ReservationExpireCommand(
+        UUID reservationId,
+        UUID userId,
+        String role,
+        ReservationStatus targetStatus,
+        String reason
+) {
+    public static ReservationExpireCommand of(UUID reservationId, UUID userId, String role, ReservationAdminCancelRequest request) {
+        return new ReservationExpireCommand(
+                reservationId,
+                userId,
+                role,
+                request.targetStatus(),
+                request.reason()
+        );
+    }
+}
diff --git a/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCandidateInfo.java b/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCandidateInfo.java
new file mode 100644
index 0000000..79ba021
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCandidateInfo.java
@@ -0,0 +1,23 @@
+package org.pgsg.reservation.application.dto.info;
+
+import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public record ReservationCandidateInfo(
+        Long id,
+        UUID candidateId,
+        String candidateNickname,
+        String status,
+        LocalDateTime createdAt
+) {
+    public static ReservationCandidateInfo from(ReservationCandidate candidate) {
+        return new ReservationCandidateInfo(
+                candidate.getId(),
+                candidate.getCandidateId(),
+                candidate.getCandidateNickname(),
+                candidate.getStatus().name(),
+                candidate.getCreatedAt()
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCancelInfo.java b/src/main/java/org/pgsg/reservation/application/dto/info/ReservationStateInfo.java
similarity index 78%
rename from src/main/java/org/pgsg/reservation/application/dto/info/ReservationCancelInfo.java
rename to src/main/java/org/pgsg/reservation/application/dto/info/ReservationStateInfo.java
index 4cf88f1..d5a87f4 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCancelInfo.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/info/ReservationStateInfo.java
@@ -7,13 +7,13 @@
 import java.util.UUID;
 
 @Builder
-public record ReservationCancelInfo(
+public record ReservationStateInfo(
         UUID reservationId,
         ReservationStatus status,
         LocalDateTime updatedAt
 ) {
-    public static ReservationCancelInfo from(Reservation reservation) {
-        return ReservationCancelInfo.builder()
+    public static ReservationStateInfo from(Reservation reservation) {
+        return ReservationStateInfo.builder()
                 .reservationId(reservation.getId())
                 .status(reservation.getStatus())
                 .updatedAt(reservation.getModifiedAt())
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 315217c..2bde0f1 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -2,11 +2,10 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.pgsg.reservation.application.dto.command.ReservationCancelCommand;
-import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
+import org.pgsg.reservation.application.dto.command.*;
 import org.pgsg.reservation.application.dto.result.ReservationDetailResult;
 import org.pgsg.reservation.infrastructure.listener.dto.ReservationEventPublisher;
-import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
+import org.pgsg.reservation.application.dto.info.ReservationStateInfo;
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
 import org.pgsg.reservation.application.dto.result.ReservationSearchResult;
@@ -19,8 +18,7 @@
 import org.pgsg.reservation.domain.repository.ReservationHistoryRepository;
 import org.pgsg.reservation.domain.service.ReservationDomainService;
 import org.pgsg.reservation.domain.repository.ReservationRepository;
-import org.pgsg.reservation.presentation.dto.request.ReservationAdminCancelRequest;
-import org.pgsg.reservation.presentation.dto.response.ReservationCandidateResponse;
+import org.pgsg.reservation.application.dto.info.ReservationCandidateInfo;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -43,16 +41,16 @@ public class ReservationService {
     @Transactional
     public ReservationCreateResult createReservation(ReservationCreateCommand command) {
         try {
-            if (reservationRepository.existsByProductId(command.getProductId())) {
+            if (reservationRepository.existsByProductId(command.productId())) {
                 throw new ReservationException(ReservationErrorCode.ALREADY_EXISTS);
             }
 
-            SellerInfo seller = SellerInfo.of(command.getSellerId(), "test");
+            SellerInfo seller = SellerInfo.of(command.sellerId(), "test");
             ProductInfo product = ProductInfo.of(
-                    command.getProductId(),
-                    command.getPrice(),
-                    command.getProductName(),
-                    command.getEndTime()
+                    command.productId(),
+                    command.price(),
+                    command.productName(),
+                    command.endTime()
             );
 
             Reservation reservation = reservationDomainService.createReservation(
@@ -119,15 +117,15 @@ public ReservationDetailResult getReservationDetail(UUID reservationId, UUID use
 
     // 예약 신청
     @Transactional
-    public ReservationCandidateResponse applyReservation(UUID reservationId, UUID userId, String nickname) {
+    public ReservationCandidateInfo applyReservation(ReservationApplyCommand command) {
         Reservation savedReservation;
 
         // 예약 엔티티 조회
-        Reservation reservation = reservationRepository.findById(reservationId)
+        Reservation reservation = reservationRepository.findById(command.reservationId())
                 .orElseThrow(() -> new ReservationException(ReservationErrorCode.RESERVATION_NOT_FOUND));
 
         // 도메인 서비스를 통한 신청 로직 (후보자 생성 및 추가)
-        ReservationCandidate candidate = reservationDomainService.addCandidate(reservation, userId, nickname);
+        ReservationCandidate candidate = reservationDomainService.addCandidate(reservation, command.userId(), command.nickname());
 
         // 변경사항 저장과 예외 감시
         try {
@@ -141,16 +139,16 @@ public ReservationCandidateResponse applyReservation(UUID reservationId, UUID us
 
         // 방금 저장된 예약에서 추하한 후보자 찾기
         ReservationCandidate savedCandidate = savedReservation.getCandidates().stream()
-                .filter(c -> c.getCandidateId().equals(userId))
+                .filter(c -> c.getCandidateId().equals(command.userId()))
                 .findFirst()
                 .orElse(candidate);
 
-        return ReservationCandidateResponse.from(savedCandidate);
+        return ReservationCandidateInfo.from(savedCandidate);
     }
 
     // 구매자 취소 처리 로직
     @Transactional
-    public ReservationCancelInfo cancelByBuyer(ReservationCancelCommand command) {
+    public ReservationStateInfo cancelByBuyer(ReservationCancelCommand command) {
         Reservation reservation = findById(command.reservationId());
 
         ReservationHistory history = reservationDomainService.cancelByBuyer(
@@ -162,32 +160,32 @@ public ReservationCancelInfo cancelByBuyer(ReservationCancelCommand command) {
 
         reservationHistoryRepository.save(history);
 
-        return ReservationCancelInfo.from(reservation);
+        return ReservationStateInfo.from(reservation);
     }
 
     // 추후 결제 시스템 연동시 트리거 발동
     @Transactional
-    public ReservationCancelInfo confirmPayment(UUID reservationId, UUID userId, String role) {
-        Reservation reservation = findById(reservationId);
+    public ReservationStateInfo confirmPayment(ReservationConfirmCommand command) {
+        Reservation reservation = findById(command.reservationId());
 
         ReservationHistory history = reservationDomainService.confirmPayment(
                 reservation,
-                userId,
-                role
+                command.userId(),
+                command.role()
         );
 
         if (history != null) {
             reservationHistoryRepository.save(history);
         } else {
-            log.info("이미 결제 완료 처리된 예약입니다(중복 요청 무시): reservationId={}", reservationId);
+            log.info("이미 결제 완료 처리된 예약입니다(중복 요청 무시): reservationId={}", reservation.getId());
         }
 
-        return ReservationCancelInfo.from(reservation);
+        return ReservationStateInfo.from(reservation);
     }
 
     // 판매자 취소 로직
     @Transactional
-    public ReservationCancelInfo cancelBySeller(ReservationCancelCommand command) {
+    public ReservationStateInfo cancelBySeller(ReservationCancelCommand command) {
         Reservation reservation = findById(command.reservationId());
 
         ReservationHistory history = reservationDomainService.cancelBySeller(
@@ -199,57 +197,50 @@ public ReservationCancelInfo cancelBySeller(ReservationCancelCommand command) {
 
         reservationHistoryRepository.save(history);
 
-        return ReservationCancelInfo.from(reservation);
+        return ReservationStateInfo.from(reservation);
     }
 
     // 예약 만료
     @Transactional
-    public ReservationCancelInfo expireByAdmin(
-            UUID reservationId,
-            ReservationAdminCancelRequest request,
-            UUID adminId,
-            String role
-    ) {
-        Reservation reservation = findById(reservationId);
+    public ReservationStateInfo expireByAdmin(ReservationExpireCommand command) {
+        Reservation reservation = findById(command.reservationId());
 
         ReservationHistory history = reservationDomainService.expireByAdmin(
                 reservation,
-                adminId,
-                role,
-                request.targetStatus(),
-                request.reason()
+                command.userId(),
+                command.role(),
+                command.targetStatus(),
+                command.reason()
         );
 
         reservationHistoryRepository.save(history);
 
-        return ReservationCancelInfo.from(reservation);
+        return ReservationStateInfo.from(reservation);
     }
 
     // 예약 완료
     @Transactional
-    public ReservationCancelInfo completeReservation(UUID reservationId, UUID userId, String role) {
+    public ReservationStateInfo completeReservation(ReservationConfirmCommand command) {
         // 예약 엔티티 조회
-        Reservation reservation = findById(reservationId);
+        Reservation reservation = findById(command.reservationId());
 
-        ReservationHistory history = reservationDomainService.completeReservation(reservation,userId,role);
+        ReservationHistory history = reservationDomainService.completeReservation(reservation,command.userId(),command.role());
 
         reservationHistoryRepository.save(history);
-
         reservationEventPublisher.publishReservationCompleted(reservation);
 
-        return ReservationCancelInfo.from(reservation);
+        return ReservationStateInfo.from(reservation);
     }
 
     // 거래 완료
     @Transactional
-    public ReservationCancelInfo confirmTrade(UUID reservationId) {
+    public ReservationStateInfo confirmTrade(ReservationConfirmCommand command) {
 
-        Reservation reservation = reservationRepository.findById(reservationId)
-                .orElseThrow(() -> new ReservationException(ReservationErrorCode.RESERVATION_NOT_FOUND));
+        Reservation reservation = findById(command.reservationId());
 
         reservation.close();
 
-        return ReservationCancelInfo.from(reservation);
+        return ReservationStateInfo.from(reservation);
     }
 
     /**
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
index fa49343..6c80509 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
@@ -34,14 +34,10 @@ public void handleTimeDealEvent(ConsumerRecord<String, String> record) {
             log.info("타임딜 상품 생성 이벤트 수신 - Product ID: {}, Name: {}",
                     event.productId(), event.name());
 
-            ReservationCreateCommand command = ReservationCreateCommand.builder()
-                    .productId(event.productId())
-                    .productName(event.name())
-                    .price(event.price())
-                    .endTime(event.endTime())
-                    .sellerId(event.sellerId())
-                    .sellerName(event.sellerName())
-                    .build();
+            ReservationCreateCommand command = new ReservationCreateCommand(
+                    event.productId(), event.sellerId(), event.sellerName(),
+                    event.name(), event.price(), event.endTime()
+            );
 
             reservationService.createReservation(command);
         }catch (ReservationException e) {
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java
index 4e8341d..410b2ab 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java
@@ -5,11 +5,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.pgsg.common.messaging.annotation.IdempotentConsumer;
+import org.pgsg.reservation.application.dto.command.ReservationConfirmCommand;
 import org.pgsg.reservation.application.service.ReservationService;
 import org.pgsg.reservation.infrastructure.listener.dto.TradeCompletedEvent;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
+import java.util.UUID;
+
 
 @Slf4j
 @Component
@@ -19,6 +22,9 @@ public class ReservationEventListener {
     private final ReservationService reservationService;
     private final ObjectMapper objectMapper;
 
+    private static final UUID SYSTEM_ID = UUID.fromString("00000000-0000-0000-0000-000000000000");
+    private static final String SYSTEM_ROLE = "ADMIN";
+
     /**
      * 거래 서비스로부터 거래 완료 이벤트를 수신
      */
@@ -33,10 +39,15 @@ public void handleTradeCompleted(ConsumerRecord<String, String> record) {
             TradeCompletedEvent event = objectMapper.readValue(record.value(), TradeCompletedEvent.class);
             log.info("거래 완료 이벤트 수신 - Trade ID: {}, Reservation ID: {}",
                     event.tradeId(), event.reservationId());
-            reservationService.confirmTrade(
-                    event.reservationId()
+
+            ReservationConfirmCommand command = new ReservationConfirmCommand(
+                    event.reservationId(),
+                    SYSTEM_ID,
+                    SYSTEM_ROLE
             );
 
+            reservationService.confirmTrade(command);
+
             log.info("예약 확정 처리 성공 - Reservation ID: {}", event.reservationId());
         }catch (Exception e) {
             log.error("예약 확정 처리 실패 - Reservation ID: {}, Error: {}",
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java b/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java
index 602ec8d..b81730e 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java
@@ -2,11 +2,11 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.pgsg.reservation.application.dto.command.ReservationExpireCommand;
 import org.pgsg.reservation.application.service.ReservationService;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
 import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 import org.pgsg.reservation.domain.repository.ReservationRepository;
-import org.pgsg.reservation.presentation.dto.request.ReservationAdminCancelRequest;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -22,7 +22,7 @@ public class ReservationExpiryScheduler {
     private final ReservationService reservationService;
     private final ReservationRepository reservationRepository;
 
-    // 시스템 자동 처리를 위한 가상의 관리자 ID (추후 시스템 관리자 용 id 따로 추가)
+    // 시스템 자동 처리를 위한 가상의 관리자 정보
     private static final UUID SYSTEM_ID = UUID.fromString("00000000-0000-0000-0000-000000000000");
     private static final String SYSTEM_ROLE = "ADMIN";
 
@@ -34,6 +34,7 @@ public void autoExpireReservations() {
         LocalDateTime threshold = LocalDateTime.now().minusMinutes(60);
         List<ReservationStatus> targetStatuses = List.of(ReservationStatus.PENDING, ReservationStatus.PAID);
 
+        // 1시간 동안 상태 변화가 없는 예약들 조회
         List<Reservation> expiredReservations = reservationRepository.findAllByStatusInAndModifiedAtBefore(
                 targetStatuses,
                 threshold
@@ -45,15 +46,10 @@ public void autoExpireReservations() {
 
         for (Reservation reservation : expiredReservations) {
             try {
-                // 현재 예약 상태에 맞는 요청 객체를 생성
-                ReservationAdminCancelRequest request = createCancelRequest(reservation);
+                ReservationExpireCommand command = createExpireCommand(reservation);
+                reservationService.expireByAdmin(command);
 
-                reservationService.expireByAdmin(
-                        reservation.getId(),
-                        request,
-                        SYSTEM_ID,
-                        SYSTEM_ROLE
-                );
+                log.info("예약 자동 만료 완료 (ID: {}, 상태: {})", reservation.getId(), reservation.getStatus());
             } catch (Exception e) {
                 log.error("예약 자동 만료 처리 중 오류 발생 (ID: {}): {}", reservation.getId(), e.getMessage());
             }
@@ -63,23 +59,26 @@ public void autoExpireReservations() {
     /**
      * 예약 상태에 따른 적절한 취소 요청 객체를 생성하는 메서드
      */
-    private ReservationAdminCancelRequest createCancelRequest(Reservation reservation) {
+    private ReservationExpireCommand createExpireCommand(Reservation reservation) {
+        ReservationStatus targetStatus;
+        String reason;
 
-        //
         if (reservation.getStatus() == ReservationStatus.PENDING) {
-            return new ReservationAdminCancelRequest(
-                    ReservationStatus.CANCELLED_BY_BUYER,
-                    "결제 제한 시간(1시간) 초과로 인한 자동 취소"
-            );
+            targetStatus = ReservationStatus.CANCELLED_BY_BUYER;
+            reason = "결제 제한 시간(1시간) 초과로 인한 자동 취소";
+        } else if (reservation.getStatus() == ReservationStatus.PAID) {
+            targetStatus = ReservationStatus.CANCELLED_BY_SELLER;
+            reason = "채팅 수락 제한 시간(1시간) 초과로 인한 자동 취소";
+        } else {
+            throw new IllegalStateException("자동 만료 대상이 아닌 상태입니다: " + reservation.getStatus());
         }
 
-        // PAID 상태일 때
-        if (reservation.getStatus() == ReservationStatus.PAID) {
-            return new ReservationAdminCancelRequest(
-                    ReservationStatus.CANCELLED_BY_SELLER,
-                    "채팅 수락 제한 시간(1시간) 초과로 인한 자동 취소"
-            );
-        }
-        throw new IllegalStateException("자동 만료 대상이 아닌 상태입니다: " + reservation.getStatus());
+        return new ReservationExpireCommand(
+                reservation.getId(),
+                SYSTEM_ID,
+                SYSTEM_ROLE,
+                targetStatus,
+                reason
+        );
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index f125069..6946481 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -2,9 +2,9 @@
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.pgsg.reservation.application.dto.command.ReservationCancelCommand;
-import org.pgsg.reservation.application.dto.command.ReservationCreateCommand;
-import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
+import org.pgsg.reservation.application.dto.command.*;
+import org.pgsg.reservation.application.dto.info.ReservationCandidateInfo;
+import org.pgsg.reservation.application.dto.info.ReservationStateInfo;
 import org.pgsg.reservation.application.dto.query.ReservationSearchQuery;
 import org.pgsg.reservation.application.dto.result.ReservationCreateResult;
 import org.pgsg.reservation.application.dto.result.ReservationDetailResult;
@@ -33,14 +33,10 @@ public class ReservationController {
     public ReservationResponse createReservation(
             @Valid @RequestBody ReservationCreateRequest request
     ) {
-        ReservationCreateCommand command = ReservationCreateCommand.builder()
-                .productId(request.getProductId())
-                .productName(request.getProductName())
-                .price(request.getPrice())
-                .endTime(request.getEndTime())
-                .sellerId(request.getSellerId())
-                .sellerName(request.getSellerNickname())
-                .build();
+        ReservationCreateCommand command = new ReservationCreateCommand(
+                request.getProductId(), request.getSellerId(), request.getSellerNickname(),
+                request.getProductName(), request.getPrice(), request.getEndTime()
+        );
 
         ReservationCreateResult result = reservationService.createReservation(command);
 
@@ -51,7 +47,7 @@ public ReservationResponse createReservation(
     @GetMapping
     public ReservationPageResponse<ReservationResponse> getReservations(
             @RequestHeader("X-User-Id") UUID userId,
-            @RequestHeader("X-User-Role") String role,
+            @RequestHeader("X-User-Roles") String role,
             @ModelAttribute ReservationSearchRequest request,
             @PageableDefault(size = 10) Pageable pageable
     ) {
@@ -75,31 +71,34 @@ public ReservationPageResponse<ReservationResponse> getReservations(
     public ReservationDetailResponse getReservationDetail(
             @PathVariable UUID reservationId,
             @RequestHeader("X-User-Id") UUID userId,
-            @RequestHeader("X-User-Role") String role
+            @RequestHeader("X-User-Roles") String role
     ) {
-
         ReservationDetailResult result = reservationService.getReservationDetail(reservationId, userId, role);
 
         return ReservationDetailResponse.from(result);
     }
 
     // 예약 신청
-    @PostMapping("/{reservationId}")
+    @PatchMapping("/{reservationId}")
     public ReservationCandidateResponse applyReservation(
             @PathVariable UUID reservationId,
             @RequestHeader("X-User-Id") UUID userId,
             @RequestHeader("X-User-Nickname") String nickname
     ) {
-        return reservationService.applyReservation(reservationId, userId, nickname);
+        ReservationApplyCommand command = ReservationApplyCommand.of(reservationId, userId, nickname);
+
+        ReservationCandidateInfo info = reservationService.applyReservation(command);
+
+        return ReservationCandidateResponse.of(info, "예약 신청이 성공적으로 완료되었습니다.");
     }
 
     // 구매자 사유 취소 (구매자/관리자)
     @PatchMapping("/{reservationId}/cancel/buyer")
-    public ReservationCancelResponse cancelByBuyer(
+    public ReservationStateResponse cancelByBuyer(
             @PathVariable UUID reservationId,
             @RequestBody ReservationCancelRequest request,
             @RequestHeader("X-User-Id") UUID userId,
-            @RequestHeader("X-User-Role") String role
+            @RequestHeader("X-User-Roles") String role
     ) {
         ReservationCancelCommand command = ReservationCancelCommand.of(
                 reservationId,
@@ -108,32 +107,36 @@ public ReservationCancelResponse cancelByBuyer(
                 request.reason()
         );
 
-        ReservationCancelInfo info = reservationService.cancelByBuyer(command);
+        ReservationStateInfo info = reservationService.cancelByBuyer(command);
 
-        return ReservationCancelResponse.of(info, "구매자 사유 취소가 완료되었습니다.");
+        return ReservationStateResponse.of(info, "구매자 사유 취소가 완료되었습니다.");
     }
 
     // 결제 완료
     @PatchMapping("/{reservationId}/paymentconfirm")
-    public ReservationCancelInfo confirmPayment(
+    public ReservationStateResponse confirmPayment(
             @PathVariable UUID reservationId,
             @RequestHeader("X-User-Id") UUID userId,
-            @RequestHeader("X-User-Role") String role
+            @RequestHeader("X-User-Roles") String role
     ) {
-        return reservationService.confirmPayment(
+        ReservationConfirmCommand command = ReservationConfirmCommand.of(
                 reservationId,
                 userId,
                 role
         );
+
+        ReservationStateInfo info = reservationService.confirmPayment(command);
+
+        return ReservationStateResponse.of(info, "구매자의 결제 완료에 따라 예약 완료 처리가 완료되었습니다.");
     }
 
     // 판매자 사유로 인한 취소(판매자,관리자)
     @PatchMapping("/{reservationId}/cancel/seller")
-    public ReservationCancelResponse cancelBySeller(
+    public ReservationStateResponse cancelBySeller(
             @PathVariable UUID reservationId,
             @RequestBody ReservationCancelRequest request,
             @RequestHeader("X-User-Id") UUID userId,
-            @RequestHeader("X-User-Role") String role
+            @RequestHeader("X-User-Roles") String role
     ) {
         ReservationCancelCommand command = ReservationCancelCommand.of(
                 reservationId,
@@ -142,60 +145,69 @@ public ReservationCancelResponse cancelBySeller(
                 request.reason()
         );
 
-        ReservationCancelInfo info = reservationService.cancelBySeller(command);
+        ReservationStateInfo info = reservationService.cancelBySeller(command);
 
-        return ReservationCancelResponse.of(info, "판매자 사유 취소가 완료되었습니다.");
+        return ReservationStateResponse.of(info, "판매자 사유 취소가 완료되었습니다.");
     }
 
     // 예약 만료(관리자만 조정 가능)
     @PatchMapping("/{reservationId}/expire")
-    public ReservationCancelResponse expireByAdmin(
+    public ReservationStateResponse expireByAdmin(
             @PathVariable UUID reservationId,
             @RequestBody ReservationAdminCancelRequest request,
             @RequestHeader("X-User-Id") UUID userId,
-            @RequestHeader("X-User-Role") String role
+            @RequestHeader("X-User-Roles") String role
     ) {
-        ReservationCancelInfo info = reservationService.expireByAdmin(
+        ReservationExpireCommand command = ReservationExpireCommand.of(
                 reservationId,
-                request,
                 userId,
-                role
+                role,
+                request
         );
 
+        ReservationStateInfo info = reservationService.expireByAdmin(command);
+
         String message = (request.targetStatus() == ReservationStatus.CANCELLED_BY_BUYER)
                 ? "관리자 권한으로 구매자 사유 취소(승계) 처리가 완료되었습니다."
                 : "관리자 권한으로 판매자 사유 취소(종료) 처리가 완료되었습니다.";
 
-        return ReservationCancelResponse.of(info, message);
+        return ReservationStateResponse.of(info, message);
     }
 
     // 예약 완료
     @PatchMapping("/{reservationId}/complete")
-    public ReservationCancelResponse completeReservation(
+    public ReservationStateResponse completeReservation(
             @PathVariable UUID reservationId,
             @RequestHeader("X-User-Id") UUID userId,
-            @RequestHeader("X-User-Role") String role
+            @RequestHeader("X-User-Roles") String role
     ) {
-        ReservationCancelInfo info = reservationService.completeReservation(
-                reservationId,
-                userId,
-                role
-        );
 
-        return ReservationCancelResponse.of(info, "판매자 채팅 수락에 따라 예약 완료 처리가 완료되었습니다.");
+         ReservationConfirmCommand command = ReservationConfirmCommand.of(
+                 reservationId,
+                 userId,
+                 role
+         );
+
+        ReservationStateInfo info = reservationService.completeReservation(command);
+
+        return ReservationStateResponse.of(info, "판매자 채팅 수락에 따라 예약 완료 처리가 완료되었습니다.");
     }
 
     // 거래 완료
     @PatchMapping("/{reservationId}/tradeconfirm")
-    public ReservationCancelResponse confirmTrade(
+    public ReservationStateResponse confirmTrade(
             @PathVariable UUID reservationId,
             @RequestHeader("X-User-Id") UUID userId,
-            @RequestHeader("X-User-Role") String role
+            @RequestHeader("X-User-Roles") String role
     ) {
-        ReservationCancelInfo info = reservationService.confirmTrade(
-                reservationId
+        ReservationConfirmCommand command = ReservationConfirmCommand.of(
+                reservationId,
+                userId,
+                role
         );
 
-        return ReservationCancelResponse.of(info, "거래가 성공적으로 완료되어 확정 처리되었습니다.");
+        ReservationStateInfo info = reservationService.confirmTrade(command);
+
+        return ReservationStateResponse.of(info, "거래가 성공적으로 완료되어 확정 처리되었습니다.");
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCandidateResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCandidateResponse.java
index cf9abf3..046c7c3 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCandidateResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCandidateResponse.java
@@ -1,23 +1,12 @@
 package org.pgsg.reservation.presentation.dto.response;
 
-import org.pgsg.reservation.domain.model.reservationcandidate.ReservationCandidate;
-import java.time.LocalDateTime;
-import java.util.UUID;
+import org.pgsg.reservation.application.dto.info.ReservationCandidateInfo;
 
 public record ReservationCandidateResponse(
-        Long id,                        // 예약후보 고유 순번
-        UUID candidateId,              // 예약후보자 회원 ID
-        String candidateNickname,      // 예약후보자 닉네임
-        String status,                 // 선정 상태 (WAITING, SELECTED, CANCELLED)
-        LocalDateTime createdAt        // 예약후보 등록 일자
+        ReservationCandidateInfo info,
+        String message
 ) {
-    public static ReservationCandidateResponse from(ReservationCandidate candidate) {
-        return new ReservationCandidateResponse(
-                candidate.getId(),               // 엔티티의 id 필드 매핑
-                candidate.getCandidateId(),       // 후보자 UUID 매핑
-                candidate.getCandidateNickname(), // 후보자 닉네임 매핑
-                candidate.getStatus().name(),     // Enum을 String으로 변환
-                candidate.getCreatedAt()          // BaseEntity로부터 상속받은 생성일자
-        );
+    public static ReservationCandidateResponse of(ReservationCandidateInfo info, String message) {
+        return new ReservationCandidateResponse(info, message);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCancelResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationStateResponse.java
similarity index 67%
rename from src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCancelResponse.java
rename to src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationStateResponse.java
index 35ad3d8..b758550 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationCancelResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationStateResponse.java
@@ -1,21 +1,21 @@
 package org.pgsg.reservation.presentation.dto.response;
 
 import lombok.Builder;
-import org.pgsg.reservation.application.dto.info.ReservationCancelInfo;
+import org.pgsg.reservation.application.dto.info.ReservationStateInfo;
 import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 
 import java.time.LocalDateTime;
 import java.util.UUID;
 
 @Builder
-public record ReservationCancelResponse(
+public record ReservationStateResponse(
         UUID reservationId,
         ReservationStatus status,
         LocalDateTime updatedAt,
         String message
 ) {
-    public static ReservationCancelResponse of(ReservationCancelInfo info, String message) {
-        return ReservationCancelResponse.builder()
+    public static ReservationStateResponse of(ReservationStateInfo info, String message) {
+        return ReservationStateResponse.builder()
                 .reservationId(info.reservationId())
                 .status(info.status())
                 .updatedAt(info.updatedAt())

From 341d488df93a9905ee2e4bf32ff8412a47abe615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 8 May 2026 22:11:06 +0900
Subject: [PATCH 025/142] =?UTF-8?q?feat=20:=20gcp=20=EC=97=B0=EB=8F=99=20?=
 =?UTF-8?q?=EB=B0=8F=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .github/workflows/deploy.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..1b83de7
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,28 @@
+name: Deploy to GCP VM
+
+on:
+  push:
+    branches: [ "dev" ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          workload_identity_provider: '${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}'
+          service_account: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
+
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v2'
+
+      - name: 'Test Connection'
+        run: 'gcloud compute instances list'
\ No newline at end of file

From 3d183bdb0cd0aa35cc74db6e10109e89ca7ac728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 8 May 2026 23:08:05 +0900
Subject: [PATCH 026/142] =?UTF-8?q?fix=20:=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1b83de7..e0cc3d9 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,4 +25,10 @@ jobs:
         uses: 'google-github-actions/setup-gcloud@v2'
 
       - name: 'Test Connection'
-        run: 'gcloud compute instances list'
\ No newline at end of file
+        run: |
+            # 1. 인증된 계정 확인
+            gcloud auth list
+            # 2. 현재 설정된 프로젝트 확인
+            gcloud config set project pgsg-project
+            # 3. 상세 에러 로그와 함께 리스트 조회
+            gcloud compute instances list --verbosity=debug
\ No newline at end of file

From 9179baf6e0a25782e7a2c939a334bc7b1466eebe Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Sat, 9 May 2026 00:13:57 +0900
Subject: [PATCH 027/142] Update deploy.yml

---
 .github/workflows/deploy.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e0cc3d9..fc78224 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -26,9 +26,9 @@ jobs:
 
       - name: 'Test Connection'
         run: |
-            # 1. 인증된 계정 확인
+            # 인증된 계정 확인
             gcloud auth list
-            # 2. 현재 설정된 프로젝트 확인
+            # 현재 설정된 프로젝트 확인
             gcloud config set project pgsg-project
-            # 3. 상세 에러 로그와 함께 리스트 조회
-            gcloud compute instances list --verbosity=debug
\ No newline at end of file
+            # 상세 에러 로그와 함께 리스트 조회
+            gcloud compute instances list --verbosity=debug

From 60a588fdd61ec8082f7de0069b176635f6c1e38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sat, 9 May 2026 23:21:22 +0900
Subject: [PATCH 028/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml              | 20 +++++----
 .github/workflows/qodana_code_quality.yml | 40 ++++++++++++++++++
 qodana.yaml                               | 49 +++++++++++++++++++++++
 3 files changed, 102 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/qodana_code_quality.yml
 create mode 100644 qodana.yaml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index fc78224..429d4a3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -24,11 +24,17 @@ jobs:
       - name: 'Set up Cloud SDK'
         uses: 'google-github-actions/setup-gcloud@v2'
 
-      - name: 'Test Connection'
+      # 1. 서버로 파일 전송 (SCP)
+      - name: 'Copy files to VM'
         run: |
-            # 인증된 계정 확인
-            gcloud auth list
-            # 현재 설정된 프로젝트 확인
-            gcloud config set project pgsg-project
-            # 상세 에러 로그와 함께 리스트 조회
-            gcloud compute instances list --verbosity=debug
+          # --quiet를 넣어야 확인 질문 없이 자동으로 진행
+          gcloud compute scp --recurse ./* reservation-service:~/app --zone=asia-northeast3-a --quiet
+
+      # 2. 서버 접속 후 앱 재시작 (SSH)
+      - name: 'SSH and Start App'
+        run: |
+          gcloud compute ssh reservation-service --zone=asia-northeast3-a --quiet --command="
+            cd ~/app
+            # 여기서부터는 서버 안에서 실행될 명령어
+            ls -al
+          "
\ No newline at end of file
diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
new file mode 100644
index 0000000..e494c3f
--- /dev/null
+++ b/.github/workflows/qodana_code_quality.yml
@@ -0,0 +1,40 @@
+#-------------------------------------------------------------------------------#
+#            Discover all capabilities of Qodana in our documentation           #
+#             https://www.jetbrains.com/help/qodana/about-qodana.html           #
+#-------------------------------------------------------------------------------#
+
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - dev
+      - main
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+      checks: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2025.3
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+        with:
+          # When pr-mode is set to true, Qodana analyzes only the files that have been changed
+          pr-mode: false
+          use-caches: true
+          post-pr-comment: true
+          use-annotations: true
+          # Upload Qodana results (SARIF, other artifacts, logs) as an artifact to the job
+          upload-result: false
+          # quick-fixes available in Ultimate and Ultimate Plus plans
+          push-fixes: 'none'
\ No newline at end of file
diff --git a/qodana.yaml b/qodana.yaml
new file mode 100644
index 0000000..9f4d242
--- /dev/null
+++ b/qodana.yaml
@@ -0,0 +1,49 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+
+#################################################################################
+#              WARNING: Do not store sensitive information in this file,        #
+#               as its contents will be included in the Qodana report.          #
+#################################################################################
+version: "1.0"
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+projectJDK: "25" #(Applied in CI/CD pipeline)
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+# Quality gate. Will fail the CI/CD pipeline if any condition is not met
+# severityThresholds - configures maximum thresholds for different problem severities
+# testCoverageThresholds - configures minimum code coverage on a whole project and newly added code
+# Code Coverage is available in Ultimate and Ultimate Plus plans
+#failureConditions:
+#  severityThresholds:
+#    any: 15
+#    critical: 5
+#  testCoverageThresholds:
+#    fresh: 70
+#    total: 50
+  
+#Qodana supports other languages, for example, Python, JavaScript, TypeScript, Go, C#, PHP
+#For all supported languages see https://www.jetbrains.com/help/qodana/linters.html
+linter: jetbrains/qodana-jvm-community:2025.3

From 0f49409b43d380d62ea851e145d2416870b0d165 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Sat, 9 May 2026 23:24:05 +0900
Subject: [PATCH 029/142] Delete .github/workflows/qodana_code_quality.yml

---
 .github/workflows/qodana_code_quality.yml | 40 -----------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 .github/workflows/qodana_code_quality.yml

diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
deleted file mode 100644
index e494c3f..0000000
--- a/.github/workflows/qodana_code_quality.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-#-------------------------------------------------------------------------------#
-#            Discover all capabilities of Qodana in our documentation           #
-#             https://www.jetbrains.com/help/qodana/about-qodana.html           #
-#-------------------------------------------------------------------------------#
-
-name: Qodana
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      - dev
-      - main
-
-jobs:
-  qodana:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      checks: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2025.3
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
-        with:
-          # When pr-mode is set to true, Qodana analyzes only the files that have been changed
-          pr-mode: false
-          use-caches: true
-          post-pr-comment: true
-          use-annotations: true
-          # Upload Qodana results (SARIF, other artifacts, logs) as an artifact to the job
-          upload-result: false
-          # quick-fixes available in Ultimate and Ultimate Plus plans
-          push-fixes: 'none'
\ No newline at end of file

From e704b9ce026fda126884c7b0f8186b968984016b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sat, 9 May 2026 23:27:29 +0900
Subject: [PATCH 030/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B822?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 429d4a3..94b740e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,6 +15,21 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      # 1. Java 설정 (프로젝트에 맞는 버전으로 설정)
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: gradle
+
+      # 2. Gradle 빌드 (jar 파일 생성)
+      - name: Build with Gradle
+        run: |
+          chmod +x ./gradlew
+          ./gradlew clean bootJar
+
+      # 3. GCP 인증
       - id: 'auth'
         uses: 'google-github-actions/auth@v2'
         with:
@@ -24,17 +39,15 @@ jobs:
       - name: 'Set up Cloud SDK'
         uses: 'google-github-actions/setup-gcloud@v2'
 
-      # 1. 서버로 파일 전송 (SCP)
-      - name: 'Copy files to VM'
+      # 4. 빌드된 jar 파일만 서버로 전송
+      - name: 'Copy Jar to VM'
         run: |
-          # --quiet를 넣어야 확인 질문 없이 자동으로 진행
-          gcloud compute scp --recurse ./* reservation-service:~/app --zone=asia-northeast3-a --quiet
+          gcloud compute scp build/libs/*.jar reservation-service:~/app/app.jar --zone=asia-northeast3-a --quiet
 
-      # 2. 서버 접속 후 앱 재시작 (SSH)
+      # 5. 서버에서 앱 실행
       - name: 'SSH and Start App'
         run: |
           gcloud compute ssh reservation-service --zone=asia-northeast3-a --quiet --command="
-            cd ~/app
-            # 여기서부터는 서버 안에서 실행될 명령어
-            ls -al
+            pgrep java | xargs -r kill -9
+            nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
           "
\ No newline at end of file

From e638d2792c5e592a3591b633c02edf2b93822bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sat, 9 May 2026 23:32:29 +0900
Subject: [PATCH 031/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8333?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 94b740e..674c2d0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # 1. Java 설정 (프로젝트에 맞는 버전으로 설정)
+      # Java 설정 (프로젝트에 맞는 버전으로 설정)
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -23,13 +23,13 @@ jobs:
           distribution: 'temurin'
           cache: gradle
 
-      # 2. Gradle 빌드 (jar 파일 생성)
+      # Gradle 빌드 (jar 파일 생성)
       - name: Build with Gradle
         run: |
           chmod +x ./gradlew
           ./gradlew clean bootJar
 
-      # 3. GCP 인증
+      # GCP 인증
       - id: 'auth'
         uses: 'google-github-actions/auth@v2'
         with:
@@ -39,15 +39,23 @@ jobs:
       - name: 'Set up Cloud SDK'
         uses: 'google-github-actions/setup-gcloud@v2'
 
-      # 4. 빌드된 jar 파일만 서버로 전송
+      # 빌드된 jar 파일만 서버로 전송
       - name: 'Copy Jar to VM'
         run: |
           gcloud compute scp build/libs/*.jar reservation-service:~/app/app.jar --zone=asia-northeast3-a --quiet
 
-      # 5. 서버에서 앱 실행
+      # 서버에서 앱 실행
       - name: 'SSH and Start App'
         run: |
-          gcloud compute ssh reservation-service --zone=asia-northeast3-a --quiet --command="
-            pgrep java | xargs -r kill -9
-            nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
-          "
\ No newline at end of file
+            gcloud compute ssh reservation-service --zone=asia-northeast3-a --quiet --command="
+              mkdir -p ~/app
+              # 기존에 실행 중인 Java 프로세스 종료 (있으면 죽이고 없으면 통과)
+              pgrep java | xargs -r kill -9
+            
+              # 새 jar 파일 실행 (로그는 log.txt에 저장)
+              nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
+            
+              # 실행 확인 (3초 뒤에 프로세스 떠있는지 확인)
+              sleep 3
+              ps -ef | grep java
+            "
\ No newline at end of file

From c21dce3519dd6ca39b5ff55d8da86385bfcf2873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sat, 9 May 2026 23:36:21 +0900
Subject: [PATCH 032/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(github=20packages=20=EC=9D=B8=EC=A6=9D=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 674c2d0..ae27bfd 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -26,8 +26,12 @@ jobs:
       # Gradle 빌드 (jar 파일 생성)
       - name: Build with Gradle
         run: |
-          chmod +x ./gradlew
-          ./gradlew clean bootJar
+            chmod +x ./gradlew
+            ./gradlew clean bootJar
+          env:
+            # GitHub Packages 인증을 위해 토큰을 넘겨줍니다.
+            USERNAME: ${{ github.actor }}
+            TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       # GCP 인증
       - id: 'auth'

From 51bc7bb6f35b40135b087f32420f087fe8ec4746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sat, 9 May 2026 23:39:19 +0900
Subject: [PATCH 033/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(github=20packages=20=EC=9D=B8=EC=A6=9D=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ae27bfd..14897ea 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,13 +25,13 @@ jobs:
 
       # Gradle 빌드 (jar 파일 생성)
       - name: Build with Gradle
+        env:
+          # GitHub Packages 인증을 위해 토큰을 넘겨줍니다.
+          GPR_USER: ${{ github.actor }}
+          GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-            chmod +x ./gradlew
-            ./gradlew clean bootJar
-          env:
-            # GitHub Packages 인증을 위해 토큰을 넘겨줍니다.
-            USERNAME: ${{ github.actor }}
-            TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          chmod +x ./gradlew
+          ./gradlew clean bootJar
 
       # GCP 인증
       - id: 'auth'

From 0992e0e7aa49c4fa34a5cb54318dcf0b2c4ea871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sat, 9 May 2026 23:50:00 +0900
Subject: [PATCH 034/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(=EB=A9=94=ED=83=80=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20username=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 14897ea..a80f96a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -46,20 +46,20 @@ jobs:
       # 빌드된 jar 파일만 서버로 전송
       - name: 'Copy Jar to VM'
         run: |
-          gcloud compute scp build/libs/*.jar reservation-service:~/app/app.jar --zone=asia-northeast3-a --quiet
+          gcloud compute scp build/libs/*.jar zsx1397@reservation-service:~/app/app.jar --zone=asia-northeast3-a --quiet
 
       # 서버에서 앱 실행
       - name: 'SSH and Start App'
         run: |
-            gcloud compute ssh reservation-service --zone=asia-northeast3-a --quiet --command="
-              mkdir -p ~/app
-              # 기존에 실행 중인 Java 프로세스 종료 (있으면 죽이고 없으면 통과)
-              pgrep java | xargs -r kill -9
+          gcloud compute ssh zsx1397@reservation-service --zone=asia-northeast3-a --quiet --command="
+            mkdir -p ~/app
+            # 기존에 실행 중인 Java 프로세스 종료 (있으면 죽이고 없으면 통과)
+            pgrep java | xargs -r kill -9
+          
+            # 새 jar 파일 실행 (로그는 log.txt에 저장)
+            nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
             
-              # 새 jar 파일 실행 (로그는 log.txt에 저장)
-              nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
-            
-              # 실행 확인 (3초 뒤에 프로세스 떠있는지 확인)
-              sleep 3
-              ps -ef | grep java
-            "
\ No newline at end of file
+            # 실행 확인 (3초 뒤에 프로세스 떠있는지 확인)
+            sleep 3
+            ps -ef | grep java
+          "
\ No newline at end of file

From e8a5b640fc22a5e577a2406acfe0509376b18270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 00:15:23 +0900
Subject: [PATCH 035/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(github=20=EA=B6=8C=ED=95=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=ED=85=8C=EC=8A=A4=ED=8A=B8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a80f96a..434a263 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -46,12 +46,11 @@ jobs:
       # 빌드된 jar 파일만 서버로 전송
       - name: 'Copy Jar to VM'
         run: |
-          gcloud compute scp build/libs/*.jar zsx1397@reservation-service:~/app/app.jar --zone=asia-northeast3-a --quiet
-
+          gcloud compute scp build/libs/*.jar reservation-service:app.jar --zone=asia-northeast3-a --quiet
       # 서버에서 앱 실행
       - name: 'SSH and Start App'
         run: |
-          gcloud compute ssh zsx1397@reservation-service --zone=asia-northeast3-a --quiet --command="
+          gcloud compute ssh reservation-service --zone=asia-northeast3-a --quiet --command="
             mkdir -p ~/app
             # 기존에 실행 중인 Java 프로세스 종료 (있으면 죽이고 없으면 통과)
             pgrep java | xargs -r kill -9

From 48627c861eae3de53dc2946e5b366987c94f8bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 00:23:20 +0900
Subject: [PATCH 036/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(github=20=EA=B6=8C=ED=95=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=ED=9B=84=20=ED=85=8C=EC=8A=A4=ED=8A=B8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 434a263..f694d11 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -46,6 +46,7 @@ jobs:
       # 빌드된 jar 파일만 서버로 전송
       - name: 'Copy Jar to VM'
         run: |
+          sleep 10
           gcloud compute scp build/libs/*.jar reservation-service:app.jar --zone=asia-northeast3-a --quiet
       # 서버에서 앱 실행
       - name: 'SSH and Start App'

From 2ae61bc5297757799ae30bfed1cbaa26cb51f69e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 00:30:53 +0900
Subject: [PATCH 037/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(=EB=B0=A9=ED=99=94=EB=B2=BD=20=EA=B7=9C?=
 =?UTF-8?q?=EC=B9=99=20=EC=B6=94=EA=B0=80=20=ED=9B=84=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f694d11..003cb0f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -47,11 +47,20 @@ jobs:
       - name: 'Copy Jar to VM'
         run: |
           sleep 10
-          gcloud compute scp build/libs/*.jar reservation-service:app.jar --zone=asia-northeast3-a --quiet
+          gcloud compute scp build/libs/*.jar reservation-service:~/app.jar \
+            --zone=asia-northeast3-a \
+            --tunnel-through-iap \
+            --quiet
       # 서버에서 앱 실행
       - name: 'SSH and Start App'
         run: |
-          gcloud compute ssh reservation-service --zone=asia-northeast3-a --quiet --command="
+          gcloud compute ssh reservation-service \
+            --zone=asia-northeast3-a \
+            --tunnel-through-iap \
+            --quiet \
+            --command="
+              mkdir -p ~/app
+              mv ~/app.jar ~/app/app.jar 2>/dev/null || true
             mkdir -p ~/app
             # 기존에 실행 중인 Java 프로세스 종료 (있으면 죽이고 없으면 통과)
             pgrep java | xargs -r kill -9
@@ -60,6 +69,6 @@ jobs:
             nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
             
             # 실행 확인 (3초 뒤에 프로세스 떠있는지 확인)
-            sleep 3
+            sleep 5
             ps -ef | grep java
           "
\ No newline at end of file

From 1a125183e38ef5e6112d5e3aa6238cb4257424a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 00:37:57 +0900
Subject: [PATCH 038/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(SSH=20=ED=82=A4=20=EC=A7=81=EC=A0=91=20?=
 =?UTF-8?q?=EB=B0=9C=EA=B8=89)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 003cb0f..32fc53c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # Java 설정 (프로젝트에 맞는 버전으로 설정)
+      # Java 설정
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -23,10 +23,9 @@ jobs:
           distribution: 'temurin'
           cache: gradle
 
-      # Gradle 빌드 (jar 파일 생성)
+      # Gradle 빌드
       - name: Build with Gradle
         env:
-          # GitHub Packages 인증을 위해 토큰을 넘겨줍니다.
           GPR_USER: ${{ github.actor }}
           GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -43,15 +42,16 @@ jobs:
       - name: 'Set up Cloud SDK'
         uses: 'google-github-actions/setup-gcloud@v2'
 
-      # 빌드된 jar 파일만 서버로 전송
+      # 빌드된 jar 파일 전송 (IAP 터널 사용)
       - name: 'Copy Jar to VM'
         run: |
-          sleep 10
+          sleep 15
           gcloud compute scp build/libs/*.jar reservation-service:~/app.jar \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --quiet
-      # 서버에서 앱 실행
+
+      # 서버에서 앱 실행 (명령어 최적화)
       - name: 'SSH and Start App'
         run: |
           gcloud compute ssh reservation-service \
@@ -60,15 +60,16 @@ jobs:
             --quiet \
             --command="
               mkdir -p ~/app
+              # 전송된 파일을 app 폴더로 이동 (이미 있다면 덮어쓰기)
               mv ~/app.jar ~/app/app.jar 2>/dev/null || true
-            mkdir -p ~/app
-            # 기존에 실행 중인 Java 프로세스 종료 (있으면 죽이고 없으면 통과)
-            pgrep java | xargs -r kill -9
           
-            # 새 jar 파일 실행 (로그는 log.txt에 저장)
-            nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
-            
-            # 실행 확인 (3초 뒤에 프로세스 떠있는지 확인)
-            sleep 5
-            ps -ef | grep java
+              # 기존 실행 중인 프로세스 종료
+              pgrep java | xargs -r kill -9 || true
+          
+              # 새 jar 파일 실행
+              nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
+          
+              # 실행 확인을 위해 5초 대기 후 프로세스 목록 출력
+              sleep 5
+              ps -ef | grep java | grep -v grep
           "
\ No newline at end of file

From cf96deafbb03e5c02dde4020887052aaf48fd3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 00:43:23 +0900
Subject: [PATCH 039/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(SSH=20=ED=82=A4=20=EB=93=B1=EB=A1=9D=20?=
 =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20=EC=9E=91=EC=84=B1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 128 ++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 32fc53c..b8c7776 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,75 +1,77 @@
-name: Deploy to GCP VM
+  cat ~/.ssh/deploy_key.pub >> ~/.ssh/authorized_keys
+    chmod 600 ~/.ssh/authorized_keys
+    ```
+  3.  **비밀키(Private Key) 내용 확인 및 복사**:
+    ```bash
+    cat ~/.ssh/deploy_key
+    ```
+    *   `-----BEGIN OPENSSH PRIVATE KEY-----`부터 끝까지 **전체 내용**을 복사해두세요.
 
-on:
-  push:
-    branches: [ "dev" ]
+  ---
+  
+  ### 2단계: GitHub에 열쇠 등록
+    1.  민성님의 GitHub 레포지토리로 가서 **Settings** > **Secrets and variables** > **Actions**를 클릭합니다.
+    2.  **New repository secret**을 누르고 아래 내용을 저장합니다.
+    *   **Name**: `SSH_PRIVATE_KEY`
+    *   **Secret**: 위에서 복사한 열쇠 내용 전체
 
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
+  ---
+  
+  ### 3단계: 수정된 `deploy.yml` (직접 접속 방식)
+    `gcloud compute scp` 대신 일반 `scp` 명령어를 사용하여 접속합니다. 이 방식은 경로와 권한 문제가 발생하지 않습니다.
+    
+    ```yaml
+  name: Deploy to GCP VM
 
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+  on:
+    push:
+      branches: [ "dev" ]
 
-      # Java 설정
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-          cache: gradle
+  jobs:
+    deploy:
+      runs-on: ubuntu-latest
 
-      # Gradle 빌드
-      - name: Build with Gradle
-        env:
-          GPR_USER: ${{ github.actor }}
-          GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          chmod +x ./gradlew
-          ./gradlew clean bootJar
+      steps:
+        - name: Checkout code
+          uses: actions/checkout@v4
 
-      # GCP 인증
-      - id: 'auth'
-        uses: 'google-github-actions/auth@v2'
-        with:
-          workload_identity_provider: '${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}'
-          service_account: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
+        - name: Set up JDK 21
+          uses: actions/setup-java@v4
+          with:
+            java-version: '21'
+            distribution: 'temurin'
+            cache: gradle
 
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v2'
+        - name: Build with Gradle
+          env:
+            GPR_USER: ${{ github.actor }}
+            GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          run: |
+            chmod +x ./gradlew
+            ./gradlew clean bootJar
 
-      # 빌드된 jar 파일 전송 (IAP 터널 사용)
-      - name: 'Copy Jar to VM'
-        run: |
-          sleep 15
-          gcloud compute scp build/libs/*.jar reservation-service:~/app.jar \
-            --zone=asia-northeast3-a \
-            --tunnel-through-iap \
-            --quiet
+        # 직접 SSH 접속을 위한 키 설정
+        - name: Setup SSH
+          run: |
+            mkdir -p ~/.ssh
+            echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+            chmod 600 ~/.ssh/id_rsa
+            # 서버의 지문을 미리 인식시킴 (34.64.247.238 부분은 민성님의 서버 IP가 맞는지 확인!)
+            ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
 
-      # 서버에서 앱 실행 (명령어 최적화)
-      - name: 'SSH and Start App'
-        run: |
-          gcloud compute ssh reservation-service \
-            --zone=asia-northeast3-a \
-            --tunnel-through-iap \
-            --quiet \
-            --command="
+        # SCP로 파일 전송
+        - name: 'Copy Jar to VM'
+          run: |
+            scp -i ~/.ssh/id_rsa build/libs/*.jar zsx1397@34.64.247.238:~/app.jar
+
+        # SSH로 명령 실행
+        - name: 'SSH and Start App'
+          run: |
+            ssh -i ~/.ssh/id_rsa zsx1397@34.64.247.238 "
               mkdir -p ~/app
-              # 전송된 파일을 app 폴더로 이동 (이미 있다면 덮어쓰기)
-              mv ~/app.jar ~/app/app.jar 2>/dev/null || true
-          
-              # 기존 실행 중인 프로세스 종료
-              pgrep java | xargs -r kill -9 || true
-          
-              # 새 jar 파일 실행
+              mv ~/app.jar ~/app/app.jar
+              pgrep java | xargs -r kill -9
               nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
-          
-              # 실행 확인을 위해 5초 대기 후 프로세스 목록 출력
               sleep 5
-              ps -ef | grep java | grep -v grep
-          "
\ No newline at end of file
+              ps -ef | grep java
+            "
\ No newline at end of file

From 39a2974c884e5b3e5023121ed5d432b8673531a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 00:43:53 +0900
Subject: [PATCH 040/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(=EC=98=A4=EB=A5=98=20=EB=82=B4=EC=9A=A9=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 131 +++++++++++++++--------------------
 1 file changed, 54 insertions(+), 77 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b8c7776..3081891 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,77 +1,54 @@
-  cat ~/.ssh/deploy_key.pub >> ~/.ssh/authorized_keys
-    chmod 600 ~/.ssh/authorized_keys
-    ```
-  3.  **비밀키(Private Key) 내용 확인 및 복사**:
-    ```bash
-    cat ~/.ssh/deploy_key
-    ```
-    *   `-----BEGIN OPENSSH PRIVATE KEY-----`부터 끝까지 **전체 내용**을 복사해두세요.
-
-  ---
-  
-  ### 2단계: GitHub에 열쇠 등록
-    1.  민성님의 GitHub 레포지토리로 가서 **Settings** > **Secrets and variables** > **Actions**를 클릭합니다.
-    2.  **New repository secret**을 누르고 아래 내용을 저장합니다.
-    *   **Name**: `SSH_PRIVATE_KEY`
-    *   **Secret**: 위에서 복사한 열쇠 내용 전체
-
-  ---
-  
-  ### 3단계: 수정된 `deploy.yml` (직접 접속 방식)
-    `gcloud compute scp` 대신 일반 `scp` 명령어를 사용하여 접속합니다. 이 방식은 경로와 권한 문제가 발생하지 않습니다.
-    
-    ```yaml
-  name: Deploy to GCP VM
-
-  on:
-    push:
-      branches: [ "dev" ]
-
-  jobs:
-    deploy:
-      runs-on: ubuntu-latest
-
-      steps:
-        - name: Checkout code
-          uses: actions/checkout@v4
-
-        - name: Set up JDK 21
-          uses: actions/setup-java@v4
-          with:
-            java-version: '21'
-            distribution: 'temurin'
-            cache: gradle
-
-        - name: Build with Gradle
-          env:
-            GPR_USER: ${{ github.actor }}
-            GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          run: |
-            chmod +x ./gradlew
-            ./gradlew clean bootJar
-
-        # 직접 SSH 접속을 위한 키 설정
-        - name: Setup SSH
-          run: |
-            mkdir -p ~/.ssh
-            echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-            chmod 600 ~/.ssh/id_rsa
-            # 서버의 지문을 미리 인식시킴 (34.64.247.238 부분은 민성님의 서버 IP가 맞는지 확인!)
-            ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
-
-        # SCP로 파일 전송
-        - name: 'Copy Jar to VM'
-          run: |
-            scp -i ~/.ssh/id_rsa build/libs/*.jar zsx1397@34.64.247.238:~/app.jar
-
-        # SSH로 명령 실행
-        - name: 'SSH and Start App'
-          run: |
-            ssh -i ~/.ssh/id_rsa zsx1397@34.64.247.238 "
-              mkdir -p ~/app
-              mv ~/app.jar ~/app/app.jar
-              pgrep java | xargs -r kill -9
-              nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
-              sleep 5
-              ps -ef | grep java
-            "
\ No newline at end of file
+name: Deploy to GCP VM
+
+on:
+  push:
+    branches: [ "dev" ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Build with Gradle
+        env:
+          GPR_USER: ${{ github.actor }}
+          GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          chmod +x ./gradlew
+          ./gradlew clean bootJar
+
+      # 직접 SSH 접속을 위한 키 설정
+      - name: Setup SSH
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          # 서버의 지문을 미리 인식시킴 (34.64.247.238 부분은 민성님의 서버 IP가 맞는지 확인!)
+          ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
+
+      # SCP로 파일 전송 (zsx1397 계정 사용)
+      - name: 'Copy Jar to VM'
+        run: |
+          scp -i ~/.ssh/id_rsa build/libs/*.jar zsx1397@34.64.247.238:~/app.jar
+
+      # SSH로 명령 실행
+      - name: 'SSH and Start App'
+        run: |
+          ssh -i ~/.ssh/id_rsa zsx1397@34.64.247.238 "
+            mkdir -p ~/app
+            mv ~/app.jar ~/app/app.jar
+            pgrep java | xargs -r kill -9
+            nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
+            sleep 5
+            ps -ef | grep java
+          "
\ No newline at end of file

From 07fbf4e53f46af7a4250cb98019bf3128dec4c33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 00:46:39 +0900
Subject: [PATCH 041/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(GPR=5FUSER=20=EC=98=A4=EB=A5=98=20=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=20=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 57 ++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 3081891..a25f171 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,11 +7,15 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      # Java 설정
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -19,6 +23,7 @@ jobs:
           distribution: 'temurin'
           cache: gradle
 
+      # Gradle 빌드 (GPR 인증 포함)
       - name: Build with Gradle
         env:
           GPR_USER: ${{ github.actor }}
@@ -27,28 +32,44 @@ jobs:
           chmod +x ./gradlew
           ./gradlew clean bootJar
 
-      # 직접 SSH 접속을 위한 키 설정
-      - name: Setup SSH
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          # 서버의 지문을 미리 인식시킴 (34.64.247.238 부분은 민성님의 서버 IP가 맞는지 확인!)
-          ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
+      # GCP 인증
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          workload_identity_provider: '${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}'
+          service_account: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
+
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v2'
 
-      # SCP로 파일 전송 (zsx1397 계정 사용)
+      # 빌드된 jar 파일 전송 (IAP 터널 사용)
       - name: 'Copy Jar to VM'
         run: |
-          scp -i ~/.ssh/id_rsa build/libs/*.jar zsx1397@34.64.247.238:~/app.jar
+          sleep 15
+          gcloud compute scp build/libs/*.jar reservation-service:~/app.jar \
+            --zone=asia-northeast3-a \
+            --tunnel-through-iap \
+            --quiet
 
-      # SSH로 명령 실행
+      # 서버에서 앱 실행
       - name: 'SSH and Start App'
         run: |
-          ssh -i ~/.ssh/id_rsa zsx1397@34.64.247.238 "
-            mkdir -p ~/app
-            mv ~/app.jar ~/app/app.jar
-            pgrep java | xargs -r kill -9
-            nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
-            sleep 5
-            ps -ef | grep java
+          gcloud compute ssh reservation-service \
+            --zone=asia-northeast3-a \
+            --tunnel-through-iap \
+            --quiet \
+            --command="
+              mkdir -p ~/app
+              # 전송된 파일을 전용 폴더로 이동
+              mv ~/app.jar ~/app/app.jar 2>/dev/null || true
+          
+              # 기존 Java 프로세스 종료
+              pgrep java | xargs -r kill -9 || true
+          
+              # 새 버전 실행
+              nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
+          
+              # 5초 뒤 실행 상태 확인
+              sleep 5
+              ps -ef | grep java | grep -v grep
           "
\ No newline at end of file

From 02c5391ca855a1c5fc9fc492b86c5fbe6ec0f5ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 00:56:51 +0900
Subject: [PATCH 042/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(env=EC=97=90=20=EC=82=AC=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EA=B3=A0=20-P=20=EC=98=B5=EC=85=98?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=A7=81=EC=A0=91=20=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a25f171..08c2772 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # Java 설정
+      # Java 설정 및 빌드
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -23,14 +23,12 @@ jobs:
           distribution: 'temurin'
           cache: gradle
 
-      # Gradle 빌드 (GPR 인증 포함)
       - name: Build with Gradle
-        env:
-          GPR_USER: ${{ github.actor }}
-          GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           chmod +x ./gradlew
-          ./gradlew clean bootJar
+          ./gradlew clean bootJar \
+          -Pgpr.user=${{ github.actor }} \
+          -Pgpr.key=${{ secrets.GITHUB_TOKEN }}
 
       # GCP 인증
       - id: 'auth'
@@ -42,11 +40,11 @@ jobs:
       - name: 'Set up Cloud SDK'
         uses: 'google-github-actions/setup-gcloud@v2'
 
-      # 빌드된 jar 파일 전송 (IAP 터널 사용)
+      # 빌드된 jar 파일 전송 (계정 명시 + IAP 터널)
       - name: 'Copy Jar to VM'
         run: |
           sleep 15
-          gcloud compute scp build/libs/*.jar reservation-service:~/app.jar \
+          gcloud compute scp build/libs/*.jar zsx1397@reservation-service:~/app.jar \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --quiet
@@ -54,22 +52,15 @@ jobs:
       # 서버에서 앱 실행
       - name: 'SSH and Start App'
         run: |
-          gcloud compute ssh reservation-service \
+          gcloud compute ssh zsx1397@reservation-service \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --quiet \
             --command="
               mkdir -p ~/app
-              # 전송된 파일을 전용 폴더로 이동
               mv ~/app.jar ~/app/app.jar 2>/dev/null || true
-          
-              # 기존 Java 프로세스 종료
               pgrep java | xargs -r kill -9 || true
-          
-              # 새 버전 실행
               nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
-          
-              # 5초 뒤 실행 상태 확인
               sleep 5
               ps -ef | grep java | grep -v grep
           "
\ No newline at end of file

From 25a11fff50de6c0a516574bff2b0340cfdc7ae2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 01:28:42 +0900
Subject: [PATCH 043/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(=EA=B3=84=EC=A0=95=EB=AA=85=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 08c2772..e9293c5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -44,7 +44,7 @@ jobs:
       - name: 'Copy Jar to VM'
         run: |
           sleep 15
-          gcloud compute scp build/libs/*.jar zsx1397@reservation-service:~/app.jar \
+          gcloud compute scp build/libs/*.jar reservation-service:~/app.jar \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --quiet
@@ -52,7 +52,7 @@ jobs:
       # 서버에서 앱 실행
       - name: 'SSH and Start App'
         run: |
-          gcloud compute ssh zsx1397@reservation-service \
+          gcloud compute ssh reservation-service \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --quiet \

From 0e4732b4fcbfeb80604bb54712a58061f03992fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 01:34:31 +0900
Subject: [PATCH 044/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(SSH=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 51 +++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e9293c5..69870f8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -30,37 +30,34 @@ jobs:
           -Pgpr.user=${{ github.actor }} \
           -Pgpr.key=${{ secrets.GITHUB_TOKEN }}
 
-      # GCP 인증
-      - id: 'auth'
-        uses: 'google-github-actions/auth@v2'
-        with:
-          workload_identity_provider: '${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}'
-          service_account: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
-
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v2'
+      # 직접 SSH 접속을 위한 키 설정
+      - name: Setup SSH
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          # 서버 IP를 알려진 호스트에 등록 (IP: 34.64.247.238 확인 필요)
+          ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
 
-      # 빌드된 jar 파일 전송 (계정 명시 + IAP 터널)
+      # 빌드된 jar 파일 전송 (표준 SCP 사용)
       - name: 'Copy Jar to VM'
         run: |
-          sleep 15
-          gcloud compute scp build/libs/*.jar reservation-service:~/app.jar \
-            --zone=asia-northeast3-a \
-            --tunnel-through-iap \
-            --quiet
+          # zsx1397 계정으로 직접 전송
+          scp -i ~/.ssh/id_rsa build/libs/*.jar zsx1397@34.64.247.238:~/app.jar
 
-      # 서버에서 앱 실행
+      # 서버에서 앱 실행 (표준 SSH 사용)
       - name: 'SSH and Start App'
         run: |
-          gcloud compute ssh reservation-service \
-            --zone=asia-northeast3-a \
-            --tunnel-through-iap \
-            --quiet \
-            --command="
-              mkdir -p ~/app
-              mv ~/app.jar ~/app/app.jar 2>/dev/null || true
-              pgrep java | xargs -r kill -9 || true
-              nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
-              sleep 5
-              ps -ef | grep java | grep -v grep
+          ssh -i ~/.ssh/id_rsa zsx1397@34.64.247.238 "
+            mkdir -p ~/app
+            mv ~/app.jar ~/app/app.jar 2>/dev/null || true
+          
+            # 기존 프로세스 종료
+            pgrep java | xargs -r kill -9 || true
+          
+            # 새 앱 실행
+            nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
+          
+            sleep 5
+            ps -ef | grep java | grep -v grep
           "
\ No newline at end of file

From 8c4a57509eee172ee14c01e932b5bbbab33b92c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 01:38:25 +0900
Subject: [PATCH 045/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(SSH=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 51 +++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 69870f8..af68413 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -30,34 +30,49 @@ jobs:
           -Pgpr.user=${{ github.actor }} \
           -Pgpr.key=${{ secrets.GITHUB_TOKEN }}
 
-      # 직접 SSH 접속을 위한 키 설정
+      # GCP 인증
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          workload_identity_provider: '${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}'
+          service_account: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
+
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v2'
+
+      # SSH 키 설정 (libcrypto 에러 및 권한 에러 해결 핵심)
       - name: Setup SSH
         run: |
           mkdir -p ~/.ssh
+          # 환경 변수에서 읽어올 때 이스케이프 처리를 위해 설정을 변경합니다.
           echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
-          # 서버 IP를 알려진 호스트에 등록 (IP: 34.64.247.238 확인 필요)
+          # 서버 지문 등록 (에러 방지)
           ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
 
-      # 빌드된 jar 파일 전송 (표준 SCP 사용)
+      # 빌드된 jar 파일 전송 (IAP 터널 사용 + 수동 키 지정)
       - name: 'Copy Jar to VM'
         run: |
-          # zsx1397 계정으로 직접 전송
-          scp -i ~/.ssh/id_rsa build/libs/*.jar zsx1397@34.64.247.238:~/app.jar
+          sleep 15
+          gcloud compute scp build/libs/*.jar zsx1397@reservation-service:~/app.jar \
+            --zone=asia-northeast3-a \
+            --tunnel-through-iap \
+            --ssh-key-file=~/.ssh/id_rsa \
+            --quiet
 
-      # 서버에서 앱 실행 (표준 SSH 사용)
+      # 서버에서 앱 실행
       - name: 'SSH and Start App'
         run: |
-          ssh -i ~/.ssh/id_rsa zsx1397@34.64.247.238 "
-            mkdir -p ~/app
-            mv ~/app.jar ~/app/app.jar 2>/dev/null || true
-          
-            # 기존 프로세스 종료
-            pgrep java | xargs -r kill -9 || true
-          
-            # 새 앱 실행
-            nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
-          
-            sleep 5
-            ps -ef | grep java | grep -v grep
+          gcloud compute ssh zsx1397@reservation-service \
+            --zone=asia-northeast3-a \
+            --tunnel-through-iap \
+            --ssh-key-file=~/.ssh/id_rsa \
+            --quiet \
+            --command="
+              mkdir -p ~/app
+              mv ~/app.jar ~/app/app.jar 2>/dev/null || true
+              pgrep java | xargs -r kill -9 || true
+              nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
+              sleep 5
+              ps -ef | grep java | grep -v grep
           "
\ No newline at end of file

From 20fc380e4ad817c697e6c1b082581661fc2e8f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 01:42:28 +0900
Subject: [PATCH 046/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(=EA=B3=B5=EA=B0=9C=ED=82=A4=20=EB=88=84?=
 =?UTF-8?q?=EB=9D=BD=20=EC=97=90=EB=9F=AC=20=ED=95=B4=EA=B2=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index af68413..a84564a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -44,10 +44,15 @@ jobs:
       - name: Setup SSH
         run: |
           mkdir -p ~/.ssh
-          # 환경 변수에서 읽어올 때 이스케이프 처리를 위해 설정을 변경합니다.
+          # 개인키 생성
           echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
-          # 서버 지문 등록 (에러 방지)
+            
+           # 개인키로부터 공개키(.pub) 추출 
+          ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
+          chmod 644 ~/.ssh/id_rsa.pub
+            
+          # 서버 지문 등록
           ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
 
       # 빌드된 jar 파일 전송 (IAP 터널 사용 + 수동 키 지정)

From b15efc844a32ffb452872a0600582525f7894349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 22:45:09 +0900
Subject: [PATCH 047/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(docker=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=20=EC=84=9C=EB=B2=84=20=EA=B5=AC=EB=8F=99=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=9E=91=EC=84=B1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 47 ++++++++++--------------------------
 Dockerfile                   | 14 +++++------
 2 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a84564a..952a97e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,21 +15,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # Java 설정 및 빌드
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-          cache: gradle
-
-      - name: Build with Gradle
-        run: |
-          chmod +x ./gradlew
-          ./gradlew clean bootJar \
-          -Pgpr.user=${{ github.actor }} \
-          -Pgpr.key=${{ secrets.GITHUB_TOKEN }}
-
       # GCP 인증
       - id: 'auth'
         uses: 'google-github-actions/auth@v2'
@@ -40,33 +25,26 @@ jobs:
       - name: 'Set up Cloud SDK'
         uses: 'google-github-actions/setup-gcloud@v2'
 
-      # SSH 키 설정 (libcrypto 에러 및 권한 에러 해결 핵심)
+      # SSH 키 설정
       - name: Setup SSH
         run: |
           mkdir -p ~/.ssh
-          # 개인키 생성
           echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
-            
-           # 개인키로부터 공개키(.pub) 추출 
           ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
-          chmod 644 ~/.ssh/id_rsa.pub
-            
-          # 서버 지문 등록
           ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
 
-      # 빌드된 jar 파일 전송 (IAP 터널 사용 + 수동 키 지정)
-      - name: 'Copy Jar to VM'
+      # 프로젝트 전체 파일을 VM으로 전송
+      - name: 'Sync Project to VM'
         run: |
-          sleep 15
-          gcloud compute scp build/libs/*.jar zsx1397@reservation-service:~/app.jar \
+          gcloud compute scp --recurse . zsx1397@reservation-service:~/app \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --ssh-key-file=~/.ssh/id_rsa \
             --quiet
 
-      # 서버에서 앱 실행
-      - name: 'SSH and Start App'
+      # VM에서 Docker Compose 실행
+      - name: 'Docker Compose Up'
         run: |
           gcloud compute ssh zsx1397@reservation-service \
             --zone=asia-northeast3-a \
@@ -74,10 +52,11 @@ jobs:
             --ssh-key-file=~/.ssh/id_rsa \
             --quiet \
             --command="
-              mkdir -p ~/app
-              mv ~/app.jar ~/app/app.jar 2>/dev/null || true
-              pgrep java | xargs -r kill -9 || true
-              nohup java -jar ~/app/app.jar > ~/app/log.txt 2>&1 &
-              sleep 5
-              ps -ef | grep java | grep -v grep
+              cd ~/app
+              # 기존 컨테이너 중지 및 삭제
+              docker-compose down
+              # 다시 빌드 및 실행
+              docker-compose up -d --build
+              # 상태 확인
+              docker ps
           "
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index fd51551..e8412a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,14 +5,14 @@ WORKDIR /app
 # dos2unix 설치
 RUN apk add --no-cache dos2unix
 
-# 1. 모든 소스 코드 복사
+# 모든 소스 코드 복사
 COPY . .
 
-# 2. 복사된 파일 중 gradlew만 골라서 줄바꿈 변환 및 실행 권한 부여
+# 복사된 파일 중 gradlew만 골라서 줄바꿈 변환 및 실행 권한 부여
 # (COPY . . 이후에 수행해야 덮어쓰기 문제를 방지할 수 있습니다)
 RUN dos2unix gradlew && chmod +x gradlew
 
-# 3. 빌드 실행
+# 빌드 실행
 RUN ./gradlew clean bootJar -x test
 
 # 실행 단계
@@ -22,17 +22,17 @@ WORKDIR /app
 # 실행 전용 사용자 생성
 RUN addgroup -S appuser && adduser -S appuser -G appuser
 
-# 4. 빌드 결과물 복사
+# 빌드 결과물 복사
 COPY --from=build /app/build/libs/*-SNAPSHOT.jar app.jar
 
-# 5. SSL 인증서 복사 (물리 경로 확보)
+# SSL 인증서 복사 (물리 경로 확보)
 RUN mkdir -p /app/ssl
 COPY --from=build /app/src/main/resources/ssl/*.jks /app/ssl/
 
-# 6. 권한 설정
+# 권한 설정
 RUN chown -R appuser:appuser /app
 
-# 7. 환경 변수 설정 (Kafka SSL 비밀번호 강제 주입)
+# 환경 변수 설정 (Kafka SSL 비밀번호 강제 주입)
 ENV SPRING_PROFILES_ACTIVE=dev,kafka
 ENV SPRING_KAFKA_SSL_TRUST_STORE_LOCATION=file:/app/ssl/kafka.server.truststore.jks
 ENV SPRING_KAFKA_SSL_TRUST_STORE_PASSWORD=_aA123456

From 48f9cc2bc7b73e72fbf4bcabcbcfcdda90a8fdef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Sun, 10 May 2026 23:56:44 +0900
Subject: [PATCH 048/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(docker=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=20=EC=84=9C=EB=B2=84=20=EA=B5=AC=EB=8F=99=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=9E=91=EC=84=B1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 4 ++--
 Dockerfile                   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 952a97e..0d67dec 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -54,9 +54,9 @@ jobs:
             --command="
               cd ~/app
               # 기존 컨테이너 중지 및 삭제
-              docker-compose down
+              docker compose down
               # 다시 빌드 및 실행
-              docker-compose up -d --build
+              docker compose up -d --build
               # 상태 확인
               docker ps
           "
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index e8412a7..1e37f76 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,6 @@
 FROM eclipse-temurin:21-jdk-alpine AS build
 WORKDIR /app
 
-# dos2unix 설치
 RUN apk add --no-cache dos2unix
 
 # 모든 소스 코드 복사
@@ -13,7 +12,9 @@ COPY . .
 RUN dos2unix gradlew && chmod +x gradlew
 
 # 빌드 실행
-RUN ./gradlew clean bootJar -x test
+ARG GPR_USER
+ARG GPR_TOKEN
+RUN ./gradlew clean bootJar -x test -Pgpr.user=${GPR_USER} -Pgpr.key=${GPR_TOKEN}
 
 # 실행 단계
 FROM eclipse-temurin:21-jre-alpine

From 4cc44494b2886c0129335ef36aebebe33ad0f536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Mon, 11 May 2026 00:01:30 +0900
Subject: [PATCH 049/142] =?UTF-8?q?gcp=20=EC=97=B0=EA=B2=B0=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(docker=20compose=20=EC=82=AC=EC=9D=B4?=
 =?UTF-8?q?=EC=97=90=20=ED=95=98=EC=9D=B4=ED=94=88=20=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0d67dec..952a97e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -54,9 +54,9 @@ jobs:
             --command="
               cd ~/app
               # 기존 컨테이너 중지 및 삭제
-              docker compose down
+              docker-compose down
               # 다시 빌드 및 실행
-              docker compose up -d --build
+              docker-compose up -d --build
               # 상태 확인
               docker ps
           "
\ No newline at end of file

From 8ac2d604dcd9c1c9b6bb66d1666d05871ce95582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Mon, 11 May 2026 00:49:16 +0900
Subject: [PATCH 050/142] =?UTF-8?q?fix=20:=20confirmTrade(=EA=B1=B0?=
 =?UTF-8?q?=EB=9E=98=20=ED=99=95=EC=A0=95)=EC=97=90=20=EA=B6=8C=ED=95=9C?=
 =?UTF-8?q?=20=EA=B2=80=EC=A6=9D=EC=9D=B8=EC=A6=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                            |  2 ++
 .../service/ReservationService.java           | 10 +++++-
 .../domain/model/reservation/Reservation.java |  6 ++++
 .../service/ReservationDomainService.java     | 33 ++++++++++++++++++-
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 536cf04..f2ee9f7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,8 @@ services:
     volumes:
       # 로컬의 resources/ssl 폴더를 컨테이너의 /app/ssl 폴더로 연결
       - ./src/main/resources/ssl:/app/ssl:ro
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     ports:
       - "${SERVER_PORT}:${SERVER_PORT}"
     depends_on:
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 2bde0f1..10ccac1 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -238,7 +238,15 @@ public ReservationStateInfo confirmTrade(ReservationConfirmCommand command) {
 
         Reservation reservation = findById(command.reservationId());
 
-        reservation.close();
+        ReservationHistory history = reservationDomainService.confirmTrade(
+                reservation,
+                command.userId(),
+                command.role()
+        );
+
+        if (history != null) {
+            reservationHistoryRepository.save(history);
+        }
 
         return ReservationStateInfo.from(reservation);
     }
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index 0757be5..2af6012 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -123,6 +123,12 @@ public void cancelBySeller() {
         this.status = ReservationStatus.CANCELLED_BY_SELLER;
     }
 
+    // 거래 완료 : COMPLETED에서만 CLOSED를 할 수 있다
+    public void confirmTrade() {
+        validateStatus(ReservationStatus.COMPLETED);
+        this.status = ReservationStatus.CLOSED;
+    }
+
     // 다음 순번 구매자로 교체
     public void changeToNextBuyer(ReservationCandidate nextCandidate) {
         // 현재 변경 가능한 상태인지 검증 (AVAILABLE 혹은 이전 구매자 취소 상태)
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index e74eb3c..5fab5ab 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -1,6 +1,7 @@
 package org.pgsg.reservation.domain.service;
 
 import lombok.RequiredArgsConstructor;
+import org.pgsg.common.exception.ErrorCode;
 import org.pgsg.reservation.domain.exception.ReservationErrorCode;
 import org.pgsg.reservation.domain.exception.ReservationException;
 import org.pgsg.reservation.domain.model.reservation.*;
@@ -261,6 +262,37 @@ public ReservationHistory completeReservation(Reservation reservation, UUID user
         );
     }
 
+    /**
+     * 거래 완료
+     * 거래 완료 도메인 로직 및 이력 객체 생성
+     */
+    public ReservationHistory confirmTrade(Reservation reservation, UUID userId, String role) {
+        // 규칙: 오직 ADMIN(시스템 포함)만 거래 확정을 할 수 있다.
+        String normalizedRole = role != null ? role.trim().toUpperCase(Locale.ROOT) : "";
+        if (!"ADMIN".equals(normalizedRole)) {
+            throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS, "관리자만 거래를 확정할 수 있습니다.");
+        }
+
+        // 상태 변경 전 상태 보관 (이력 기록용)
+        ReservationStatus previousStatus = reservation.getStatus();
+
+        // 엔티티 비즈니스 로직 실행 (COMPLETED -> CLOSED)
+        reservation.confirmTrade();
+
+        // 이력(History) 객체 생성 및 반환
+        return ReservationHistory.of(
+                reservation.getId(),
+                previousStatus,
+                reservation.getStatus(),
+                "거래가 최종 확정되었습니다.",
+                userId
+        );
+    }
+
+    private boolean isAdmin(String role) {
+        return "ADMIN".equals(role);
+    }
+
     /**
      * 다음 구매자 승계 내부 로직
      */
@@ -287,5 +319,4 @@ private void validateReason(String reason) {
         }
     }
 
-
 }
\ No newline at end of file

From 52ccfee4bab5df696c67e266b61212f0d7bbc8ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Mon, 11 May 2026 00:51:49 +0900
Subject: [PATCH 051/142] =?UTF-8?q?fix=20:=20=EB=B3=B4=EC=95=88=20?=
 =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 56cf233..a0d56ea 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -27,10 +27,10 @@ spring:
     ssl:
       # Docker 환경(file:/app/...)과 로컬 환경(C:/...)을 환경 변수 하나로 제어합니다.
       trust-store-location: ${KAFKA_SSL_PATH:file:/app/ssl/kafka.server.truststore.jks}
-      trust-store-password: _aA123456
+      trust-store-password: ${KAFKA_SSL_TRUSTSTORE_PASSWORD}
     properties:
       security.protocol: SSL
-      ssl.endpoint.identification.algorithm: ""
+      ssl.endpoint.identification.algorithm: https
 
   data:
     redis:

From f1c47bf800d4ffc6769556a37e6c8ac41c24fa99 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Mon, 11 May 2026 22:20:54 +0900
Subject: [PATCH 052/142] =?UTF-8?q?Feat=20:=20redis=20=EA=B8=B0=EB=8A=A5?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80=20(#41)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Feat : redis 기능 추가

* fix : 코드 래빗 제안 수정
- 버전 호환성 문제 x.27.x -> x.51.x로 업

* fix : 코드 래빗 제안 수정
- redis 데이터 일관성 부분 수정

* fix : 코드 래빗 제안 수정
- redis 데이터 일관성 부분 수정

* fix : 코드 래빗 제안 수정
- 상세 정보 조회시 권한 및 id 검증 로직 추가
---
 build.gradle                                  |  6 +-
 .../service/ReservationService.java           | 38 ++++++++++
 .../infrastructure/config/RedisConfig.java    | 76 +++++++++++++++++++
 src/main/resources/application.yml            |  4 +-
 4 files changed, 121 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java

diff --git a/build.gradle b/build.gradle
index 3ea4e1a..0a842e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,13 +75,17 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
-    // [ swagger]
+    // [swagger]
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5'
     implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.22'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'
 
     // [Database]
     runtimeOnly 'org.postgresql:postgresql'
+
+    // [Redis]
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'org.redisson:redisson-spring-boot-starter:3.51.0'
 }
 
 def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 10ccac1..ff11684 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -19,6 +19,9 @@
 import org.pgsg.reservation.domain.service.ReservationDomainService;
 import org.pgsg.reservation.domain.repository.ReservationRepository;
 import org.pgsg.reservation.application.dto.info.ReservationCandidateInfo;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -75,6 +78,10 @@ public ReservationCreateResult createReservation(ReservationCreateCommand comman
 
     // 예약 목록 조회
     @Transactional(readOnly = true)
+    @Cacheable(value = "reservations",
+            key = "{" +
+                    "#userId, #role, #query.sellerName(), #query.buyerName(), #query.productName(), " +
+                    "#query.status(), #query.productId(), #pageable.pageNumber, #pageable.pageSize, #pageable.sort}")
     public Page<ReservationSearchResult> getSearchReservations(
             UUID userId,
             String role,
@@ -103,6 +110,7 @@ public Page<ReservationSearchResult> getSearchReservations(
 
 
     // 예약 상세 조회
+    @Cacheable(value = "reservationDetail", key = "{#reservationId, #userId, #role}")
     @Transactional(readOnly = true)
     public ReservationDetailResult getReservationDetail(UUID reservationId, UUID userId, String role) {
         // 엔티티 조회
@@ -117,6 +125,12 @@ public ReservationDetailResult getReservationDetail(UUID reservationId, UUID use
 
     // 예약 신청
     @Transactional
+    @Caching(evict = {
+            // 해당 예약의 상세 정보 캐시만 삭제
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            // 목록은 순서나 데이터가 변했을 수 있으므로 전체 삭제
+            @CacheEvict(value = "reservations", allEntries = true)
+    })
     public ReservationCandidateInfo applyReservation(ReservationApplyCommand command) {
         Reservation savedReservation;
 
@@ -148,6 +162,10 @@ public ReservationCandidateInfo applyReservation(ReservationApplyCommand command
 
     // 구매자 취소 처리 로직
     @Transactional
+    @Caching(evict = {
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservations", allEntries = true)
+    })
     public ReservationStateInfo cancelByBuyer(ReservationCancelCommand command) {
         Reservation reservation = findById(command.reservationId());
 
@@ -165,6 +183,10 @@ public ReservationStateInfo cancelByBuyer(ReservationCancelCommand command) {
 
     // 추후 결제 시스템 연동시 트리거 발동
     @Transactional
+    @Caching(evict = {
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservations", allEntries = true)
+    })
     public ReservationStateInfo confirmPayment(ReservationConfirmCommand command) {
         Reservation reservation = findById(command.reservationId());
 
@@ -185,6 +207,10 @@ public ReservationStateInfo confirmPayment(ReservationConfirmCommand command) {
 
     // 판매자 취소 로직
     @Transactional
+    @Caching(evict = {
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservations", allEntries = true)
+    })
     public ReservationStateInfo cancelBySeller(ReservationCancelCommand command) {
         Reservation reservation = findById(command.reservationId());
 
@@ -202,6 +228,10 @@ public ReservationStateInfo cancelBySeller(ReservationCancelCommand command) {
 
     // 예약 만료
     @Transactional
+    @Caching(evict = {
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservations", allEntries = true)
+    })
     public ReservationStateInfo expireByAdmin(ReservationExpireCommand command) {
         Reservation reservation = findById(command.reservationId());
 
@@ -220,6 +250,10 @@ public ReservationStateInfo expireByAdmin(ReservationExpireCommand command) {
 
     // 예약 완료
     @Transactional
+    @Caching(evict = {
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservations", allEntries = true)
+    })
     public ReservationStateInfo completeReservation(ReservationConfirmCommand command) {
         // 예약 엔티티 조회
         Reservation reservation = findById(command.reservationId());
@@ -234,6 +268,10 @@ public ReservationStateInfo completeReservation(ReservationConfirmCommand comman
 
     // 거래 완료
     @Transactional
+    @Caching(evict = {
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservations", allEntries = true)
+    })
     public ReservationStateInfo confirmTrade(ReservationConfirmCommand command) {
 
         Reservation reservation = findById(command.reservationId());
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
new file mode 100644
index 0000000..1de72d9
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -0,0 +1,76 @@
+package org.pgsg.reservation.infrastructure.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.data.web.config.SpringDataJacksonConfiguration;
+
+import java.time.Duration;
+
+@Configuration
+@EnableCaching
+public class RedisConfig {
+
+    @Value("${spring.data.redis.host}")
+    private String host;
+
+    @Value("${spring.data.redis.port}")
+    private int port;
+
+    @Bean
+    public RedisConnectionFactory redisConnectionFactory() {
+        // Lettuce 사용 시
+        return new LettuceConnectionFactory(host, port);
+    }
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate() {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(redisConnectionFactory());
+
+        // 일반 key-value 값
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+
+        // hash 구조용 설정
+        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+        redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
+
+        return redisTemplate;
+    }
+
+    @Bean
+    public CacheManager cacheManager(RedisConnectionFactory factory) {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.registerModule(new JavaTimeModule()); // 날짜 처리
+        // PageImpl 역직렬화를 위한 설정
+        objectMapper.registerModule(new SpringDataJacksonConfiguration().pageModule());
+
+        RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
+                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer(objectMapper)))
+                .entryTtl(Duration.ofDays(1));
+
+        RedisCacheConfiguration listCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
+                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer(objectMapper)))
+                .entryTtl(Duration.ofSeconds(30));
+
+        return RedisCacheManager.builder(factory)
+                .cacheDefaults(defaultCacheConfig)
+                .withCacheConfiguration("reservations", listCacheConfig) // 목록만 30초
+                .build();
+    }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a0d56ea..4f2b7de 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,8 +34,8 @@ spring:
 
   data:
     redis:
-      host: ${REDIS_HOST}
-      port: ${REDIS_PORT}
+      host: ${REDIS_HOST:localhost}
+      port: ${REDIS_PORT:6379}
 
   jpa:
     hibernate:

From 21c3d8ad6b166bc7e09319fecafe2db1a05b68d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Tue, 12 May 2026 14:50:10 +0900
Subject: [PATCH 053/142] =?UTF-8?q?fix=20:=20=EC=9C=A0=EB=A0=88=EC=B9=B4?=
 =?UTF-8?q?=20=EC=84=9C=EB=B2=84=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                 | 2 +-
 src/main/resources/application.yml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f2ee9f7..70ac9c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - "SERVER_PORT=${SERVER_PORT}"
       - "DB_URL=jdbc:postgresql://reservation-db:5432/${DB_NAME}"
       - "REDIS_HOST=reservation-redis"
-      - "EUREKA_SERVER=http://host.docker.internal:8761/eureka/"
+      - "EUREKA_SERVER_URL=${EUREKA_SERVER_URL}"
       - "KAFKA_SSL_PATH=/app/ssl/kafka.server.truststore.jks"
     env_file:
       - .env
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4f2b7de..ea6e0d3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -30,7 +30,7 @@ spring:
       trust-store-password: ${KAFKA_SSL_TRUSTSTORE_PASSWORD}
     properties:
       security.protocol: SSL
-      ssl.endpoint.identification.algorithm: https
+      ssl.endpoint.identification.algorithm: ""
 
   data:
     redis:
@@ -58,14 +58,14 @@ jwt:
 
 eureka:
   instance:
-    instance-id: ${spring.application.name}:${random.value}
+    instance-id: ${spring.application.name}:${spring.application.instance_id:${random.value}}
     prefer-ip-address: true
   client:
-    enabled: ${EUREKA_ENABLED:true} # 도커/로컬 상황에 따라 토글 가능
+    enabled: ${EUREKA_ENABLED:true}
     register-with-eureka: true
     fetch-registry: true
     service-url:
-      defaultZone: ${EUREKA_SERVER:http://localhost:8761/eureka/}
+      defaultZone: ${EUREKA_SERVER_URL:http://localhost:8761/eureka/}
 
 topics:
   reservation:

From c27414606aaa3df2e9ba9a1fe127f13ea76b5629 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Tue, 12 May 2026 23:04:18 +0900
Subject: [PATCH 054/142] =?UTF-8?q?Feat=20:=20=ED=8C=90=EB=A7=A4=EC=9E=90?=
 =?UTF-8?q?=20=EC=82=AC=EC=9C=A0=EB=A1=9C=20=EC=B7=A8=EC=86=8C=20=EC=83=81?=
 =?UTF-8?q?=ED=92=88=EC=97=90=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EB=B0=9C?=
 =?UTF-8?q?=EC=86=A1=20(#43)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Feat : 판매자 사유로 취소 상품에 이벤트 발송

* fix : 코드래빗 제안 수정
---
 .../dto/event/ReservationCancelledEvent.java  | 19 ++++++++++
 .../service/ReservationService.java           |  1 +
 .../domain/model/reservation/Reservation.java | 10 +----
 .../ReservationHistory.java                   |  3 +-
 .../event/ReservationEventBridge.java         | 37 ++++++++++++++++++-
 .../dto/ReservationEventPublisher.java        |  2 +
 src/main/resources/application.yml            |  1 +
 7 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/event/ReservationCancelledEvent.java

diff --git a/src/main/java/org/pgsg/reservation/application/dto/event/ReservationCancelledEvent.java b/src/main/java/org/pgsg/reservation/application/dto/event/ReservationCancelledEvent.java
new file mode 100644
index 0000000..7698ee0
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/event/ReservationCancelledEvent.java
@@ -0,0 +1,19 @@
+package org.pgsg.reservation.application.dto.event;
+
+import org.pgsg.reservation.domain.model.reservation.Reservation;
+
+import java.util.UUID;
+
+public record ReservationCancelledEvent(
+        UUID reservationId,
+        UUID productId,
+        String reason
+) {
+    public static ReservationCancelledEvent from(Reservation reservation, String reason) {
+        return new ReservationCancelledEvent(
+                reservation.getId(),
+                reservation.getProductInfo().getProductId(),
+                reason
+        );
+    }
+}
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index ff11684..8ed1ce0 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -222,6 +222,7 @@ public ReservationStateInfo cancelBySeller(ReservationCancelCommand command) {
         );
 
         reservationHistoryRepository.save(history);
+        reservationEventPublisher.publishReservationCancelled(reservation,command.reason());
 
         return ReservationStateInfo.from(reservation);
     }
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index 2af6012..3bad63b 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -90,12 +90,6 @@ public void complete() {
         this.status = ReservationStatus.COMPLETED;
     }
 
-    // 최종 종료: 완료된 거래를 아카이브 상태로 변경
-    public void close() {
-        validateStatus(ReservationStatus.COMPLETED);
-        this.status = ReservationStatus.CLOSED;
-    }
-
     // 거래 복구: COMPLETED 상태에서 취소 발생 시 AVAILABLE로 복구
     public void rollbackToAvailable() {
         validateStatus(ReservationStatus.COMPLETED);
@@ -117,9 +111,9 @@ public void reopen() {
         this.buyerInfo = null; // 기존 구매자 정보 제거
     }
 
-    // 판매자 취소: PENDING 또는 PAID 상태에서 판매자가 취소(영구 종료)
+    // 판매자 취소: AVAILABLE,PENDING,PAID 상태에서 판매자가 취소(영구 종료)
     public void cancelBySeller() {
-        validateStatus(ReservationStatus.PENDING, ReservationStatus.PAID);
+        validateStatus(ReservationStatus.AVAILABLE,ReservationStatus.PENDING, ReservationStatus.PAID);
         this.status = ReservationStatus.CANCELLED_BY_SELLER;
     }
 
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservationhistory/ReservationHistory.java b/src/main/java/org/pgsg/reservation/domain/model/reservationhistory/ReservationHistory.java
index 41a9a14..5587524 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservationhistory/ReservationHistory.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservationhistory/ReservationHistory.java
@@ -5,6 +5,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.pgsg.common.domain.BaseEntity;
 import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 
 import java.util.UUID;
@@ -14,7 +15,7 @@
 @Table(name = "p_reservation_histories")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class ReservationHistory {
+public class ReservationHistory extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java b/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
index 9d18dee..f9b3961 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
@@ -4,6 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.pgsg.common.event.Events;
 import org.pgsg.common.event.OutboxEvent;
+import org.pgsg.reservation.application.dto.event.ReservationCancelledEvent;
 import org.pgsg.reservation.application.dto.event.ReservationCompletedEvent;
 import org.pgsg.reservation.infrastructure.listener.dto.ReservationEventPublisher;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
@@ -18,7 +19,10 @@
 public class ReservationEventBridge implements ReservationEventPublisher {
 
     @Value("${topics.reservation.completed}")
-    private String topicName;
+    private String completedTopicName;
+
+    @Value("${topics.reservation.cancelled}")
+    private String buyerCancelledTopicName;
 
     @Override
     public void publishReservationCompleted(Reservation reservation) {
@@ -38,7 +42,7 @@ public void publishReservationCompleted(Reservation reservation) {
                     correlationId,    // 1. correlationId
                     domainId,         // 2. domainId (UUID 타입)
                     "RESERVATION",    // 3. domainType
-                    topicName,        // 4. eventType (토픽명)
+                    completedTopicName,        // 4. eventType (토픽명)
                     event             // 5. payload
             ));
 
@@ -49,4 +53,33 @@ public void publishReservationCompleted(Reservation reservation) {
             throw new RuntimeException("이벤트 발행 중 오류 발생", e);
         }
     }
+
+    @Override
+    public void publishReservationCancelled(Reservation reservation, String reason) {
+        try {
+            log.info("판매자 사유로 인한 취소 Outbox 등록 시작 - 예약 ID: {}", reservation.getId());
+
+            // Product/Trade 서비스에서 식별자로 쓸 ID (상품 ID)
+            UUID correlationId = UUID.fromString(reservation.getProductInfo().getProductId().toString());
+
+            // Outbox 테이블의 PK로 저장될 ID (예약 ID)
+            UUID domainId = UUID.fromString(reservation.getId().toString());
+
+            ReservationCancelledEvent event = ReservationCancelledEvent.from(reservation, reason);
+
+            Events.trigger(new OutboxEvent(
+                    correlationId,    // 연관 ID (상품 ID)
+                    domainId,         // 도메인 ID (예약 ID)
+                    "RESERVATION",    // 도메인 타입
+                    buyerCancelledTopicName,   // 이벤트 타입 (취소 토픽명)
+                    event             // 페이로드
+            ));
+
+            log.info("판매자 사유로 인한 취소 Outbox 등록 완료 - correlationId: {}", correlationId);
+
+        } catch (Exception e) {
+            log.error("취소 Outbox 등록 실패 - 예약 ID: {}", reservation.getId(), e);
+            throw new RuntimeException("취소 이벤트 발행 중 오류 발생", e);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/ReservationEventPublisher.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/ReservationEventPublisher.java
index b0283cb..510a1eb 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/ReservationEventPublisher.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/dto/ReservationEventPublisher.java
@@ -4,4 +4,6 @@
 
 public interface ReservationEventPublisher {
     void publishReservationCompleted(Reservation reservation);
+
+    void publishReservationCancelled(Reservation reservation, String reason);
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ea6e0d3..0e2f3cd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -70,5 +70,6 @@ eureka:
 topics:
   reservation:
     completed: prod-reservation-completed
+    cancelled: prod-reservation-cancelled
   product:
     created: prod-product-created
\ No newline at end of file

From f1827e627261267c1ff488ab47f3c43c80c1d01f Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Wed, 13 May 2026 12:12:26 +0900
Subject: [PATCH 055/142] Feat/40 reservation eventfailreturn (#44)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Feat : 예약생성,거래완료 이벤트 실패 시 취소 이벤트 발송

* Feat : 예약생성,거래완료 이벤트 실패 시 취소 이벤트 발송

* fix : 코드 래빗 제안 수정
- 필드명 수정

* fix : 코드 래빗 제안 수정
- 실패 이벤트 등록 실패시 오류 발생하도록 수정

* fix : 코드 래빗 제안 수정
- event가 null 일 경우 reservationId를 따로 확보해서publishTradeConfirmFailed를 호출할 수 있도록 수정
---
 .../dto/event/ReservationFailedEvent.java     |  8 +++
 .../event/ReservationEventBridge.java         | 68 +++++++++++++++++--
 .../listener/ProductListener.java             | 19 ++++--
 .../listener/ReservationEventListener.java    | 29 +++++++-
 src/main/resources/application.yml            |  4 +-
 5 files changed, 113 insertions(+), 15 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/event/ReservationFailedEvent.java

diff --git a/src/main/java/org/pgsg/reservation/application/dto/event/ReservationFailedEvent.java b/src/main/java/org/pgsg/reservation/application/dto/event/ReservationFailedEvent.java
new file mode 100644
index 0000000..cf3cac2
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/event/ReservationFailedEvent.java
@@ -0,0 +1,8 @@
+package org.pgsg.reservation.application.dto.event;
+
+import java.util.UUID;
+
+public record ReservationFailedEvent(
+        UUID id,
+        String reason
+) {}
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java b/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
index f9b3961..1445daf 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/event/ReservationEventBridge.java
@@ -6,10 +6,13 @@
 import org.pgsg.common.event.OutboxEvent;
 import org.pgsg.reservation.application.dto.event.ReservationCancelledEvent;
 import org.pgsg.reservation.application.dto.event.ReservationCompletedEvent;
+import org.pgsg.reservation.application.dto.event.ReservationFailedEvent;
 import org.pgsg.reservation.infrastructure.listener.dto.ReservationEventPublisher;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.UUID;
 
@@ -24,6 +27,12 @@ public class ReservationEventBridge implements ReservationEventPublisher {
     @Value("${topics.reservation.cancelled}")
     private String buyerCancelledTopicName;
 
+    @Value("${topics.product.failed}")
+    private String productFailureTopicName;
+
+    @Value("${topics.reservation.failed}")
+    private String tradeFailureTopicName;
+
     @Override
     public void publishReservationCompleted(Reservation reservation) {
         try {
@@ -39,11 +48,11 @@ public void publishReservationCompleted(Reservation reservation) {
             ReservationCompletedEvent event = ReservationCompletedEvent.from(reservation);
 
             Events.trigger(new OutboxEvent(
-                    correlationId,    // 1. correlationId
-                    domainId,         // 2. domainId (UUID 타입)
-                    "RESERVATION",    // 3. domainType
-                    completedTopicName,        // 4. eventType (토픽명)
-                    event             // 5. payload
+                    correlationId,    // correlationId
+                    domainId,         // domainId (UUID 타입)
+                    "RESERVATION",    // domainType
+                    completedTopicName,// eventType (토픽명)
+                    event             // payload
             ));
 
             log.info("예약 완료 Outbox 등록 완료 - correlationId: {}", correlationId);
@@ -54,6 +63,35 @@ public void publishReservationCompleted(Reservation reservation) {
         }
     }
 
+    // 상품 생성 실패시 상품에 이벤트 발송
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void publishReservationCreationFailed(UUID productId, String reason) {
+        try {
+            log.info("예약 생성 실패 Outbox 등록 시작 - 상품 ID: {}", productId);
+
+            // 엔티티가 없으므로 correlationId와 domainId 모두 productId를 활용하거나,
+            // 별도의 랜덤 UUID를 domainId로 생성합니다.
+            UUID correlationId = UUID.fromString(productId.toString());
+            UUID domainId = UUID.randomUUID(); // Outbox PK용
+
+            ReservationFailedEvent event = new ReservationFailedEvent(productId, reason);
+
+            Events.trigger(new OutboxEvent(
+                    correlationId,    // 상품 서비스가 식별할 ID
+                    domainId,         // Outbox 식별 ID
+                    "RESERVATION",
+                    productFailureTopicName, // 실패 전용 토픽
+                    event
+            ));
+
+            log.info("예약 생성 실패 Outbox 등록 완료 - productId: {}", productId);
+
+        } catch (Exception e) {
+            log.error("실패 알림 Outbox 등록 중 오류 발생 - 상품 ID: {}", productId, e);
+            throw new RuntimeException("예약 생성 실패 이벤트 발행 중 오류 발생", e);
+        }
+    }
+
     @Override
     public void publishReservationCancelled(Reservation reservation, String reason) {
         try {
@@ -82,4 +120,24 @@ public void publishReservationCancelled(Reservation reservation, String reason)
             throw new RuntimeException("취소 이벤트 발행 중 오류 발생", e);
         }
     }
+
+    // 거래 완료 생성 실패시 발송하는 이벤트
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void publishTradeConfirmFailed(UUID reservationId, String reason) {
+        log.info("예약 생성 실패 Outbox 등록 시작 - 예약 ID: {}", reservationId);
+
+        UUID correlationId = UUID.fromString(reservationId.toString());
+        UUID domainId = UUID.randomUUID();
+
+        // 실패 전용 DTO: ReservationFailedEvent
+        ReservationFailedEvent event = new ReservationFailedEvent(correlationId, reason);
+
+        Events.trigger(new OutboxEvent(
+                correlationId,
+                domainId,
+                "TRADE", // 도메인 타입 구분
+                tradeFailureTopicName, // 거래 서비스가 구독할 토픽명
+                event
+        ));
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
index 6c80509..aee5ac4 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/ProductListener.java
@@ -12,6 +12,9 @@
 import org.pgsg.reservation.domain.exception.ReservationException;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
+import org.pgsg.reservation.infrastructure.event.ReservationEventBridge;
+
+import java.util.Objects;
 
 @Slf4j
 @Component
@@ -20,6 +23,7 @@ public class ProductListener {
 
     private final ReservationService reservationService;
     private final ObjectMapper objectMapper;
+    private final ReservationEventBridge eventBridge;
 
     /**
      * 상품 서비스에서 타임딜 상품이 생성되었을 때의 이벤트를 수신합니다.
@@ -42,15 +46,18 @@ public void handleTimeDealEvent(ConsumerRecord<String, String> record) {
             reservationService.createReservation(command);
         }catch (ReservationException e) {
             if (e.getErrorCode() == ReservationErrorCode.ALREADY_EXISTS) {
-                log.info("중복 예약 생성 이벤트 무시: productId={}",
-                        (event != null) ? event.productId() : "Unknown");
+                log.info("중복 예약 생성 이벤트 무시 (이미 존재): productId={}", Objects.requireNonNull(event).productId());
                 return;
             }
-            log.error("예약 생성 중 비즈니스 오류 발생: {}", e.getMessage());
-            throw e; // 재시도가 필요한 경우 던짐
+
+            log.error("예약 생성 비즈니스 실패: {}", e.getMessage());
+            eventBridge.publishReservationCreationFailed(Objects.requireNonNull(event).productId(), e.getMessage());
+
         } catch (Exception e) {
-            log.error("상품 생성 이벤트 처리 실패 - Topic: {}, Error: {}",
-                    record.topic(), e.getMessage());
+            log.error("시스템 장애로 인한 예약 생성 실패: {}", e.getMessage());
+            if (event != null) {
+                eventBridge.publishReservationCreationFailed(event.productId(), "SYSTEM_ERROR: " + e.getMessage());
+            }
         }
     }
 
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java b/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java
index 410b2ab..c39682d 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/listener/ReservationEventListener.java
@@ -1,5 +1,6 @@
 package org.pgsg.reservation.infrastructure.listener;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -8,6 +9,7 @@
 import org.pgsg.reservation.application.dto.command.ReservationConfirmCommand;
 import org.pgsg.reservation.application.service.ReservationService;
 import org.pgsg.reservation.infrastructure.listener.dto.TradeCompletedEvent;
+import org.pgsg.reservation.infrastructure.event.ReservationEventBridge;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
@@ -21,6 +23,7 @@ public class ReservationEventListener {
 
     private final ReservationService reservationService;
     private final ObjectMapper objectMapper;
+    private final ReservationEventBridge bridge;
 
     private static final UUID SYSTEM_ID = UUID.fromString("00000000-0000-0000-0000-000000000000");
     private static final String SYSTEM_ROLE = "ADMIN";
@@ -34,9 +37,17 @@ public class ReservationEventListener {
             groupId = "reservation-group"
     )
     public void handleTradeCompleted(ConsumerRecord<String, String> record) {
-
+        TradeCompletedEvent event;
+        UUID reservationId = null;
         try {
-            TradeCompletedEvent event = objectMapper.readValue(record.value(), TradeCompletedEvent.class);
+            JsonNode root = objectMapper.readTree(record.value());
+            try {
+                reservationId = UUID.fromString(root.get("reservationId").asText());
+            } catch (IllegalArgumentException e) {
+                log.warn("유효하지 않은 UUID 형식의 reservationId 수신: {}", root.get("reservationId").asText());
+            }
+            event = objectMapper.treeToValue(root, TradeCompletedEvent.class);
+
             log.info("거래 완료 이벤트 수신 - Trade ID: {}, Reservation ID: {}",
                     event.tradeId(), event.reservationId());
 
@@ -51,7 +62,19 @@ public void handleTradeCompleted(ConsumerRecord<String, String> record) {
             log.info("예약 확정 처리 성공 - Reservation ID: {}", event.reservationId());
         }catch (Exception e) {
             log.error("예약 확정 처리 실패 - Reservation ID: {}, Error: {}",
-                    record.topic(), e.getMessage());
+                    (reservationId != null) ? reservationId : "Unknown", e.getMessage());
+
+            // 실패 알림 발송
+            // 이 알림을 보고 거래 서비스나 관리자 서비스가 후속 조치(거래 롤백 등)를 할 수 있습니다.
+            if (reservationId != null) {
+                // 사실 여기서는 productId를 알기 어려울 수 있으니,
+                // 브릿지에 reservationId를 받는 실패 메서드를 하나 더 만들거나
+                // event에서 productId를 꺼낼 수 있도록 설계하는 것이 좋을 수도?
+                bridge.publishTradeConfirmFailed(
+                        reservationId, // UUID 타입
+                        "CONFIRM_FAIL: " + e.getMessage()
+                );
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0e2f3cd..cc0fbfd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -71,5 +71,7 @@ topics:
   reservation:
     completed: prod-reservation-completed
     cancelled: prod-reservation-cancelled
+    failed : prod-reservation-tradefail
   product:
-    created: prod-product-created
\ No newline at end of file
+    created: prod-product-created
+    failed: prod-product-failed
\ No newline at end of file

From 44cac76bce844f2cad031288f7461178582dc1e4 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Wed, 13 May 2026 20:14:49 +0900
Subject: [PATCH 056/142] =?UTF-8?q?chore=20:=20config=20=EC=84=9C=EB=B2=84?=
 =?UTF-8?q?=20=EC=9C=A0=EB=A0=88=EC=B9=B4=EB=A5=BC=20=ED=86=B5=ED=95=B4?=
 =?UTF-8?q?=EC=84=9C=20=EC=97=B0=EA=B2=B0=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20(#46)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore : config 서버 유레카를 통해서 연결하도록 수정

* fix : . Eureka 디스커버리를 사용하도록 수정
---
 deploy/docker-compose.prod.yaml    | 57 ++++++++++++++++++++++++++++++
 src/main/resources/application.yml | 12 +++++--
 2 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 deploy/docker-compose.prod.yaml

diff --git a/deploy/docker-compose.prod.yaml b/deploy/docker-compose.prod.yaml
new file mode 100644
index 0000000..31914e6
--- /dev/null
+++ b/deploy/docker-compose.prod.yaml
@@ -0,0 +1,57 @@
+version: '3.8'
+
+services:
+  reservation-service:
+    container_name: reservation-service
+    image: ${AR_IMAGE_PATH}:${IMAGE_TAG:-latest} # AR 기반 이미지 사용
+    restart: always
+    env_file:
+      - .env
+    volumes:
+      # 서버의 /opt/reservation-service/ssl 폴더를 컨테이너 내부로 연결
+      - ./ssl:/app/ssl:ro
+    ports:
+      - "${SERVER_PORT:-8085}:${SERVER_PORT:-8085}"
+      - "8081:8081" # 헬스체크용 포트
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - pgsg-network
+
+  db:
+    image: postgres:17
+    container_name: reservation-db
+    environment:
+      POSTGRES_DB: ${DB_NAME:-reservation_db}
+      POSTGRES_USER: ${DB_USERNAME:-postgres}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+    volumes:
+      - postgres-reservation-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-postgres} -d ${DB_NAME:-reservation_db}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - pgsg-network
+
+  redis:
+    image: redis:7.2
+    container_name: reservation-redis
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - pgsg-network
+
+networks:
+  pgsg-network:
+    external: true
+
+volumes:
+  postgres-reservation-data:
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cc0fbfd..84d96df 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -15,7 +15,13 @@ spring:
   config:
     import:
       - "optional:file:.env[.properties]"
-      - "optional:configserver:${CONFIG_SERVER:http://34.50.50.170:13100}"
+      - "optional:configserver: "
+
+  cloud:
+    config:
+      discovery:
+        enabled: true
+        service-id: CONFIG-SERVER
 
   datasource:
     url: ${DB_URL}
@@ -58,14 +64,14 @@ jwt:
 
 eureka:
   instance:
-    instance-id: ${spring.application.name}:${spring.application.instance_id:${random.value}}
+    instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
     prefer-ip-address: true
   client:
     enabled: ${EUREKA_ENABLED:true}
     register-with-eureka: true
     fetch-registry: true
     service-url:
-      defaultZone: ${EUREKA_SERVER_URL:http://localhost:8761/eureka/}
+      defaultZone: ${EUREKA_SERVER_URL:http://34.50.50.170:8761/eureka/}
 
 topics:
   reservation:

From 27b66815ff16ba649b1e05e0a51f664b2a55b74a Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Thu, 14 May 2026 00:25:34 +0900
Subject: [PATCH 057/142] =?UTF-8?q?fix=20:=20=ED=95=84=ED=84=B0=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=EC=A4=91=20(#47)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix : 필터 기능 추가중

* fix : 코드 래빗 제안 수정
- jjwt 버전 13으로 수정

* fix : 코드 래빗 제안 수정
- Primary 이노테이션 제거

* fix : 코드 래빗 제안 수정
- ${spring.cloud.client.ip-address} 속성에 대한 기본값 수정
---
 build.gradle                                  |  5 ++
 .../config/ReservationSecurityConfig.java     | 65 +++++++++++++++++++
 .../infrastructure/config/SecurityConfig.java | 35 ----------
 src/main/resources/application.yml            |  3 +-
 4 files changed, 72 insertions(+), 36 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java
 delete mode 100644 src/main/java/org/pgsg/reservation/infrastructure/config/SecurityConfig.java

diff --git a/build.gradle b/build.gradle
index 0a842e8..54b9cd1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,6 +66,11 @@ dependencies {
     annotationProcessor "jakarta.annotation:jakarta.annotation-api"
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
+    // [JWT]
+    implementation 'io.jsonwebtoken:jjwt-api:0.13.0'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.13.0'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.13.0'
+
     // [Common Module]
     implementation 'org.pgsg:common:0.2.6-SNAPSHOT'
 
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java
new file mode 100644
index 0000000..45c3d7d
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java
@@ -0,0 +1,65 @@
+package org.pgsg.reservation.infrastructure.config;
+
+import lombok.RequiredArgsConstructor;
+import org.pgsg.config.security.CustomAccessDeniedHandler;
+import org.pgsg.config.security.CustomAuthenticationEntryPoint;
+import org.pgsg.config.security.LoginFilter;
+import org.pgsg.config.security.SecurityConfigImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+@Configuration
+@EnableWebSecurity
+@EnableMethodSecurity // @PreAuthorize 사용을 위해 필요
+@RequiredArgsConstructor
+@Import({SecurityConfigImpl.class})
+public class ReservationSecurityConfig {
+
+    private final LoginFilter loginFilter;
+    private final CustomAuthenticationEntryPoint authenticationEntryPoint;
+    private final CustomAccessDeniedHandler accessDeniedHandler;
+
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http
+                .csrf(AbstractHttpConfigurer::disable)
+                .sessionManagement(c -> c.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+
+                .authorizeHttpRequests(auth -> auth
+                        // 공용 API 및 모니터링 허용
+                        .requestMatchers(
+                                "/v3/api-docs/**",
+                                "/swagger-ui/**",
+                                "/actuator/**",
+                                "/favicon.ico",
+                                "/error"
+                        ).permitAll()
+
+                        // 예약 서비스의 핵심 API (Gateway에서 인증된 사용자만 접근)
+                        .requestMatchers("/api/v1/reservations/**").authenticated()
+
+                        // 나머지는 인증 필요
+                        .anyRequest().authenticated()
+                )
+
+                // LoginFilter를 인증 필터 앞에 배치
+                .addFilterBefore(loginFilter, UsernamePasswordAuthenticationFilter.class)
+
+                // 커스텀 예외 처리
+                .exceptionHandling(c -> {
+                    c.authenticationEntryPoint(authenticationEntryPoint);
+                    c.accessDeniedHandler(accessDeniedHandler);
+                });
+
+        return http.build();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/SecurityConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/SecurityConfig.java
deleted file mode 100644
index 2da76a9..0000000
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/SecurityConfig.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.pgsg.reservation.infrastructure.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import org.springframework.core.annotation.Order;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig {
-
-    @Primary
-    @Order(1) // 다른 보안 설정보다 먼저 적용되도록 강제
-    @Bean(name = "reservationDevFilterChain")
-    @Profile({"local", "dev"})
-    // 핵심: static 키워드를 추가하여 인스턴스 불일치 문제를 해결합니다.
-    public static SecurityFilterChain devFilterChain(HttpSecurity http) throws Exception {
-        http
-                .csrf(AbstractHttpConfigurer::disable)
-                .httpBasic(AbstractHttpConfigurer::disable)
-                .formLogin(AbstractHttpConfigurer::disable)
-                .authorizeHttpRequests(auth -> auth
-                        .requestMatchers("/api/v1/reservations/**").permitAll()
-                        .requestMatchers("/v3/api-docs/**", "/swagger-ui/**").permitAll()
-                        .anyRequest().authenticated()
-                );
-
-        return http.build();
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 84d96df..43c070e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -64,8 +64,9 @@ jwt:
 
 eureka:
   instance:
-    instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
     prefer-ip-address: true
+    ip-address: ${spring.cloud.client.ip-address:${SERVER_IP:localhost}}
+    instance-id: ${spring.cloud.client.ip-address:${SERVER_IP:localhost}}:${spring.application.name}:${server.port}
   client:
     enabled: ${EUREKA_ENABLED:true}
     register-with-eureka: true

From 09e33dc320b5bb321962cd5af376203840e3e5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 00:36:20 +0900
Subject: [PATCH 058/142] =?UTF-8?q?fix=20:=20'Sync=20Project=20to=20VM'=20?=
 =?UTF-8?q?=EB=AC=B4=ED=95=9C=20=EB=A3=A8=ED=94=84=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 952a97e..f5e05c0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -34,10 +34,14 @@ jobs:
           ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
           ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
 
-      # 프로젝트 전체 파일을 VM으로 전송
+      # 프로젝트 핵심 파일만 VM으로 전송
       - name: 'Sync Project to VM'
         run: |
-          gcloud compute scp --recurse . zsx1397@reservation-service:~/app \
+          mkdir -p deploy
+          cp -r src deploy/
+          cp build.gradle settings.gradle Dockerfile docker-compose.yml deploy/
+
+          gcloud compute scp --recurse ./deploy/* zsx1397@reservation-service:~/app \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --ssh-key-file=~/.ssh/id_rsa \

From 6c9e88bb1b4aa65346e899a3e60b106591fdbac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 00:42:45 +0900
Subject: [PATCH 059/142] =?UTF-8?q?fix=20:=20=EA=B8=B0=EC=A1=B4=EC=97=90?=
 =?UTF-8?q?=20=EC=9E=88=EB=8A=94=20=EC=BB=A8=ED=85=8C=EC=9D=B4=EB=84=88=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=82=AD=EC=A0=9C=20?=
 =?UTF-8?q?=ED=9B=84=20=EB=8B=A4=EC=8B=9C=20=EC=8B=A4=ED=96=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f5e05c0..86dd804 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -57,10 +57,16 @@ jobs:
             --quiet \
             --command="
               cd ~/app
-              # 기존 컨테이너 중지 및 삭제
-              docker-compose down
-              # 다시 빌드 및 실행
-              docker-compose up -d --build
-              # 상태 확인
+              # 기존 컨테이너를 이름 기준으로 중지하고 삭제
+              docker-compose down --remove-orphans
+          
+              # 이전 이미지 삭제
+              docker rmi app-reservation-service || true
+          
+              # 새로운 소스로 빌드 및 실행
+              docker-compose up -d --build --force-recreate
+          
+              # 5초 대기 후 상태 확인
+              sleep 5
               docker ps
           "
\ No newline at end of file

From 08fd07068953e1ff10e51f4646d5d2c989b5819b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 00:45:50 +0900
Subject: [PATCH 060/142] =?UTF-8?q?fix=20:=20=EC=9D=B4=EB=AF=B8=EC=A7=80?=
 =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20=EC=8B=9C=20=EA=B0=95=EC=A0=9C=20?=
 =?UTF-8?q?=EC=98=B5=EC=85=98(-f)=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=EB=82=98=EB=8F=84=20=EB=AC=B4=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 86dd804..c1c4bb0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -56,17 +56,10 @@ jobs:
             --ssh-key-file=~/.ssh/id_rsa \
             --quiet \
             --command="
-              cd ~/app
-              # 기존 컨테이너를 이름 기준으로 중지하고 삭제
-              docker-compose down --remove-orphans
-          
-              # 이전 이미지 삭제
-              docker rmi app-reservation-service || true
-          
-              # 새로운 소스로 빌드 및 실행
+            cd ~/app
+              docker-compose down --remove-orphans -v
+              docker rmi -f app-reservation-service || true
               docker-compose up -d --build --force-recreate
-          
-              # 5초 대기 후 상태 확인
               sleep 5
               docker ps
-          "
\ No newline at end of file
+            "
\ No newline at end of file

From 43eee9f656f5fa2b59427b669b5bca0e9797c19f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 00:49:42 +0900
Subject: [PATCH 061/142] =?UTF-8?q?fix=20:=20=EC=BB=A8=ED=85=8C=EC=9D=B4?=
 =?UTF-8?q?=EB=84=88=20=EC=9D=B4=EB=A6=84=20=EC=A7=80=EC=B9=AD=20=ED=9B=84?=
 =?UTF-8?q?=20=EA=B0=95=EC=A0=9C=EB=A1=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c1c4bb0..6a8a2ab 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -56,10 +56,14 @@ jobs:
             --ssh-key-file=~/.ssh/id_rsa \
             --quiet \
             --command="
-            cd ~/app
-              docker-compose down --remove-orphans -v
+              cd ~/app
+          
+              docker rm -f reservation-service || true
+          
               docker rmi -f app-reservation-service || true
+          
               docker-compose up -d --build --force-recreate
+          
               sleep 5
               docker ps
-            "
\ No newline at end of file
+          "
\ No newline at end of file

From 6c8c9cad323f3369138d0b29a1a46f7183c6892f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 00:55:25 +0900
Subject: [PATCH 062/142] =?UTF-8?q?fix=20:=20GitHub=20Actions=EC=97=90=20G?=
 =?UTF-8?q?PR=EB=B6=80=EB=B6=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6a8a2ab..f5a0d90 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -57,13 +57,15 @@ jobs:
             --quiet \
             --command="
               cd ~/app
+              docker network create pgsg-network || true
+              docker-compose down --remove-orphans
           
-              docker rm -f reservation-service || true
-          
-              docker rmi -f app-reservation-service || true
+              export GPR_USER=${{ secrets.GPR_USER }}
+              export GPR_TOKEN=${{ secrets.GPR_TOKEN }}
           
               docker-compose up -d --build --force-recreate
           
-              sleep 5
+              sleep 10
               docker ps
+              docker logs reservation-service
           "
\ No newline at end of file

From 7bb3648c615941d9b9d99a089871ab3ab14590e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 00:59:35 +0900
Subject: [PATCH 063/142] =?UTF-8?q?fix=20:=20env=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EB=B6=80=EB=B6=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f5a0d90..99d59b3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -50,22 +50,31 @@ jobs:
       # VM에서 Docker Compose 실행
       - name: 'Docker Compose Up'
         run: |
-          gcloud compute ssh zsx1397@reservation-service \
+          gcloud compute ssh ***@reservation-service \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --ssh-key-file=~/.ssh/id_rsa \
             --quiet \
             --command="
               cd ~/app
-              docker network create pgsg-network || true
+          
               docker-compose down --remove-orphans
           
-              export GPR_USER=${{ secrets.GPR_USER }}
-              export GPR_TOKEN=${{ secrets.GPR_TOKEN }}
+              # .env 파일 존재 여부 확인 (디버깅용)
+              if [ ! -f .env ]; then
+                echo '.env 파일이 없습니다! 경로를 확인해주세요.'
+                exit 1
+              fi
+          
+              # .env 파일의 내용을 환경 변수로 로드하여 빌드 실행
+              # xargs를 사용해 .env의 내용을 현재 쉘 세션에 주입합니다.
+              export \$(grep -v '^#' .env | xargs)
           
+              # 빌드 및 실행
               docker-compose up -d --build --force-recreate
           
+              # 상태 확인
               sleep 10
               docker ps
-              docker logs reservation-service
+              docker logs reservation-service || echo '빌드 중 에러가 발생했습니다. 위 로그를 확인하세요.'
           "
\ No newline at end of file

From 54e1e932e0a045d706e44e18523584056f346268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 01:04:28 +0900
Subject: [PATCH 064/142] =?UTF-8?q?fix=20:=20env=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EB=B6=80=EB=B6=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 99d59b3..eafa597 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -29,9 +29,9 @@ jobs:
       - name: Setup SSH
         run: |
           mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/google_compute_engine
+          chmod 600 ~/.ssh/google_compute_engine
+          ssh-keygen -y -f ~/.ssh/google_compute_engine > ~/.ssh/google_compute_engine.pub
           ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
 
       # 프로젝트 핵심 파일만 VM으로 전송
@@ -44,16 +44,16 @@ jobs:
           gcloud compute scp --recurse ./deploy/* zsx1397@reservation-service:~/app \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
-            --ssh-key-file=~/.ssh/id_rsa \
+            --ssh-key-file=~/.ssh/google_compute_engine \
             --quiet
 
       # VM에서 Docker Compose 실행
       - name: 'Docker Compose Up'
         run: |
-          gcloud compute ssh ***@reservation-service \
+          gcloud compute ssh zsx1397@reservation-service \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
-            --ssh-key-file=~/.ssh/id_rsa \
+            --ssh-key-file=~/.ssh/google_compute_engine \
             --quiet \
             --command="
               cd ~/app

From f6a524def753f7da7c5c4dc171d2dba57fa0cf06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 01:08:44 +0900
Subject: [PATCH 065/142] =?UTF-8?q?fix=20:=20env=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index eafa597..f5a3e53 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -60,21 +60,16 @@ jobs:
           
               docker-compose down --remove-orphans
           
-              # .env 파일 존재 여부 확인 (디버깅용)
               if [ ! -f .env ]; then
-                echo '.env 파일이 없습니다! 경로를 확인해주세요.'
+                echo '.env 파일이 없습니다!'
                 exit 1
               fi
           
-              # .env 파일의 내용을 환경 변수로 로드하여 빌드 실행
-              # xargs를 사용해 .env의 내용을 현재 쉘 세션에 주입합니다.
-              export \$(grep -v '^#' .env | xargs)
-          
-              # 빌드 및 실행
+              # --env-file 옵션을 사용하여 직접 전달
+              # GPR_USER와 GPR_TOKEN은 Dockerfile에서 ARG로 사용되므로 빌드 시점에 주입
               docker-compose up -d --build --force-recreate
           
-              # 상태 확인
               sleep 10
               docker ps
-              docker logs reservation-service || echo '빌드 중 에러가 발생했습니다. 위 로그를 확인하세요.'
+              docker logs reservation-service || echo '실행 실패 - 빌드 로그를 확인하세요'
           "
\ No newline at end of file

From da40a5b08f8d0598ea44ab5fbf579f452095d29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 01:20:17 +0900
Subject: [PATCH 066/142] =?UTF-8?q?fix=20:=20env=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f5a3e53..26abf0c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # GCP 인증
+      # GCP auth
       - id: 'auth'
         uses: 'google-github-actions/auth@v2'
         with:
@@ -25,7 +25,7 @@ jobs:
       - name: 'Set up Cloud SDK'
         uses: 'google-github-actions/setup-gcloud@v2'
 
-      # SSH 키 설정
+      # SSH key setup
       - name: Setup SSH
         run: |
           mkdir -p ~/.ssh
@@ -34,7 +34,7 @@ jobs:
           ssh-keygen -y -f ~/.ssh/google_compute_engine > ~/.ssh/google_compute_engine.pub
           ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
 
-      # 프로젝트 핵심 파일만 VM으로 전송
+      # Sync deploy files to VM
       - name: 'Sync Project to VM'
         run: |
           mkdir -p deploy
@@ -47,7 +47,7 @@ jobs:
             --ssh-key-file=~/.ssh/google_compute_engine \
             --quiet
 
-      # VM에서 Docker Compose 실행
+      # Run Docker Compose on VM
       - name: 'Docker Compose Up'
         run: |
           gcloud compute ssh zsx1397@reservation-service \
@@ -56,20 +56,29 @@ jobs:
             --ssh-key-file=~/.ssh/google_compute_engine \
             --quiet \
             --command="
+              set -e
+
               cd ~/app
-          
+
               docker-compose down --remove-orphans
-          
+
               if [ ! -f .env ]; then
-                echo '.env 파일이 없습니다!'
+                echo '.env file is missing!'
+                exit 1
+              fi
+
+              invalid_env_lines=\$(grep -nEv '^[[:space:]]*(#|$|[A-Za-z_][A-Za-z0-9_]*=)' .env || true)
+              if [ -n \"\$invalid_env_lines\" ]; then
+                echo '.env has lines that Docker env_file cannot parse.'
+                echo 'Use KEY=value only. Do not use export KEY=value or keys with spaces.'
+                echo \"\$invalid_env_lines\"
                 exit 1
               fi
-          
-              # --env-file 옵션을 사용하여 직접 전달
-              # GPR_USER와 GPR_TOKEN은 Dockerfile에서 ARG로 사용되므로 빌드 시점에 주입
+
+              docker-compose config >/dev/null
               docker-compose up -d --build --force-recreate
-          
+
               sleep 10
               docker ps
-              docker logs reservation-service || echo '실행 실패 - 빌드 로그를 확인하세요'
-          "
\ No newline at end of file
+              docker logs reservation-service
+          "

From 0d2121e5c2d4476a238d41cb789c2c31da1e8ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 01:25:04 +0900
Subject: [PATCH 067/142] =?UTF-8?q?fix=20:=20docker-compose=20down=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 26abf0c..f4cb2da 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -60,8 +60,6 @@ jobs:
 
               cd ~/app
 
-              docker-compose down --remove-orphans
-
               if [ ! -f .env ]; then
                 echo '.env file is missing!'
                 exit 1
@@ -75,6 +73,7 @@ jobs:
                 exit 1
               fi
 
+              docker-compose down --remove-orphans
               docker-compose config >/dev/null
               docker-compose up -d --build --force-recreate
 

From 1e72d9f6346b3dd0a47e6841ea20665c0d3f92a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 01:38:59 +0900
Subject: [PATCH 068/142] =?UTF-8?q?fix=20:=20=20=EC=82=AD=EC=A0=9C?=
 =?UTF-8?q?=EB=90=9C=20=ED=8C=8C=EC=9D=BC=EC=9D=80=20VM=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20=EC=A7=80=EC=9A=B0=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f4cb2da..c6a8008 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -41,6 +41,13 @@ jobs:
           cp -r src deploy/
           cp build.gradle settings.gradle Dockerfile docker-compose.yml deploy/
 
+          gcloud compute ssh zsx1397@reservation-service \
+            --zone=asia-northeast3-a \
+            --tunnel-through-iap \
+            --ssh-key-file=~/.ssh/google_compute_engine \
+            --quiet \
+            --command="mkdir -p ~/app && rm -rf ~/app/src ~/app/build"
+
           gcloud compute scp --recurse ./deploy/* zsx1397@reservation-service:~/app \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \

From 766a000aa23c57c46911908b28ecaffae91fcd27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 01:47:55 +0900
Subject: [PATCH 069/142] =?UTF-8?q?fix=20:=20SERVER=5FIP=EA=B0=80=20?=
 =?UTF-8?q?=EB=A8=BC=EC=A0=80=20=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 43c070e..ee90d42 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -65,8 +65,8 @@ jwt:
 eureka:
   instance:
     prefer-ip-address: true
-    ip-address: ${spring.cloud.client.ip-address:${SERVER_IP:localhost}}
-    instance-id: ${spring.cloud.client.ip-address:${SERVER_IP:localhost}}:${spring.application.name}:${server.port}
+    ip-address: ${SERVER_IP:${spring.cloud.client.ip-address:localhost}}
+    instance-id: ${SERVER_IP:${spring.cloud.client.ip-address:localhost}}:${spring.application.name}:${server.port}
   client:
     enabled: ${EUREKA_ENABLED:true}
     register-with-eureka: true
@@ -81,4 +81,4 @@ topics:
     failed : prod-reservation-tradefail
   product:
     created: prod-product-created
-    failed: prod-product-failed
\ No newline at end of file
+    failed: prod-product-failed

From 1266ac54ab0aa0d530642291f96d785dbbbe308d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 02:02:22 +0900
Subject: [PATCH 070/142] =?UTF-8?q?fix=20:=20SERVER=5FIP=EC=A3=BC=EC=86=8C?=
 =?UTF-8?q?=20=EC=A7=81=EC=A0=91=20=EC=9E=85=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 2 ++
 docker-compose.yml           | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c6a8008..3a9a57d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -80,6 +80,8 @@ jobs:
                 exit 1
               fi
 
+              echo \"Deploying reservation-service as SERVER_IP=\$SERVER_IP SERVER_PORT=\$SERVER_PORT\"
+
               docker-compose down --remove-orphans
               docker-compose config >/dev/null
               docker-compose up -d --build --force-recreate
diff --git a/docker-compose.yml b/docker-compose.yml
index 70ac9c0..6f3ae6d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,11 @@ services:
         - GPR_TOKEN=${GPR_TOKEN}
     environment:
       - "SERVER_PORT=${SERVER_PORT}"
+      - "EUREKA_INSTANCE_PREFER_IP_ADDRESS=true"
+      - "EUREKA_INSTANCE_IP_ADDRESS=${SERVER_IP:?SERVER_IP is required}"
+      - "EUREKA_INSTANCE_HOSTNAME=${SERVER_IP:?SERVER_IP is required}"
+      - "EUREKA_INSTANCE_INSTANCE_ID=${SERVER_IP:?SERVER_IP is required}:reservation-service:${SERVER_PORT}"
+      - "EUREKA_INSTANCE_NON_SECURE_PORT=${SERVER_PORT}"
       - "DB_URL=jdbc:postgresql://reservation-db:5432/${DB_NAME}"
       - "REDIS_HOST=reservation-redis"
       - "EUREKA_SERVER_URL=${EUREKA_SERVER_URL}"
@@ -69,4 +74,4 @@ networks:
     external: true
 
 volumes:
-  postgres-reservation-data:
\ No newline at end of file
+  postgres-reservation-data:

From 4ef29fc9472b5dfd37357cebf4758bbdea383ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 02:12:24 +0900
Subject: [PATCH 071/142] =?UTF-8?q?fix=20:=20=ED=86=A0=ED=81=B0=EC=9D=84?=
 =?UTF-8?q?=20=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8B=A4=EA=B0=80=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=84=EC=95=84=EC=9B=83=EC=8B=9C=20=EC=B5=9C=EB=8C=80=205?=
 =?UTF-8?q?=EB=B2=88,=2010=EC=B4=88=20=EA=B0=84=EA=B2=A9=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=20=EC=9E=AC=EC=8B=9C=EB=8F=84=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 40 +++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 3a9a57d..fc8778a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -37,18 +37,35 @@ jobs:
       # Sync deploy files to VM
       - name: 'Sync Project to VM'
         run: |
+          retry() {
+            local attempts=5
+            local delay=10
+            local n=1
+
+            until "$@"; do
+              if [ "$n" -ge "$attempts" ]; then
+                echo "Command failed after $attempts attempts: $*"
+                return 1
+              fi
+
+              echo "Command failed. Retrying in ${delay}s... ($n/$attempts)"
+              sleep "$delay"
+              n=$((n + 1))
+            done
+          }
+
           mkdir -p deploy
           cp -r src deploy/
           cp build.gradle settings.gradle Dockerfile docker-compose.yml deploy/
 
-          gcloud compute ssh zsx1397@reservation-service \
+          retry gcloud compute ssh zsx1397@reservation-service \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --ssh-key-file=~/.ssh/google_compute_engine \
             --quiet \
             --command="mkdir -p ~/app && rm -rf ~/app/src ~/app/build"
 
-          gcloud compute scp --recurse ./deploy/* zsx1397@reservation-service:~/app \
+          retry gcloud compute scp --recurse ./deploy/* zsx1397@reservation-service:~/app \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --ssh-key-file=~/.ssh/google_compute_engine \
@@ -57,7 +74,24 @@ jobs:
       # Run Docker Compose on VM
       - name: 'Docker Compose Up'
         run: |
-          gcloud compute ssh zsx1397@reservation-service \
+          retry() {
+            local attempts=5
+            local delay=10
+            local n=1
+
+            until "$@"; do
+              if [ "$n" -ge "$attempts" ]; then
+                echo "Command failed after $attempts attempts: $*"
+                return 1
+              fi
+
+              echo "Command failed. Retrying in ${delay}s... ($n/$attempts)"
+              sleep "$delay"
+              n=$((n + 1))
+            done
+          }
+
+          retry gcloud compute ssh zsx1397@reservation-service \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --ssh-key-file=~/.ssh/google_compute_engine \

From 819730812eb9b745a73d4ff234eeaf9ddcf23478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 02:34:58 +0900
Subject: [PATCH 072/142] =?UTF-8?q?fix=20:=20user-role=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/controller/ReservationController.java        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index 6946481..4d27beb 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -2,6 +2,7 @@
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.pgsg.reservation.application.dto.command.*;
 import org.pgsg.reservation.application.dto.info.ReservationCandidateInfo;
 import org.pgsg.reservation.application.dto.info.ReservationStateInfo;
@@ -21,6 +22,7 @@
 
 import java.util.UUID;
 
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/v1/reservations")
@@ -52,6 +54,8 @@ public ReservationPageResponse<ReservationResponse> getReservations(
             @PageableDefault(size = 10) Pageable pageable
     ) {
 
+        log.info("테스트{}", role);
+
         ReservationSearchQuery query = new ReservationSearchQuery(
                 request.getSellerName(),
                 request.getBuyerName(),

From 6a8ef6b32a431830cb7251da75f8bd95d7068e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 10:02:46 +0900
Subject: [PATCH 073/142] =?UTF-8?q?fix=20:=20local=20compose=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=20=EC=B6=94=EA=B0=80,gcp=20Docker=20=EC=9A=A9?=
 =?UTF-8?q?=EB=9F=89=20=ED=99=95=EC=9D=B8/=EC=A0=95=EB=A6=AC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.local.example           | 19 ++++++++++
 .github/workflows/deploy.yml | 19 +++++++++-
 .gitignore                   |  3 +-
 docker-compose.local.yml     | 70 ++++++++++++++++++++++++++++++++++++
 docker-compose.yml           |  6 ++--
 docs/testing.md              | 69 +++++++++++++++++++++++++++++++++++
 6 files changed, 181 insertions(+), 5 deletions(-)
 create mode 100644 .env.local.example
 create mode 100644 docker-compose.local.yml
 create mode 100644 docs/testing.md

diff --git a/.env.local.example b/.env.local.example
new file mode 100644
index 0000000..0f4ffaf
--- /dev/null
+++ b/.env.local.example
@@ -0,0 +1,19 @@
+SERVER_PORT=8085
+SERVER_IP=localhost
+
+DB_NAME=reservation_db
+DB_USERNAME=postgres
+DB_PASSWORD=postgres
+
+REDIS_PORT=6379
+
+GPR_USER=your-github-username
+GPR_TOKEN=your-github-package-token
+JWT_SECRET=use-the-same-secret-as-the-token-issuer-for-local-tests
+
+EUREKA_ENABLED=false
+EUREKA_SERVER_URL=http://localhost:8761/eureka/
+
+SPRING_PROFILES_ACTIVE=dev,kafka
+KAFKA_HOST=localhost:9092
+KAFKA_SSL_TRUSTSTORE_PASSWORD=change-me
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index fc8778a..d37e8e6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -114,9 +114,26 @@ jobs:
                 exit 1
               fi
 
-              echo \"Deploying reservation-service as SERVER_IP=\$SERVER_IP SERVER_PORT=\$SERVER_PORT\"
+              if ! grep -Eq '^SERVER_IP=[^[:space:]]+' .env; then
+                echo 'SERVER_IP is required in .env for deployment.'
+                exit 1
+              fi
+
+              if ! grep -Eq '^SERVER_PORT=[0-9]+' .env; then
+                echo 'SERVER_PORT is required in .env for deployment.'
+                exit 1
+              fi
+
+              deploy_server_ip=\$(grep -E '^SERVER_IP=' .env | tail -n 1 | cut -d= -f2-)
+              deploy_server_port=\$(grep -E '^SERVER_PORT=' .env | tail -n 1 | cut -d= -f2-)
+              echo \"Deploying reservation-service as SERVER_IP=\$deploy_server_ip SERVER_PORT=\$deploy_server_port\"
 
               docker-compose down --remove-orphans
+              docker system df
+              docker builder prune -af || true
+              docker image prune -af || true
+              docker container prune -f || true
+              docker system df
               docker-compose config >/dev/null
               docker-compose up -d --build --force-recreate
 
diff --git a/.gitignore b/.gitignore
index dfe3f5b..00c48f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ HELP.md
 !**/src/main/**/build/
 !**/src/test/**/build/
 .env
+.env.local
 
 # QueryDSL
 src/main/generated/
@@ -52,4 +53,4 @@ out/
 kafka.server.truststore.jks
 
 # Gradle credentials
-gradle.properties
\ No newline at end of file
+gradle.properties
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
new file mode 100644
index 0000000..3864799
--- /dev/null
+++ b/docker-compose.local.yml
@@ -0,0 +1,70 @@
+services:
+  reservation-service:
+    container_name: reservation-service
+    build:
+      context: .
+      args:
+        - GPR_USER=${GPR_USER}
+        - GPR_TOKEN=${GPR_TOKEN}
+    env_file:
+      - .env.local
+    environment:
+      - "SERVER_PORT=${SERVER_PORT:-8085}"
+      - "SPRING_CLOUD_CONFIG_ENABLED=false"
+      - "SPRING_CLOUD_CONFIG_DISCOVERY_ENABLED=false"
+      - "EUREKA_CLIENT_ENABLED=false"
+      - "EUREKA_CLIENT_REGISTER_WITH_EUREKA=false"
+      - "EUREKA_CLIENT_FETCH_REGISTRY=false"
+      - "DB_URL=jdbc:postgresql://reservation-db:5432/${DB_NAME:-reservation_db}"
+      - "REDIS_HOST=reservation-redis"
+      - "KAFKA_SSL_PATH=/app/ssl/kafka.server.truststore.jks"
+    volumes:
+      - ./src/main/resources/ssl:/app/ssl:ro
+    ports:
+      - "${SERVER_PORT:-8085}:${SERVER_PORT:-8085}"
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - pgsg-network
+
+  db:
+    image: postgres:17
+    container_name: reservation-db
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_DB: ${DB_NAME:-reservation_db}
+      POSTGRES_USER: ${DB_USERNAME:-postgres}
+      POSTGRES_PASSWORD: ${DB_PASSWORD:-postgres}
+    volumes:
+      - postgres-reservation-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-postgres}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - pgsg-network
+
+  redis:
+    image: redis:7.2
+    container_name: reservation-redis
+    ports:
+      - "6379:6379"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - pgsg-network
+
+networks:
+  pgsg-network:
+    name: pgsg-network
+
+volumes:
+  postgres-reservation-data:
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f3ae6d..de5a2a8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,9 +11,9 @@ services:
     environment:
       - "SERVER_PORT=${SERVER_PORT}"
       - "EUREKA_INSTANCE_PREFER_IP_ADDRESS=true"
-      - "EUREKA_INSTANCE_IP_ADDRESS=${SERVER_IP:?SERVER_IP is required}"
-      - "EUREKA_INSTANCE_HOSTNAME=${SERVER_IP:?SERVER_IP is required}"
-      - "EUREKA_INSTANCE_INSTANCE_ID=${SERVER_IP:?SERVER_IP is required}:reservation-service:${SERVER_PORT}"
+      - "EUREKA_INSTANCE_IP_ADDRESS=${SERVER_IP:-localhost}"
+      - "EUREKA_INSTANCE_HOSTNAME=${SERVER_IP:-localhost}"
+      - "EUREKA_INSTANCE_INSTANCE_ID=${SERVER_IP:-localhost}:reservation-service:${SERVER_PORT}"
       - "EUREKA_INSTANCE_NON_SECURE_PORT=${SERVER_PORT}"
       - "DB_URL=jdbc:postgresql://reservation-db:5432/${DB_NAME}"
       - "REDIS_HOST=reservation-redis"
diff --git a/docs/testing.md b/docs/testing.md
new file mode 100644
index 0000000..559434c
--- /dev/null
+++ b/docs/testing.md
@@ -0,0 +1,69 @@
+# Reservation Service Test Guide
+
+## Local Docker Test
+
+Create a local env file from the example.
+
+```bash
+cp .env.local.example .env.local
+```
+
+Fill `GPR_USER`, `GPR_TOKEN`, and `JWT_SECRET`.
+
+Run the service locally.
+
+```bash
+docker compose --env-file .env.local -f docker-compose.local.yml up -d --build
+```
+
+Check logs.
+
+```bash
+docker logs -f reservation-service
+```
+
+Direct local request:
+
+```http
+GET http://localhost:8085/api/v1/reservations
+Authorization: Bearer <token>
+X-User-Id: <user-uuid>
+X-User-Roles: BUYER
+```
+
+The gateway normally adds `X-User-Id` and `X-User-Roles`. If you call the reservation service directly in Apidog, add those headers manually.
+
+## GCP Test Through Gateway
+
+Use the gateway address, not the reservation service address.
+
+```http
+GET http://<gateway-ip>:8090/api/v1/reservations
+Authorization: Bearer <token>
+```
+
+The gateway should validate the token, add user headers, discover `RESERVATION-SERVICE` from Eureka, and route the request.
+
+## GCP Direct Service Test
+
+Use this only to isolate reservation-service.
+
+```http
+GET http://<reservation-service-ip>:8085/api/v1/reservations
+Authorization: Bearer <token>
+X-User-Id: <user-uuid>
+X-User-Roles: BUYER
+```
+
+If this works but the gateway request fails, check gateway routing or Eureka registration.
+
+## Deployment Checks
+
+On the reservation VM, `.env` must include:
+
+```env
+SERVER_IP=<reservation-service-vm-external-ip>
+SERVER_PORT=8085
+```
+
+Check registered Eureka address after deployment. It should be the reservation VM external IP, not a Docker bridge IP such as `172.18.x.x`.

From 3e2f8c812d59619e7847225ef221c295f7405de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 10:05:39 +0900
Subject: [PATCH 074/142] =?UTF-8?q?chore=20:=20env=20=EC=B6=94=EC=A0=81=20?=
 =?UTF-8?q?=EC=A0=9C=EC=99=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.local.example | 19 -------------------
 .gitignore         |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 .env.local.example

diff --git a/.env.local.example b/.env.local.example
deleted file mode 100644
index 0f4ffaf..0000000
--- a/.env.local.example
+++ /dev/null
@@ -1,19 +0,0 @@
-SERVER_PORT=8085
-SERVER_IP=localhost
-
-DB_NAME=reservation_db
-DB_USERNAME=postgres
-DB_PASSWORD=postgres
-
-REDIS_PORT=6379
-
-GPR_USER=your-github-username
-GPR_TOKEN=your-github-package-token
-JWT_SECRET=use-the-same-secret-as-the-token-issuer-for-local-tests
-
-EUREKA_ENABLED=false
-EUREKA_SERVER_URL=http://localhost:8761/eureka/
-
-SPRING_PROFILES_ACTIVE=dev,kafka
-KAFKA_HOST=localhost:9092
-KAFKA_SSL_TRUSTSTORE_PASSWORD=change-me
diff --git a/.gitignore b/.gitignore
index 00c48f8..830f3ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ HELP.md
 !**/src/main/**/build/
 !**/src/test/**/build/
 .env
-.env.local
+.env.*
 
 # QueryDSL
 src/main/generated/

From 82174b23ef28e8df4f5abf89618b7a8d52f165fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 10:09:39 +0900
Subject: [PATCH 075/142] =?UTF-8?q?chore=20:=20=EC=A0=88=EB=8C=80=20?=
 =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20/home/zsx1397/=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d37e8e6..dd2795e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -54,6 +54,7 @@ jobs:
             done
           }
 
+          rm -rf deploy
           mkdir -p deploy
           cp -r src deploy/
           cp build.gradle settings.gradle Dockerfile docker-compose.yml deploy/
@@ -63,9 +64,9 @@ jobs:
             --tunnel-through-iap \
             --ssh-key-file=~/.ssh/google_compute_engine \
             --quiet \
-            --command="mkdir -p ~/app && rm -rf ~/app/src ~/app/build"
+            --command="mkdir -p /home/zsx1397/app && rm -rf /home/zsx1397/app/src /home/zsx1397/app/build"
 
-          retry gcloud compute scp --recurse ./deploy/* zsx1397@reservation-service:~/app \
+          retry gcloud compute scp --recurse ./deploy/* zsx1397@reservation-service:/home/zsx1397/app \
             --zone=asia-northeast3-a \
             --tunnel-through-iap \
             --ssh-key-file=~/.ssh/google_compute_engine \

From 73cb7fd0770210249e7499644f56782297d6746d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 10:17:45 +0900
Subject: [PATCH 076/142] =?UTF-8?q?chore=20:=20=EC=95=95=EC=B6=95=ED=9B=84?=
 =?UTF-8?q?=20=ED=95=84=EC=9A=94=20=ED=8C=8C=EC=9D=BC=EB=A7=8C=20=EB=B3=B5?=
 =?UTF-8?q?=EC=82=AC=20=ED=9B=84=20GCP=EC=97=90=20=EC=97=85=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 156 ++++++++++++++++-------------------
 1 file changed, 70 insertions(+), 86 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index dd2795e..25d8c21 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -34,47 +34,18 @@ jobs:
           ssh-keygen -y -f ~/.ssh/google_compute_engine > ~/.ssh/google_compute_engine.pub
           ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
 
-      # Sync deploy files to VM
-      - name: 'Sync Project to VM'
+      - name: Deploy
         run: |
-          retry() {
-            local attempts=5
-            local delay=10
-            local n=1
-
-            until "$@"; do
-              if [ "$n" -ge "$attempts" ]; then
-                echo "Command failed after $attempts attempts: $*"
-                return 1
-              fi
-
-              echo "Command failed. Retrying in ${delay}s... ($n/$attempts)"
-              sleep "$delay"
-              n=$((n + 1))
-            done
-          }
-
-          rm -rf deploy
-          mkdir -p deploy
-          cp -r src deploy/
-          cp build.gradle settings.gradle Dockerfile docker-compose.yml deploy/
-
-          retry gcloud compute ssh zsx1397@reservation-service \
-            --zone=asia-northeast3-a \
-            --tunnel-through-iap \
-            --ssh-key-file=~/.ssh/google_compute_engine \
-            --quiet \
-            --command="mkdir -p /home/zsx1397/app && rm -rf /home/zsx1397/app/src /home/zsx1397/app/build"
-
-          retry gcloud compute scp --recurse ./deploy/* zsx1397@reservation-service:/home/zsx1397/app \
-            --zone=asia-northeast3-a \
-            --tunnel-through-iap \
-            --ssh-key-file=~/.ssh/google_compute_engine \
+          VM="zsx1397@reservation-service"
+          APP_DIR="/home/zsx1397/app"
+          ARCHIVE="reservation-service-deploy.tar.gz"
+          GCLOUD_ARGS=(
+            --zone=asia-northeast3-a
+            --tunnel-through-iap
+            --ssh-key-file=~/.ssh/google_compute_engine
             --quiet
+          )
 
-      # Run Docker Compose on VM
-      - name: 'Docker Compose Up'
-        run: |
           retry() {
             local attempts=5
             local delay=10
@@ -92,53 +63,66 @@ jobs:
             done
           }
 
-          retry gcloud compute ssh zsx1397@reservation-service \
-            --zone=asia-northeast3-a \
-            --tunnel-through-iap \
-            --ssh-key-file=~/.ssh/google_compute_engine \
-            --quiet \
-            --command="
-              set -e
-
-              cd ~/app
-
-              if [ ! -f .env ]; then
-                echo '.env file is missing!'
-                exit 1
-              fi
-
-              invalid_env_lines=\$(grep -nEv '^[[:space:]]*(#|$|[A-Za-z_][A-Za-z0-9_]*=)' .env || true)
-              if [ -n \"\$invalid_env_lines\" ]; then
-                echo '.env has lines that Docker env_file cannot parse.'
-                echo 'Use KEY=value only. Do not use export KEY=value or keys with spaces.'
-                echo \"\$invalid_env_lines\"
-                exit 1
-              fi
-
-              if ! grep -Eq '^SERVER_IP=[^[:space:]]+' .env; then
-                echo 'SERVER_IP is required in .env for deployment.'
-                exit 1
-              fi
+          remote() {
+            retry gcloud compute ssh "$VM" "${GCLOUD_ARGS[@]}" --command "$1"
+          }
 
-              if ! grep -Eq '^SERVER_PORT=[0-9]+' .env; then
-                echo 'SERVER_PORT is required in .env for deployment.'
-                exit 1
-              fi
+          copy_to_vm() {
+            retry gcloud compute scp "$1" "$VM:$2" "${GCLOUD_ARGS[@]}" --scp-flag=-O
+          }
 
-              deploy_server_ip=\$(grep -E '^SERVER_IP=' .env | tail -n 1 | cut -d= -f2-)
-              deploy_server_port=\$(grep -E '^SERVER_PORT=' .env | tail -n 1 | cut -d= -f2-)
-              echo \"Deploying reservation-service as SERVER_IP=\$deploy_server_ip SERVER_PORT=\$deploy_server_port\"
-
-              docker-compose down --remove-orphans
-              docker system df
-              docker builder prune -af || true
-              docker image prune -af || true
-              docker container prune -f || true
-              docker system df
-              docker-compose config >/dev/null
-              docker-compose up -d --build --force-recreate
-
-              sleep 10
-              docker ps
-              docker logs reservation-service
-          "
+          rm -rf deploy
+          mkdir -p deploy
+          cp -r src deploy/
+          cp build.gradle settings.gradle Dockerfile docker-compose.yml deploy/
+          tar -czf "$ARCHIVE" -C deploy .
+
+          remote "mkdir -p $APP_DIR && rm -rf $APP_DIR/src $APP_DIR/build /tmp/$ARCHIVE"
+          copy_to_vm "$ARCHIVE" "/tmp/$ARCHIVE"
+          remote "tar -xzf /tmp/$ARCHIVE -C $APP_DIR && rm -f /tmp/$ARCHIVE"
+
+          remote '
+            set -e
+
+            cd /home/zsx1397/app
+
+            if [ ! -f .env ]; then
+              echo ".env file is missing!"
+              exit 1
+            fi
+
+            invalid_env_lines=$(grep -nEv "^[[:space:]]*(#|$|[A-Za-z_][A-Za-z0-9_]*=)" .env || true)
+            if [ -n "$invalid_env_lines" ]; then
+              echo ".env has lines that Docker env_file cannot parse."
+              echo "Use KEY=value only. Do not use export KEY=value or keys with spaces."
+              echo "$invalid_env_lines"
+              exit 1
+            fi
+
+            if ! grep -Eq "^SERVER_IP=[^[:space:]]+" .env; then
+              echo "SERVER_IP is required in .env for deployment."
+              exit 1
+            fi
+
+            if ! grep -Eq "^SERVER_PORT=[0-9]+" .env; then
+              echo "SERVER_PORT is required in .env for deployment."
+              exit 1
+            fi
+
+            deploy_server_ip=$(grep -E "^SERVER_IP=" .env | tail -n 1 | cut -d= -f2-)
+            deploy_server_port=$(grep -E "^SERVER_PORT=" .env | tail -n 1 | cut -d= -f2-)
+            echo "Deploying reservation-service as SERVER_IP=$deploy_server_ip SERVER_PORT=$deploy_server_port"
+
+            docker-compose down --remove-orphans
+            docker system df
+            docker builder prune -af || true
+            docker image prune -af || true
+            docker container prune -f || true
+            docker system df
+            docker-compose config >/dev/null
+            docker-compose up -d --build --force-recreate
+
+            sleep 10
+            docker ps
+            docker logs reservation-service
+          '

From c10e68f18cf330ae3bf1192d7cf2df1ea850d66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 11:13:56 +0900
Subject: [PATCH 077/142] =?UTF-8?q?chore=20:=20Artifact=20Registry?=
 =?UTF-8?q?=EB=A5=BC=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml    | 249 ++++++++++++++++++++------------
 Dockerfile                      |  12 +-
 deploy/docker-compose.prod.yaml |  17 ++-
 docs/testing.md                 |  69 ---------
 4 files changed, 175 insertions(+), 172 deletions(-)
 delete mode 100644 docs/testing.md

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 25d8c21..c8a8309 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,12 +1,81 @@
-name: Deploy to GCP VM
+name: Deploy Reservation Service
 
 on:
   push:
-    branches: [ "dev" ]
+    branches: [ "main","dev" ]
+  workflow_dispatch:
+
+env:
+  GCP_PROJECT: ${{ vars.GCP_PROJECT_ID }}
+  GCP_ZONE: ${{ vars.GCP_ZONE }}
+  AR_IMAGE_PATH: ${{ vars.AR_IMAGE_PATH }}
+  VM_NAME: reservation-service
+  VM_USER: zsx1397
+  WORK_DIR: /home/zsx1397/app
+  HEALTH_RETRIES: 30
+  HEALTH_INTERVAL: 10
 
 jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    permissions:
+      contents: read
+      id-token: write
+    outputs:
+      image_tag: ${{ steps.meta.outputs.tag }}
+      registry_host: ${{ steps.meta.outputs.registry_host }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Authenticate to GCP
+        id: auth
+        uses: google-github-actions/auth@v2
+        with:
+          token_format: access_token
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+          service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+          project_id: ${{ env.GCP_PROJECT }}
+
+      - name: Set up gcloud
+        uses: google-github-actions/setup-gcloud@v2
+
+      - name: Resolve image metadata
+        id: meta
+        run: |
+          echo "tag=${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
+          echo "registry_host=$(echo "$AR_IMAGE_PATH" | cut -d/ -f1)" >> "$GITHUB_OUTPUT"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Artifact Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ steps.meta.outputs.registry_host }}
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
+
+      - name: Build and push image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ env.AR_IMAGE_PATH }}:${{ steps.meta.outputs.tag }}
+            ${{ env.AR_IMAGE_PATH }}:latest
+          secrets: |
+            GPR_USER=${{ secrets.GPR_USER }}
+            GPR_TOKEN=${{ secrets.GPR_TOKEN }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
   deploy:
+    needs: build-and-push
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     permissions:
       contents: read
       id-token: write
@@ -15,17 +84,18 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # GCP auth
-      - id: 'auth'
-        uses: 'google-github-actions/auth@v2'
+      - name: Authenticate to GCP
+        id: auth
+        uses: google-github-actions/auth@v2
         with:
-          workload_identity_provider: '${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}'
-          service_account: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
+          token_format: access_token
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+          service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+          project_id: ${{ env.GCP_PROJECT }}
 
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v2'
+      - name: Set up gcloud
+        uses: google-github-actions/setup-gcloud@v2
 
-      # SSH key setup
       - name: Setup SSH
         run: |
           mkdir -p ~/.ssh
@@ -34,95 +104,86 @@ jobs:
           ssh-keygen -y -f ~/.ssh/google_compute_engine > ~/.ssh/google_compute_engine.pub
           ssh-keyscan -H 34.64.247.238 >> ~/.ssh/known_hosts
 
-      - name: Deploy
+      - name: Check VM status
+        id: vm-status
+        run: |
+          STATUS=$(gcloud compute instances describe "$VM_NAME" \
+            --zone="$GCP_ZONE" \
+            --project="$GCP_PROJECT" \
+            --format="value(status)" 2>/dev/null || echo "NOT_FOUND")
+          echo "status=$STATUS" >> "$GITHUB_OUTPUT"
+          echo "$VM_NAME -> $STATUS"
+
+      - name: Copy compose file
+        if: steps.vm-status.outputs.status == 'RUNNING'
         run: |
-          VM="zsx1397@reservation-service"
-          APP_DIR="/home/zsx1397/app"
-          ARCHIVE="reservation-service-deploy.tar.gz"
-          GCLOUD_ARGS=(
-            --zone=asia-northeast3-a
-            --tunnel-through-iap
-            --ssh-key-file=~/.ssh/google_compute_engine
+          gcloud compute scp deploy/docker-compose.prod.yaml \
+            "$VM_USER@$VM_NAME:/tmp/docker-compose.prod.yaml" \
+            --zone="$GCP_ZONE" \
+            --project="$GCP_PROJECT" \
+            --tunnel-through-iap \
+            --ssh-key-file=~/.ssh/google_compute_engine \
+            --scp-flag=-O \
             --quiet
-          )
-
-          retry() {
-            local attempts=5
-            local delay=10
-            local n=1
 
-            until "$@"; do
-              if [ "$n" -ge "$attempts" ]; then
-                echo "Command failed after $attempts attempts: $*"
-                return 1
+      - name: Deploy and verify
+        if: steps.vm-status.outputs.status == 'RUNNING'
+        env:
+          IMAGE_TAG: ${{ needs.build-and-push.outputs.image_tag }}
+          AR_TOKEN: ${{ steps.auth.outputs.access_token }}
+          REGISTRY_HOST: ${{ needs.build-and-push.outputs.registry_host }}
+        run: |
+          gcloud compute ssh "$VM_USER@$VM_NAME" \
+            --zone="$GCP_ZONE" \
+            --project="$GCP_PROJECT" \
+            --tunnel-through-iap \
+            --ssh-key-file=~/.ssh/google_compute_engine \
+            --quiet \
+            --command="
+              set -e
+
+              echo '$AR_TOKEN' | docker login -u oauth2accesstoken --password-stdin https://$REGISTRY_HOST
+
+              mkdir -p '$WORK_DIR'
+              mv /tmp/docker-compose.prod.yaml '$WORK_DIR/docker-compose.prod.yaml'
+              cd '$WORK_DIR'
+
+              test -f .env || { echo '.env not found in $WORK_DIR'; exit 1; }
+
+              if ! grep -Eq '^SERVER_IP=[^[:space:]]+' .env; then
+                echo 'SERVER_IP is required in .env for deployment.'
+                exit 1
               fi
 
-              echo "Command failed. Retrying in ${delay}s... ($n/$attempts)"
-              sleep "$delay"
-              n=$((n + 1))
-            done
-          }
-
-          remote() {
-            retry gcloud compute ssh "$VM" "${GCLOUD_ARGS[@]}" --command "$1"
-          }
-
-          copy_to_vm() {
-            retry gcloud compute scp "$1" "$VM:$2" "${GCLOUD_ARGS[@]}" --scp-flag=-O
-          }
-
-          rm -rf deploy
-          mkdir -p deploy
-          cp -r src deploy/
-          cp build.gradle settings.gradle Dockerfile docker-compose.yml deploy/
-          tar -czf "$ARCHIVE" -C deploy .
-
-          remote "mkdir -p $APP_DIR && rm -rf $APP_DIR/src $APP_DIR/build /tmp/$ARCHIVE"
-          copy_to_vm "$ARCHIVE" "/tmp/$ARCHIVE"
-          remote "tar -xzf /tmp/$ARCHIVE -C $APP_DIR && rm -f /tmp/$ARCHIVE"
-
-          remote '
-            set -e
-
-            cd /home/zsx1397/app
-
-            if [ ! -f .env ]; then
-              echo ".env file is missing!"
-              exit 1
-            fi
-
-            invalid_env_lines=$(grep -nEv "^[[:space:]]*(#|$|[A-Za-z_][A-Za-z0-9_]*=)" .env || true)
-            if [ -n "$invalid_env_lines" ]; then
-              echo ".env has lines that Docker env_file cannot parse."
-              echo "Use KEY=value only. Do not use export KEY=value or keys with spaces."
-              echo "$invalid_env_lines"
-              exit 1
-            fi
+              if ! grep -Eq '^SERVER_PORT=[0-9]+' .env; then
+                echo 'SERVER_PORT is required in .env for deployment.'
+                exit 1
+              fi
 
-            if ! grep -Eq "^SERVER_IP=[^[:space:]]+" .env; then
-              echo "SERVER_IP is required in .env for deployment."
-              exit 1
-            fi
+              if ! docker network inspect pgsg-network >/dev/null 2>&1; then
+                docker network create pgsg-network
+              fi
 
-            if ! grep -Eq "^SERVER_PORT=[0-9]+" .env; then
-              echo "SERVER_PORT is required in .env for deployment."
+              docker image prune -af || true
+              docker container prune -f || true
+
+              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker compose -f docker-compose.prod.yaml config >/dev/null
+              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker compose -f docker-compose.prod.yaml pull
+              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker compose -f docker-compose.prod.yaml up -d
+
+              for i in \$(seq 1 $HEALTH_RETRIES); do
+                if curl -sf http://localhost:8085/actuator/health | grep -q '\"status\":\"UP\"'; then
+                  echo \"Actuator UP (attempt \$i)\"
+                  docker ps
+                  docker logs reservation-service --tail=120
+                  exit 0
+                fi
+                echo \"Waiting for service... (\$i/$HEALTH_RETRIES)\"
+                sleep $HEALTH_INTERVAL
+              done
+
+              docker ps
+              docker logs reservation-service --tail=200
+              echo 'Actuator health check failed.'
               exit 1
-            fi
-
-            deploy_server_ip=$(grep -E "^SERVER_IP=" .env | tail -n 1 | cut -d= -f2-)
-            deploy_server_port=$(grep -E "^SERVER_PORT=" .env | tail -n 1 | cut -d= -f2-)
-            echo "Deploying reservation-service as SERVER_IP=$deploy_server_ip SERVER_PORT=$deploy_server_port"
-
-            docker-compose down --remove-orphans
-            docker system df
-            docker builder prune -af || true
-            docker image prune -af || true
-            docker container prune -f || true
-            docker system df
-            docker-compose config >/dev/null
-            docker-compose up -d --build --force-recreate
-
-            sleep 10
-            docker ps
-            docker logs reservation-service
-          '
+            "
diff --git a/Dockerfile b/Dockerfile
index 1e37f76..283f5ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1.7
+
 # 빌드 단계
 FROM eclipse-temurin:21-jdk-alpine AS build
 WORKDIR /app
@@ -14,7 +16,11 @@ RUN dos2unix gradlew && chmod +x gradlew
 # 빌드 실행
 ARG GPR_USER
 ARG GPR_TOKEN
-RUN ./gradlew clean bootJar -x test -Pgpr.user=${GPR_USER} -Pgpr.key=${GPR_TOKEN}
+RUN --mount=type=secret,id=GPR_USER,required=false \
+    --mount=type=secret,id=GPR_TOKEN,required=false \
+    GPR_USER_VALUE="$(cat /run/secrets/GPR_USER 2>/dev/null || echo "${GPR_USER}")" && \
+    GPR_TOKEN_VALUE="$(cat /run/secrets/GPR_TOKEN 2>/dev/null || echo "${GPR_TOKEN}")" && \
+    ./gradlew clean bootJar -x test -Pgpr.user="${GPR_USER_VALUE}" -Pgpr.key="${GPR_TOKEN_VALUE}"
 
 # 실행 단계
 FROM eclipse-temurin:21-jre-alpine
@@ -28,7 +34,7 @@ COPY --from=build /app/build/libs/*-SNAPSHOT.jar app.jar
 
 # SSL 인증서 복사 (물리 경로 확보)
 RUN mkdir -p /app/ssl
-COPY --from=build /app/src/main/resources/ssl/*.jks /app/ssl/
+COPY --from=build /app/src/main/resources/ssl/ /app/ssl/
 
 # 권한 설정
 RUN chown -R appuser:appuser /app
@@ -41,4 +47,4 @@ ENV SPRING_KAFKA_SSL_TRUST_STORE_PASSWORD=_aA123456
 EXPOSE 8085
 USER appuser
 
-ENTRYPOINT ["java", "-XX:+UseContainerSupport", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-XX:+UseContainerSupport", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/deploy/docker-compose.prod.yaml b/deploy/docker-compose.prod.yaml
index 31914e6..9724c4b 100644
--- a/deploy/docker-compose.prod.yaml
+++ b/deploy/docker-compose.prod.yaml
@@ -1,18 +1,23 @@
-version: '3.8'
-
 services:
   reservation-service:
     container_name: reservation-service
-    image: ${AR_IMAGE_PATH}:${IMAGE_TAG:-latest} # AR 기반 이미지 사용
+    image: ${AR_IMAGE_PATH}:${IMAGE_TAG:-latest}
     restart: always
     env_file:
       - .env
+    environment:
+      EUREKA_INSTANCE_PREFER_IP_ADDRESS: "true"
+      EUREKA_INSTANCE_IP_ADDRESS: ${SERVER_IP}
+      EUREKA_INSTANCE_HOSTNAME: ${SERVER_IP}
+      EUREKA_INSTANCE_INSTANCE_ID: ${SERVER_IP}:reservation-service:${SERVER_PORT:-8085}
+      EUREKA_INSTANCE_NON_SECURE_PORT: ${SERVER_PORT:-8085}
+      DB_URL: jdbc:postgresql://reservation-db:5432/${DB_NAME:-reservation_db}
+      REDIS_HOST: reservation-redis
+      KAFKA_SSL_PATH: /app/ssl/kafka.server.truststore.jks
     volumes:
-      # 서버의 /opt/reservation-service/ssl 폴더를 컨테이너 내부로 연결
       - ./ssl:/app/ssl:ro
     ports:
       - "${SERVER_PORT:-8085}:${SERVER_PORT:-8085}"
-      - "8081:8081" # 헬스체크용 포트
     depends_on:
       db:
         condition: service_healthy
@@ -54,4 +59,4 @@ networks:
     external: true
 
 volumes:
-  postgres-reservation-data:
\ No newline at end of file
+  postgres-reservation-data:
diff --git a/docs/testing.md b/docs/testing.md
deleted file mode 100644
index 559434c..0000000
--- a/docs/testing.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Reservation Service Test Guide
-
-## Local Docker Test
-
-Create a local env file from the example.
-
-```bash
-cp .env.local.example .env.local
-```
-
-Fill `GPR_USER`, `GPR_TOKEN`, and `JWT_SECRET`.
-
-Run the service locally.
-
-```bash
-docker compose --env-file .env.local -f docker-compose.local.yml up -d --build
-```
-
-Check logs.
-
-```bash
-docker logs -f reservation-service
-```
-
-Direct local request:
-
-```http
-GET http://localhost:8085/api/v1/reservations
-Authorization: Bearer <token>
-X-User-Id: <user-uuid>
-X-User-Roles: BUYER
-```
-
-The gateway normally adds `X-User-Id` and `X-User-Roles`. If you call the reservation service directly in Apidog, add those headers manually.
-
-## GCP Test Through Gateway
-
-Use the gateway address, not the reservation service address.
-
-```http
-GET http://<gateway-ip>:8090/api/v1/reservations
-Authorization: Bearer <token>
-```
-
-The gateway should validate the token, add user headers, discover `RESERVATION-SERVICE` from Eureka, and route the request.
-
-## GCP Direct Service Test
-
-Use this only to isolate reservation-service.
-
-```http
-GET http://<reservation-service-ip>:8085/api/v1/reservations
-Authorization: Bearer <token>
-X-User-Id: <user-uuid>
-X-User-Roles: BUYER
-```
-
-If this works but the gateway request fails, check gateway routing or Eureka registration.
-
-## Deployment Checks
-
-On the reservation VM, `.env` must include:
-
-```env
-SERVER_IP=<reservation-service-vm-external-ip>
-SERVER_PORT=8085
-```
-
-Check registered Eureka address after deployment. It should be the reservation VM external IP, not a Docker bridge IP such as `172.18.x.x`.

From 1be739467aec51c2d19ebd26d3c5db6857f50e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 11:48:43 +0900
Subject: [PATCH 078/142] =?UTF-8?q?chore=20:=20=EB=B9=8C=EB=93=9C=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=EB=A1=9C=20=EC=9D=B8=ED=95=98=EC=97=AC=20?=
 =?UTF-8?q?=ED=95=98=EC=9D=B4=ED=94=88=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c8a8309..5b90a52 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -167,9 +167,9 @@ jobs:
               docker image prune -af || true
               docker container prune -f || true
 
-              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker compose -f docker-compose.prod.yaml config >/dev/null
-              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker compose -f docker-compose.prod.yaml pull
-              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker compose -f docker-compose.prod.yaml up -d
+              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker-compose -f docker-compose.prod.yaml config >/dev/null
+              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker-compose -f docker-compose.prod.yaml pull
+              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker-compose -f docker-compose.prod.yaml up -d
 
               for i in \$(seq 1 $HEALTH_RETRIES); do
                 if curl -sf http://localhost:8085/actuator/health | grep -q '\"status\":\"UP\"'; then

From 815532a5ee60a5643443cd8b58e5181c9a94a47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 12:04:39 +0900
Subject: [PATCH 079/142] =?UTF-8?q?chore=20:=20kafka=20ssl=20=EB=88=84?=
 =?UTF-8?q?=EB=9D=BD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 63 +++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5b90a52..cae3c60 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -126,6 +126,40 @@ jobs:
             --scp-flag=-O \
             --quiet
 
+      - name: Copy Kafka truststore
+        if: steps.vm-status.outputs.status == 'RUNNING'
+        env:
+          KAFKA_TRUSTSTORE_JKS_BASE64: ${{ secrets.KAFKA_TRUSTSTORE_JKS_BASE64 }}
+        run: |
+          if [ -z "$KAFKA_TRUSTSTORE_JKS_BASE64" ]; then
+            echo "KAFKA_TRUSTSTORE_JKS_BASE64 is not set."
+            exit 0
+          fi
+
+          printf '%s' "$KAFKA_TRUSTSTORE_JKS_BASE64" | base64 -d > kafka.server.truststore.jks
+
+          gcloud compute scp kafka.server.truststore.jks \
+            "$VM_USER@$VM_NAME:/tmp/kafka.server.truststore.jks" \
+            --zone="$GCP_ZONE" \
+            --project="$GCP_PROJECT" \
+            --tunnel-through-iap \
+            --ssh-key-file=~/.ssh/google_compute_engine \
+            --scp-flag=-O \
+            --quiet
+
+          gcloud compute ssh "$VM_USER@$VM_NAME" \
+            --zone="$GCP_ZONE" \
+            --project="$GCP_PROJECT" \
+            --tunnel-through-iap \
+            --ssh-key-file=~/.ssh/google_compute_engine \
+            --quiet \
+            --command="
+              mkdir -p '$WORK_DIR/ssl'
+              sudo chown -R '$VM_USER:$VM_USER' '$WORK_DIR/ssl'
+              mv /tmp/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
+              chmod 600 '$WORK_DIR/ssl/kafka.server.truststore.jks'
+            "
+
       - name: Deploy and verify
         if: steps.vm-status.outputs.status == 'RUNNING'
         env:
@@ -148,28 +182,26 @@ jobs:
               mv /tmp/docker-compose.prod.yaml '$WORK_DIR/docker-compose.prod.yaml'
               cd '$WORK_DIR'
 
+              find . -mindepth 1 -maxdepth 1 ! -name '.env' ! -name 'ssl' ! -name 'docker-compose.prod.yaml' -exec rm -rf {} +
+
               test -f .env || { echo '.env not found in $WORK_DIR'; exit 1; }
 
-              if ! grep -Eq '^SERVER_IP=[^[:space:]]+' .env; then
-                echo 'SERVER_IP is required in .env for deployment.'
+              if [ ! -s ssl/kafka.server.truststore.jks ]; then
+                echo 'Kafka truststore is missing in $WORK_DIR/ssl'
                 exit 1
               fi
 
-              if ! grep -Eq '^SERVER_PORT=[0-9]+' .env; then
-                echo 'SERVER_PORT is required in .env for deployment.'
-                exit 1
-              fi
-
-              if ! docker network inspect pgsg-network >/dev/null 2>&1; then
-                docker network create pgsg-network
-              fi
+              docker network inspect pgsg-network >/dev/null 2>&1 || docker network create pgsg-network
 
               docker image prune -af || true
-              docker container prune -f || true
+          
+              COMPOSE_CMD='docker compose'
+              if ! \$COMPOSE_CMD version >/dev/null 2>&1; then
+                COMPOSE_CMD='docker-compose'
+              fi
 
-              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker-compose -f docker-compose.prod.yaml config >/dev/null
-              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker-compose -f docker-compose.prod.yaml pull
-              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' docker-compose -f docker-compose.prod.yaml up -d
+              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' \$COMPOSE_CMD -f docker-compose.prod.yaml pull
+              IMAGE_TAG='$IMAGE_TAG' AR_IMAGE_PATH='$AR_IMAGE_PATH' \$COMPOSE_CMD -f docker-compose.prod.yaml up -d
 
               for i in \$(seq 1 $HEALTH_RETRIES); do
                 if curl -sf http://localhost:8085/actuator/health | grep -q '\"status\":\"UP\"'; then
@@ -184,6 +216,5 @@ jobs:
 
               docker ps
               docker logs reservation-service --tail=200
-              echo 'Actuator health check failed.'
               exit 1
-            "
+            "
\ No newline at end of file

From 3f8e3f0a5b934550731413ebf30ed39014eaf13d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 12:17:57 +0900
Subject: [PATCH 080/142] =?UTF-8?q?chore=20:=20kafka=20ssl=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index cae3c60..a2ff7a7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -112,7 +112,6 @@ jobs:
             --project="$GCP_PROJECT" \
             --format="value(status)" 2>/dev/null || echo "NOT_FOUND")
           echo "status=$STATUS" >> "$GITHUB_OUTPUT"
-          echo "$VM_NAME -> $STATUS"
 
       - name: Copy compose file
         if: steps.vm-status.outputs.status == 'RUNNING'
@@ -132,14 +131,13 @@ jobs:
           KAFKA_TRUSTSTORE_JKS_BASE64: ${{ secrets.KAFKA_TRUSTSTORE_JKS_BASE64 }}
         run: |
           if [ -z "$KAFKA_TRUSTSTORE_JKS_BASE64" ]; then
-            echo "KAFKA_TRUSTSTORE_JKS_BASE64 is not set."
             exit 0
           fi
 
           printf '%s' "$KAFKA_TRUSTSTORE_JKS_BASE64" | base64 -d > kafka.server.truststore.jks
 
           gcloud compute scp kafka.server.truststore.jks \
-            "$VM_USER@$VM_NAME:/tmp/kafka.server.truststore.jks" \
+            "$VM_USER@$VM_NAME:~/kafka.server.truststore.jks" \
             --zone="$GCP_ZONE" \
             --project="$GCP_PROJECT" \
             --tunnel-through-iap \
@@ -155,9 +153,14 @@ jobs:
             --quiet \
             --command="
               mkdir -p '$WORK_DIR/ssl'
+              if [ -f ~/kafka.server.truststore.jks ]; then
+                mv ~/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
+              elif [ -f /tmp/kafka.server.truststore.jks ]; then
+                mv /tmp/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
+              fi
               sudo chown -R '$VM_USER:$VM_USER' '$WORK_DIR/ssl'
-              mv /tmp/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
-              chmod 600 '$WORK_DIR/ssl/kafka.server.truststore.jks'
+              chmod 755 '$WORK_DIR/ssl'
+              chmod 644 '$WORK_DIR/ssl/kafka.server.truststore.jks'
             "
 
       - name: Deploy and verify
@@ -179,15 +182,14 @@ jobs:
               echo '$AR_TOKEN' | docker login -u oauth2accesstoken --password-stdin https://$REGISTRY_HOST
 
               mkdir -p '$WORK_DIR'
-              mv /tmp/docker-compose.prod.yaml '$WORK_DIR/docker-compose.prod.yaml'
+              [ -f /tmp/docker-compose.prod.yaml ] && mv /tmp/docker-compose.prod.yaml '$WORK_DIR/docker-compose.prod.yaml'
               cd '$WORK_DIR'
 
               find . -mindepth 1 -maxdepth 1 ! -name '.env' ! -name 'ssl' ! -name 'docker-compose.prod.yaml' -exec rm -rf {} +
 
-              test -f .env || { echo '.env not found in $WORK_DIR'; exit 1; }
+              test -f .env || { exit 1; }
 
               if [ ! -s ssl/kafka.server.truststore.jks ]; then
-                echo 'Kafka truststore is missing in $WORK_DIR/ssl'
                 exit 1
               fi
 
@@ -205,12 +207,10 @@ jobs:
 
               for i in \$(seq 1 $HEALTH_RETRIES); do
                 if curl -sf http://localhost:8085/actuator/health | grep -q '\"status\":\"UP\"'; then
-                  echo \"Actuator UP (attempt \$i)\"
                   docker ps
                   docker logs reservation-service --tail=120
                   exit 0
                 fi
-                echo \"Waiting for service... (\$i/$HEALTH_RETRIES)\"
                 sleep $HEALTH_INTERVAL
               done
 

From 996f640532ac67f2b8a1f88cf0060d758f4febde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 12:27:37 +0900
Subject: [PATCH 081/142] =?UTF-8?q?chore=20:=20=EC=82=AC=EC=9A=A9=EC=9E=90?=
 =?UTF-8?q?=20=EC=9D=B4=EB=A6=84=EC=9D=84=20docker=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=ED=95=98=EC=97=AC=20=ED=95=B8=EB=93=A4=EB=A7=81=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=EC=97=86=EC=9D=B4=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a2ff7a7..1a69916 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -158,9 +158,11 @@ jobs:
               elif [ -f /tmp/kafka.server.truststore.jks ]; then
                 mv /tmp/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
               fi
-              sudo chown -R '$VM_USER:$VM_USER' '$WORK_DIR/ssl'
+              sudo chown -R $VM_USER:docker '$WORK_DIR/ssl'
               chmod 755 '$WORK_DIR/ssl'
               chmod 644 '$WORK_DIR/ssl/kafka.server.truststore.jks'
+          
+              ls -l '$WORK_DIR/ssl/kafka.server.truststore.jks'
             "
 
       - name: Deploy and verify

From 446db3b8602ab1b824565ca2df4bc412150cab63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 12:33:46 +0900
Subject: [PATCH 082/142] =?UTF-8?q?chore=20:=20ssl=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1a69916..d7a50bf 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -152,16 +152,20 @@ jobs:
             --ssh-key-file=~/.ssh/google_compute_engine \
             --quiet \
             --command="
-              mkdir -p '$WORK_DIR/ssl'
+              sudo mkdir -p '$WORK_DIR/ssl'
+          
               if [ -f ~/kafka.server.truststore.jks ]; then
-                mv ~/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
+                sudo mv ~/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
               elif [ -f /tmp/kafka.server.truststore.jks ]; then
-                mv /tmp/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
+                sudo mv /tmp/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
               fi
+          
+              sudo chmod 755 '$WORK_DIR/ssl'
+              sudo chmod 644 '$WORK_DIR/ssl/kafka.server.truststore.jks'
+          
               sudo chown -R $VM_USER:docker '$WORK_DIR/ssl'
-              chmod 755 '$WORK_DIR/ssl'
-              chmod 644 '$WORK_DIR/ssl/kafka.server.truststore.jks'
           
+              ls -ld '$WORK_DIR/ssl'
               ls -l '$WORK_DIR/ssl/kafka.server.truststore.jks'
             "
 

From f4585c9093a398e0a81758b661d5e57ce283c308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 12:44:12 +0900
Subject: [PATCH 083/142] =?UTF-8?q?chore=20:=20=EC=BB=A8=ED=85=8C=EC=9D=B4?=
 =?UTF-8?q?=EB=84=88=20=EA=B6=8C=ED=95=9C=20=EB=B6=80=EC=97=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d7a50bf..59bf7f2 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -2,7 +2,7 @@ name: Deploy Reservation Service
 
 on:
   push:
-    branches: [ "main","dev" ]
+    branches: [ "main", "dev" ]
   workflow_dispatch:
 
 env:
@@ -152,19 +152,18 @@ jobs:
             --ssh-key-file=~/.ssh/google_compute_engine \
             --quiet \
             --command="
+              sudo chmod 755 /home/$VM_USER
               sudo mkdir -p '$WORK_DIR/ssl'
+              sudo chmod 755 '$WORK_DIR'
           
               if [ -f ~/kafka.server.truststore.jks ]; then
                 sudo mv ~/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
-              elif [ -f /tmp/kafka.server.truststore.jks ]; then
-                sudo mv /tmp/kafka.server.truststore.jks '$WORK_DIR/ssl/kafka.server.truststore.jks'
               fi
           
+              sudo chown -R 1000:1000 '$WORK_DIR/ssl'
               sudo chmod 755 '$WORK_DIR/ssl'
               sudo chmod 644 '$WORK_DIR/ssl/kafka.server.truststore.jks'
           
-              sudo chown -R $VM_USER:docker '$WORK_DIR/ssl'
-          
               ls -ld '$WORK_DIR/ssl'
               ls -l '$WORK_DIR/ssl/kafka.server.truststore.jks'
             "

From ad7cb98fbade4b300e556506a97f9a5910ae1669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 14:16:52 +0900
Subject: [PATCH 084/142] =?UTF-8?q?chore=20:=20Zipkin=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml       | 27 +++++++++++----------------
 build.gradle                       |  7 +++++++
 deploy/docker-compose.prod.yaml    | 12 ++++++++++++
 src/main/resources/application.yml |  9 ++++++++-
 4 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 59bf7f2..5f34690 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -113,17 +113,16 @@ jobs:
             --format="value(status)" 2>/dev/null || echo "NOT_FOUND")
           echo "status=$STATUS" >> "$GITHUB_OUTPUT"
 
-      - name: Copy compose file
+      - name: Copy Config files
         if: steps.vm-status.outputs.status == 'RUNNING'
         run: |
           gcloud compute scp deploy/docker-compose.prod.yaml \
             "$VM_USER@$VM_NAME:/tmp/docker-compose.prod.yaml" \
-            --zone="$GCP_ZONE" \
-            --project="$GCP_PROJECT" \
-            --tunnel-through-iap \
-            --ssh-key-file=~/.ssh/google_compute_engine \
-            --scp-flag=-O \
-            --quiet
+            --zone="$GCP_ZONE" --project="$GCP_PROJECT" --tunnel-through-iap --ssh-key-file=~/.ssh/google_compute_engine --scp-flag=-O --quiet
+
+          gcloud compute scp deploy/promtail-config.yml \
+            "$VM_USER@$VM_NAME:/tmp/promtail-config.yml" \
+            --zone="$GCP_ZONE" --project="$GCP_PROJECT" --tunnel-through-iap --ssh-key-file=~/.ssh/google_compute_engine --scp-flag=-O --quiet
 
       - name: Copy Kafka truststore
         if: steps.vm-status.outputs.status == 'RUNNING'
@@ -154,6 +153,7 @@ jobs:
             --command="
               sudo chmod 755 /home/$VM_USER
               sudo mkdir -p '$WORK_DIR/ssl'
+              sudo mkdir -p '$WORK_DIR/logs'
               sudo chmod 755 '$WORK_DIR'
           
               if [ -f ~/kafka.server.truststore.jks ]; then
@@ -161,11 +161,10 @@ jobs:
               fi
           
               sudo chown -R 1000:1000 '$WORK_DIR/ssl'
+              sudo chown -R 1000:1000 '$WORK_DIR/logs'
               sudo chmod 755 '$WORK_DIR/ssl'
+              sudo chmod 777 '$WORK_DIR/logs'
               sudo chmod 644 '$WORK_DIR/ssl/kafka.server.truststore.jks'
-          
-              ls -ld '$WORK_DIR/ssl'
-              ls -l '$WORK_DIR/ssl/kafka.server.truststore.jks'
             "
 
       - name: Deploy and verify
@@ -188,16 +187,13 @@ jobs:
 
               mkdir -p '$WORK_DIR'
               [ -f /tmp/docker-compose.prod.yaml ] && mv /tmp/docker-compose.prod.yaml '$WORK_DIR/docker-compose.prod.yaml'
+              [ -f /tmp/promtail-config.yml ] && mv /tmp/promtail-config.yml '$WORK_DIR/promtail-config.yml'
               cd '$WORK_DIR'
 
-              find . -mindepth 1 -maxdepth 1 ! -name '.env' ! -name 'ssl' ! -name 'docker-compose.prod.yaml' -exec rm -rf {} +
+              find . -mindepth 1 -maxdepth 1 ! -name '.env' ! -name 'ssl' ! -name 'logs' ! -name 'docker-compose.prod.yaml' ! -name 'promtail-config.yml' -exec rm -rf {} +
 
               test -f .env || { exit 1; }
 
-              if [ ! -s ssl/kafka.server.truststore.jks ]; then
-                exit 1
-              fi
-
               docker network inspect pgsg-network >/dev/null 2>&1 || docker network create pgsg-network
 
               docker image prune -af || true
@@ -213,7 +209,6 @@ jobs:
               for i in \$(seq 1 $HEALTH_RETRIES); do
                 if curl -sf http://localhost:8085/actuator/health | grep -q '\"status\":\"UP\"'; then
                   docker ps
-                  docker logs reservation-service --tail=120
                   exit 0
                 fi
                 sleep $HEALTH_INTERVAL
diff --git a/build.gradle b/build.gradle
index 54b9cd1..8f31f23 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,6 +91,13 @@ dependencies {
     // [Redis]
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.redisson:redisson-spring-boot-starter:3.51.0'
+
+    // [Observability]
+    implementation 'io.micrometer:micrometer-tracing-bridge-otel'
+    implementation 'io.opentelemetry:opentelemetry-exporter-zipkin'
+
+    // [Logback]
+    implementation 'io.github.openfeign:feign-micrometer'
 }
 
 def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
diff --git a/deploy/docker-compose.prod.yaml b/deploy/docker-compose.prod.yaml
index 9724c4b..1e55c53 100644
--- a/deploy/docker-compose.prod.yaml
+++ b/deploy/docker-compose.prod.yaml
@@ -13,9 +13,11 @@ services:
       EUREKA_INSTANCE_NON_SECURE_PORT: ${SERVER_PORT:-8085}
       DB_URL: jdbc:postgresql://reservation-db:5432/${DB_NAME:-reservation_db}
       REDIS_HOST: reservation-redis
+      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "http://34.64.247.238:9411/api/v2/spans"
       KAFKA_SSL_PATH: /app/ssl/kafka.server.truststore.jks
     volumes:
       - ./ssl:/app/ssl:ro
+      - ./logs:/app/logs
     ports:
       - "${SERVER_PORT:-8085}:${SERVER_PORT:-8085}"
     depends_on:
@@ -26,6 +28,16 @@ services:
     networks:
       - pgsg-network
 
+  promtail:
+    image: grafana/promtail:2.9.1
+    container_name: promtail
+    volumes:
+      - ./promtail-config.yml:/etc/promtail/config.yml
+      - ./logs:/logs
+    command: -config.file=/etc/promtail/config.yml
+    networks:
+      - pgsg-network
+
   db:
     image: postgres:17
     container_name: reservation-db
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ee90d42..87f2b58 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -54,10 +54,16 @@ spring:
     defer-datasource-initialization: true
 
 management:
+  tracing:
+    sampling:
+      probability: 1.0
+  zipkin:
+    tracing:
+      endpoint: http://34.64.247.238:9411/api/v2/spans # 도메인 대신 IP 권장
   endpoints:
     web:
       exposure:
-        include: health, info, refresh
+        include: health, info, refresh, prometheus
 
 jwt:
   secret: ${JWT_SECRET}
@@ -74,6 +80,7 @@ eureka:
     service-url:
       defaultZone: ${EUREKA_SERVER_URL:http://34.50.50.170:8761/eureka/}
 
+
 topics:
   reservation:
     completed: prod-reservation-completed

From 30ee6c6d4b20e6336c143799b2d4aaf9f0954706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 14:22:23 +0900
Subject: [PATCH 085/142] =?UTF-8?q?chore=20:=20promtail-config.yml=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/promtail-config.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 deploy/promtail-config.yml

diff --git a/deploy/promtail-config.yml b/deploy/promtail-config.yml
new file mode 100644
index 0000000..392e57f
--- /dev/null
+++ b/deploy/promtail-config.yml
@@ -0,0 +1,18 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+clients:
+  - url: http://34.64.247.238:3100/loki/api/v1/push
+
+scrape_configs:
+  - job_name: system
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          job: reservation-service
+          __path__: /app/logs/*.log
\ No newline at end of file

From 1f1ec897079889f018d802408e60fc4fa9c6fa5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 14:32:08 +0900
Subject: [PATCH 086/142] =?UTF-8?q?chore=20:=20common=EB=B2=84=EC=A0=84=20?=
 =?UTF-8?q?=EC=97=85=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8f31f23..80aa7a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,7 +72,7 @@ dependencies {
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.13.0'
 
     // [Common Module]
-    implementation 'org.pgsg:common:0.2.6-SNAPSHOT'
+    implementation 'org.pgsg:common:0.3.2-SNAPSHOT'
 
     // [Spring Starters]
     implementation 'org.springframework.boot:spring-boot-starter-web'

From 0cc65660e82c77efc77ed7feece06ebf7a62e4c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 14:51:01 +0900
Subject: [PATCH 087/142] =?UTF-8?q?chore=20:=20zinkin=20=EC=A3=BC=EC=86=8C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/docker-compose.prod.yaml    | 2 +-
 deploy/promtail-config.yml         | 6 +++---
 src/main/resources/application.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deploy/docker-compose.prod.yaml b/deploy/docker-compose.prod.yaml
index 1e55c53..f1ceffa 100644
--- a/deploy/docker-compose.prod.yaml
+++ b/deploy/docker-compose.prod.yaml
@@ -13,7 +13,7 @@ services:
       EUREKA_INSTANCE_NON_SECURE_PORT: ${SERVER_PORT:-8085}
       DB_URL: jdbc:postgresql://reservation-db:5432/${DB_NAME:-reservation_db}
       REDIS_HOST: reservation-redis
-      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "http://34.64.247.238:9411/api/v2/spans"
+      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "http://34.47.69.9:3100/api/v2/spans"
       KAFKA_SSL_PATH: /app/ssl/kafka.server.truststore.jks
     volumes:
       - ./ssl:/app/ssl:ro
diff --git a/deploy/promtail-config.yml b/deploy/promtail-config.yml
index 392e57f..655f178 100644
--- a/deploy/promtail-config.yml
+++ b/deploy/promtail-config.yml
@@ -6,13 +6,13 @@ positions:
   filename: /tmp/positions.yaml
 
 clients:
-  - url: http://34.64.247.238:3100/loki/api/v1/push
+  - url: http://34.47.69.9:3100/loki/api/v1/push
 
 scrape_configs:
-  - job_name: system
+  - job_name: reservation-service
     static_configs:
       - targets:
           - localhost
         labels:
           job: reservation-service
-          __path__: /app/logs/*.log
\ No newline at end of file
+          __path__: /home/zsx1397/app/logs/*.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 87f2b58..3600c6e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -59,7 +59,7 @@ management:
       probability: 1.0
   zipkin:
     tracing:
-      endpoint: http://34.64.247.238:9411/api/v2/spans # 도메인 대신 IP 권장
+      endpoint: http://34.47.69.9:9411/api/v2/spans
   endpoints:
     web:
       exposure:

From 4842dd9dd7f1d377d0a2d5a0745caad99b2dba8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 15:04:49 +0900
Subject: [PATCH 088/142] =?UTF-8?q?chore=20:=20bridge-otel=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 80aa7a1..87497f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -93,7 +93,6 @@ dependencies {
     implementation 'org.redisson:redisson-spring-boot-starter:3.51.0'
 
     // [Observability]
-    implementation 'io.micrometer:micrometer-tracing-bridge-otel'
     implementation 'io.opentelemetry:opentelemetry-exporter-zipkin'
 
     // [Logback]

From 90b4c194c78cbfaf995d79d0fbe88e14d3a2e485 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Thu, 14 May 2026 23:12:56 +0900
Subject: [PATCH 089/142] =?UTF-8?q?fix=20:=20user-role=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=ED=98=95=EC=8B=9D=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=88=98=EC=A0=95=20(#49)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix : user-role 데이터 형식 변경에 따른 수정

* fix : 코드래빗 제안 수정
- role을 다시 캐시 키에 포함
---
 .../service/ReservationService.java           |  5 +-
 .../model/reservation/SearchPolicy.java       | 25 +++------
 .../service/ReservationDomainService.java     | 52 +++++++++----------
 .../domain/service/ReservationValidator.java  | 25 ++++++---
 .../ReservationRepositoryImpl.java            | 12 ++---
 5 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 8ed1ce0..dc9d038 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -79,9 +79,8 @@ public ReservationCreateResult createReservation(ReservationCreateCommand comman
     // 예약 목록 조회
     @Transactional(readOnly = true)
     @Cacheable(value = "reservations",
-            key = "{" +
-                    "#userId, #role, #query.sellerName(), #query.buyerName(), #query.productName(), " +
-                    "#query.status(), #query.productId(), #pageable.pageNumber, #pageable.pageSize, #pageable.sort}")
+            key = "{#userId, #role, #query.sellerName(), #query.buyerName(), #query.productName(), " +
+                    "#query.status(), #query.productId(), #pageable.pageNumber, #pageable.pageSize}")
     public Page<ReservationSearchResult> getSearchReservations(
             UUID userId,
             String role,
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java
index eb531a7..915a956 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/SearchPolicy.java
@@ -4,32 +4,19 @@
 
 public record SearchPolicy(
         UUID accessUserId,
-        boolean isBuyerFilter,
-        boolean isSellerFilter
+        boolean isUserFilter
 ) {
     public SearchPolicy {
-        if (isBuyerFilter && isSellerFilter) {
-            throw new IllegalArgumentException("Filter flags are mutually exclusive.");
+        if (isUserFilter && accessUserId == null) {
+            throw new IllegalArgumentException("accessUserId is required for user filter.");
         }
-
-        if ((isBuyerFilter || isSellerFilter) && accessUserId == null) {
-            throw new IllegalArgumentException("accessUserId is required for buyer/seller filter.");
-        }
-
-        if (!isBuyerFilter && !isSellerFilter && accessUserId != null) {
-            throw new IllegalArgumentException("accessUserId must be null when no filter is applied.");
-        }
-    }
-
-    public static SearchPolicy buyer(UUID userId) {
-        return new SearchPolicy(userId, true, false);
     }
 
-    public static SearchPolicy seller(UUID userId) {
-        return new SearchPolicy(userId, false, true);
+    public static SearchPolicy user(UUID userId) {
+        return new SearchPolicy(userId, true);
     }
 
     public static SearchPolicy all() {
-        return new SearchPolicy(null, false, false);
+        return new SearchPolicy(null, false);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 5fab5ab..ada68ae 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -1,7 +1,6 @@
 package org.pgsg.reservation.domain.service;
 
 import lombok.RequiredArgsConstructor;
-import org.pgsg.common.exception.ErrorCode;
 import org.pgsg.reservation.domain.exception.ReservationErrorCode;
 import org.pgsg.reservation.domain.exception.ReservationException;
 import org.pgsg.reservation.domain.model.reservation.*;
@@ -12,7 +11,6 @@
 
 import java.util.*;
 
-
 @Service
 @RequiredArgsConstructor
 public class ReservationDomainService {
@@ -37,21 +35,17 @@ public Reservation createReservation(SellerInfo seller, ProductInfo product ) {
      * 권한에 따른 조회 범위를 검증하고 정책(Policy)을 결정
      */
     public SearchPolicy getReservations(UUID userId, String role) {
-        // 권한 데이터가 비어있는지 검증
         reservationValidator.validateSearchRequest(userId, role);
 
-        // 역할에 따른 필터링
-        String normalizedRole = role.trim().toUpperCase(Locale.ROOT);
-        if ("ADMIN".equals(normalizedRole)) {
-            return new SearchPolicy(null, false, false);
-        }
-        if ("SELLER".equals(normalizedRole)) {
-            return new SearchPolicy(userId, false, true);
-        }
-        if ("BUYER".equals(normalizedRole)) {
-            return new SearchPolicy(userId, true, false);
+        String normalizedRole = normalizeRole(role);
+
+        // MASTER, MANAGER는 전체 조회
+        if (isAdminRole(normalizedRole)) {
+            return SearchPolicy.all();
         }
-        throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
+
+        // 그 외 모든 일반 사용자(USER 등)는 본인 것만 조회 (판매 + 구매)
+        return SearchPolicy.user(userId);
     }
 
     /**
@@ -62,13 +56,11 @@ public void validateDetailAccess(Reservation reservation, UUID userId, String ro
         // 정책 획득
         SearchPolicy policy = this.getReservations(userId, role);
 
-        // 관리자 판단 로직
-        boolean isAdmin = !policy.isBuyerFilter() && !policy.isSellerFilter();
-
-        if (!isAdmin) {
+        if (policy.isUserFilter()) {
             // 본인 확인 (구매자 혹은 판매자 본인인지 체크)
-            boolean isOwner = reservation.getBuyerInfo().getBuyerId().equals(userId) ||
-                    reservation.getSellerInfo().getSellerId().equals(userId);
+            // 구매자 정보가 있을 때만 비교하도록 null 체크 추가 (안정성)
+            boolean isOwner = (reservation.getBuyerInfo() != null && reservation.getBuyerInfo().getBuyerId().equals(userId)) ||
+                    (reservation.getSellerInfo() != null && reservation.getSellerInfo().getSellerId().equals(userId));
 
             if (!isOwner) {
                 throw new RuntimeException("해당 예약을 조회할 권한이 없습니다.");
@@ -200,7 +192,7 @@ public ReservationHistory expireByAdmin(
 
         // 관리자 권한 및 취소 가능 상태인지 확인
         reservationValidator.validateSearchRequest(adminId, role);
-        if (!"ADMIN".equalsIgnoreCase(role == null ? null : role.trim())) {
+        if (!isAdminRole(normalizeRole(role))) {
             throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
         }
         reservationValidator.validateCommonCancel(reservation, adminId);
@@ -241,7 +233,7 @@ public ReservationHistory expireByAdmin(
     public ReservationHistory completeReservation(Reservation reservation, UUID userId ,String role) {
         // 권한 검증 로직
         boolean isSeller = reservation.getSellerInfo() != null && Objects.equals(reservation.getSellerInfo().getSellerId(), userId);
-        boolean isAdmin = "ADMIN".equalsIgnoreCase(role);
+        boolean isAdmin = isAdminRole(normalizeRole(role));
         if (!isAdmin && !isSeller) {
             throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
         }
@@ -268,8 +260,7 @@ public ReservationHistory completeReservation(Reservation reservation, UUID user
      */
     public ReservationHistory confirmTrade(Reservation reservation, UUID userId, String role) {
         // 규칙: 오직 ADMIN(시스템 포함)만 거래 확정을 할 수 있다.
-        String normalizedRole = role != null ? role.trim().toUpperCase(Locale.ROOT) : "";
-        if (!"ADMIN".equals(normalizedRole)) {
+        if (!isAdminRole(normalizeRole(role))) {
             throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS, "관리자만 거래를 확정할 수 있습니다.");
         }
 
@@ -289,8 +280,17 @@ public ReservationHistory confirmTrade(Reservation reservation, UUID userId, Str
         );
     }
 
-    private boolean isAdmin(String role) {
-        return "ADMIN".equals(role);
+    private String normalizeRole(String role) {
+        if (role == null) return "";
+        String upperRole = role.trim().toUpperCase(Locale.ROOT);
+        if (upperRole.startsWith("ROLE_")) {
+            return upperRole.substring(5).trim();
+        }
+        return upperRole;
+    }
+
+    private boolean isAdminRole(String normalizedRole) {
+        return "ADMIN".equals(normalizedRole) || "MANAGER".equals(normalizedRole) || "MASTER".equals(normalizedRole);
     }
 
     /**
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
index 106afc8..00f9d23 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationValidator.java
@@ -4,11 +4,11 @@
 import org.pgsg.reservation.domain.exception.*;
 import org.springframework.stereotype.Component;
 
+import java.util.Locale;
 import java.util.Objects;
 import java.util.UUID;
 
 @Component
-
 public class ReservationValidator {
 
     // 예약 생성
@@ -32,7 +32,7 @@ public void validateCancelByBuyer(Reservation reservation, UUID userId, String r
         boolean isBuyer = reservation.getBuyerInfo() != null &&
                 Objects.equals(reservation.getBuyerInfo().getBuyerId(), userId);
 
-        boolean isAdmin = "ADMIN".equalsIgnoreCase(role);
+        boolean isAdmin = isAdminRole(normalizeRole(role));
 
         if (!isBuyer && !isAdmin) {
             throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
@@ -46,8 +46,8 @@ public void validateConfirmPayment(Reservation reservation, UUID userId, String
         }
 
         // 권한 검증: 관리자,SYSTEM만 허용함
-        String normalizedRole = role == null ? "" : role.trim();
-        boolean isAdmin = "ADMIN".equalsIgnoreCase(normalizedRole);
+        String normalizedRole = normalizeRole(role);
+        boolean isAdmin = isAdminRole(normalizedRole);
         boolean isSystem = "SYSTEM".equalsIgnoreCase(normalizedRole);
         if (!isAdmin && !isSystem) {
             throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
@@ -66,7 +66,7 @@ public void validateCancelBySeller(Reservation reservation, UUID userId, String
         boolean isSeller = reservation.getSellerInfo() != null &&
                 Objects.equals(reservation.getSellerInfo().getSellerId(), userId);
 
-        boolean isAdmin = "ADMIN".equalsIgnoreCase(role);
+        boolean isAdmin = isAdminRole(normalizeRole(role));
 
         if (!isSeller && !isAdmin) {
             throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS);
@@ -89,4 +89,17 @@ public void validateCommonCancel(Reservation reservation, UUID userId) {
     private boolean isSamePerson(BuyerInfo buyer, SellerInfo seller) {
         return buyer.getBuyerId().equals(seller.getSellerId());
     }
-}
+
+    private String normalizeRole(String role) {
+        if (role == null) return "";
+        String upperRole = role.trim().toUpperCase(Locale.ROOT);
+        if (upperRole.startsWith("ROLE_")) {
+            return upperRole.substring(5).trim();
+        }
+        return upperRole;
+    }
+
+    private boolean isAdminRole(String normalizedRole) {
+        return "ADMIN".equals(normalizedRole) || "MANAGER".equals(normalizedRole) || "MASTER".equals(normalizedRole);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
index 84854a4..1674f48 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
@@ -101,14 +101,10 @@ public Page<Reservation> findByCriteria(
     }
 
     private BooleanExpression applyPolicyFilter(SearchPolicy policy) {
-        if (policy == null) return null;
-        if (policy.isBuyerFilter()) {
-            return reservation.get("buyerInfo").get("buyerId", UUID.class).eq(policy.accessUserId());
-        }
-        if (policy.isSellerFilter()) {
-            return reservation.get("sellerInfo").get("sellerId", UUID.class).eq(policy.accessUserId());
-        }
-        return null;
+        if (policy == null || !policy.isUserFilter()) return null;
+
+        return reservation.get("buyerInfo").get("buyerId", UUID.class).eq(policy.accessUserId())
+                .or(reservation.get("sellerInfo").get("sellerId", UUID.class).eq(policy.accessUserId()));
     }
 
     private BooleanExpression statusEq(ReservationStatus status) {

From b79269bc23f1a37651c39a2183527f854d331c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 23:37:23 +0900
Subject: [PATCH 090/142] =?UTF-8?q?fix=20:=20=EC=BD=94=EB=93=9C=EB=9E=98?=
 =?UTF-8?q?=EB=B9=97=20=EC=A0=9C=EC=95=88=20=EC=88=98=EC=A0=95=20-=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/ReservationSecurityConfig.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java
index 45c3d7d..04d60ec 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java
@@ -45,7 +45,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         ).permitAll()
 
                         // 예약 서비스의 핵심 API (Gateway에서 인증된 사용자만 접근)
-                        .requestMatchers("/api/v1/reservations/**").authenticated()
+                        .requestMatchers("/api/v1/reservations/**").permitAll()
 
                         // 나머지는 인증 필요
                         .anyRequest().authenticated()

From 5171070fbd406e91711c5da673199b38f3d2ff04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Thu, 14 May 2026 23:58:49 +0900
Subject: [PATCH 091/142] =?UTF-8?q?fix=20:=20=EB=B3=B4=EC=95=88=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/ReservationSecurityConfig.java       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java
index 04d60ec..d2f8f1a 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/ReservationSecurityConfig.java
@@ -44,9 +44,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                                 "/error"
                         ).permitAll()
 
-                        // 예약 서비스의 핵심 API (Gateway에서 인증된 사용자만 접근)
-                        .requestMatchers("/api/v1/reservations/**").permitAll()
-
                         // 나머지는 인증 필요
                         .anyRequest().authenticated()
                 )

From 9fd6ebd83887f2c4cb5460cf21bde139aa03ce5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 00:11:29 +0900
Subject: [PATCH 092/142] =?UTF-8?q?fix=20:=20MANAGEMENT=5FZIPKIN=5FTRACING?=
 =?UTF-8?q?=5FENDPOINT=20=ED=8F=AC=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/docker-compose.prod.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/docker-compose.prod.yaml b/deploy/docker-compose.prod.yaml
index f1ceffa..52b851e 100644
--- a/deploy/docker-compose.prod.yaml
+++ b/deploy/docker-compose.prod.yaml
@@ -13,7 +13,7 @@ services:
       EUREKA_INSTANCE_NON_SECURE_PORT: ${SERVER_PORT:-8085}
       DB_URL: jdbc:postgresql://reservation-db:5432/${DB_NAME:-reservation_db}
       REDIS_HOST: reservation-redis
-      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "http://34.47.69.9:3100/api/v2/spans"
+      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "http://34.47.69.9:9411/api/v2/spans"
       KAFKA_SSL_PATH: /app/ssl/kafka.server.truststore.jks
     volumes:
       - ./ssl:/app/ssl:ro

From 17dd0a5e4910ce581d178ebfa78e1d1f06fdae9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 10:42:02 +0900
Subject: [PATCH 093/142] =?UTF-8?q?fix=20:=20tags=20=EB=88=84=EB=9D=BD=20?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3600c6e..bc2e1b7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -54,6 +54,9 @@ spring:
     defer-datasource-initialization: true
 
 management:
+  metrics:
+    tags:
+      application: ${spring.application.name}
   tracing:
     sampling:
       probability: 1.0

From 9757cc31446819f1d595a40c5fcfe96f70f4c845 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Fri, 15 May 2026 11:27:43 +0900
Subject: [PATCH 094/142] =?UTF-8?q?fix=20:=20endtime=EB=8F=84=20=EA=B0=99?=
 =?UTF-8?q?=EC=9D=B4=20=EB=B3=B4=EC=97=AC=EC=A3=BC=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20(#51)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/docker-compose.prod.yaml                             | 4 +++-
 .../application/dto/result/ReservationDetailResult.java     | 6 ++++--
 .../dto/response/ReservationDetailResponse.java             | 5 +++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/deploy/docker-compose.prod.yaml b/deploy/docker-compose.prod.yaml
index 52b851e..093ca46 100644
--- a/deploy/docker-compose.prod.yaml
+++ b/deploy/docker-compose.prod.yaml
@@ -34,7 +34,9 @@ services:
     volumes:
       - ./promtail-config.yml:/etc/promtail/config.yml
       - ./logs:/logs
-    command: -config.file=/etc/promtail/config.yml
+    command: -config.file=/etc/promtail/config.yml -config.expand-env=true
+    env_file:
+      - .env
     networks:
       - pgsg-network
 
diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
index 86c7f8d..0d4f156 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
@@ -19,7 +19,8 @@ public record ReservationDetailResult(
     public record ProductInfo(
             UUID productId,
             String productName,
-            int price
+            int price,
+            LocalDateTime endTime
     ) {}
 
     public record SellerInfo(
@@ -38,7 +39,8 @@ public static ReservationDetailResult from(Reservation reservation) {
                 new ProductInfo(
                         reservation.getProductInfo().getProductId(),
                         reservation.getProductInfo().getProductName(),
-                        reservation.getProductInfo().getProductPrice()
+                        reservation.getProductInfo().getProductPrice(),
+                        reservation.getProductInfo().getEndTime()
                 ),
                 new SellerInfo(
                         reservation.getSellerInfo().getSellerId(),
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
index a049974..d03af23 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
@@ -18,7 +18,8 @@ public record ReservationDetailResponse(
     public record ProductDetailInfo(
             UUID productId,
             String productName,
-            int price
+            int price,
+            LocalDateTime endTime
     ) {}
 
     public record SellerDetailInfo(
@@ -35,7 +36,7 @@ public static ReservationDetailResponse from(ReservationDetailResult result) {
         return new ReservationDetailResponse(
                 result.reservationId(),
                 result.status(),
-                new ProductDetailInfo(result.product().productId(), result.product().productName(), result.product().price()),
+                new ProductDetailInfo(result.product().productId(), result.product().productName(), result.product().price(),result.product().endTime()),
                 new SellerDetailInfo(result.seller().sellerId(), result.seller().sellerName()),
                 new BuyerDetailInfo(result.buyer().buyerId(), result.buyer().buyerName()),
                 result.createdAt(),

From 6479300c35955d6a47ecc625ea408361b61db11f Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Fri, 15 May 2026 11:57:27 +0900
Subject: [PATCH 095/142] =?UTF-8?q?fix=20:=20=EC=8A=A4=EC=BC=80=EC=A4=84?=
 =?UTF-8?q?=EB=A7=81=EC=97=90=EC=84=9C=20endtime=EB=8F=84=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#5?=
 =?UTF-8?q?3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/ReservationRepository.java     |  6 ++-
 .../ReservationRepositoryImpl.java            | 19 +++++---
 .../scheduler/ReservationExpiryScheduler.java | 43 ++++++++++++-------
 3 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
index e71e84f..cc7ce91 100644
--- a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
+++ b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
@@ -23,7 +23,11 @@ public interface ReservationRepository {
     Optional<Reservation> findById(UUID id);
 
     // 예약 만료 스케줄링용
-    List<Reservation> findAllByStatusInAndModifiedAtBefore(List<ReservationStatus> statuses, LocalDateTime threshold);
+    List<Reservation> findAllByStatusInAndModifiedAtBeforeOrProductInfoEndTimeBefore(
+            List<ReservationStatus> statuses,
+            LocalDateTime threshold,
+            LocalDateTime now
+    );
 
     // 상품 존재 여부 확인
     boolean existsByProductId(UUID productId);
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
index 1674f48..13aa51b 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
@@ -47,18 +47,21 @@ public boolean existsByProductId(UUID productId) {
 
     @Override
     @Transactional(readOnly = true)
-    public List<Reservation> findAllByStatusInAndModifiedAtBefore(
+    public List<Reservation> findAllByStatusInAndModifiedAtBeforeOrProductInfoEndTimeBefore(
             List<ReservationStatus> statuses,
-            LocalDateTime threshold
+            LocalDateTime threshold,
+            LocalDateTime now
     ){
-        if (statuses == null || statuses.isEmpty() || threshold == null) {
+        if (statuses == null || statuses.isEmpty() || threshold == null || now == null) {
             return List.of();
         }
+
         return queryFactory
                 .selectFrom(reservation)
                 .where(
-                        statusIn(statuses),
-                        modifiedAtBefore(threshold)
+                        statusIn(statuses), // 우선 대상 상태여야 함 (AND)
+                        modifiedAtBefore(threshold) // 수정 시간이 1시간 지났거나 (OR)
+                                .or(endTimeBefore(now)) // 상품 종료 시간이 지났거나
                 )
                 .fetch();
     }
@@ -149,4 +152,10 @@ private BooleanExpression modifiedAtBefore(LocalDateTime threshold) {
                 ? reservation.getDateTime("modifiedAt", LocalDateTime.class).before(threshold)
                 : null;
     }
+
+    private BooleanExpression endTimeBefore(LocalDateTime now) {
+        return now != null
+                ? reservation.get("productInfo").getDateTime("endTime", LocalDateTime.class).before(now)
+                : null;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java b/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java
index b81730e..ea52d6c 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/scheduler/ReservationExpiryScheduler.java
@@ -31,25 +31,28 @@ public class ReservationExpiryScheduler {
      */
     @Scheduled(cron = "0 * * * * *")
     public void autoExpireReservations() {
-        LocalDateTime threshold = LocalDateTime.now().minusMinutes(60);
-        List<ReservationStatus> targetStatuses = List.of(ReservationStatus.PENDING, ReservationStatus.PAID);
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime threshold = now.minusMinutes(60); // 1시간 경과 기준
+        List<ReservationStatus> targetStatuses = List.of(ReservationStatus.AVAILABLE,ReservationStatus.PENDING, ReservationStatus.PAID);
 
-        // 1시간 동안 상태 변화가 없는 예약들 조회
-        List<Reservation> expiredReservations = reservationRepository.findAllByStatusInAndModifiedAtBefore(
+        // 1시간 경과했거나,endTime이 지났거나 둘 중 하나라도 해당되는 데이터 조회
+        List<Reservation> expiredReservations = reservationRepository.findAllByStatusInAndModifiedAtBeforeOrProductInfoEndTimeBefore(
                 targetStatuses,
-                threshold
+                threshold,
+                now
         );
 
         if (expiredReservations.isEmpty()) return;
 
-        log.info("시스템 자동 만료 처리 시작: {}건", expiredReservations.size());
+        log.info("시스템 자동 만료 대상 발견: {}건", expiredReservations.size());
 
         for (Reservation reservation : expiredReservations) {
             try {
-                ReservationExpireCommand command = createExpireCommand(reservation);
+                // 종료 사유를 판단하여 커맨드 생성
+                ReservationExpireCommand command = createExpireCommand(reservation, now);
                 reservationService.expireByAdmin(command);
 
-                log.info("예약 자동 만료 완료 (ID: {}, 상태: {})", reservation.getId(), reservation.getStatus());
+                log.info("예약 자동 종료 완료 (ID: {}, 종료사유: {})", reservation.getId(), command.reason());
             } catch (Exception e) {
                 log.error("예약 자동 만료 처리 중 오류 발생 (ID: {}): {}", reservation.getId(), e.getMessage());
             }
@@ -59,18 +62,26 @@ public void autoExpireReservations() {
     /**
      * 예약 상태에 따른 적절한 취소 요청 객체를 생성하는 메서드
      */
-    private ReservationExpireCommand createExpireCommand(Reservation reservation) {
+    private ReservationExpireCommand createExpireCommand(Reservation reservation, LocalDateTime now) {
         ReservationStatus targetStatus;
         String reason;
 
-        if (reservation.getStatus() == ReservationStatus.PENDING) {
-            targetStatus = ReservationStatus.CANCELLED_BY_BUYER;
-            reason = "결제 제한 시간(1시간) 초과로 인한 자동 취소";
-        } else if (reservation.getStatus() == ReservationStatus.PAID) {
-            targetStatus = ReservationStatus.CANCELLED_BY_SELLER;
-            reason = "채팅 수락 제한 시간(1시간) 초과로 인한 자동 취소";
+        // endTime이 먼저 지났는지 확인
+        boolean isEndTimeExpired = reservation.getProductInfo().getEndTime().isBefore(now);
+
+        if (isEndTimeExpired) {
+            targetStatus = (reservation.getStatus() == ReservationStatus.PENDING)
+                    ? ReservationStatus.CANCELLED_BY_BUYER : ReservationStatus.CANCELLED_BY_SELLER;
+            reason = "타임딜 종료 시간 도달로 인한 자동 종료";
         } else {
-            throw new IllegalStateException("자동 만료 대상이 아닌 상태입니다: " + reservation.getStatus());
+            // 1시간 경과로 인한 종료인 경우
+            if (reservation.getStatus() == ReservationStatus.PENDING) {
+                targetStatus = ReservationStatus.CANCELLED_BY_BUYER;
+                reason = "결제 제한 시간(1시간) 초과로 인한 자동 취소";
+            } else {
+                targetStatus = ReservationStatus.CANCELLED_BY_SELLER;
+                reason = "채팅 수락 제한 시간(1시간) 초과로 인한 자동 취소";
+            }
         }
 
         return new ReservationExpireCommand(

From fdc301b4b94f7ffb9b90cd9f1b07f33f08fb339f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 12:22:31 +0900
Subject: [PATCH 096/142] =?UTF-8?q?fix=20:=20=ED=8C=90=EB=A7=A4=EC=9E=90?=
 =?UTF-8?q?=20=EC=B7=A8=EC=86=8C=20=EA=B7=9C=EC=B9=99=EC=97=90=20endtime?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=A2=85=EB=A3=8C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/wrapper/gradle-wrapper.properties                        | 2 +-
 .../pgsg/reservation/domain/model/reservation/Reservation.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aaaabb3..07aa335 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.14.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
index 3bad63b..b922009 100644
--- a/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
+++ b/src/main/java/org/pgsg/reservation/domain/model/reservation/Reservation.java
@@ -98,7 +98,7 @@ public void rollbackToAvailable() {
 
     // 구매자 취소: PENDING 또는 PAID 상태에서 구매자가 취소
     public void cancelByBuyer() {
-        validateStatus(ReservationStatus.PENDING, ReservationStatus.PAID);
+        validateStatus(ReservationStatus.AVAILABLE, ReservationStatus.PENDING, ReservationStatus.PAID);
         this.status = ReservationStatus.CANCELLED_BY_BUYER;
     }
 

From c8b31236976b7139a5197973984763229357109d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 12:32:22 +0900
Subject: [PATCH 097/142] =?UTF-8?q?fix=20:=20DetailInfo=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ReservationDetailResult.java    | 18 +++++++++++-------
 .../response/ReservationDetailResponse.java    |  5 ++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
index 0d4f156..9596bb8 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
@@ -21,17 +21,21 @@ public record ProductInfo(
             String productName,
             int price,
             LocalDateTime endTime
-    ) {}
+    ) {
+    }
 
     public record SellerInfo(
             UUID sellerId,
             String sellerName
-    ) {}
+    ) {
+    }
 
     public record BuyerInfo(
             UUID buyerId,
             String buyerName
-    ) {}
+    ) {
+    }
+
     public static ReservationDetailResult from(Reservation reservation) {
         return new ReservationDetailResult(
                 reservation.getId(),
@@ -46,10 +50,10 @@ public static ReservationDetailResult from(Reservation reservation) {
                         reservation.getSellerInfo().getSellerId(),
                         reservation.getSellerInfo().getSellerName()
                 ),
-                new BuyerInfo(
-                        reservation.getBuyerInfo() != null ? reservation.getBuyerInfo().getBuyerId() : null,
-                        reservation.getBuyerInfo() != null ? reservation.getBuyerInfo().getBuyerName() : "N/A"
-                ),
+                reservation.getBuyerInfo() != null ? new BuyerInfo(
+                        reservation.getBuyerInfo().getBuyerId(),
+                        reservation.getBuyerInfo().getBuyerName()
+                ) : null,
                 reservation.getCreatedAt(),
                 reservation.getModifiedAt()
         );
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
index d03af23..45f77d4 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
@@ -38,7 +38,10 @@ public static ReservationDetailResponse from(ReservationDetailResult result) {
                 result.status(),
                 new ProductDetailInfo(result.product().productId(), result.product().productName(), result.product().price(),result.product().endTime()),
                 new SellerDetailInfo(result.seller().sellerId(), result.seller().sellerName()),
-                new BuyerDetailInfo(result.buyer().buyerId(), result.buyer().buyerName()),
+                result.buyer() != null ? new BuyerDetailInfo(
+                        result.buyer().buyerId(),
+                        result.buyer().buyerName()
+                ) : null,
                 result.createdAt(),
                 result.updatedAt()
         );

From 84ca2b30ce57c457099ce228e57f5a57bf8783bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 12:40:58 +0900
Subject: [PATCH 098/142] =?UTF-8?q?fix=20:=20DetailInfo=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/service/ReservationDomainService.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index ada68ae..437bfb9 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -53,16 +53,17 @@ public SearchPolicy getReservations(UUID userId, String role) {
      * 특정 사용자가 해당 예약에 접근할 수 있는지 비즈니스 규칙 검사
      */
     public void validateDetailAccess(Reservation reservation, UUID userId, String role) {
-        // 정책 획득
         SearchPolicy policy = this.getReservations(userId, role);
 
         if (policy.isUserFilter()) {
-            // 본인 확인 (구매자 혹은 판매자 본인인지 체크)
-            // 구매자 정보가 있을 때만 비교하도록 null 체크 추가 (안정성)
-            boolean isOwner = (reservation.getBuyerInfo() != null && reservation.getBuyerInfo().getBuyerId().equals(userId)) ||
-                    (reservation.getSellerInfo() != null && reservation.getSellerInfo().getSellerId().equals(userId));
+            // Objects.equals는 파라미터가 null이어도 에러를 내지 않고 false를 반환해서 안전합니다.
+            boolean isBuyer = reservation.getBuyerInfo() != null &&
+                    Objects.equals(reservation.getBuyerInfo().getBuyerId(), userId);
 
-            if (!isOwner) {
+            boolean isSeller = reservation.getSellerInfo() != null &&
+                    Objects.equals(reservation.getSellerInfo().getSellerId(), userId);
+
+            if (!isBuyer && !isSeller) {
                 throw new RuntimeException("해당 예약을 조회할 권한이 없습니다.");
             }
         }

From dfab4a5c16087baa985c495a9218be4b40e652fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 12:54:14 +0900
Subject: [PATCH 099/142] =?UTF-8?q?fix=20:=20=EC=9D=91=EB=8B=B5=20price=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/dto/result/ReservationDetailResult.java         | 2 +-
 .../presentation/dto/response/ReservationDetailResponse.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
index 9596bb8..9380e9e 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
@@ -19,7 +19,7 @@ public record ReservationDetailResult(
     public record ProductInfo(
             UUID productId,
             String productName,
-            int price,
+            Integer price,
             LocalDateTime endTime
     ) {
     }
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
index 45f77d4..c43af33 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationDetailResponse.java
@@ -18,7 +18,7 @@ public record ReservationDetailResponse(
     public record ProductDetailInfo(
             UUID productId,
             String productName,
-            int price,
+            Integer price,
             LocalDateTime endTime
     ) {}
 

From 6b5ac383146d464af74af185ee7fd52a15b6af6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 13:55:48 +0900
Subject: [PATCH 100/142] =?UTF-8?q?fix=20:=20=EB=A1=9C=EA=B7=B8=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/application/service/ReservationService.java   | 4 +++-
 .../presentation/controller/ReservationController.java        | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index dc9d038..f4aebbc 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -112,12 +112,14 @@ public Page<ReservationSearchResult> getSearchReservations(
     @Cacheable(value = "reservationDetail", key = "{#reservationId, #userId, #role}")
     @Transactional(readOnly = true)
     public ReservationDetailResult getReservationDetail(UUID reservationId, UUID userId, String role) {
+        log.info("조회{}", reservationId);
         // 엔티티 조회
         Reservation reservation = reservationRepository.findById(reservationId)
                 .orElseThrow(() -> new RuntimeException("해당 예약을 찾을 수 없습니다. ID: " + reservationId));
-
+        log.info("통과{}", reservation);
         // 도메인 서비스를 통한 권한 검증
         reservationDomainService.validateDetailAccess(reservation, userId, role);
+        log.info("권한 통과");
 
         return ReservationDetailResult.from(reservation);
     }
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index 4d27beb..c070f52 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -79,6 +79,8 @@ public ReservationDetailResponse getReservationDetail(
     ) {
         ReservationDetailResult result = reservationService.getReservationDetail(reservationId, userId, role);
 
+        log.info("컨트롤러 통과{}",result);
+
         return ReservationDetailResponse.from(result);
     }
 

From 8559888af05f026224fea0cf831f2996822aba17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 14:11:11 +0900
Subject: [PATCH 101/142] =?UTF-8?q?fix=20:=20=EB=A1=9C=EA=B7=B8=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/controller/ReservationController.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index c070f52..c38904d 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -77,9 +77,11 @@ public ReservationDetailResponse getReservationDetail(
             @RequestHeader("X-User-Id") UUID userId,
             @RequestHeader("X-User-Roles") String role
     ) {
+        log.info("인터셉터 통과 후 컨트롤러 첫 라인 진입 성공! ID: {}", reservationId);
+
         ReservationDetailResult result = reservationService.getReservationDetail(reservationId, userId, role);
 
-        log.info("컨트롤러 통과{}",result);
+        log.info("컨트롤러 통과{}", result);
 
         return ReservationDetailResponse.from(result);
     }

From e14391c3508e9acf75f78f64abce8998d84deb69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 14:23:42 +0900
Subject: [PATCH 102/142] =?UTF-8?q?fix=20:=20=EB=A1=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20=EC=8A=A4=EC=BC=80=EC=A4=84?=
 =?UTF-8?q?=EB=9F=AC=20=EA=B2=80=EC=A6=9D=20=EB=A1=9C=EC=A7=81=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ReservationService.java            |  3 ---
 .../reservation/ReservationRepositoryImpl.java | 18 +++++++++++++-----
 .../controller/ReservationController.java      |  3 ---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index f4aebbc..651340f 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -112,14 +112,11 @@ public Page<ReservationSearchResult> getSearchReservations(
     @Cacheable(value = "reservationDetail", key = "{#reservationId, #userId, #role}")
     @Transactional(readOnly = true)
     public ReservationDetailResult getReservationDetail(UUID reservationId, UUID userId, String role) {
-        log.info("조회{}", reservationId);
         // 엔티티 조회
         Reservation reservation = reservationRepository.findById(reservationId)
                 .orElseThrow(() -> new RuntimeException("해당 예약을 찾을 수 없습니다. ID: " + reservationId));
-        log.info("통과{}", reservation);
         // 도메인 서비스를 통한 권한 검증
         reservationDomainService.validateDetailAccess(reservation, userId, role);
-        log.info("권한 통과");
 
         return ReservationDetailResult.from(reservation);
     }
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
index 13aa51b..3ab90d9 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
@@ -56,13 +56,21 @@ public List<Reservation> findAllByStatusInAndModifiedAtBeforeOrProductInfoEndTim
             return List.of();
         }
 
+        // 조건 1: 상태가 AVAILABLE 이면서 endTime이 지난 경우
+        BooleanExpression availableExpired = statusEq(ReservationStatus.AVAILABLE)
+                .and(endTimeBefore(now));
+
+        // 조건 2: 상태가 PENDING/PAID 이면서 (1시간이 경과했거나 OR endTime이 지난 경우)
+        BooleanExpression activeStatuses = reservation.get("status", ReservationStatus.class)
+                .in(ReservationStatus.PENDING, ReservationStatus.PAID);
+
+        BooleanExpression pendingOrPaidExpired = activeStatuses
+                .and(modifiedAtBefore(threshold).or(endTimeBefore(now)));
+
+        // 두 조건을 OR로 묶어서 조회합니다.
         return queryFactory
                 .selectFrom(reservation)
-                .where(
-                        statusIn(statuses), // 우선 대상 상태여야 함 (AND)
-                        modifiedAtBefore(threshold) // 수정 시간이 1시간 지났거나 (OR)
-                                .or(endTimeBefore(now)) // 상품 종료 시간이 지났거나
-                )
+                .where(availableExpired.or(pendingOrPaidExpired))
                 .fetch();
     }
 
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index c38904d..b19932c 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -77,12 +77,9 @@ public ReservationDetailResponse getReservationDetail(
             @RequestHeader("X-User-Id") UUID userId,
             @RequestHeader("X-User-Roles") String role
     ) {
-        log.info("인터셉터 통과 후 컨트롤러 첫 라인 진입 성공! ID: {}", reservationId);
 
         ReservationDetailResult result = reservationService.getReservationDetail(reservationId, userId, role);
 
-        log.info("컨트롤러 통과{}", result);
-
         return ReservationDetailResponse.from(result);
     }
 

From ba2b1a424547d2efb6ff69bc4c331248485ca371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 14:31:06 +0900
Subject: [PATCH 103/142] =?UTF-8?q?fix=20:=20=EC=BA=90=EC=8B=9C=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=ED=98=95=ED=83=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/application/service/ReservationService.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 651340f..fa6cc54 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -109,7 +109,10 @@ public Page<ReservationSearchResult> getSearchReservations(
 
 
     // 예약 상세 조회
-    @Cacheable(value = "reservationDetail", key = "{#reservationId, #userId, #role}")
+    @Cacheable(
+            value = "reservationDetail",
+            key = "#reservationId.toString() + ':' + #userId.toString() + ':' + #role"
+    )
     @Transactional(readOnly = true)
     public ReservationDetailResult getReservationDetail(UUID reservationId, UUID userId, String role) {
         // 엔티티 조회

From 9700e2d1f6ca2b3666f69eed415452e908b3a1e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 15:10:04 +0900
Subject: [PATCH 104/142] =?UTF-8?q?fix=20:=20=EC=BA=90=EC=8B=9C=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=ED=98=95=ED=83=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/RedisConfig.java           | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 1de72d9..1042f29 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -55,8 +55,14 @@ public RedisTemplate<String, Object> redisTemplate() {
     public CacheManager cacheManager(RedisConnectionFactory factory) {
         ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.registerModule(new JavaTimeModule()); // 날짜 처리
-        // PageImpl 역직렬화를 위한 설정
-        objectMapper.registerModule(new SpringDataJacksonConfiguration().pageModule());
+        objectMapper.registerModule(new SpringDataJacksonConfiguration().pageModule()); // PageImpl 처리
+
+        objectMapper.setVisibility(com.fasterxml.jackson.annotation.PropertyAccessor.ALL, com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY);
+
+        objectMapper.activateDefaultTyping(
+                objectMapper.getPolymorphicTypeValidator(),
+                ObjectMapper.DefaultTyping.NON_FINAL
+        );
 
         RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
                 .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
@@ -70,7 +76,7 @@ public CacheManager cacheManager(RedisConnectionFactory factory) {
 
         return RedisCacheManager.builder(factory)
                 .cacheDefaults(defaultCacheConfig)
-                .withCacheConfiguration("reservations", listCacheConfig) // 목록만 30초
+                .withCacheConfiguration("reservations", listCacheConfig)
                 .build();
     }
 }

From 3200c4fb3b7afd0e1e10c2b4541832d8568545d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 15:17:48 +0900
Subject: [PATCH 105/142] =?UTF-8?q?fix=20:=20=EC=BA=90=EC=8B=9C=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=ED=98=95=ED=83=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pgsg/reservation/infrastructure/config/RedisConfig.java    | 3 +++
 .../presentation/controller/ReservationController.java         | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 1042f29..9fb342d 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -57,8 +57,10 @@ public CacheManager cacheManager(RedisConnectionFactory factory) {
         objectMapper.registerModule(new JavaTimeModule()); // 날짜 처리
         objectMapper.registerModule(new SpringDataJacksonConfiguration().pageModule()); // PageImpl 처리
 
+        // 🚨 [핵심 추가] PageImpl 역직렬화를 막기 위한 가시성 및 믹스인 추가 튜닝
         objectMapper.setVisibility(com.fasterxml.jackson.annotation.PropertyAccessor.ALL, com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY);
 
+        // PageImpl 복원 시 유효성 검사 예외 방지 정책
         objectMapper.activateDefaultTyping(
                 objectMapper.getPolymorphicTypeValidator(),
                 ObjectMapper.DefaultTyping.NON_FINAL
@@ -69,6 +71,7 @@ public CacheManager cacheManager(RedisConnectionFactory factory) {
                 .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer(objectMapper)))
                 .entryTtl(Duration.ofDays(1));
 
+        // 목록 조회 캐시 설정
         RedisCacheConfiguration listCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
                 .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
                 .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer(objectMapper)))
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index b19932c..52d6b4c 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -54,8 +54,6 @@ public ReservationPageResponse<ReservationResponse> getReservations(
             @PageableDefault(size = 10) Pageable pageable
     ) {
 
-        log.info("테스트{}", role);
-
         ReservationSearchQuery query = new ReservationSearchQuery(
                 request.getSellerName(),
                 request.getBuyerName(),

From bfaa50ec0fea5d8aa6ffa3ec48da6e580ca3262c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 15:26:10 +0900
Subject: [PATCH 106/142] =?UTF-8?q?fix=20:=20=EC=BA=90=EC=8B=9C=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=ED=98=95=ED=83=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/service/ReservationService.java     |  9 +++++++--
 .../infrastructure/config/RedisConfig.java          | 13 +++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index fa6cc54..98cac93 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -79,8 +79,13 @@ public ReservationCreateResult createReservation(ReservationCreateCommand comman
     // 예약 목록 조회
     @Transactional(readOnly = true)
     @Cacheable(value = "reservations",
-            key = "{#userId, #role, #query.sellerName(), #query.buyerName(), #query.productName(), " +
-                    "#query.status(), #query.productId(), #pageable.pageNumber, #pageable.pageSize}")
+            key = "#userId.toString() + ':' + #role + ':' + " +
+                    "(#query.sellerName() != null ? #query.sellerName() : '') + ':' + " +
+                    "(#query.buyerName() != null ? #query.buyerName() : '') + ':' + " +
+                    "(#query.productName() != null ? #query.productName() : '') + ':' + " +
+                    "(#query.status() != null ? #query.status().name() : '') + ':' + " +
+                    "(#query.productId() != null ? #query.productId().toString() : '') + ':' + " +
+                    "#pageable.pageNumber + ':' + #pageable.pageSize")
     public Page<ReservationSearchResult> getSearchReservations(
             UUID userId,
             String role,
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 9fb342d..a1e422a 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -54,13 +54,18 @@ public RedisTemplate<String, Object> redisTemplate() {
     @Bean
     public CacheManager cacheManager(RedisConnectionFactory factory) {
         ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.registerModule(new JavaTimeModule()); // 날짜 처리
-        objectMapper.registerModule(new SpringDataJacksonConfiguration().pageModule()); // PageImpl 처리
 
-        // 🚨 [핵심 추가] PageImpl 역직렬화를 막기 위한 가시성 및 믹스인 추가 튜닝
+        // 기본 날짜 및 Spring Data Page 모듈 등록
+        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.registerModule(new SpringDataJacksonConfiguration().pageModule());
+
+        //  record 및 일반 DTO 클래스의 필드/생성자 가시성을 무조건 열어줌
         objectMapper.setVisibility(com.fasterxml.jackson.annotation.PropertyAccessor.ALL, com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY);
+        objectMapper.setVisibility(com.fasterxml.jackson.annotation.PropertyAccessor.CREATOR, com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY);
+
+        // 역직렬화 시 생성자가 없거나 불일치해도 유연하게 매핑하도록 설정
+        objectMapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
-        // PageImpl 복원 시 유효성 검사 예외 방지 정책
         objectMapper.activateDefaultTyping(
                 objectMapper.getPolymorphicTypeValidator(),
                 ObjectMapper.DefaultTyping.NON_FINAL

From ca98b341727f1f441470630756283fbcbefb936f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 15:32:33 +0900
Subject: [PATCH 107/142] =?UTF-8?q?fix=20:=20ObjectMapper=20=EB=B9=88?=
 =?UTF-8?q?=EC=9D=84=20=EC=99=84=EB=B2=BD=ED=95=98=EA=B2=8C=20=EA=B3=B5?=
 =?UTF-8?q?=EC=9C=A0=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=A6=AC=ED=8C=A9?=
 =?UTF-8?q?=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/RedisConfig.java    | 61 ++++++++++---------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index a1e422a..d8878c2 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -1,5 +1,8 @@
 package org.pgsg.reservation.infrastructure.config;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,55 +34,55 @@ public class RedisConfig {
 
     @Bean
     public RedisConnectionFactory redisConnectionFactory() {
-        // Lettuce 사용 시
         return new LettuceConnectionFactory(host, port);
     }
 
     @Bean
-    public RedisTemplate<String, Object> redisTemplate() {
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(redisConnectionFactory());
-
-        // 일반 key-value 값
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
-        redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
-
-        // hash 구조용 설정
-        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-        redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
-
-        return redisTemplate;
-    }
-
-    @Bean
-    public CacheManager cacheManager(RedisConnectionFactory factory) {
+    public ObjectMapper redisObjectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
-
-        // 기본 날짜 및 Spring Data Page 모듈 등록
         objectMapper.registerModule(new JavaTimeModule());
         objectMapper.registerModule(new SpringDataJacksonConfiguration().pageModule());
 
-        //  record 및 일반 DTO 클래스의 필드/생성자 가시성을 무조건 열어줌
-        objectMapper.setVisibility(com.fasterxml.jackson.annotation.PropertyAccessor.ALL, com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY);
-        objectMapper.setVisibility(com.fasterxml.jackson.annotation.PropertyAccessor.CREATOR, com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY);
+        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        objectMapper.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.ANY);
 
-        // 역직렬화 시 생성자가 없거나 불일치해도 유연하게 매핑하도록 설정
-        objectMapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
         objectMapper.activateDefaultTyping(
                 objectMapper.getPolymorphicTypeValidator(),
                 ObjectMapper.DefaultTyping.NON_FINAL
         );
 
+        return objectMapper;
+    }
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory, ObjectMapper redisObjectMapper) {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(factory);
+
+        GenericJackson2JsonRedisSerializer jsonSerializer = new GenericJackson2JsonRedisSerializer(redisObjectMapper);
+
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(jsonSerializer);
+        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+        redisTemplate.setHashValueSerializer(jsonSerializer);
+
+        return redisTemplate;
+    }
+
+    @Bean
+    public CacheManager cacheManager(RedisConnectionFactory factory, ObjectMapper redisObjectMapper) {
+        GenericJackson2JsonRedisSerializer jsonSerializer = new GenericJackson2JsonRedisSerializer(redisObjectMapper);
+
         RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
                 .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
-                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer(objectMapper)))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jsonSerializer))
                 .entryTtl(Duration.ofDays(1));
 
-        // 목록 조회 캐시 설정
         RedisCacheConfiguration listCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
                 .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
-                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer(objectMapper)))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jsonSerializer))
                 .entryTtl(Duration.ofSeconds(30));
 
         return RedisCacheManager.builder(factory)
@@ -87,4 +90,4 @@ public CacheManager cacheManager(RedisConnectionFactory factory) {
                 .withCacheConfiguration("reservations", listCacheConfig)
                 .build();
     }
-}
+}
\ No newline at end of file

From 8909fbe36687f223c06f8cb1f6e9c84f399d8ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 15:46:09 +0900
Subject: [PATCH 108/142] =?UTF-8?q?fix=20:=20RedisConfig=20=EC=97=AD?=
 =?UTF-8?q?=EC=A7=81=EB=A0=AC=ED=99=94=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ReservationDetailResult.java      | 16 ++++++----------
 .../application/service/ReservationService.java  | 16 +++++++---------
 .../infrastructure/config/RedisConfig.java       |  1 +
 .../dto/response/ReservationPageResponse.java    |  5 +++++
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
index 9380e9e..1f8dea2 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
@@ -15,26 +15,22 @@ public record ReservationDetailResult(
         LocalDateTime createdAt,
         LocalDateTime updatedAt
 ) {
-    // 내부 record로 데이터를 구조화합니다.
-    public record ProductInfo(
+    public static record ProductInfo(
             UUID productId,
             String productName,
             Integer price,
             LocalDateTime endTime
-    ) {
-    }
+    ) {}
 
-    public record SellerInfo(
+    public static record SellerInfo(
             UUID sellerId,
             String sellerName
-    ) {
-    }
+    ) {}
 
-    public record BuyerInfo(
+    public static record BuyerInfo(
             UUID buyerId,
             String buyerName
-    ) {
-    }
+    ) {}
 
     public static ReservationDetailResult from(Reservation reservation) {
         return new ReservationDetailResult(
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 98cac93..b3cc730 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -132,9 +132,7 @@ public ReservationDetailResult getReservationDetail(UUID reservationId, UUID use
     // 예약 신청
     @Transactional
     @Caching(evict = {
-            // 해당 예약의 상세 정보 캐시만 삭제
-            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
-            // 목록은 순서나 데이터가 변했을 수 있으므로 전체 삭제
+            @CacheEvict(value = "reservationDetail", allEntries = true),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationCandidateInfo applyReservation(ReservationApplyCommand command) {
@@ -169,7 +167,7 @@ public ReservationCandidateInfo applyReservation(ReservationApplyCommand command
     // 구매자 취소 처리 로직
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservationDetail", allEntries = true),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo cancelByBuyer(ReservationCancelCommand command) {
@@ -190,7 +188,7 @@ public ReservationStateInfo cancelByBuyer(ReservationCancelCommand command) {
     // 추후 결제 시스템 연동시 트리거 발동
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservationDetail", allEntries = true),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo confirmPayment(ReservationConfirmCommand command) {
@@ -214,7 +212,7 @@ public ReservationStateInfo confirmPayment(ReservationConfirmCommand command) {
     // 판매자 취소 로직
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservationDetail", allEntries = true),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo cancelBySeller(ReservationCancelCommand command) {
@@ -236,7 +234,7 @@ public ReservationStateInfo cancelBySeller(ReservationCancelCommand command) {
     // 예약 만료
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservationDetail", allEntries = true),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo expireByAdmin(ReservationExpireCommand command) {
@@ -258,7 +256,7 @@ public ReservationStateInfo expireByAdmin(ReservationExpireCommand command) {
     // 예약 완료
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservationDetail", allEntries = true),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo completeReservation(ReservationConfirmCommand command) {
@@ -276,7 +274,7 @@ public ReservationStateInfo completeReservation(ReservationConfirmCommand comman
     // 거래 완료
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", key = "#command.reservationId()"),
+            @CacheEvict(value = "reservationDetail", allEntries = true),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo confirmTrade(ReservationConfirmCommand command) {
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index d8878c2..3d62200 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -45,6 +45,7 @@ public ObjectMapper redisObjectMapper() {
 
         objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
         objectMapper.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.ANY);
+        objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
 
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java
index 702c863..f0766cf 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java
@@ -1,10 +1,15 @@
 package org.pgsg.reservation.presentation.dto.response;
 
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import java.util.List;
 
 @Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED, force = true)
+@AllArgsConstructor
 public class ReservationPageResponse<T> {
     private final List<T> content;
     private final int pageNumber;

From ff0a367320bb3f268c594180910a417a0598c469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 15:58:07 +0900
Subject: [PATCH 109/142] =?UTF-8?q?fix=20:=20RedisConfig=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=ED=99=95=EC=9D=B8=EC=9A=A9=20log?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/application/service/ReservationService.java  | 4 ++++
 .../pgsg/reservation/infrastructure/config/RedisConfig.java  | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index b3cc730..d7dfc68 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -108,6 +108,8 @@ public Page<ReservationSearchResult> getSearchReservations(
 
         Page<Reservation> reservations = reservationRepository.findByCriteria(criteria, pageable);
 
+        log.info("Found {} reservations for query '{}'", reservations.getTotalElements(), query.toString());
+
         // Repository(QueryDSL)에 정책과 검색 조건을 함께 전달
         return reservations.map(ReservationSearchResult::from);
     }
@@ -126,6 +128,8 @@ public ReservationDetailResult getReservationDetail(UUID reservationId, UUID use
         // 도메인 서비스를 통한 권한 검증
         reservationDomainService.validateDetailAccess(reservation, userId, role);
 
+        log.info("예약 상세 {}",reservation);
+
         return ReservationDetailResult.from(reservation);
     }
 
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 3d62200..bb4b2a4 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -49,11 +49,6 @@ public ObjectMapper redisObjectMapper() {
 
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
-        objectMapper.activateDefaultTyping(
-                objectMapper.getPolymorphicTypeValidator(),
-                ObjectMapper.DefaultTyping.NON_FINAL
-        );
-
         return objectMapper;
     }
 

From 8bff5fc27030ef22ddd7d187f74e7f5e16e40919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 16:06:07 +0900
Subject: [PATCH 110/142] =?UTF-8?q?fix=20:=20RedisConfig=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=ED=99=95=EC=9D=B8=EC=9A=A9=20log?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/pgsg/reservation/ReservationServiceApplication.java     | 2 ++
 .../reservation/application/service/ReservationService.java     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
index 767f59f..dd010c1 100644
--- a/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
+++ b/src/main/java/org/pgsg/reservation/ReservationServiceApplication.java
@@ -4,6 +4,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.data.web.config.EnableSpringDataWebSupport;
 
 @SpringBootApplication(scanBasePackages = {"org.pgsg.reservation", "org.pgsg.common"})
 @EntityScan(basePackages = {
@@ -14,6 +15,7 @@
         "org.pgsg.reservation",
         "org.pgsg.common.domain"
 })
+@EnableSpringDataWebSupport(pageSerializationMode = EnableSpringDataWebSupport.PageSerializationMode.VIA_DTO)
 public class ReservationServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(ReservationServiceApplication.class, args);
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index d7dfc68..0cbb20b 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -128,7 +128,7 @@ public ReservationDetailResult getReservationDetail(UUID reservationId, UUID use
         // 도메인 서비스를 통한 권한 검증
         reservationDomainService.validateDetailAccess(reservation, userId, role);
 
-        log.info("예약 상세 {}",reservation);
+        log.info("예약 상세 조회 완료 - ID: {}, 상태: {}", reservation.getId(), reservation.getStatus());
 
         return ReservationDetailResult.from(reservation);
     }

From e783766518b20c31b545a24a0a6245f4e863954a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 16:13:51 +0900
Subject: [PATCH 111/142] =?UTF-8?q?fix=20:=20RedisConfig=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=EC=9D=84=20=EC=9C=84=20=EC=BD=94=EB=93=9C=EB=A1=9C=20?=
 =?UTF-8?q?=ED=99=95=EC=8B=A4=ED=95=98=EA=B2=8C=20=EB=8D=AE=EC=96=B4?=
 =?UTF-8?q?=EC=93=B0=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/RedisConfig.java          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index bb4b2a4..66c804a 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -5,11 +5,13 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -37,7 +39,8 @@ public RedisConnectionFactory redisConnectionFactory() {
         return new LettuceConnectionFactory(host, port);
     }
 
-    @Bean
+    @Primary
+    @Bean(name = "redisObjectMapper")
     public ObjectMapper redisObjectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.registerModule(new JavaTimeModule());
@@ -53,7 +56,9 @@ public ObjectMapper redisObjectMapper() {
     }
 
     @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory, ObjectMapper redisObjectMapper) {
+    public RedisTemplate<String, Object> redisTemplate(
+            RedisConnectionFactory factory,
+            @Qualifier("redisObjectMapper") ObjectMapper redisObjectMapper) {
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
         redisTemplate.setConnectionFactory(factory);
 
@@ -68,7 +73,9 @@ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factor
     }
 
     @Bean
-    public CacheManager cacheManager(RedisConnectionFactory factory, ObjectMapper redisObjectMapper) {
+    public CacheManager cacheManager(
+            RedisConnectionFactory factory,
+            @Qualifier("redisObjectMapper") ObjectMapper redisObjectMapper) {
         GenericJackson2JsonRedisSerializer jsonSerializer = new GenericJackson2JsonRedisSerializer(redisObjectMapper);
 
         RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()

From f63acc3bb2067322e53d86ca1e7210c510cd2fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 16:22:30 +0900
Subject: [PATCH 112/142] =?UTF-8?q?fix=20:=20RedisConfig=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=EC=9D=84=20=EC=9C=84=20=EC=BD=94=EB=93=9C=EB=A1=9C=20?=
 =?UTF-8?q?=ED=99=95=EC=8B=A4=ED=95=98=EA=B2=8C=20=EB=8D=AE=EC=96=B4?=
 =?UTF-8?q?=EC=93=B0=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/RedisConfig.java          | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 66c804a..d53d032 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
+import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -43,6 +45,7 @@ public RedisConnectionFactory redisConnectionFactory() {
     @Bean(name = "redisObjectMapper")
     public ObjectMapper redisObjectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
+
         objectMapper.registerModule(new JavaTimeModule());
         objectMapper.registerModule(new SpringDataJacksonConfiguration().pageModule());
 
@@ -52,6 +55,16 @@ public ObjectMapper redisObjectMapper() {
 
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
+        PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
+                .allowIfBaseType(Object.class)
+                .build();
+
+        objectMapper.activateDefaultTyping(
+                typeValidator,
+                ObjectMapper.DefaultTyping.NON_FINAL,
+                com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
+        );
+
         return objectMapper;
     }
 

From 5680c02b58b79ac36f98141a9856ffe15e9c3e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 16:29:48 +0900
Subject: [PATCH 113/142] =?UTF-8?q?fix=20:=20RedisConfig=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=EC=9D=84=20=EC=9C=84=20=EC=BD=94=EB=93=9C=EB=A1=9C=20?=
 =?UTF-8?q?=ED=99=95=EC=8B=A4=ED=95=98=EA=B2=8C=20=EB=8D=AE=EC=96=B4?=
 =?UTF-8?q?=EC=93=B0=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/infrastructure/config/RedisConfig.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index d53d032..61b85dd 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -46,15 +46,22 @@ public RedisConnectionFactory redisConnectionFactory() {
     public ObjectMapper redisObjectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
 
+        // 날짜 모듈 및 페이징 모듈 등록
         objectMapper.registerModule(new JavaTimeModule());
         objectMapper.registerModule(new SpringDataJacksonConfiguration().pageModule());
 
+        // LocalDateTime이 [2026,5,14] 배열로 쪼개져서 직렬화되는 것을 막습니다.
+        objectMapper.disable(com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+
+        // 가시성 설정
         objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
         objectMapper.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.ANY);
         objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
 
+        // 없는 필드 무시
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
+        // 다형성 타이핑 설정
         PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
                 .allowIfBaseType(Object.class)
                 .build();

From a18730a003ec2948fb9934eddca3b13cc2bfebb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 16:46:25 +0900
Subject: [PATCH 114/142] =?UTF-8?q?fix=20:=20RedisConfig=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=EC=9D=84=20=EC=9C=84=20=EC=BD=94=EB=93=9C=EB=A1=9C=20?=
 =?UTF-8?q?=ED=99=95=EC=8B=A4=ED=95=98=EA=B2=8C=20=EB=8D=AE=EC=96=B4?=
 =?UTF-8?q?=EC=93=B0=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pgsg/reservation/infrastructure/config/RedisConfig.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 61b85dd..bd10886 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -61,14 +61,14 @@ public ObjectMapper redisObjectMapper() {
         // 없는 필드 무시
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
-        // 다형성 타이핑 설정
         PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
+                .allowIfBaseType("org.pgsg")
                 .allowIfBaseType(Object.class)
                 .build();
 
         objectMapper.activateDefaultTyping(
                 typeValidator,
-                ObjectMapper.DefaultTyping.NON_FINAL,
+                ObjectMapper.DefaultTyping.NON_CONCRETE_AND_ARRAYS,
                 com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
         );
 

From 34b81b0b5843101a889077dfe0cfe09760fc61a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 17:18:02 +0900
Subject: [PATCH 115/142] =?UTF-8?q?fix=20:=20wrapper/dists=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 07aa335..aaaabb3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.14.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 65dcf3836793db8669b16ae1605fa427f85c9b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 17:29:01 +0900
Subject: [PATCH 116/142] =?UTF-8?q?fix=20:=20wrapper/dists=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/RedisConfig.java    | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index bd10886..487564b 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -14,6 +15,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.geo.GeoModule;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -46,21 +49,27 @@ public RedisConnectionFactory redisConnectionFactory() {
     public ObjectMapper redisObjectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
 
-        // 날짜 모듈 및 페이징 모듈 등록
+        // 1. 날짜 모듈 및 스프링 데이터 관련 공식 Jackson 모듈 등록
         objectMapper.registerModule(new JavaTimeModule());
-        objectMapper.registerModule(new SpringDataJacksonConfiguration().pageModule());
+        objectMapper.registerModule(new GeoModule());
 
-        // LocalDateTime이 [2026,5,14] 배열로 쪼개져서 직렬화되는 것을 막습니다.
-        objectMapper.disable(com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 🚨 기존의 부실했던 pageModule() 대신, 역직렬화가 완벽히 지원되는 PageJacksonModule을 강제 등록합니다.
+        objectMapper.registerModule(new org.springframework.data.web.config.SpringDataJacksonConfiguration.PageJacksonModule());
 
-        // 가시성 설정
+        // 2. 날짜 배열 쪼개짐 방지 및 타임스탬프 비활성화
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+
+        // 3. 가시성 설정 (Jackson이 private 필드나 생성자에도 접근할 수 있도록 셋팅)
         objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
         objectMapper.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.ANY);
         objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
 
-        // 없는 필드 무시
+        // 4. 없는 필드가 역직렬화 대상에 있어도 무시하고 정상 파싱
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
+        // 5. 다형성 타이핑 범위 교정
+        // 자바 표준 unmodifiable 리스트 등이 오염되어 터지는 걸 막기 위해,
+        // 오직 우리가 만든 패키지("org.pgsg")와 프레임워크 필수 객체(Object)만 타입 정보를 붙이도록 가이드라인을 좁힙니다.
         PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
                 .allowIfBaseType("org.pgsg")
                 .allowIfBaseType(Object.class)
@@ -68,7 +77,7 @@ public ObjectMapper redisObjectMapper() {
 
         objectMapper.activateDefaultTyping(
                 typeValidator,
-                ObjectMapper.DefaultTyping.NON_CONCRETE_AND_ARRAYS,
+                ObjectMapper.DefaultTyping.NON_CONCRETE_AND_ARRAYS, // 최신 규격 반영
                 com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
         );
 

From b42224a35395fa6f3405d78a7f0f6f886595bb8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 17:36:24 +0900
Subject: [PATCH 117/142] =?UTF-8?q?fix=20:=20wrapper/dists=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aaaabb3..07aa335 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.14.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From d8783a54545652ac94f83799116f23a8e784ce61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 17:38:43 +0900
Subject: [PATCH 118/142] =?UTF-8?q?fix=20:=20ageMixIn=20=EC=9D=B8=ED=84=B0?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=8A=A4=EB=A5=BC=20=EC=A7=81=EC=A0=91=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/RedisConfig.java    | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 487564b..94011d7 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -1,10 +1,13 @@
 package org.pgsg.reservation.infrastructure.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -16,6 +19,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.geo.GeoModule;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
@@ -25,9 +29,9 @@
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.data.web.config.SpringDataJacksonConfiguration;
 
 import java.time.Duration;
+import java.util.List;
 
 @Configuration
 @EnableCaching
@@ -49,27 +53,20 @@ public RedisConnectionFactory redisConnectionFactory() {
     public ObjectMapper redisObjectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
 
-        // 1. 날짜 모듈 및 스프링 데이터 관련 공식 Jackson 모듈 등록
         objectMapper.registerModule(new JavaTimeModule());
         objectMapper.registerModule(new GeoModule());
 
-        // 🚨 기존의 부실했던 pageModule() 대신, 역직렬화가 완벽히 지원되는 PageJacksonModule을 강제 등록합니다.
-        objectMapper.registerModule(new org.springframework.data.web.config.SpringDataJacksonConfiguration.PageJacksonModule());
+        objectMapper.addMixIn(org.springframework.data.domain.Page.class, PageMixIn.class);
+        objectMapper.addMixIn(org.springframework.data.domain.PageImpl.class, PageMixIn.class);
 
-        // 2. 날짜 배열 쪼개짐 방지 및 타임스탬프 비활성화
         objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
 
-        // 3. 가시성 설정 (Jackson이 private 필드나 생성자에도 접근할 수 있도록 셋팅)
         objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
         objectMapper.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.ANY);
         objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
 
-        // 4. 없는 필드가 역직렬화 대상에 있어도 무시하고 정상 파싱
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
-        // 5. 다형성 타이핑 범위 교정
-        // 자바 표준 unmodifiable 리스트 등이 오염되어 터지는 걸 막기 위해,
-        // 오직 우리가 만든 패키지("org.pgsg")와 프레임워크 필수 객체(Object)만 타입 정보를 붙이도록 가이드라인을 좁힙니다.
         PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
                 .allowIfBaseType("org.pgsg")
                 .allowIfBaseType(Object.class)
@@ -77,7 +74,7 @@ public ObjectMapper redisObjectMapper() {
 
         objectMapper.activateDefaultTyping(
                 typeValidator,
-                ObjectMapper.DefaultTyping.NON_CONCRETE_AND_ARRAYS, // 최신 규격 반영
+                ObjectMapper.DefaultTyping.NON_CONCRETE_AND_ARRAYS,
                 com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
         );
 
@@ -122,4 +119,12 @@ public CacheManager cacheManager(
                 .withCacheConfiguration("reservations", listCacheConfig)
                 .build();
     }
+
+    @JsonDeserialize(as = PageImpl.class)
+    private interface PageMixIn {
+        @JsonCreator
+        void PageImpl(@JsonProperty("content") List<?> content,
+                      @JsonProperty("pageable") Pageable pageable,
+                      @JsonProperty("total") long total);
+    }
 }
\ No newline at end of file

From d47b7f82d26c538a0002862021b54f5332ab5715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 17:47:22 +0900
Subject: [PATCH 119/142] =?UTF-8?q?fix=20:=20log=ED=99=95=EC=9D=B8?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ReservationService.java           | 66 ++++++++++++-------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 0cbb20b..17f8b21 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -92,26 +92,35 @@ public Page<ReservationSearchResult> getSearchReservations(
             ReservationSearchQuery query,
             Pageable pageable
     ) {
-        // 권한에 따른 조회 범위 결정 로직을 도메인 모델로 전달
-        SearchPolicy policy = reservationDomainService.getReservations(userId, role);
-
-        ReservationSearchCriteria criteria = new ReservationSearchCriteria(
-                query.sellerName(),
-                query.buyerName(),
-                query.productName(),
-                query.status(),
-                query.productId(),
-                null, // startDateTime
-                null, // endDateTime
-                policy
-        );
+        log.info("[🚨디버깅-목록조회] 메서드 진입 성공 (이 로그가 찍히면 DB 조회 스텝입니다)");
+        try {
+            // 권한에 따른 조회 범위 결정 로직을 도메인 모델로 전달
+            SearchPolicy policy = reservationDomainService.getReservations(userId, role);
+
+            ReservationSearchCriteria criteria = new ReservationSearchCriteria(
+                    query.sellerName(),
+                    query.buyerName(),
+                    query.productName(),
+                    query.status(),
+                    query.productId(),
+                    null, // startDateTime
+                    null, // endDateTime
+                    policy
+            );
 
-        Page<Reservation> reservations = reservationRepository.findByCriteria(criteria, pageable);
+            Page<Reservation> reservations = reservationRepository.findByCriteria(criteria, pageable);
 
-        log.info("Found {} reservations for query '{}'", reservations.getTotalElements(), query.toString());
+            log.info("Found {} reservations for query '{}'", reservations.getTotalElements(), query.toString());
 
-        // Repository(QueryDSL)에 정책과 검색 조건을 함께 전달
-        return reservations.map(ReservationSearchResult::from);
+            // Repository(QueryDSL)에 정책과 검색 조건을 함께 전달
+            Page<ReservationSearchResult> result = reservations.map(ReservationSearchResult::from);
+            log.info("[🚨디버깅-목록조회] 변환 완료. 리턴 직전 - Result 데이터 수: {}", result.getContent().size());
+            return result;
+
+        } catch (Exception e) {
+            log.error("[🔥디버깅-목록조회 킬러로그] DB 조회나 데이터 변환 중 진짜 에러 발생!!!", e);
+            throw e;
+        }
     }
 
 
@@ -122,15 +131,24 @@ public Page<ReservationSearchResult> getSearchReservations(
     )
     @Transactional(readOnly = true)
     public ReservationDetailResult getReservationDetail(UUID reservationId, UUID userId, String role) {
-        // 엔티티 조회
-        Reservation reservation = reservationRepository.findById(reservationId)
-                .orElseThrow(() -> new RuntimeException("해당 예약을 찾을 수 없습니다. ID: " + reservationId));
-        // 도메인 서비스를 통한 권한 검증
-        reservationDomainService.validateDetailAccess(reservation, userId, role);
+        log.info("[🚨디버깅-상세조회] 메서드 진입 성공 (캐시가 비어있어 DB를 찌릅니다) - ID: {}", reservationId);
+        try {
+            // 엔티티 조회
+            Reservation reservation = reservationRepository.findById(reservationId)
+                    .orElseThrow(() -> new RuntimeException("해당 예약을 찾을 수 없습니다. ID: " + reservationId));
+            // 도메인 서비스를 통한 권한 검증
+            reservationDomainService.validateDetailAccess(reservation, userId, role);
+
+            log.info("예약 상세 조회 완료 - ID: {}, 상태: {}", reservation.getId(), reservation.getStatus());
 
-        log.info("예약 상세 조회 완료 - ID: {}, 상태: {}", reservation.getId(), reservation.getStatus());
+            ReservationDetailResult result = ReservationDetailResult.from(reservation);
+            log.info("[🚨디버깅-상세조회] 변환 성공. 리턴 직전 객체 상태: {}", result);
+            return result;
 
-        return ReservationDetailResult.from(reservation);
+        } catch (Exception e) {
+            log.error("[🔥디버깅-상세조회 킬러로그] 상세조회 로직 수행 중 진짜 에러 발생!!!", e);
+            throw e;
+        }
     }
 
     // 예약 신청

From dfa67b491741a8e9658e36222b1e2ef0eee67dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 17:57:28 +0900
Subject: [PATCH 120/142] =?UTF-8?q?fix=20:=20log=ED=99=95=EC=9D=B8?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/pgsg/reservation/infrastructure/config/RedisConfig.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 94011d7..78c0951 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -66,6 +66,7 @@ public ObjectMapper redisObjectMapper() {
         objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
 
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 
         PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
                 .allowIfBaseType("org.pgsg")

From 150080085a8a0f676e77f281562f1979893de038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 18:06:02 +0900
Subject: [PATCH 121/142] =?UTF-8?q?fix=20:=20log=ED=99=95=EC=9D=B8?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pgsg/reservation/infrastructure/config/RedisConfig.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 78c0951..2f6295a 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.CacheManager;
@@ -55,6 +56,7 @@ public ObjectMapper redisObjectMapper() {
 
         objectMapper.registerModule(new JavaTimeModule());
         objectMapper.registerModule(new GeoModule());
+        objectMapper.registerModule(new ParameterNamesModule());
 
         objectMapper.addMixIn(org.springframework.data.domain.Page.class, PageMixIn.class);
         objectMapper.addMixIn(org.springframework.data.domain.PageImpl.class, PageMixIn.class);
@@ -103,6 +105,7 @@ public RedisTemplate<String, Object> redisTemplate(
     public CacheManager cacheManager(
             RedisConnectionFactory factory,
             @Qualifier("redisObjectMapper") ObjectMapper redisObjectMapper) {
+
         GenericJackson2JsonRedisSerializer jsonSerializer = new GenericJackson2JsonRedisSerializer(redisObjectMapper);
 
         RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
@@ -118,6 +121,7 @@ public CacheManager cacheManager(
         return RedisCacheManager.builder(factory)
                 .cacheDefaults(defaultCacheConfig)
                 .withCacheConfiguration("reservations", listCacheConfig)
+                .withCacheConfiguration("reservationDetail", defaultCacheConfig)
                 .build();
     }
 

From a935f4151cdafffd4c26b77396d6907e3878e931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 18:16:00 +0900
Subject: [PATCH 122/142] =?UTF-8?q?fix=20:=20log=ED=99=95=EC=9D=B8?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/RedisConfig.java    | 53 +++++++++++++++----
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 2f6295a..abab1ec 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -1,15 +1,17 @@
 package org.pgsg.reservation.infrastructure.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -19,7 +21,9 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.geo.GeoModule;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
@@ -31,7 +35,9 @@
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import java.io.IOException;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.List;
 
 @Configuration
@@ -49,6 +55,7 @@ public RedisConnectionFactory redisConnectionFactory() {
         return new LettuceConnectionFactory(host, port);
     }
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     @Primary
     @Bean(name = "redisObjectMapper")
     public ObjectMapper redisObjectMapper() {
@@ -58,8 +65,11 @@ public ObjectMapper redisObjectMapper() {
         objectMapper.registerModule(new GeoModule());
         objectMapper.registerModule(new ParameterNamesModule());
 
-        objectMapper.addMixIn(org.springframework.data.domain.Page.class, PageMixIn.class);
-        objectMapper.addMixIn(org.springframework.data.domain.PageImpl.class, PageMixIn.class);
+        JsonDeserializer<Page> jsonPageDeserializer = new JsonPageDeserializer();
+        SimpleModule pageModule = new SimpleModule();
+        pageModule.addDeserializer((Class) Page.class, jsonPageDeserializer);
+        pageModule.addDeserializer((Class) PageImpl.class, jsonPageDeserializer);
+        objectMapper.registerModule(pageModule);
 
         objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
 
@@ -125,11 +135,32 @@ public CacheManager cacheManager(
                 .build();
     }
 
-    @JsonDeserialize(as = PageImpl.class)
-    private interface PageMixIn {
-        @JsonCreator
-        void PageImpl(@JsonProperty("content") List<?> content,
-                      @JsonProperty("pageable") Pageable pageable,
-                      @JsonProperty("total") long total);
+    private static class JsonPageDeserializer extends JsonDeserializer<Page> {
+        @Override
+        public Page deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+            ObjectMapper mapper = (ObjectMapper) p.getCodec();
+            JsonNode node = mapper.readTree(p);
+
+            JsonNode contentNode = node.get("content");
+            List<Object> content = new ArrayList<>();
+            if (contentNode != null && contentNode.isArray()) {
+                for (JsonNode element : contentNode) {
+                    content.add(mapper.treeToValue(element, Object.class));
+                }
+            }
+
+            long totalElements = 0;
+            if (node.has("totalElements")) {
+                totalElements = node.get("totalElements").asLong();
+            } else if (node.has("total")) {
+                totalElements = node.get("total").asLong();
+            }
+
+            int page = node.has("number") ? node.get("number").asInt() : 0;
+            int size = node.has("size") ? node.get("size").asInt() : (content.isEmpty() ? 10 : content.size());
+
+            Pageable pageable = PageRequest.of(page, size);
+            return new PageImpl<>(content, pageable, totalElements);
+        }
     }
 }
\ No newline at end of file

From 3d13f8e5822bfed9ce5d6f86a35a3975efc294b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 18:24:24 +0900
Subject: [PATCH 123/142] =?UTF-8?q?fix=20:=20log=ED=99=95=EC=9D=B8?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/RedisConfig.java    | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index abab1ec..c4ed3b4 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -9,8 +9,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
-import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
@@ -31,7 +29,7 @@
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
@@ -65,10 +63,9 @@ public ObjectMapper redisObjectMapper() {
         objectMapper.registerModule(new GeoModule());
         objectMapper.registerModule(new ParameterNamesModule());
 
-        JsonDeserializer<Page> jsonPageDeserializer = new JsonPageDeserializer();
         SimpleModule pageModule = new SimpleModule();
-        pageModule.addDeserializer((Class) Page.class, jsonPageDeserializer);
-        pageModule.addDeserializer((Class) PageImpl.class, jsonPageDeserializer);
+        pageModule.addDeserializer((Class) Page.class, new JsonPageDeserializer());
+        pageModule.addDeserializer((Class) PageImpl.class, new JsonPageDeserializer());
         objectMapper.registerModule(pageModule);
 
         objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
@@ -80,17 +77,6 @@ public ObjectMapper redisObjectMapper() {
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 
-        PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
-                .allowIfBaseType("org.pgsg")
-                .allowIfBaseType(Object.class)
-                .build();
-
-        objectMapper.activateDefaultTyping(
-                typeValidator,
-                ObjectMapper.DefaultTyping.NON_CONCRETE_AND_ARRAYS,
-                com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
-        );
-
         return objectMapper;
     }
 
@@ -101,7 +87,7 @@ public RedisTemplate<String, Object> redisTemplate(
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
         redisTemplate.setConnectionFactory(factory);
 
-        GenericJackson2JsonRedisSerializer jsonSerializer = new GenericJackson2JsonRedisSerializer(redisObjectMapper);
+        Jackson2JsonRedisSerializer<Object> jsonSerializer = new Jackson2JsonRedisSerializer<>(redisObjectMapper, Object.class);
 
         redisTemplate.setKeySerializer(new StringRedisSerializer());
         redisTemplate.setValueSerializer(jsonSerializer);
@@ -116,7 +102,7 @@ public CacheManager cacheManager(
             RedisConnectionFactory factory,
             @Qualifier("redisObjectMapper") ObjectMapper redisObjectMapper) {
 
-        GenericJackson2JsonRedisSerializer jsonSerializer = new GenericJackson2JsonRedisSerializer(redisObjectMapper);
+        Jackson2JsonRedisSerializer<Object> jsonSerializer = new Jackson2JsonRedisSerializer<>(redisObjectMapper, Object.class);
 
         RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
                 .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))

From c58df69b982abcb1ad176451b87741e38df4ead7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 19:31:16 +0900
Subject: [PATCH 124/142] =?UTF-8?q?fix=20:=20redis=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/RedisConfig.java    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index c4ed3b4..d827375 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -9,6 +9,8 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
+import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
@@ -29,7 +31,7 @@
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
@@ -37,6 +39,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Pattern;
 
 @Configuration
 @EnableCaching
@@ -77,6 +80,18 @@ public ObjectMapper redisObjectMapper() {
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 
+        PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
+                .allowIfBaseType(Pattern.compile("^\\[Ljava\\.lang\\.Object;"))
+                .allowIfBaseType("org.pgsg")
+                .allowIfBaseType(Object.class)
+                .build();
+
+        objectMapper.activateDefaultTyping(
+                typeValidator,
+                ObjectMapper.DefaultTyping.NON_FINAL,
+                com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
+        );
+
         return objectMapper;
     }
 
@@ -87,7 +102,7 @@ public RedisTemplate<String, Object> redisTemplate(
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
         redisTemplate.setConnectionFactory(factory);
 
-        Jackson2JsonRedisSerializer<Object> jsonSerializer = new Jackson2JsonRedisSerializer<>(redisObjectMapper, Object.class);
+        GenericJackson2JsonRedisSerializer jsonSerializer = new GenericJackson2JsonRedisSerializer(redisObjectMapper);
 
         redisTemplate.setKeySerializer(new StringRedisSerializer());
         redisTemplate.setValueSerializer(jsonSerializer);
@@ -102,7 +117,7 @@ public CacheManager cacheManager(
             RedisConnectionFactory factory,
             @Qualifier("redisObjectMapper") ObjectMapper redisObjectMapper) {
 
-        Jackson2JsonRedisSerializer<Object> jsonSerializer = new Jackson2JsonRedisSerializer<>(redisObjectMapper, Object.class);
+        GenericJackson2JsonRedisSerializer jsonSerializer = new GenericJackson2JsonRedisSerializer(redisObjectMapper);
 
         RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
                 .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))

From 782d3c6b11b2ab8a909b51ab7e318e36ca9ff6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 19:42:06 +0900
Subject: [PATCH 125/142] =?UTF-8?q?fix=20:=20redis=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pgsg/reservation/infrastructure/config/RedisConfig.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index d827375..6ca5abb 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -39,7 +39,6 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Pattern;
 
 @Configuration
 @EnableCaching
@@ -81,8 +80,9 @@ public ObjectMapper redisObjectMapper() {
         objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 
         PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
-                .allowIfBaseType(Pattern.compile("^\\[Ljava\\.lang\\.Object;"))
-                .allowIfBaseType("org.pgsg")
+                .allowIfBaseType("org.pgsg.")
+                .allowIfBaseType("java.util.")
+                .allowIfBaseType("java.lang.")
                 .allowIfBaseType(Object.class)
                 .build();
 

From 17a31c9b84ad9c88f91dc0f6d9a9bd0d2fff4faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 19:53:05 +0900
Subject: [PATCH 126/142] =?UTF-8?q?fix=20:=20=EB=A1=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bc2e1b7..7e19ec1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -31,7 +31,6 @@ spring:
   kafka:
     bootstrap-servers: ${KAFKA_HOST:34.64.35.152:9092,34.22.94.155:9092,34.50.28.59:9092}
     ssl:
-      # Docker 환경(file:/app/...)과 로컬 환경(C:/...)을 환경 변수 하나로 제어합니다.
       trust-store-location: ${KAFKA_SSL_PATH:file:/app/ssl/kafka.server.truststore.jks}
       trust-store-password: ${KAFKA_SSL_TRUSTSTORE_PASSWORD}
     properties:
@@ -82,7 +81,18 @@ eureka:
     fetch-registry: true
     service-url:
       defaultZone: ${EUREKA_SERVER_URL:http://34.50.50.170:8761/eureka/}
-
+logging:
+  file:
+    name: /app/logs/reservation-service.log
+  logback:
+    rollingpolicy:
+      max-file-size: 10MB
+      max-history: 7
+  level:
+    root: INFO
+    org.springframework.data.redis: TRACE
+    org.springframework.cache: TRACE
+    com.fasterxml.jackson: TRACE
 
 topics:
   reservation:
@@ -91,4 +101,4 @@ topics:
     failed : prod-reservation-tradefail
   product:
     created: prod-product-created
-    failed: prod-product-failed
+    failed: prod-product-failed
\ No newline at end of file

From 1fe6bb5d6f7fc300f75479bc49c6505d64ea558d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 20:03:35 +0900
Subject: [PATCH 127/142] =?UTF-8?q?fix=20:=20JsonDeserialize=EB=A1=9C=20?=
 =?UTF-8?q?=EB=A0=88=EC=BD=94=EB=93=9C=20=EB=A7=A4=ED=95=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ReservationDetailResult.java   | 58 ++++++++++++++++++-
 .../dto/result/ReservationSearchResult.java   | 19 ++++++
 2 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
index 1f8dea2..0beb602 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationDetailResult.java
@@ -1,5 +1,7 @@
 package org.pgsg.reservation.application.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
 import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 
@@ -15,22 +17,72 @@ public record ReservationDetailResult(
         LocalDateTime createdAt,
         LocalDateTime updatedAt
 ) {
+    @JsonCreator
+    public ReservationDetailResult(
+            @JsonProperty("reservationId") UUID reservationId,
+            @JsonProperty("status") ReservationStatus status,
+            @JsonProperty("product") ProductInfo product,
+            @JsonProperty("seller") SellerInfo seller,
+            @JsonProperty("buyer") BuyerInfo buyer,
+            @JsonProperty("createdAt") LocalDateTime createdAt,
+            @JsonProperty("updatedAt") LocalDateTime updatedAt
+            ) {
+        this.reservationId = reservationId;
+        this.status = status;
+        this.product = product;
+        this.seller = seller;
+        this.buyer = buyer;
+        this.createdAt = createdAt;
+        this.updatedAt = updatedAt;
+    }
+
     public static record ProductInfo(
             UUID productId,
             String productName,
             Integer price,
             LocalDateTime endTime
-    ) {}
+    ) {
+        @JsonCreator
+        public ProductInfo(
+                @JsonProperty("productId") UUID productId,
+                @JsonProperty("productName") String productName,
+                @JsonProperty("price") Integer price,
+                @JsonProperty("endTime") LocalDateTime endTime
+        ) {
+            this.productId = productId;
+            this.productName = productName;
+            this.price = price;
+            this.endTime = endTime;
+        }
+    }
 
     public static record SellerInfo(
             UUID sellerId,
             String sellerName
-    ) {}
+    ) {
+        @JsonCreator
+        public SellerInfo(
+                @JsonProperty("sellerId") UUID sellerId,
+                @JsonProperty("sellerName") String sellerName
+        ) {
+            this.sellerId = sellerId;
+            this.sellerName = sellerName;
+        }
+    }
 
     public static record BuyerInfo(
             UUID buyerId,
             String buyerName
-    ) {}
+    ) {
+        @JsonCreator
+        public BuyerInfo(
+                @JsonProperty("buyerId") UUID buyerId,
+                @JsonProperty("buyerName") String buyerName
+        ) {
+            this.buyerId = buyerId;
+            this.buyerName = buyerName;
+        }
+    }
 
     public static ReservationDetailResult from(Reservation reservation) {
         return new ReservationDetailResult(
diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
index 7abe1ee..382a1b5 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/ReservationSearchResult.java
@@ -1,5 +1,7 @@
 package org.pgsg.reservation.application.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.pgsg.reservation.domain.model.reservation.Reservation;
 import org.pgsg.reservation.domain.model.reservation.ReservationStatus;
 
@@ -14,6 +16,23 @@ public record ReservationSearchResult(
         ReservationStatus status,
         LocalDateTime createdAt
 ) {
+    @JsonCreator
+    public ReservationSearchResult(
+            @JsonProperty("reservationId") UUID reservationId,
+            @JsonProperty("productName") String productName,
+            @JsonProperty("sellerName") String sellerName,
+            @JsonProperty("buyerName") String buyerName,
+            @JsonProperty("status") ReservationStatus status,
+            @JsonProperty("createdAt") LocalDateTime createdAt
+    ) {
+        this.reservationId = reservationId;
+        this.productName = productName;
+        this.sellerName = sellerName;
+        this.buyerName = buyerName;
+        this.status = status;
+        this.createdAt = createdAt;
+    }
+
     public static ReservationSearchResult from(Reservation reservation) {
         return new ReservationSearchResult(
                 reservation.getId(),

From 12bb957e7009bc55b27e92cdf4febb100e7de615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 20:13:20 +0900
Subject: [PATCH 128/142] =?UTF-8?q?fix=20:=20JsonDeserialize=EB=A1=9C=20?=
 =?UTF-8?q?=EB=A0=88=EC=BD=94=EB=93=9C=20=EB=A7=A4=ED=95=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/pgsg/reservation/infrastructure/config/RedisConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 6ca5abb..eb959a9 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -127,7 +127,7 @@ public CacheManager cacheManager(
         RedisCacheConfiguration listCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
                 .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
                 .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jsonSerializer))
-                .entryTtl(Duration.ofSeconds(30));
+                .entryTtl(Duration.ofHours(1));
 
         return RedisCacheManager.builder(factory)
                 .cacheDefaults(defaultCacheConfig)

From 3afbfa608e16a5bdbb38c59395274bf4f2356182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 20:23:15 +0900
Subject: [PATCH 129/142] =?UTF-8?q?fix=20:=20JsonDeserialize=EB=A1=9C=20?=
 =?UTF-8?q?=EB=A0=88=EC=BD=94=EB=93=9C=20=EB=A7=A4=ED=95=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/config/RedisConfig.java            | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index eb959a9..1c7852f 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -80,9 +80,6 @@ public ObjectMapper redisObjectMapper() {
         objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 
         PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
-                .allowIfBaseType("org.pgsg.")
-                .allowIfBaseType("java.util.")
-                .allowIfBaseType("java.lang.")
                 .allowIfBaseType(Object.class)
                 .build();
 
@@ -146,6 +143,14 @@ public Page deserialize(JsonParser p, DeserializationContext ctxt) throws IOExce
             List<Object> content = new ArrayList<>();
             if (contentNode != null && contentNode.isArray()) {
                 for (JsonNode element : contentNode) {
+                    if (element.has("@class")) {
+                        try {
+                            Class<?> targetClass = Class.forName(element.get("@class").asText());
+                            content.add(mapper.treeToValue(element, targetClass));
+                            continue;
+                        } catch (ClassNotFoundException e) {
+                        }
+                    }
                     content.add(mapper.treeToValue(element, Object.class));
                 }
             }

From 3feb175b33c89e51488afa305260d6ae848c49ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 20:31:53 +0900
Subject: [PATCH 130/142] =?UTF-8?q?fix=20:=20mapper=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/infrastructure/config/RedisConfig.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 1c7852f..8076494 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -145,10 +145,11 @@ public Page deserialize(JsonParser p, DeserializationContext ctxt) throws IOExce
                 for (JsonNode element : contentNode) {
                     if (element.has("@class")) {
                         try {
-                            Class<?> targetClass = Class.forName(element.get("@class").asText());
-                            content.add(mapper.treeToValue(element, targetClass));
+                            com.fasterxml.jackson.databind.JavaType javaType =
+                                    mapper.getTypeFactory().constructFromCanonical(element.get("@class").asText());
+                            content.add(mapper.treeToValue(element, javaType));
                             continue;
-                        } catch (ClassNotFoundException e) {
+                        } catch (Exception e) {
                         }
                     }
                     content.add(mapper.treeToValue(element, Object.class));

From 5c8b5983ec0f8685bd28f67c623b5146bd581e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 20:42:49 +0900
Subject: [PATCH 131/142] =?UTF-8?q?fix=20:=20EVERYTHING=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pgsg/reservation/infrastructure/config/RedisConfig.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 8076494..eeb4328 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -1,6 +1,7 @@
 package org.pgsg.reservation.infrastructure.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
@@ -85,8 +86,8 @@ public ObjectMapper redisObjectMapper() {
 
         objectMapper.activateDefaultTyping(
                 typeValidator,
-                ObjectMapper.DefaultTyping.NON_FINAL,
-                com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
+                ObjectMapper.DefaultTyping.EVERYTHING,
+                JsonTypeInfo.As.PROPERTY
         );
 
         return objectMapper;

From f16ed1239e289b13bad686b60f7925c061ae3165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 20:56:43 +0900
Subject: [PATCH 132/142] =?UTF-8?q?fix=20:=20class=EB=B6=80=EB=B6=84=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/dto/result/CustomPage.java    | 36 +++++++++++
 .../service/ReservationService.java           | 18 ++----
 .../infrastructure/config/RedisConfig.java    | 60 +------------------
 .../dto/response/ReservationPageResponse.java | 10 ++--
 4 files changed, 46 insertions(+), 78 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/application/dto/result/CustomPage.java

diff --git a/src/main/java/org/pgsg/reservation/application/dto/result/CustomPage.java b/src/main/java/org/pgsg/reservation/application/dto/result/CustomPage.java
new file mode 100644
index 0000000..eb3631a
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/application/dto/result/CustomPage.java
@@ -0,0 +1,36 @@
+package org.pgsg.reservation.application.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CustomPage<T> {
+    private List<T> content;
+    private int pageNumber;
+    private int pageSize;
+    private long totalElements;
+
+    public static <T> CustomPage<T> from(Page<T> page) {
+        return new CustomPage<>(
+                page.getContent(),
+                page.getNumber(),
+                page.getSize(),
+                page.getTotalElements()
+        );
+    }
+
+    public <U> CustomPage<U> map(Function<? super T, ? extends U> converter) {
+        List<U> convertedContent = this.content.stream()
+                .map(converter)
+                .collect(Collectors.toList());
+        return new CustomPage<>(convertedContent, this.pageNumber, this.pageSize, this.totalElements);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 17f8b21..da3ca08 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.pgsg.reservation.application.dto.command.*;
+import org.pgsg.reservation.application.dto.result.CustomPage;
 import org.pgsg.reservation.application.dto.result.ReservationDetailResult;
 import org.pgsg.reservation.infrastructure.listener.dto.ReservationEventPublisher;
 import org.pgsg.reservation.application.dto.info.ReservationStateInfo;
@@ -86,13 +87,12 @@ public ReservationCreateResult createReservation(ReservationCreateCommand comman
                     "(#query.status() != null ? #query.status().name() : '') + ':' + " +
                     "(#query.productId() != null ? #query.productId().toString() : '') + ':' + " +
                     "#pageable.pageNumber + ':' + #pageable.pageSize")
-    public Page<ReservationSearchResult> getSearchReservations(
+    public CustomPage<ReservationSearchResult> getSearchReservations(
             UUID userId,
             String role,
             ReservationSearchQuery query,
             Pageable pageable
     ) {
-        log.info("[🚨디버깅-목록조회] 메서드 진입 성공 (이 로그가 찍히면 DB 조회 스텝입니다)");
         try {
             // 권한에 따른 조회 범위 결정 로직을 도메인 모델로 전달
             SearchPolicy policy = reservationDomainService.getReservations(userId, role);
@@ -110,15 +110,11 @@ public Page<ReservationSearchResult> getSearchReservations(
 
             Page<Reservation> reservations = reservationRepository.findByCriteria(criteria, pageable);
 
-            log.info("Found {} reservations for query '{}'", reservations.getTotalElements(), query.toString());
-
             // Repository(QueryDSL)에 정책과 검색 조건을 함께 전달
             Page<ReservationSearchResult> result = reservations.map(ReservationSearchResult::from);
-            log.info("[🚨디버깅-목록조회] 변환 완료. 리턴 직전 - Result 데이터 수: {}", result.getContent().size());
-            return result;
+            return CustomPage.from(result);
 
         } catch (Exception e) {
-            log.error("[🔥디버깅-목록조회 킬러로그] DB 조회나 데이터 변환 중 진짜 에러 발생!!!", e);
             throw e;
         }
     }
@@ -131,7 +127,6 @@ public Page<ReservationSearchResult> getSearchReservations(
     )
     @Transactional(readOnly = true)
     public ReservationDetailResult getReservationDetail(UUID reservationId, UUID userId, String role) {
-        log.info("[🚨디버깅-상세조회] 메서드 진입 성공 (캐시가 비어있어 DB를 찌릅니다) - ID: {}", reservationId);
         try {
             // 엔티티 조회
             Reservation reservation = reservationRepository.findById(reservationId)
@@ -139,14 +134,9 @@ public ReservationDetailResult getReservationDetail(UUID reservationId, UUID use
             // 도메인 서비스를 통한 권한 검증
             reservationDomainService.validateDetailAccess(reservation, userId, role);
 
-            log.info("예약 상세 조회 완료 - ID: {}, 상태: {}", reservation.getId(), reservation.getStatus());
-
-            ReservationDetailResult result = ReservationDetailResult.from(reservation);
-            log.info("[🚨디버깅-상세조회] 변환 성공. 리턴 직전 객체 상태: {}", result);
-            return result;
+            return ReservationDetailResult.from(reservation);
 
         } catch (Exception e) {
-            log.error("[🔥디버깅-상세조회 킬러로그] 상세조회 로직 수행 중 진짜 에러 발생!!!", e);
             throw e;
         }
     }
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index eeb4328..96cfb38 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -3,16 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
-import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -21,11 +16,6 @@
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.geo.GeoModule;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
@@ -36,10 +26,7 @@
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
-import java.io.IOException;
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
 
 @Configuration
 @EnableCaching
@@ -56,8 +43,6 @@ public RedisConnectionFactory redisConnectionFactory() {
         return new LettuceConnectionFactory(host, port);
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Primary
     @Bean(name = "redisObjectMapper")
     public ObjectMapper redisObjectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
@@ -66,11 +51,6 @@ public ObjectMapper redisObjectMapper() {
         objectMapper.registerModule(new GeoModule());
         objectMapper.registerModule(new ParameterNamesModule());
 
-        SimpleModule pageModule = new SimpleModule();
-        pageModule.addDeserializer((Class) Page.class, new JsonPageDeserializer());
-        pageModule.addDeserializer((Class) PageImpl.class, new JsonPageDeserializer());
-        objectMapper.registerModule(pageModule);
-
         objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
 
         objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
@@ -86,7 +66,7 @@ public ObjectMapper redisObjectMapper() {
 
         objectMapper.activateDefaultTyping(
                 typeValidator,
-                ObjectMapper.DefaultTyping.EVERYTHING,
+                ObjectMapper.DefaultTyping.NON_FINAL,
                 JsonTypeInfo.As.PROPERTY
         );
 
@@ -133,42 +113,4 @@ public CacheManager cacheManager(
                 .withCacheConfiguration("reservationDetail", defaultCacheConfig)
                 .build();
     }
-
-    private static class JsonPageDeserializer extends JsonDeserializer<Page> {
-        @Override
-        public Page deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-            ObjectMapper mapper = (ObjectMapper) p.getCodec();
-            JsonNode node = mapper.readTree(p);
-
-            JsonNode contentNode = node.get("content");
-            List<Object> content = new ArrayList<>();
-            if (contentNode != null && contentNode.isArray()) {
-                for (JsonNode element : contentNode) {
-                    if (element.has("@class")) {
-                        try {
-                            com.fasterxml.jackson.databind.JavaType javaType =
-                                    mapper.getTypeFactory().constructFromCanonical(element.get("@class").asText());
-                            content.add(mapper.treeToValue(element, javaType));
-                            continue;
-                        } catch (Exception e) {
-                        }
-                    }
-                    content.add(mapper.treeToValue(element, Object.class));
-                }
-            }
-
-            long totalElements = 0;
-            if (node.has("totalElements")) {
-                totalElements = node.get("totalElements").asLong();
-            } else if (node.has("total")) {
-                totalElements = node.get("total").asLong();
-            }
-
-            int page = node.has("number") ? node.get("number").asInt() : 0;
-            int size = node.has("size") ? node.get("size").asInt() : (content.isEmpty() ? 10 : content.size());
-
-            Pageable pageable = PageRequest.of(page, size);
-            return new PageImpl<>(content, pageable, totalElements);
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java
index f0766cf..ae29a0e 100644
--- a/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java
+++ b/src/main/java/org/pgsg/reservation/presentation/dto/response/ReservationPageResponse.java
@@ -4,7 +4,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
+import org.pgsg.reservation.application.dto.result.CustomPage;
 import java.util.List;
 
 @Getter
@@ -16,14 +16,14 @@ public class ReservationPageResponse<T> {
     private final long totalElements;
     private final int totalPages;
 
-    private ReservationPageResponse(Page<T> page) {
+    private ReservationPageResponse(CustomPage<T> page) {
         this.content = page.getContent();
-        this.pageNumber = page.getNumber();
+        this.pageNumber = page.getPageNumber();
         this.totalElements = page.getTotalElements();
-        this.totalPages = page.getTotalPages();
+        this.totalPages = (int) Math.ceil((double) page.getTotalElements() / page.getPageSize());
     }
 
-    public static <T> ReservationPageResponse<T> from(Page<T> page) {
+    public static <T> ReservationPageResponse<T> from(CustomPage<T> page) {
         return new ReservationPageResponse<>(page);
     }
 }
\ No newline at end of file

From 9dd55dccd3ccd7429e283cee0508964840a78ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Fri, 15 May 2026 21:06:04 +0900
Subject: [PATCH 133/142] =?UTF-8?q?fix=20:=20EVERYTHING=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/pgsg/reservation/infrastructure/config/RedisConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index 96cfb38..dde9586 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -66,7 +66,7 @@ public ObjectMapper redisObjectMapper() {
 
         objectMapper.activateDefaultTyping(
                 typeValidator,
-                ObjectMapper.DefaultTyping.NON_FINAL,
+                ObjectMapper.DefaultTyping.EVERYTHING,
                 JsonTypeInfo.As.PROPERTY
         );
 

From 10386b623605944dab6f429ca0405d47444ccca9 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Mon, 18 May 2026 12:12:12 +0900
Subject: [PATCH 134/142] =?UTF-8?q?Feat=20:=20Redisson=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B0=98=EC=9D=98=20=EB=B6=84=EC=82=B0=20=EB=9D=BD=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20(#55)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Feat : Redisson 기반의 분산 락 설정

* fix : 코드래빗 제안 수정
- Watchdog 기능 설정

* fix : 코드래빗 제안 수정
- 입력 누락 값 수정
---
 .../service/ReservationService.java           |  4 +-
 .../exception/ReservationErrorCode.java       |  6 ++-
 .../infrastructure/config/RedissonConfig.java | 28 +++++++++++
 .../controller/ReservationController.java     |  4 +-
 .../facade/ReservationFacade.java             | 50 +++++++++++++++++++
 .../application-reservation-error.yml         | 21 ++++++--
 6 files changed, 104 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/org/pgsg/reservation/infrastructure/config/RedissonConfig.java
 create mode 100644 src/main/java/org/pgsg/reservation/presentation/facade/ReservationFacade.java

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index da3ca08..af6211c 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -147,7 +147,7 @@ public ReservationDetailResult getReservationDetail(UUID reservationId, UUID use
             @CacheEvict(value = "reservationDetail", allEntries = true),
             @CacheEvict(value = "reservations", allEntries = true)
     })
-    public ReservationCandidateInfo applyReservation(ReservationApplyCommand command) {
+    public ReservationCandidateInfo proceedApplyTransaction(ReservationApplyCommand command) {
         Reservation savedReservation;
 
         // 예약 엔티티 조회
@@ -167,7 +167,7 @@ public ReservationCandidateInfo applyReservation(ReservationApplyCommand command
             throw e;
         }
 
-        // 방금 저장된 예약에서 추하한 후보자 찾기
+        // 방금 저장된 예약에서 추가한 후보자 찾기
         ReservationCandidate savedCandidate = savedReservation.getCandidates().stream()
                 .filter(c -> c.getCandidateId().equals(command.userId()))
                 .findFirst()
diff --git a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
index b7effa8..b4fe920 100644
--- a/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
+++ b/src/main/java/org/pgsg/reservation/domain/exception/ReservationErrorCode.java
@@ -23,7 +23,11 @@ public enum ReservationErrorCode implements ErrorCode {
     // 서비스 예외 - 충돌 및 중복 (R007~R009 계열)
     DUPLICATE_RESERVATION("[reservation.exception.conflict.duplicate-reservation]", "productId"),
     ALREADY_APPLIED("[reservation.exception.conflict.already-applied]", "buyerId"),
-    ALREADY_EXISTS("[reservation.exception.conflict.already-exists]", "productId");
+    ALREADY_EXISTS("[reservation.exception.conflict.already-exists]", "productId"),
+
+    // 분산 락 관련 예외 (R010~R011 계열 추가)
+    RESERVATION_BUSY("[reservation.exception.lock.busy]", "reservationId"),
+    RESERVATION_INTERRUPTED("[reservation.exception.lock.interrupted]", "reservationId");
 
     private final String errorKey;
     private final String field;
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedissonConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedissonConfig.java
new file mode 100644
index 0000000..b92a375
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedissonConfig.java
@@ -0,0 +1,28 @@
+package org.pgsg.reservation.infrastructure.config;
+
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RedissonConfig {
+
+    @Value("${spring.data.redis.host}")
+    private String host;
+
+    @Value("${spring.data.redis.port}")
+    private int port;
+
+    @Bean
+    public RedissonClient redissonClient() {
+        Config config = new Config();
+
+        config.useSingleServer()
+                .setAddress("redis://" + host + ":" + port);
+
+        return Redisson.create(config);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
index 52d6b4c..b86c53a 100644
--- a/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
+++ b/src/main/java/org/pgsg/reservation/presentation/controller/ReservationController.java
@@ -16,6 +16,7 @@
 import org.pgsg.reservation.presentation.dto.request.ReservationCreateRequest;
 import org.pgsg.reservation.presentation.dto.request.ReservationSearchRequest;
 import org.pgsg.reservation.presentation.dto.response.*;
+import org.pgsg.reservation.presentation.facade.ReservationFacade;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.web.bind.annotation.*;
@@ -29,6 +30,7 @@
 public class ReservationController {
 
     private final ReservationService reservationService;
+    private final ReservationFacade reservationFacade;
 
     // 예약 생성
     @PostMapping
@@ -90,7 +92,7 @@ public ReservationCandidateResponse applyReservation(
     ) {
         ReservationApplyCommand command = ReservationApplyCommand.of(reservationId, userId, nickname);
 
-        ReservationCandidateInfo info = reservationService.applyReservation(command);
+        ReservationCandidateInfo info = reservationFacade.applyReservation(command);
 
         return ReservationCandidateResponse.of(info, "예약 신청이 성공적으로 완료되었습니다.");
     }
diff --git a/src/main/java/org/pgsg/reservation/presentation/facade/ReservationFacade.java b/src/main/java/org/pgsg/reservation/presentation/facade/ReservationFacade.java
new file mode 100644
index 0000000..3b10859
--- /dev/null
+++ b/src/main/java/org/pgsg/reservation/presentation/facade/ReservationFacade.java
@@ -0,0 +1,50 @@
+package org.pgsg.reservation.presentation.facade;
+
+import lombok.RequiredArgsConstructor;
+import org.pgsg.reservation.application.dto.command.ReservationApplyCommand;
+import org.pgsg.reservation.application.dto.info.ReservationCandidateInfo;
+import org.pgsg.reservation.application.service.ReservationService;
+import org.pgsg.reservation.domain.exception.ReservationErrorCode;
+import org.pgsg.reservation.domain.exception.ReservationException;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+@Component
+@RequiredArgsConstructor
+public class ReservationFacade {
+
+    private final RedissonClient redissonClient;
+    private final ReservationService reservationService;
+
+    public ReservationCandidateInfo applyReservation(ReservationApplyCommand command) {
+        // 락의 키를 예약 자원 ID(reservationId) 단위로 설정하여 정밀하게 제어
+        String lockKey = "lock:reservation:" + command.reservationId();
+        RLock lock = redissonClient.getLock(lockKey);
+
+        try {
+            // waitTime: 10초 (락 획득을 위해 대기할 시간)
+            // leaseTime: -1초 (-1로 설정하여 Watchdog 활성화)
+            boolean available = lock.tryLock(10, -1, TimeUnit.SECONDS);
+
+            if (!available) {
+                // 락 획득 실패 시 커넥션을 소모하지 않고 바로 예외를 던져 Tomcat 스레드 블로킹 방지
+                throw new ReservationException(ReservationErrorCode.RESERVATION_BUSY);
+            }
+
+            // 락을 안전하게 획득한 단 하나의 스레드만 실제 DB 트랜잭션 서비스로 진입
+            return reservationService.proceedApplyTransaction(command);
+
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new ReservationException(ReservationErrorCode.RESERVATION_INTERRUPTED);
+        } finally {
+            // 작업 완료 후 트랜잭션이 완전히 '커밋'된 시점에 안전하게 락을 해제
+            if (lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/application-reservation-error.yml b/src/main/resources/application-reservation-error.yml
index fcbd76f..b55766e 100644
--- a/src/main/resources/application-reservation-error.yml
+++ b/src/main/resources/application-reservation-error.yml
@@ -38,12 +38,23 @@ error:
       message: "이미 해당 상품에 대한 예약 진행 내역이 존재합니다."
       status: 409
 
-    "[reservation.exception.conflict.already-applied]":
-      code: "R008"
-      message: "이미 해당 예약에 신청한 후보자입니다."
-      status: 409
-
     "[reservation.exception.conflict.already-exists]":
       code: "R009"
       message: "해당 상품으로 이미 생성된 예약 데이터가 존재합니다."
+      status: 409
+
+    # 분산 락 및 동시성 제어
+    "[reservation.exception.lock.busy]":
+      code: "R010"
+      message: "현재 접속자가 많아 예약 요청을 처리할 수 없습니다. 잠시 후 다시 시도해주세요."
+      status: 429
+
+    "[reservation.exception.lock.interrupted]":
+      code: "R011"
+      message: "예약 처리 중 대기 시간이 초과되었습니다. 다시 시도해주세요."
+      status: 500
+
+    "[reservation.exception.conflict.already-applied]":
+      code: "R008"
+      message: "이미 해당 예약에 신청한 후보자입니다."
       status: 409
\ No newline at end of file

From 564970651b0d7cd8b7954f9075ac49c134c13907 Mon Sep 17 00:00:00 2001
From: loveletheart <83873639+loveletheart@users.noreply.github.com>
Date: Mon, 18 May 2026 15:24:45 +0900
Subject: [PATCH 135/142] Update README with project details and API
 documentation

Added detailed project description, features, tech stack, setup instructions, and API documentation.
---
 README.md | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 262 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0e721a8..23d035d 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,262 @@
-# reservation-service
\ No newline at end of file
+# reservation-service
+
+예약 생명주기를 담당하는 Spring Boot 기반 마이크로서비스입니다.대량의 동시 예약 신청 트래픽을 제어하기 위해 Redisson 분산 락 아키텍처를 도입했으며,예약 성공 및 상태 변경 시 아웃박스(Outbox) 패턴을 통해 이벤트를 발행합니다.
+
+## 주요 기능
+
+- 상품 생성 Kafka 이벤트 수신 후 예약 자동 생성
+- 예약 목록/단건 상세 조회 REST API 제공
+- 분산 락(Redisson) 기반 안전한 동시 예약 신청 제어
+- 구매자/판매자 상호 예약 확정 및 취소 처리
+- 트랜잭션 보장(Outbox 패턴)을 통한 예약 완료/취소/실패 이벤트 발행
+- Promtail 호환 설정을 통한 분산 로그 수집
+
+## 기술 스택
+
+- Java 21
+- Spring Boot 3.5.13
+- Spring Cloud 2025.0.2
+- Spring Data JPA
+- Querydsl 6.8
+- Spring Data Redis & Redisson
+- Spring Kafka
+- Eureka Client
+- Spring Security & JWT
+- PostgreSQL
+- Docker, Docker Compose
+- Grafana Alloy (Promtail config format)
+
+## 프로젝트 구조
+
+```text
+src/main/java/org/pgsg/reservation
+├── application      # 유스케이스, 서비스, 포트, 커맨드/결과 DTO
+├── domain           # 예약 도메인 모델, 값 객체, 도메인 예외
+├── infrastructure   # JPA 레포지토리 구현체, Kafka, Redis 인프라 어댑터
+└── presentation     # REST 컨트롤러, API 요청/응답 DTO, 분산 락 제어 패사드
+```
+
+## 사전 준비
+
+- JDK 21
+- Docker, Docker Compose
+- GitHub Package Registry 접근 권한
+- 실행 환경에 맞는 Config Server, Eureka, Kafka, DB 설정
+
+`org.pgsg:common` 패키지를 GitHub Package Registry에서 내려받기 때문에 Gradle 인증 정보가 필요합니다.
+
+```properties
+# ~/.gradle/gradle.properties
+gpr.user=GITHUB_USERNAME
+gpr.token=GITHUB_TOKEN
+```
+
+또는 환경변수로 지정할 수 있습니다.
+
+```bash
+export GPR_USER=GITHUB_USERNAME
+export GPR_TOKEN=GITHUB_TOKEN
+```
+
+## 설정
+
+애플리케이션은 기본적으로 `.env`, Config Server, Eureka를 사용합니다.
+
+```yaml
+spring:
+  application:
+    name: reservation-service
+  profiles:
+    active: kafka, topics, dev
+  config:
+    import:
+      - "optional:file:.env[.properties]"
+      - "optional:configserver:"
+```
+
+로컬 또는 배포 환경에서는 다음 값이 필요합니다.
+
+| 변수 | 설명 |
+| --- | --- |
+| `SERVER_IP` | Eureka 서버 URL 목록 |
+| `SERVER_PORT` | 외부 포트 바인딩용 변수  |
+| `DB_NAME` | 연결 및 생성 대상 PostgreSQL 데이터베이스 이름 |
+| `DB_USERNAME` | PostgreSQL 데이터베이스 사용자명 |
+| `DB_PASSWORD` | PostgreSQL 데이터베이스 접근 비밀번호 |
+| `REDIS_HOST` | 분산 락 및 캐시용 Redis 컨테이너 접속 호스트명 |
+| `MANAGEMENT_ZIPKIN_TRACING_ENDPOINT` | 트레이싱 수집용 외부 Zipkin API 엔드포인트 URL |
+| `KAFKA_SSL_PATH` | 컨테이너 내부에 마운트되는 Kafka SSL truststore 파일 경로 |
+| `AR_IMAGE_PATH` | Google Artifact Registry 등 도커 이미지 배포 저장소 경로 |
+| `IMAGE_TAG` | 도커 이미지 빌드 및 배포용 태그 버전 |
+| `GPR_USER` | GitHub Package Registry 사용자명 |
+| `GPR_TOKEN` | GitHub Package Registry 토큰 |
+
+Kafka topic 설정은 Config Server 또는 활성 프로필 설정에서 제공되어야 합니다.
+
+| 설정 키 | 설명 |
+| --- | --- |
+| `prod-reservation-completed` | 예약 완료 이벤트 발행 topic |
+| `prod-reservation-cancelled` | 예약 취소 이벤트 발행 topic |
+| `prod-reservation-tradefail` | 거래 실패로 인한 예약 실패 처리 수신 topic |
+| `prod-product-created` | 상품 생성 이벤트 수신 topic |
+| `prod-product-failed` | 상품 생성 실패 이벤트 수신 topic |
+
+## Docker 실행
+
+로컬 Docker Compose는 `trade-service`와 로그 수집용 Alloy 컨테이너를 함께 실행합니다.
+
+```bash
+docker compose up --build
+```
+
+기본 포트 매핑은 다음과 같습니다.
+
+| 대상 | 포트 |
+| --- | --- |
+| Host | `19020` |
+| Container | `8085` |
+
+Compose 실행 전 외부 네트워크가 필요합니다.
+
+```bash
+docker network create pgsg-network
+```
+
+Docker 빌드 시 `~/.gradle/gradle.properties`가 BuildKit secret으로 전달됩니다.
+
+## API
+
+### 예약 생성
+
+```http
+POST /api/v1/reservations
+```
+
+### 예약 목록 조회
+
+```http
+GET /api/v1/reservations?page=0&size=10
+```
+- page: 0 이상의 페이지 번호
+- size: 1 이상의 페이지 크기 (기본값: 10)
+- sellerName: 판매자 이름 필터 (선택)
+- buyerName: 구매자 이름 필터 (선택)
+- productName: 상품명 필터 (선택)
+- status: 예약 상태 필터 (선택)
+- productId: 상품 ID 필터 (선택)
+
+### 예약 상세 목록 조회
+
+```http
+GET /api/v1/reservations/{reservationId}
+```
+
+### 예약 신청
+
+```http
+PATCH /api/v1/reservations/{reservationId}
+```
+
+### 구매자 사유 취소
+
+```http
+PATCH /api/v1/reservations/{reservationId}/cancel/buyer
+```
+
+### 결제 완료
+
+```http
+PATCH /api/v1/reservations/{reservationId}/paymentconfirm
+```
+
+### 판매자 사유 취소
+
+```http
+PATCH /api/v1/reservations/{reservationId}/cancel/seller
+```
+
+### 예약 만료 (관리자)
+
+```http
+PATCH /api/v1/reservations/{reservationId}/expire
+```
+
+### 예약 완료
+
+```http
+PATCH /api/v1/reservations/{reservationId}/complete
+```
+
+### 거래 완료
+```http
+PATCH /api/v1/reservations/{reservationId}/tradeconfirm
+```
+
+예약 및 거래 상태 관리 로직
+- 인증 사용자 기반 상태 저장: Bearer Token을 이용해 요청한 현재 사용자의 권한을 검증하고,해당 예약건에 대한 구매자 또는 판매자의 개별 상태를 저장합니다.
+
+최종 예 완료 및 이벤트 발행 조건 (COMPLETED):
+- 구매자의 결제 완료(paymentconfirm)와 판매자의 채팅 수락(complete) 두 개의 상호 확정이 모두 이루어져야 합니다.
+- 구매자와 판매자가 모두 예약 완료 처리를 마치는 시점에 최종적으로 거래 상태가 COMPLETED로 전환되며, 외부 서비스 전파를 위한 예약 완료 이벤트 발행이 요청됩니다.
+
+## 이벤트 흐름
+
+### 수신 이벤트
+
+`prod-product-created` topic의 상품 타임 이벤트를 수신해 예약를 생성합니다.
+
+```json
+{
+	"productId": "00000000-0000-0000-0000-000000000000",
+	"name": "상품명",
+	"price": 10000,
+	"endTime": [ 2026,5,21,12,24,41 ],
+	"sellerId": "00000000-0000-0000-0000-000000000000",
+	"sellerName": "판매자"
+}
+```
+
+`prod-trade-completed` topic의 거래 완료 이벤트를 수신해 예약은 완료합니다.
+```json
+{
+	"tradeId": "00000000-0000-0000-0000-000000000000",
+	"reservationId": "00000000-0000-0000-0000-000000000000",
+  "productId": "00000000-0000-0000-0000-000000000000"
+}
+```
+
+### 발행 이벤트
+
+서비스는 common 모듈의 Outbox 이벤트를 통해 다음 이벤트 등록을 요청합니다.
+
+- 예약 완료: prod-reservation-completed
+- 예약 취소: prod-reservation-cancelled
+- 예약 실패: prod-reservation-tradefail
+  
+## 로그 수집
+
+`promtail-config.yml`과 `deploy/promtail-config.yml`은 `/logs/*.log` 파일을 수집해 Loki 엔드포인트로 전송합니다. 로컬 Compose와 운영 Compose 모두 Grafana Alloy를 Promtail config format으로 실행합니다.
+
+## 배포
+
+운영 Compose 파일은 `deploy/docker-compose.prod.yaml`에 있습니다.
+
+```bash
+docker compose -f deploy/docker-compose.prod.yaml up -d
+```
+
+운영 환경에서는 다음 경로를 사용합니다.
+
+| 경로 | 용도 |
+| --- | --- |
+| `/opt/reservation-service/ssl` | Kafka SSL 인증서 |
+| `/opt/reservation-service/logs` | 애플리케이션 로그 |
+| `/opt/reservation-service/promtail-config.yml` | 로그 수집 설정 |
+
+## 테스트
+
+```bash
+./gradlew test
+```
+
+테스트는 도메인 모델, 애플리케이션 서비스, 영속성 어댑터, Kafka Consumer, 컨트롤러, 아키텍처 규칙을 검증합니다.

From b1d114eb9b0a84e4066b6b0422c9e505334d664d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Mon, 18 May 2026 15:39:53 +0900
Subject: [PATCH 136/142] =?UTF-8?q?fix=20:=20application.yml=20=EC=97=85?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7e19ec1..de3f633 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,9 @@
 server:
   port: ${SERVER_PORT:8085}
+  tomcat:
+    threads:
+      max: 60
+      min-spare: 20
 
 spring:
   main:
@@ -27,6 +31,12 @@ spring:
     url: ${DB_URL}
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
+    hikari:
+      maximum-pool-size: 20
+      minimum-idle: 10
+      connection-timeout: 5000
+      idle-timeout: 600000
+      max-lifetime: 1800000
 
   kafka:
     bootstrap-servers: ${KAFKA_HOST:34.64.35.152:9092,34.22.94.155:9092,34.50.28.59:9092}
@@ -81,6 +91,7 @@ eureka:
     fetch-registry: true
     service-url:
       defaultZone: ${EUREKA_SERVER_URL:http://34.50.50.170:8761/eureka/}
+
 logging:
   file:
     name: /app/logs/reservation-service.log

From f4fee4f368c0c9cb67f8d50a490020397db5f3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Mon, 18 May 2026 19:55:39 +0900
Subject: [PATCH 137/142] =?UTF-8?q?fix=20:=20redis=20=EC=84=B1=EB=8A=A5=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ReservationService.java           | 69 ++++++++-----------
 .../service/ReservationDomainService.java     |  2 +-
 2 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index af6211c..89fd341 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -93,58 +93,47 @@ public CustomPage<ReservationSearchResult> getSearchReservations(
             ReservationSearchQuery query,
             Pageable pageable
     ) {
-        try {
-            // 권한에 따른 조회 범위 결정 로직을 도메인 모델로 전달
-            SearchPolicy policy = reservationDomainService.getReservations(userId, role);
-
-            ReservationSearchCriteria criteria = new ReservationSearchCriteria(
-                    query.sellerName(),
-                    query.buyerName(),
-                    query.productName(),
-                    query.status(),
-                    query.productId(),
-                    null, // startDateTime
-                    null, // endDateTime
-                    policy
-            );
-
-            Page<Reservation> reservations = reservationRepository.findByCriteria(criteria, pageable);
+        // 권한에 따른 조회 범위 결정 로직을 도메인 모델로 전달
+        SearchPolicy policy = reservationDomainService.getReservations(userId, role);
+
+        ReservationSearchCriteria criteria = new ReservationSearchCriteria(
+                query.sellerName(),
+                query.buyerName(),
+                query.productName(),
+                query.status(),
+                query.productId(),
+                null, // startDateTime
+                null, // endDateTime
+                policy
+        );
 
-            // Repository(QueryDSL)에 정책과 검색 조건을 함께 전달
-            Page<ReservationSearchResult> result = reservations.map(ReservationSearchResult::from);
-            return CustomPage.from(result);
+        Page<Reservation> reservations = reservationRepository.findByCriteria(criteria, pageable);
 
-        } catch (Exception e) {
-            throw e;
-        }
+        return CustomPage.from(reservations.map(ReservationSearchResult::from));
     }
 
 
     // 예약 상세 조회
     @Cacheable(
             value = "reservationDetail",
-            key = "#reservationId.toString() + ':' + #userId.toString() + ':' + #role"
+            key = "#reservationId.toString()",
+            unless = "#result == null"
     )
     @Transactional(readOnly = true)
     public ReservationDetailResult getReservationDetail(UUID reservationId, UUID userId, String role) {
-        try {
-            // 엔티티 조회
-            Reservation reservation = reservationRepository.findById(reservationId)
-                    .orElseThrow(() -> new RuntimeException("해당 예약을 찾을 수 없습니다. ID: " + reservationId));
-            // 도메인 서비스를 통한 권한 검증
-            reservationDomainService.validateDetailAccess(reservation, userId, role);
-
-            return ReservationDetailResult.from(reservation);
+        // 엔티티 조회
+        Reservation reservation = reservationRepository.findById(reservationId)
+                .orElseThrow(() -> new RuntimeException("해당 예약을 찾을 수 없습니다. ID: " + reservationId));
+        // 도메인 서비스를 통한 권한 검증
+        reservationDomainService.validateDetailAccess(reservation, userId, role);
 
-        } catch (Exception e) {
-            throw e;
-        }
+        return ReservationDetailResult.from(reservation);
     }
 
     // 예약 신청
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", allEntries = true),
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationCandidateInfo proceedApplyTransaction(ReservationApplyCommand command) {
@@ -179,7 +168,7 @@ public ReservationCandidateInfo proceedApplyTransaction(ReservationApplyCommand
     // 구매자 취소 처리 로직
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", allEntries = true),
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo cancelByBuyer(ReservationCancelCommand command) {
@@ -200,7 +189,7 @@ public ReservationStateInfo cancelByBuyer(ReservationCancelCommand command) {
     // 추후 결제 시스템 연동시 트리거 발동
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", allEntries = true),
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo confirmPayment(ReservationConfirmCommand command) {
@@ -224,7 +213,7 @@ public ReservationStateInfo confirmPayment(ReservationConfirmCommand command) {
     // 판매자 취소 로직
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", allEntries = true),
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo cancelBySeller(ReservationCancelCommand command) {
@@ -246,7 +235,7 @@ public ReservationStateInfo cancelBySeller(ReservationCancelCommand command) {
     // 예약 만료
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", allEntries = true),
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo expireByAdmin(ReservationExpireCommand command) {
@@ -286,7 +275,7 @@ public ReservationStateInfo completeReservation(ReservationConfirmCommand comman
     // 거래 완료
     @Transactional
     @Caching(evict = {
-            @CacheEvict(value = "reservationDetail", allEntries = true),
+            @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
             @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo confirmTrade(ReservationConfirmCommand command) {
diff --git a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
index 437bfb9..1ddf247 100644
--- a/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
+++ b/src/main/java/org/pgsg/reservation/domain/service/ReservationDomainService.java
@@ -64,7 +64,7 @@ public void validateDetailAccess(Reservation reservation, UUID userId, String ro
                     Objects.equals(reservation.getSellerInfo().getSellerId(), userId);
 
             if (!isBuyer && !isSeller) {
-                throw new RuntimeException("해당 예약을 조회할 권한이 없습니다.");
+                throw new ReservationException(ReservationErrorCode.UNAUTHORIZED_ACCESS, "해당 예약을 조회할 권한이 없습니다.");
             }
         }
     }

From 7c6b07de4e9b2e0786e88361d2aa6d3f4cd77dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Mon, 18 May 2026 20:19:22 +0900
Subject: [PATCH 138/142] =?UTF-8?q?fix=20:=20=EB=9D=BD=20=ED=9A=8D?=
 =?UTF-8?q?=EB=93=9D=EC=9D=84=20=EC=9C=84=ED=95=B4=20=EB=8C=80=EA=B8=B0=20?=
 =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EA=B0=90=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/presentation/facade/ReservationFacade.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/presentation/facade/ReservationFacade.java b/src/main/java/org/pgsg/reservation/presentation/facade/ReservationFacade.java
index 3b10859..4a86608 100644
--- a/src/main/java/org/pgsg/reservation/presentation/facade/ReservationFacade.java
+++ b/src/main/java/org/pgsg/reservation/presentation/facade/ReservationFacade.java
@@ -25,9 +25,9 @@ public ReservationCandidateInfo applyReservation(ReservationApplyCommand command
         RLock lock = redissonClient.getLock(lockKey);
 
         try {
-            // waitTime: 10초 (락 획득을 위해 대기할 시간)
+            // waitTime: 1.5초 (락 획득을 위해 대기할 시간)
             // leaseTime: -1초 (-1로 설정하여 Watchdog 활성화)
-            boolean available = lock.tryLock(10, -1, TimeUnit.SECONDS);
+            boolean available = lock.tryLock(1500, -1, TimeUnit.MILLISECONDS);
 
             if (!available) {
                 // 락 획득 실패 시 커넥션을 소모하지 않고 바로 예외를 던져 Tomcat 스레드 블로킹 방지

From 22c707d57fdfd20b01d44e1e6adbc5b78bf5d904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Mon, 18 May 2026 20:42:04 +0900
Subject: [PATCH 139/142] =?UTF-8?q?fix=20:=20=EC=84=B1=EB=8A=A5=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0=EC=9D=84=20=EC=9C=84=ED=95=B4=20@CacheEvict(?=
 =?UTF-8?q?value=20=3D=20"reservations",=20allEntries=20=3D=20true)=20?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/service/ReservationService.java          | 9 +--------
 .../domain/repository/ReservationRepository.java         | 3 ---
 .../reservation/infrastructure/config/RedisConfig.java   | 2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index 89fd341..c1defd2 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -134,7 +134,6 @@ public ReservationDetailResult getReservationDetail(UUID reservationId, UUID use
     @Transactional
     @Caching(evict = {
             @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
-            @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationCandidateInfo proceedApplyTransaction(ReservationApplyCommand command) {
         Reservation savedReservation;
@@ -148,7 +147,7 @@ public ReservationCandidateInfo proceedApplyTransaction(ReservationApplyCommand
 
         // 변경사항 저장과 예외 감시
         try {
-            savedReservation = reservationRepository.saveAndFlush(reservation);
+            savedReservation = reservationRepository.save(reservation);
         } catch (DataIntegrityViolationException e) {
             if (isDuplicateApplyViolation(e)) {
                 throw new ReservationException(ReservationErrorCode.ALREADY_APPLIED);
@@ -169,7 +168,6 @@ public ReservationCandidateInfo proceedApplyTransaction(ReservationApplyCommand
     @Transactional
     @Caching(evict = {
             @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
-            @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo cancelByBuyer(ReservationCancelCommand command) {
         Reservation reservation = findById(command.reservationId());
@@ -190,7 +188,6 @@ public ReservationStateInfo cancelByBuyer(ReservationCancelCommand command) {
     @Transactional
     @Caching(evict = {
             @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
-            @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo confirmPayment(ReservationConfirmCommand command) {
         Reservation reservation = findById(command.reservationId());
@@ -214,7 +211,6 @@ public ReservationStateInfo confirmPayment(ReservationConfirmCommand command) {
     @Transactional
     @Caching(evict = {
             @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
-            @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo cancelBySeller(ReservationCancelCommand command) {
         Reservation reservation = findById(command.reservationId());
@@ -236,7 +232,6 @@ public ReservationStateInfo cancelBySeller(ReservationCancelCommand command) {
     @Transactional
     @Caching(evict = {
             @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
-            @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo expireByAdmin(ReservationExpireCommand command) {
         Reservation reservation = findById(command.reservationId());
@@ -258,7 +253,6 @@ public ReservationStateInfo expireByAdmin(ReservationExpireCommand command) {
     @Transactional
     @Caching(evict = {
             @CacheEvict(value = "reservationDetail", allEntries = true),
-            @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo completeReservation(ReservationConfirmCommand command) {
         // 예약 엔티티 조회
@@ -276,7 +270,6 @@ public ReservationStateInfo completeReservation(ReservationConfirmCommand comman
     @Transactional
     @Caching(evict = {
             @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
-            @CacheEvict(value = "reservations", allEntries = true)
     })
     public ReservationStateInfo confirmTrade(ReservationConfirmCommand command) {
 
diff --git a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
index cc7ce91..a117d62 100644
--- a/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
+++ b/src/main/java/org/pgsg/reservation/domain/repository/ReservationRepository.java
@@ -14,9 +14,6 @@
 public interface ReservationRepository {
     Reservation save(Reservation reservation);
 
-    // 즉시 DB에 반영하고 ID를 확보하기 위한 메서드
-    Reservation saveAndFlush(Reservation reservation);
-
     // QueryDSL을 활용한 동적 검색 구현
     Page<Reservation> findByCriteria(ReservationSearchCriteria criteria, Pageable pageable);
 
diff --git a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
index dde9586..c2839f3 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/config/RedisConfig.java
@@ -105,7 +105,7 @@ public CacheManager cacheManager(
         RedisCacheConfiguration listCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
                 .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
                 .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jsonSerializer))
-                .entryTtl(Duration.ofHours(1));
+                .entryTtl(Duration.ofSeconds(3));
 
         return RedisCacheManager.builder(factory)
                 .cacheDefaults(defaultCacheConfig)

From 6ed4ae58b2514e246f956082b351984f2350eb1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Mon, 18 May 2026 20:53:31 +0900
Subject: [PATCH 140/142] =?UTF-8?q?fix=20:=20@Override=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/reservation/ReservationRepositoryImpl.java    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
index 3ab90d9..ac81354 100644
--- a/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
+++ b/src/main/java/org/pgsg/reservation/infrastructure/repository/reservation/ReservationRepositoryImpl.java
@@ -35,11 +35,6 @@ public Reservation save(Reservation reservationEntity) {
         return reservationJpaRepository.save(reservationEntity);
     }
 
-    @Override
-    public Reservation saveAndFlush(Reservation reservationEntity) {
-        return reservationJpaRepository.saveAndFlush(reservationEntity);
-    }
-
     @Override
     public boolean existsByProductId(UUID productId) {
         return reservationJpaRepository.existsByProductInfoProductId(productId);

From 6edeca609e007be9dba2646fdedd5d151e7d0fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Mon, 18 May 2026 21:22:28 +0900
Subject: [PATCH 141/142] =?UTF-8?q?fix=20:=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EC=84=B1=EB=8A=A5=20=EB=B0=8F=20=EC=A0=80=EC=9E=A5=20=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/service/ReservationService.java      | 12 ++----------
 src/main/resources/application.yml                   | 10 +++++-----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
index c1defd2..7c737fc 100644
--- a/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
+++ b/src/main/java/org/pgsg/reservation/application/service/ReservationService.java
@@ -136,7 +136,6 @@ public ReservationDetailResult getReservationDetail(UUID reservationId, UUID use
             @CacheEvict(value = "reservationDetail", key = "#command.reservationId().toString()"),
     })
     public ReservationCandidateInfo proceedApplyTransaction(ReservationApplyCommand command) {
-        Reservation savedReservation;
 
         // 예약 엔티티 조회
         Reservation reservation = reservationRepository.findById(command.reservationId())
@@ -147,21 +146,14 @@ public ReservationCandidateInfo proceedApplyTransaction(ReservationApplyCommand
 
         // 변경사항 저장과 예외 감시
         try {
-            savedReservation = reservationRepository.save(reservation);
+            reservationRepository.save(reservation);
         } catch (DataIntegrityViolationException e) {
             if (isDuplicateApplyViolation(e)) {
                 throw new ReservationException(ReservationErrorCode.ALREADY_APPLIED);
             }
             throw e;
         }
-
-        // 방금 저장된 예약에서 추가한 후보자 찾기
-        ReservationCandidate savedCandidate = savedReservation.getCandidates().stream()
-                .filter(c -> c.getCandidateId().equals(command.userId()))
-                .findFirst()
-                .orElse(candidate);
-
-        return ReservationCandidateInfo.from(savedCandidate);
+        return ReservationCandidateInfo.from(candidate);
     }
 
     // 구매자 취소 처리 로직
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index de3f633..a846d19 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,8 +2,8 @@ server:
   port: ${SERVER_PORT:8085}
   tomcat:
     threads:
-      max: 60
-      min-spare: 20
+      max: 30
+      min-spare: 10
 
 spring:
   main:
@@ -32,9 +32,9 @@ spring:
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     hikari:
-      maximum-pool-size: 20
-      minimum-idle: 10
-      connection-timeout: 5000
+      maximum-pool-size: 30
+      minimum-idle: 15
+      connection-timeout: 3000
       idle-timeout: 600000
       max-lifetime: 1800000
 

From 4ced95cf5addd032e56a9c85a3c366c7759ce4b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=B1?= <zsx1397@gmail.com>
Date: Wed, 20 May 2026 12:01:51 +0900
Subject: [PATCH 142/142] =?UTF-8?q?fix=20:=20ID=20=ED=95=84=EB=93=9C?=
 =?UTF-8?q?=EA=B0=92=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/dto/info/ReservationCandidateInfo.java          | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCandidateInfo.java b/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCandidateInfo.java
index 79ba021..99e3423 100644
--- a/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCandidateInfo.java
+++ b/src/main/java/org/pgsg/reservation/application/dto/info/ReservationCandidateInfo.java
@@ -5,7 +5,6 @@
 import java.util.UUID;
 
 public record ReservationCandidateInfo(
-        Long id,
         UUID candidateId,
         String candidateNickname,
         String status,
@@ -13,7 +12,6 @@ public record ReservationCandidateInfo(
 ) {
     public static ReservationCandidateInfo from(ReservationCandidate candidate) {
         return new ReservationCandidateInfo(
-                candidate.getId(),
                 candidate.getCandidateId(),
                 candidate.getCandidateNickname(),
                 candidate.getStatus().name(),