src/main/kotlin/roomescape/payment/business/PaymentWriter.kt

@@ -68,20 +68,18 @@ class PaymentWriter(
         payment: PaymentEntity,
         requestedAt: LocalDateTime,
         cancelResponse: PaymentClientCancelResponse
-    ) {
+    ): CanceledPaymentEntity {
         log.debug { "[PaymentWriterV2.cancelPayment] 결제 취소 정보 저장 시작: payment.id=${payment.id}" }
 
-        val canceledPayment: CanceledPaymentEntity = cancelResponse.cancels.toEntity(
+        paymentRepository.save(payment.apply { this.cancel() })
+
+        return cancelResponse.cancels.toEntity(
             id = tsidFactory.next(),
             paymentId = payment.id,
             cancelRequestedAt = requestedAt,
             canceledBy = memberId
-        )
+        ).also {
-
+            canceledPaymentRepository.save(it)
-        run {
-            canceledPaymentRepository.save(canceledPayment)
-            paymentRepository.save(payment.apply { this.cancel() })
-        }.also {
             log.debug { "[PaymentWriterV2.cancelPayment] 결제 취소 정보 저장 완료: payment.id=${payment.id}" }
         }
     }