service/src/test/kotlin/com/sangdol/roomescape/supports/DummyInitializer.kt

@@ -156,6 +156,27 @@ class DummyInitializer(
         }
     }
 
+    fun createExpiredOrCanceledReservation(
+        user: UserEntity,
+        status: ReservationStatus,
+        storeId: Long = IDGenerator.create(),
+        themeRequest: ThemeCreateRequest = ThemeFixture.createRequest,
+        scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest,
+        reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest,
+    ): ReservationEntity {
+        return createPendingReservation(user, storeId, themeRequest, scheduleRequest, reservationRequest).apply {
+            this.status = status
+        }.also {
+            reservationRepository.save(it)
+
+            scheduleRepository.findByIdOrNull(it.scheduleId)?.let { schedule ->
+                schedule.status = ScheduleStatus.AVAILABLE
+                schedule.holdExpiredAt = null
+                scheduleRepository.save(schedule)
+            }
+        }
+    }
+
     fun createPayment(
         reservationId: Long,
         request: PaymentConfirmRequest = PaymentFixture.confirmRequest,

service/src/test/kotlin/com/sangdol/roomescape/supports/Fixtures.kt

@@ -299,7 +299,23 @@ object PaymentFixture {
         easyPayDetail: EasyPayDetailResponse? = null,
         transferDetail: TransferDetailResponse? = null,
         orderId: String = randomString(25),
-    ) = PaymentGatewayResponse(
+    ): PaymentGatewayResponse {
+        var card: CardDetailResponse? = cardDetail
+        if (method == PaymentMethod.CARD && cardDetail == null) {
+            card = cardDetail(amount)
+        }
+
+        var easypay: EasyPayDetailResponse? = easyPayDetail
+        if (method == PaymentMethod.EASY_PAY && easyPayDetail == null) {
+            easypay = easypayDetail(amount)
+        }
+
+        var transfer: TransferDetailResponse? = transferDetail
+        if (method == PaymentMethod.TRANSFER && transferDetail == null) {
+            transfer = transferDetail()
+        }
+
+        return PaymentGatewayResponse(
             paymentKey = paymentKey,
             status = PaymentStatus.DONE,
             orderId = orderId,
@@ -308,12 +324,13 @@ object PaymentFixture {
             vat = (amount * 0.1).toInt(),
             suppliedAmount = (amount * 0.9).toInt(),
             method = method,
-        card = cardDetail,
+            card = card,
-        easyPay = easyPayDetail,
+            easyPay = easypay,
-        transfer = transferDetail,
+            transfer = transfer,
             requestedAt = KoreaDateTime.nowWithOffset(),
             approvedAt = KoreaDateTime.nowWithOffset().plusSeconds(5)
         )
+    }
 
     fun cancelResponse(
         amount: Int,