From c3b736b81f9dc3859b8d985e720e261e60887823 Mon Sep 17 00:00:00 2001
From: pricelees <priceelees@gmail.com>
Date: Sat, 13 Sep 2025 15:38:53 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EC=9A=A9=20=EC=98=88=EC=95=BD=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EC=82=BD=EC=9E=85=20=EC=8B=9C=20=EB=B0=9C=EC=83=9D=ED=95=A0=20?=
 =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8A=94=20=EC=9D=BC=EC=A0=95=20/=20?=
 =?UTF-8?q?=ED=85=8C=EB=A7=88=20=EC=B6=A9=EB=8F=8C=20=EB=AC=B8=EC=A0=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

---
 .../roomescape/supports/DummyInitializer.kt   | 58 +++++++++++++------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/test/kotlin/roomescape/supports/DummyInitializer.kt b/src/test/kotlin/roomescape/supports/DummyInitializer.kt
index 300af25b..4d20cc05 100644
--- a/src/test/kotlin/roomescape/supports/DummyInitializer.kt
+++ b/src/test/kotlin/roomescape/supports/DummyInitializer.kt
@@ -94,16 +94,26 @@ class DummyInitializer(
         scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest,
         reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest,
     ): ReservationEntity {
-        val themeId: Long = createTheme(
-            adminToken = adminToken,
-            request = themeRequest
-        ).id
+        val themeId: Long = if (scheduleRequest.themeId > 1) {
+            scheduleRequest.themeId
+        } else if (reservationRequest.scheduleId > 1) {
+            scheduleRepository.findByIdOrNull(reservationRequest.scheduleId)!!.themeId
+        } else {
+            createTheme(
+                adminToken = adminToken,
+                request = themeRequest
+            ).id
+        }
 
-        val scheduleId: Long = createSchedule(
-            adminToken = adminToken,
-            request = scheduleRequest.copy(themeId = themeId),
-            status = ScheduleStatus.HOLD
-        ).id
+        val scheduleId: Long = if (reservationRequest.scheduleId > 1) {
+            reservationRequest.scheduleId
+        } else {
+            createSchedule(
+                adminToken = adminToken,
+                request = scheduleRequest.copy(themeId = themeId),
+                status = ScheduleStatus.HOLD
+            ).id
+        }
 
         return createPendingReservation(
             reserverToken = reserverToken,
@@ -118,20 +128,30 @@ class DummyInitializer(
         scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest,
         reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest,
     ): ReservationEntity {
-        val themeId: Long = createTheme(
-            adminToken = adminToken,
-            request = themeRequest
-        ).id
+        val themeId: Long = if (scheduleRequest.themeId > 1) {
+            scheduleRequest.themeId
+        } else if (reservationRequest.scheduleId > 1) {
+            scheduleRepository.findByIdOrNull(reservationRequest.scheduleId)!!.themeId
+        } else {
+            createTheme(
+                adminToken = adminToken,
+                request = themeRequest
+            ).id
+        }
 
-        val schedule: ScheduleEntity = createSchedule(
-            adminToken = adminToken,
-            request = scheduleRequest.copy(themeId = themeId),
-            status = ScheduleStatus.HOLD
-        )
+        val scheduleId: Long = if (reservationRequest.scheduleId > 1) {
+            reservationRequest.scheduleId
+        } else {
+            createSchedule(
+                adminToken = adminToken,
+                request = scheduleRequest.copy(themeId = themeId),
+                status = ScheduleStatus.HOLD
+            ).id
+        }
 
         val reservation = createPendingReservation(
             reserverToken = reserverToken,
-            request = reservationRequest.copy(scheduleId = schedule.id)
+            request = reservationRequest.copy(scheduleId = scheduleId)
         )
 
         Given {