From 375ec4507857d7ed3029c6732fc2af871e589b67 Mon Sep 17 00:00:00 2001
From: pricelees <priceelees@gmail.com>
Date: Sat, 13 Sep 2025 18:18:00 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=9A=8C=EC=9B=90=EC=9D=98=20?=
 =?UTF-8?q?=EC=98=88=EC=95=BD=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=EC=8B=9C=20=EC=9D=BC=EB=B6=80=20=EC=83=81=ED=83=9C=EB=A7=8C=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=ED=95=98=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

---
 .../reservation/business/ReservationService.kt        |  5 ++++-
 .../persistence/ReservationRepository.kt              |  2 +-
 .../roomescape/reservation/ReservationApiTest.kt      | 11 +++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt
index 4b4b6f6f..d487d2cf 100644
--- a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt
+++ b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt
@@ -94,7 +94,10 @@ class ReservationService(
     fun findUserSummaryReservation(user: CurrentUserContext): ReservationSummaryRetrieveListResponse {
         log.info { "[ReservationService.findSummaryByMemberId] 예약 조회 시작: userId=${user.id}" }
 
-        val reservations: List<ReservationEntity> = reservationRepository.findAllByUserId(user.id)
+        val reservations: List<ReservationEntity> = reservationRepository.findAllByUserIdAndStatusIsIn(
+            userId = user.id,
+            statuses = listOf(ReservationStatus.CONFIRMED, ReservationStatus.CANCELED)
+        )
 
         return ReservationSummaryRetrieveListResponse(reservations.map {
             val schedule: ScheduleSummaryResponse = scheduleService.findSummaryById(it.scheduleId)
diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt
index d3417f45..08bac9f6 100644
--- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt
+++ b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt
@@ -7,7 +7,7 @@ import java.time.LocalDate
 
 interface ReservationRepository : JpaRepository<ReservationEntity, Long> {
 
-    fun findAllByUserId(userId: Long): List<ReservationEntity>
+    fun findAllByUserIdAndStatusIsIn(userId: Long, statuses: List<ReservationStatus>): List<ReservationEntity>
 
     @Query("""
         SELECT s.themeId 
diff --git a/src/test/kotlin/roomescape/reservation/ReservationApiTest.kt b/src/test/kotlin/roomescape/reservation/ReservationApiTest.kt
index ca8d073b..b3080179 100644
--- a/src/test/kotlin/roomescape/reservation/ReservationApiTest.kt
+++ b/src/test/kotlin/roomescape/reservation/ReservationApiTest.kt
@@ -388,6 +388,17 @@ class ReservationApiTest(
                     )
                 }
 
+                // PENDING 예약은 조회되지 않음.
+                dummyInitializer.createPendingReservation(
+                    adminToken = adminToken,
+                    reserverToken = userToken,
+                    themeRequest = ThemeFixture.createRequest.copy(name = "theme-$4"),
+                    scheduleRequest = ScheduleFixture.createRequest.copy(
+                        date = LocalDate.now().plusDays(1),
+                        time = LocalTime.now()
+                    )
+                )
+
                 runTest(
                     token = userToken,
                     on = {