From 747ecbf058a24ec8679c500328808df6470912ca Mon Sep 17 00:00:00 2001
From: pricelees <priceelees@gmail.com>
Date: Mon, 15 Sep 2025 13:32:33 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B4=88?=
 =?UTF-8?q?=EA=B8=B0=ED=99=94=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95(ID?=
 =?UTF-8?q?=EA=B0=80=201=EC=9D=B4=EB=A9=B4=20=EC=83=9D=EC=84=B1=20->=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=ED=9B=84=20=EC=97=86=EC=9C=BC=EB=A9=B4=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/supports/DummyInitializer.kt    | 18 +++++++++---------
 .../kotlin/roomescape/supports/Fixtures.kt     |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/test/kotlin/roomescape/supports/DummyInitializer.kt b/src/test/kotlin/roomescape/supports/DummyInitializer.kt
index fcce8092..6b4309f6 100644
--- a/src/test/kotlin/roomescape/supports/DummyInitializer.kt
+++ b/src/test/kotlin/roomescape/supports/DummyInitializer.kt
@@ -57,7 +57,7 @@ class DummyInitializer(
         request: ScheduleCreateRequest,
         status: ScheduleStatus = ScheduleStatus.AVAILABLE
     ): ScheduleEntity {
-        val themeId: Long = if (request.themeId > 1L) {
+        val themeId: Long = if (themeRepository.existsById(request.themeId)) {
             request.themeId
         } else {
             createTheme(
@@ -94,10 +94,10 @@ class DummyInitializer(
         scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest,
         reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest,
     ): ReservationEntity {
-        val themeId: Long = if (scheduleRequest.themeId > 1) {
+        val themeId: Long = if (themeRepository.existsById(scheduleRequest.themeId)) {
             scheduleRequest.themeId
-        } else if (reservationRequest.scheduleId > 1) {
-            scheduleRepository.findByIdOrNull(reservationRequest.scheduleId)!!.themeId
+        } else if (themeRepository.existsById(reservationRequest.scheduleId)) {
+            reservationRequest.scheduleId
         } else {
             createTheme(
                 adminToken = adminToken,
@@ -105,7 +105,7 @@ class DummyInitializer(
             ).id
         }
 
-        val scheduleId: Long = if (reservationRequest.scheduleId > 1) {
+        val scheduleId: Long = if (scheduleRepository.existsById(reservationRequest.scheduleId)) {
             reservationRequest.scheduleId
         } else {
             createSchedule(
@@ -128,10 +128,10 @@ class DummyInitializer(
         scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest,
         reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest,
     ): ReservationEntity {
-        val themeId: Long = if (scheduleRequest.themeId > 1) {
+        val themeId: Long = if (themeRepository.existsById(scheduleRequest.themeId)) {
             scheduleRequest.themeId
-        } else if (reservationRequest.scheduleId > 1) {
-            scheduleRepository.findByIdOrNull(reservationRequest.scheduleId)!!.themeId
+        } else if (themeRepository.existsById(reservationRequest.scheduleId)) {
+            reservationRequest.scheduleId
         } else {
             createTheme(
                 adminToken = adminToken,
@@ -139,7 +139,7 @@ class DummyInitializer(
             ).id
         }
 
-        val scheduleId: Long = if (reservationRequest.scheduleId > 1) {
+        val scheduleId: Long = if (scheduleRepository.existsById(reservationRequest.scheduleId)) {
             reservationRequest.scheduleId
         } else {
             createSchedule(
diff --git a/src/test/kotlin/roomescape/supports/Fixtures.kt b/src/test/kotlin/roomescape/supports/Fixtures.kt
index ef936341..ecc056bd 100644
--- a/src/test/kotlin/roomescape/supports/Fixtures.kt
+++ b/src/test/kotlin/roomescape/supports/Fixtures.kt
@@ -170,7 +170,7 @@ object ScheduleFixture {
     val createRequest: ScheduleCreateRequest = ScheduleCreateRequest(
         date = LocalDate.now().plusDays(1),
         time = LocalTime.now(),
-        themeId = 1L
+        themeId = tsidFactory.next()
     )
 }
 
@@ -183,7 +183,7 @@ object PaymentFixture {
     )
 
     val cancelRequest: PaymentCancelRequest = PaymentCancelRequest(
-        reservationId = 1L,
+        reservationId = tsidFactory.next(),
         cancelReason = "cancelReason",
     )
 
@@ -260,7 +260,7 @@ object PaymentFixture {
 
 object ReservationFixture {
     val pendingCreateRequest: PendingReservationCreateRequest = PendingReservationCreateRequest(
-        scheduleId = 1L,
+        scheduleId = tsidFactory.next(),
         reserverName = "Wilbur Stuart",
         reserverContact = "wilbur@example.com",
         participantCount = 5,