Dockerfile

@@ -1,29 +1,9 @@
-FROM gradle:8-jdk17 AS dependencies
-WORKDIR /app
-
-COPY gradlew settings.gradle build.gradle.kts /app/
-COPY gradle /app/gradle
-COPY service/build.gradle.kts /app/service/
-COPY tosspay-mock/build.gradle.kts /app/tosspay-mock/
-COPY common/log/build.gradle.kts /app/common/log/
-COPY common/persistence/build.gradle.kts /app/common/persistence/
-COPY common/types/build.gradle.kts /app/common/types/
-COPY common/utils/build.gradle.kts /app/common/utils/
-COPY common/web/build.gradle.kts /app/common/web/
-
-RUN ./gradlew dependencies --no-daemon
-
-FROM dependencies AS builder
-WORKDIR /app
-
-COPY . .
-
-RUN ./gradlew :service:bootjar --no-daemon
-
 FROM amazoncorretto:17
+
 WORKDIR /app
+
+COPY service/build/libs/service.jar app.jar
+
 EXPOSE 8080
 
-COPY --from=builder /app/service/build/libs/*.jar app.jar
-
 ENTRYPOINT ["java", "-jar", "app.jar"]

build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+IMAGE_NAME="roomescape-backend"
+IMAGE_TAG=$1
+
+./gradlew build -x test && docker buildx build --platform=linux/amd64 -t ${PRIVATE_REGISTRY}/$IMAGE_NAME:$IMAGE_TAG . --push

service/src/main/kotlin/com/sangdol/roomescape/order/business/OrderPostProcessorService.kt

@@ -1,60 +0,0 @@
-package com.sangdol.roomescape.order.business
-
-import com.sangdol.common.persistence.IDGenerator
-import com.sangdol.common.persistence.TransactionExecutionUtil
-import com.sangdol.roomescape.order.infrastructure.persistence.PostOrderTaskEntity
-import com.sangdol.roomescape.order.infrastructure.persistence.PostOrderTaskRepository
-import com.sangdol.roomescape.payment.business.PaymentService
-import com.sangdol.roomescape.payment.dto.PaymentGatewayResponse
-import com.sangdol.roomescape.reservation.business.ReservationService
-import io.github.oshai.kotlinlogging.KLogger
-import io.github.oshai.kotlinlogging.KotlinLogging
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Propagation
-import org.springframework.transaction.annotation.Transactional
-import java.time.Instant
-
-private val log: KLogger = KotlinLogging.logger {}
-
-@Service
-class OrderPostProcessorService(
-    private val idGenerator: IDGenerator,
-    private val reservationService: ReservationService,
-    private val paymentService: PaymentService,
-    private val postOrderTaskRepository: PostOrderTaskRepository,
-    private val transactionExecutionUtil: TransactionExecutionUtil
-) {
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
-    fun processAfterPaymentConfirmation(
-        reservationId: Long,
-        paymentResponse: PaymentGatewayResponse
-    ) {
-        val paymentKey = paymentResponse.paymentKey
-        try {
-            log.info { "[processAfterPaymentConfirmation] 결제 정보 저장 및 예약 확정 처리 시작: reservationId=${reservationId}, paymentKey=${paymentKey}" }
-
-            val paymentCreateResponse = paymentService.savePayment(reservationId, paymentResponse)
-            reservationService.confirmReservation(reservationId)
-
-            log.info {
-                "[processAfterPaymentConfirmation] 결제 정보 저장 및 예약 확정 처리 완료: reservationId=${reservationId}, paymentKey=${paymentKey}, paymentId=${paymentCreateResponse.paymentId}, paymentDetailId=${paymentCreateResponse.detailId}"
-            }
-        } catch (e: Exception) {
-            log.warn(e) { "[processAfterPaymentConfirmation] 결제 정보 저장 및 예약 확정 처리 실패. 작업 저장 시작: reservationId=${reservationId}, paymentKey=$paymentKey}" }
-
-            transactionExecutionUtil.withNewTransaction(isReadOnly = false) {
-                PostOrderTaskEntity(
-                    id = idGenerator.create(),
-                    reservationId = reservationId,
-                    paymentKey = paymentKey,
-                    trial = 1,
-                    nextRetryAt = Instant.now().plusSeconds(30),
-                ).also {
-                    postOrderTaskRepository.save(it)
-                }
-            }
-
-            log.info { "[processAfterPaymentConfirmation] 작업 저장 완료" }
-        }
-    }
-}

service/src/main/kotlin/com/sangdol/roomescape/order/business/OrderService.kt

@@ -1,146 +1,69 @@
 package com.sangdol.roomescape.order.business
 
-import com.sangdol.common.persistence.IDGenerator
 import com.sangdol.common.persistence.TransactionExecutionUtil
 import com.sangdol.common.types.exception.ErrorCode
 import com.sangdol.common.types.exception.RoomescapeException
 import com.sangdol.roomescape.order.exception.OrderErrorCode
 import com.sangdol.roomescape.order.exception.OrderException
-import com.sangdol.roomescape.order.infrastructure.persistence.AttemptResult
-import com.sangdol.roomescape.order.infrastructure.persistence.PaymentAttemptEntity
-import com.sangdol.roomescape.order.infrastructure.persistence.PaymentAttemptRepository
 import com.sangdol.roomescape.payment.business.PaymentService
 import com.sangdol.roomescape.payment.dto.PaymentConfirmRequest
-import com.sangdol.roomescape.payment.dto.PaymentGatewayResponse
-import com.sangdol.roomescape.payment.exception.PaymentException
 import com.sangdol.roomescape.reservation.business.ReservationService
+import com.sangdol.roomescape.reservation.business.event.ReservationConfirmEvent
 import com.sangdol.roomescape.reservation.dto.ReservationStateResponse
 import com.sangdol.roomescape.schedule.business.ScheduleService
 import com.sangdol.roomescape.schedule.dto.ScheduleStateResponse
 import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
+import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 
 private val log: KLogger = KotlinLogging.logger {}
 
 @Service
 class OrderService(
-    private val idGenerator: IDGenerator,
     private val reservationService: ReservationService,
     private val scheduleService: ScheduleService,
     private val paymentService: PaymentService,
     private val transactionExecutionUtil: TransactionExecutionUtil,
     private val orderValidator: OrderValidator,
-    private val paymentAttemptRepository: PaymentAttemptRepository,
+    private val eventPublisher: ApplicationEventPublisher
-    private val orderPostProcessorService: OrderPostProcessorService
 ) {
 
     fun confirm(reservationId: Long, paymentConfirmRequest: PaymentConfirmRequest) {
-        var trial: Long = 0
         val paymentKey = paymentConfirmRequest.paymentKey
 
         log.info { "[confirm] 결제 및 예약 확정 시작: reservationId=${reservationId}, paymentKey=${paymentKey}" }
         try {
-            trial = transactionExecutionUtil.withNewTransaction(isReadOnly = false) {
+            transactionExecutionUtil.withNewTransaction(isReadOnly = false) {
-                getTrialAfterValidateCanConfirm(reservationId).also {
+                validateCanConfirm(reservationId)
                 reservationService.markInProgress(reservationId)
             }
-            } ?: run {
-                log.warn { "[confirm] 모든 paymentAttempts 조회 과정에서의 예상치 못한 null 응답: reservationId=${reservationId}" }
-                throw OrderException(OrderErrorCode.BOOKING_UNEXPECTED_ERROR)
-            }
 
-            val paymentClientResponse: PaymentGatewayResponse =
+            paymentService.requestConfirm(reservationId, paymentConfirmRequest)
-                requestConfirmPayment(reservationId, paymentConfirmRequest)
+            eventPublisher.publishEvent(ReservationConfirmEvent(reservationId))
 
-            orderPostProcessorService.processAfterPaymentConfirmation(reservationId, paymentClientResponse)
+            log.info { "[confirm] 결제 처리 및 예약 확정 이벤트 발행 완료" }
         } catch (e: Exception) {
             val errorCode: ErrorCode = if (e is RoomescapeException) {
                 e.errorCode
             } else {
-                OrderErrorCode.BOOKING_UNEXPECTED_ERROR
+                OrderErrorCode.ORDER_UNEXPECTED_ERROR
             }
 
-            throw OrderException(errorCode, e.message ?: errorCode.message, trial)
+            throw OrderException(errorCode, e.message ?: errorCode.message)
         }
     }
 
-    private fun getTrialAfterValidateCanConfirm(reservationId: Long): Long {
+    private fun validateCanConfirm(reservationId: Long) {
         log.info { "[validateAndMarkInProgress] 예약 확정 가능 여부 검증 시작: reservationId=${reservationId}" }
         val reservation: ReservationStateResponse = reservationService.findStatusWithLock(reservationId)
         val schedule: ScheduleStateResponse = scheduleService.findStateWithLock(reservation.scheduleId)
 
         try {
             orderValidator.validateCanConfirm(reservation, schedule)
-
-            return getTrialIfSuccessAttemptNotExists(reservationId).also {
-                log.info { "[validateAndMarkInProgress] 예약 확정 가능 여부 검증 완료: reservationId=${reservationId}" }
-            }
         } catch (e: OrderException) {
             val errorCode = OrderErrorCode.NOT_CONFIRMABLE
             throw OrderException(errorCode, e.message)
         }
     }
-
-    private fun getTrialIfSuccessAttemptNotExists(reservationId: Long): Long {
-        val paymentAttempts: List<PaymentAttemptEntity> = paymentAttemptRepository.findAllByReservationId(reservationId)
-
-        if (paymentAttempts.any { it.result == AttemptResult.SUCCESS }) {
-            log.info { "[validateCanConfirm] 이미 결제 완료된 예약: id=${reservationId}" }
-            throw OrderException(OrderErrorCode.BOOKING_ALREADY_COMPLETED)
-        }
-
-        return paymentAttempts.size.toLong()
-    }
-
-    private fun requestConfirmPayment(
-        reservationId: Long,
-        paymentConfirmRequest: PaymentConfirmRequest
-    ): PaymentGatewayResponse {
-        log.info { "[requestConfirmPayment] 결제 및 이력 저장 시작: reservationId=${reservationId}, paymentKey=${paymentConfirmRequest.paymentKey}" }
-        val paymentResponse: PaymentGatewayResponse
-        var attempt: PaymentAttemptEntity? = null
-
-        try {
-            paymentResponse = paymentService.requestConfirm(paymentConfirmRequest)
-
-            attempt = PaymentAttemptEntity(
-                id = idGenerator.create(),
-                reservationId = reservationId,
-                result = AttemptResult.SUCCESS,
-            )
-        } catch (e: Exception) {
-            val errorCode: String = if (e is PaymentException) {
-                log.info { "[requestConfirmPayment] 결제 요청 실패: reservationId=${reservationId}, paymentKey=${paymentConfirmRequest.paymentKey}" }
-                e.errorCode.name
-            } else {
-                log.warn {
-                    "[requestConfirmPayment] 결제 요청 실패: reservationId=${reservationId}, paymentKey=${paymentConfirmRequest.paymentKey}"
-                }
-                OrderErrorCode.BOOKING_UNEXPECTED_ERROR.name
-            }
-
-            attempt = PaymentAttemptEntity(
-                id = idGenerator.create(),
-                reservationId = reservationId,
-                result = AttemptResult.FAILED,
-                errorCode = errorCode,
-                message = e.message
-            )
-
-            throw e
-        } finally {
-            val savedAttempt: PaymentAttemptEntity? = attempt?.let {
-                log.info { "[requestPayment] 결제 요청 이력 저장 시작: id=${it.id}, reservationId=${it.reservationId}, result=${it.result}, errorCode=${it.errorCode}, message=${it.message}" }
-                paymentAttemptRepository.save(it)
-            }
-            savedAttempt?.also {
-                log.info { "[requestPayment] 결제 요청 이력 저장 완료: id=${savedAttempt.id}" }
-            } ?: run {
-                log.info { "[requestPayment] 결제 요청 이력 저장 실패: reservationId=${reservationId}" }
-            }
-        }
-
-        return paymentResponse
-    }
 }

service/src/main/kotlin/com/sangdol/roomescape/order/business/OrderValidator.kt

@@ -3,7 +3,6 @@ package com.sangdol.roomescape.order.business
 import com.sangdol.common.utils.KoreaDateTime
 import com.sangdol.roomescape.order.exception.OrderErrorCode
 import com.sangdol.roomescape.order.exception.OrderException
-import com.sangdol.roomescape.order.infrastructure.persistence.PaymentAttemptRepository
 import com.sangdol.roomescape.reservation.dto.ReservationStateResponse
 import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationStatus
 import com.sangdol.roomescape.schedule.dto.ScheduleStateResponse
@@ -29,7 +28,7 @@ class OrderValidator {
         when (reservation.status) {
             ReservationStatus.CONFIRMED -> {
                 log.info { "[validateCanConfirm] 이미 확정된 예약: id=${reservation.id}" }
-                throw OrderException(OrderErrorCode.BOOKING_ALREADY_COMPLETED)
+                throw OrderException(OrderErrorCode.ORDER_ALREADY_CONFIRMED)
             }
             ReservationStatus.EXPIRED -> {
                 log.info { "[validateCanConfirm] 만료된 예약: id=${reservation.id}" }

service/src/main/kotlin/com/sangdol/roomescape/order/exception/OrderErrorCode.kt

@@ -9,11 +9,11 @@ enum class OrderErrorCode(
     override val message: String
 ) : ErrorCode {
     NOT_CONFIRMABLE(HttpStatus.CONFLICT, "B000", "예약을 확정할 수 없어요."),
-    BOOKING_ALREADY_COMPLETED(HttpStatus.CONFLICT, "B001", "이미 완료된 예약이에요."),
+    ORDER_ALREADY_CONFIRMED(HttpStatus.CONFLICT, "B001", "이미 완료된 예약이에요."),
     EXPIRED_RESERVATION(HttpStatus.CONFLICT, "B002", "결제 가능 시간이 지나 만료된 예약이에요. 처음부터 다시 시도해주세요."),
     CANCELED_RESERVATION(HttpStatus.CONFLICT, "B003", "이미 취소된 예약이에요. 본인이 취소하지 않았다면 매장에 문의해주세요."),
     PAST_SCHEDULE(HttpStatus.CONFLICT, "B004", "지난 일정은 예약할 수 없어요."),
 
-    BOOKING_UNEXPECTED_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "B999", "예상치 못한 예외가 발생했어요. 잠시 후 다시 시도해주세요.")
+    ORDER_UNEXPECTED_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "B999", "예상치 못한 예외가 발생했어요. 잠시 후 다시 시도해주세요.")
     ;
 }

service/src/main/kotlin/com/sangdol/roomescape/order/exception/OrderException.kt

@@ -6,11 +6,4 @@ import com.sangdol.common.types.exception.RoomescapeException
 class OrderException(
     override val errorCode: ErrorCode,
     override val message: String = errorCode.message,
-    var trial: Long = 0
 ) : RoomescapeException(errorCode, message)
-
-class OrderErrorResponse(
-    val code: String,
-    val message: String,
-    val trial: Long
-)

service/src/main/kotlin/com/sangdol/roomescape/order/exception/OrderExceptionHandler.kt

@@ -1,45 +0,0 @@
-package com.sangdol.roomescape.order.exception
-
-import com.sangdol.common.types.exception.ErrorCode
-import com.sangdol.common.types.web.HttpStatus
-import com.sangdol.common.web.support.log.WebLogMessageConverter
-import io.github.oshai.kotlinlogging.KLogger
-import io.github.oshai.kotlinlogging.KotlinLogging
-import jakarta.servlet.http.HttpServletRequest
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.ExceptionHandler
-import org.springframework.web.bind.annotation.RestControllerAdvice
-
-private val log: KLogger = KotlinLogging.logger {}
-
-@RestControllerAdvice
-class OrderExceptionHandler(
-    private val messageConverter: WebLogMessageConverter
-) {
-    @ExceptionHandler(OrderException::class)
-    fun handleOrderException(
-        servletRequest: HttpServletRequest,
-        e: OrderException
-    ): ResponseEntity<OrderErrorResponse> {
-        val errorCode: ErrorCode = e.errorCode
-        val httpStatus: HttpStatus = errorCode.httpStatus
-        val errorResponse = OrderErrorResponse(
-            code = errorCode.errorCode,
-            message = if (httpStatus.isClientError()) e.message else errorCode.message,
-            trial = e.trial
-        )
-
-        log.info {
-            messageConverter.convertToErrorResponseMessage(
-                servletRequest = servletRequest,
-                httpStatus = httpStatus,
-                responseBody = errorResponse,
-                exception = if (errorCode.message == e.message) null else e
-            )
-        }
-
-        return ResponseEntity
-            .status(httpStatus.value())
-            .body(errorResponse)
-    }
-}

service/src/main/kotlin/com/sangdol/roomescape/order/infrastructure/persistence/PaymentAttemptEntity.kt

@@ -1,38 +0,0 @@
-package com.sangdol.roomescape.order.infrastructure.persistence
-
-import com.sangdol.common.persistence.PersistableBaseEntity
-import jakarta.persistence.*
-import org.springframework.data.annotation.CreatedBy
-import org.springframework.data.annotation.CreatedDate
-import org.springframework.data.jpa.domain.support.AuditingEntityListener
-import java.time.Instant
-
-@Entity
-@EntityListeners(AuditingEntityListener::class)
-@Table(name = "payment_attempts")
-class PaymentAttemptEntity(
-    id: Long,
-
-    val reservationId: Long,
-
-    @Enumerated(value = EnumType.STRING)
-    val result: AttemptResult,
-
-    @Column(columnDefinition = "VARCHAR(50)")
-    val errorCode: String? = null,
-
-    @Column(columnDefinition = "TEXT")
-    val message: String? = null,
-) : PersistableBaseEntity(id) {
-    @Column(updatable = false)
-    @CreatedDate
-    lateinit var createdAt: Instant
-
-    @Column(updatable = false)
-    @CreatedBy
-    var createdBy: Long = 0L
-}
-
-enum class AttemptResult {
-    SUCCESS, FAILED
-}

service/src/main/kotlin/com/sangdol/roomescape/order/infrastructure/persistence/PaymentAttemptRepository.kt

@@ -1,28 +0,0 @@
-package com.sangdol.roomescape.order.infrastructure.persistence
-
-import org.springframework.data.jpa.repository.JpaRepository
-import org.springframework.data.jpa.repository.Query
-
-interface PaymentAttemptRepository: JpaRepository<PaymentAttemptEntity, Long> {
-
-    fun countByReservationId(reservationId: Long): Long
-
-    @Query(
-        """
-        SELECT 
-            CASE 
-                WHEN COUNT(pa) > 0
-                THEN TRUE 
-            ELSE FALSE 
-            END 
-        FROM 
-            PaymentAttemptEntity pa
-        WHERE 
-            pa.reservationId = :reservationId
-            AND pa.result = com.sangdol.roomescape.order.infrastructure.persistence.AttemptResult.SUCCESS
-    """
-    )
-    fun isSuccessAttemptExists(reservationId: Long): Boolean
-
-    fun findAllByReservationId(reservationId: Long): List<PaymentAttemptEntity>
-}

service/src/main/kotlin/com/sangdol/roomescape/order/infrastructure/persistence/PostOrderTaskEntity.kt

@@ -1,16 +0,0 @@
-package com.sangdol.roomescape.order.infrastructure.persistence
-
-import com.sangdol.common.persistence.PersistableBaseEntity
-import jakarta.persistence.Entity
-import jakarta.persistence.Table
-import java.time.Instant
-
-@Entity
-@Table(name = "post_order_tasks")
-class PostOrderTaskEntity(
-    id: Long,
-    val reservationId: Long,
-    val paymentKey: String,
-    val trial: Int,
-    val nextRetryAt: Instant
-) : PersistableBaseEntity(id)

service/src/main/kotlin/com/sangdol/roomescape/order/infrastructure/persistence/PostOrderTaskRepository.kt

@@ -1,6 +0,0 @@
-package com.sangdol.roomescape.order.infrastructure.persistence
-
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface PostOrderTaskRepository : JpaRepository<PostOrderTaskEntity, Long> {
-}

service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentService.kt

@@ -1,5 +1,6 @@
 package com.sangdol.roomescape.payment.business
 
+import com.sangdol.common.persistence.IDGenerator
 import com.sangdol.common.persistence.TransactionExecutionUtil
 import com.sangdol.roomescape.payment.business.domain.UserFacingPaymentErrorCode
 import com.sangdol.roomescape.payment.dto.*
@@ -8,9 +9,12 @@ import com.sangdol.roomescape.payment.exception.PaymentErrorCode
 import com.sangdol.roomescape.payment.exception.PaymentException
 import com.sangdol.roomescape.payment.infrastructure.client.TosspayClient
 import com.sangdol.roomescape.payment.infrastructure.persistence.*
+import com.sangdol.roomescape.payment.mapper.toEntity
+import com.sangdol.roomescape.payment.mapper.toEvent
 import com.sangdol.roomescape.payment.mapper.toResponse
 import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
+import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -18,18 +22,20 @@ private val log: KLogger = KotlinLogging.logger {}
 
 @Service
 class PaymentService(
+    private val idGenerator: IDGenerator,
     private val paymentClient: TosspayClient,
     private val paymentRepository: PaymentRepository,
     private val paymentDetailRepository: PaymentDetailRepository,
     private val canceledPaymentRepository: CanceledPaymentRepository,
-    private val paymentWriter: PaymentWriter,
     private val transactionExecutionUtil: TransactionExecutionUtil,
+    private val eventPublisher: ApplicationEventPublisher
 ) {
-    fun requestConfirm(request: PaymentConfirmRequest): PaymentGatewayResponse {
+    fun requestConfirm(reservationId: Long, request: PaymentConfirmRequest): PaymentGatewayResponse {
         log.info { "[requestConfirm] 결제 요청 시작: paymentKey=${request.paymentKey}" }
         try {
             return paymentClient.confirm(request.paymentKey, request.orderId, request.amount).also {
-                log.info { "[requestConfirm] 결제 완료: paymentKey=${request.paymentKey}" }
+                eventPublisher.publishEvent(it.toEvent(reservationId))
+                log.info { "[requestConfirm] 결제 및 이벤트 발행 완료: paymentKey=${request.paymentKey}" }
             }
         } catch (e: Exception) {
             when(e) {
@@ -56,19 +62,6 @@ class PaymentService(
         }
     }
 
-    fun savePayment(
-        reservationId: Long,
-        paymentGatewayResponse: PaymentGatewayResponse
-    ): PaymentCreateResponse {
-        val payment: PaymentEntity = paymentWriter.createPayment(
-            reservationId = reservationId,
-            paymentGatewayResponse = paymentGatewayResponse
-        )
-        val detail: PaymentDetailEntity = paymentWriter.createDetail(paymentGatewayResponse, payment.id)
-
-        return PaymentCreateResponse(paymentId = payment.id, detailId = detail.id)
-    }
-
     fun cancel(userId: Long, request: PaymentCancelRequest) {
         val payment: PaymentEntity = findByReservationIdOrThrow(request.reservationId)
 
@@ -79,12 +72,17 @@ class PaymentService(
         )
 
         transactionExecutionUtil.withNewTransaction(isReadOnly = false) {
-            paymentWriter.cancel(
+            val payment = findByReservationIdOrThrow(request.reservationId).apply { this.cancel() }
-                userId = userId,
+
-                payment = payment,
+            clientCancelResponse.cancels.toEntity(
-                requestedAt = request.requestedAt,
+                id = idGenerator.create(),
-                cancelResponse = clientCancelResponse
+                paymentId = payment.id,
-            )
+                cancelRequestedAt = request.requestedAt,
+                canceledBy = userId
+            ).also {
+                canceledPaymentRepository.save(it)
+                log.debug { "[cancel] 결제 취소 정보 저장 완료: payment.id=${payment.id}" }
+            }
         }.also {
             log.info { "[cancel] 결제 취소 완료: paymentId=${payment.id}" }
         }

service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentWriter.kt

@@ -1,80 +0,0 @@
-package com.sangdol.roomescape.payment.business
-
-import com.sangdol.common.persistence.IDGenerator
-import com.sangdol.roomescape.payment.exception.PaymentErrorCode
-import com.sangdol.roomescape.payment.exception.PaymentException
-import com.sangdol.roomescape.payment.business.domain.PaymentMethod
-import com.sangdol.roomescape.payment.dto.PaymentGatewayCancelResponse
-import com.sangdol.roomescape.payment.dto.PaymentGatewayResponse
-import com.sangdol.roomescape.payment.mapper.toCardDetailEntity
-import com.sangdol.roomescape.payment.mapper.toEasypayPrepaidDetailEntity
-import com.sangdol.roomescape.payment.mapper.toEntity
-import com.sangdol.roomescape.payment.mapper.toTransferDetailEntity
-import com.sangdol.roomescape.payment.infrastructure.persistence.*
-import io.github.oshai.kotlinlogging.KLogger
-import io.github.oshai.kotlinlogging.KotlinLogging
-import org.springframework.stereotype.Component
-import java.time.Instant
-
-private val log: KLogger = KotlinLogging.logger {}
-
-@Component
-class PaymentWriter(
-    private val paymentRepository: PaymentRepository,
-    private val paymentDetailRepository: PaymentDetailRepository,
-    private val canceledPaymentRepository: CanceledPaymentRepository,
-    private val idGenerator: IDGenerator,
-) {
-
-    fun createPayment(
-        reservationId: Long,
-        paymentGatewayResponse: PaymentGatewayResponse
-    ): PaymentEntity {
-        log.info { "[PaymentWriterV2.createPayment] 결제 승인 및 결제 정보 저장 시작: reservationId=${reservationId}, paymentKey=${paymentGatewayResponse.paymentKey}" }
-
-        return paymentGatewayResponse.toEntity(id = idGenerator.create(), reservationId = reservationId).also {
-            paymentRepository.save(it)
-            log.info { "[PaymentWriterV2.createPayment] 결제 승인 및 결제 정보 저장 완료: reservationId=${reservationId}, payment.id=${it.id}" }
-        }
-    }
-
-    fun createDetail(
-        paymentGatewayResponse: PaymentGatewayResponse,
-        paymentId: Long,
-    ): PaymentDetailEntity {
-        val method: PaymentMethod = paymentGatewayResponse.method
-        val id = idGenerator.create()
-
-        if (method == PaymentMethod.TRANSFER) {
-            return paymentDetailRepository.save(paymentGatewayResponse.toTransferDetailEntity(id, paymentId))
-        }
-        if (method == PaymentMethod.EASY_PAY && paymentGatewayResponse.card == null) {
-            return paymentDetailRepository.save(paymentGatewayResponse.toEasypayPrepaidDetailEntity(id, paymentId))
-        }
-        if (paymentGatewayResponse.card != null) {
-            return paymentDetailRepository.save(paymentGatewayResponse.toCardDetailEntity(id, paymentId))
-        }
-        throw PaymentException(PaymentErrorCode.NOT_SUPPORTED_PAYMENT_TYPE)
-    }
-
-    fun cancel(
-        userId: Long,
-        payment: PaymentEntity,
-        requestedAt: Instant,
-        cancelResponse: PaymentGatewayCancelResponse
-    ): CanceledPaymentEntity {
-        log.debug { "[PaymentWriterV2.cancelPayment] 결제 취소 정보 저장 시작: payment.id=${payment.id}" }
-
-        paymentRepository.save(payment.apply { this.cancel() })
-
-        return cancelResponse.cancels.toEntity(
-            id = idGenerator.create(),
-            paymentId = payment.id,
-            cancelRequestedAt = requestedAt,
-            canceledBy = userId
-        ).also {
-            canceledPaymentRepository.save(it)
-            log.debug { "[PaymentWriterV2.cancelPayment] 결제 취소 정보 저장 완료: payment.id=${payment.id}" }
-        }
-    }
-}

service/src/main/kotlin/com/sangdol/roomescape/payment/business/domain/PaymentDetail.kt

@@ -0,0 +1,38 @@
+package com.sangdol.roomescape.payment.business.domain
+
+abstract class PaymentDetail
+
+class BankTransferPaymentDetail(
+    val bankCode: BankCode,
+    val settlementStatus: String,
+): PaymentDetail()
+
+class CardPaymentDetail(
+    val issuerCode: CardIssuerCode,
+    val number: String,
+    val amount: Int,
+    val cardType: CardType,
+    val ownerType: CardOwnerType,
+    val isInterestFree: Boolean,
+    val approveNo: String,
+    val installmentPlanMonths: Int
+): PaymentDetail()
+
+class EasypayCardPaymentDetail(
+    val issuerCode: CardIssuerCode,
+    val number: String,
+    val amount: Int,
+    val cardType: CardType,
+    val ownerType: CardOwnerType,
+    val isInterestFree: Boolean,
+    val approveNo: String,
+    val installmentPlanMonths: Int,
+    val easypayProvider: EasyPayCompanyCode,
+    val easypayDiscountAmount: Int,
+): PaymentDetail()
+
+class EasypayPrepaidPaymentDetail(
+    val provider: EasyPayCompanyCode,
+    val amount: Int,
+    val discountAmount: Int,
+): PaymentDetail()

service/src/main/kotlin/com/sangdol/roomescape/payment/business/event/PaymentEvent.kt

@@ -0,0 +1,22 @@
+package com.sangdol.roomescape.payment.business.event
+
+import com.sangdol.roomescape.payment.business.domain.PaymentDetail
+import com.sangdol.roomescape.payment.business.domain.PaymentMethod
+import com.sangdol.roomescape.payment.business.domain.PaymentStatus
+import com.sangdol.roomescape.payment.business.domain.PaymentType
+import java.time.Instant
+
+class PaymentEvent(
+    val reservationId: Long,
+    val paymentKey: String,
+    val orderId: String,
+    val type: PaymentType,
+    val status: PaymentStatus,
+    val totalAmount: Int,
+    val vat: Int,
+    val suppliedAmount: Int,
+    val method: PaymentMethod,
+    val requestedAt: Instant,
+    val approvedAt: Instant,
+    val detail: PaymentDetail
+)

service/src/main/kotlin/com/sangdol/roomescape/payment/business/event/PaymentEventListener.kt

@@ -0,0 +1,48 @@
+package com.sangdol.roomescape.payment.business.event
+
+import com.sangdol.common.persistence.IDGenerator
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentDetailEntity
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentDetailRepository
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentEntity
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentRepository
+import com.sangdol.roomescape.payment.mapper.toDetailEntity
+import com.sangdol.roomescape.payment.mapper.toEntity
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
+import org.springframework.context.event.EventListener
+import org.springframework.scheduling.annotation.Async
+import org.springframework.stereotype.Component
+import org.springframework.transaction.annotation.Transactional
+
+private val log: KLogger = KotlinLogging.logger {}
+
+@Component
+class PaymentEventListener(
+    private val idGenerator: IDGenerator,
+    private val paymentRepository: PaymentRepository,
+    private val paymentDetailRepository: PaymentDetailRepository
+) {
+
+    @Async
+    @EventListener
+    @Transactional
+    fun handlePaymentEvent(event: PaymentEvent) {
+        val reservationId = event.reservationId
+
+        log.info { "[handlePaymentEvent] 결제 정보 저장 이벤트 수신: reservationId=${reservationId}, paymentKey=${event.paymentKey}" }
+
+        val paymentId = idGenerator.create()
+        val paymentEntity: PaymentEntity = event.toEntity(paymentId)
+        paymentRepository.save(paymentEntity).also {
+            log.info { "[handlePaymentEvent] 결제 정보 저장 완료: paymentId=${paymentId}" }
+        }
+
+        val paymentDetailId = idGenerator.create()
+        val paymentDetailEntity: PaymentDetailEntity = event.toDetailEntity(id = paymentDetailId, paymentId = paymentId)
+        paymentDetailRepository.save(paymentDetailEntity).also {
+            log.info { "[handlePaymentEvent] 결제 상세 저장 완료: paymentDetailId=${paymentDetailId}" }
+        }
+
+        log.info { "[handlePaymentEvent] 결제 정보 저장 이벤트 처리 완료" }
+    }
+}

service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt

@@ -2,11 +2,8 @@ package com.sangdol.roomescape.payment.docs
 
 import com.sangdol.common.types.web.CommonApiResponse
 import com.sangdol.roomescape.auth.web.support.User
-import com.sangdol.roomescape.auth.web.support.UserOnly
 import com.sangdol.roomescape.common.types.CurrentUserContext
-import com.sangdol.roomescape.payment.dto.PaymentGatewayResponse
 import com.sangdol.roomescape.payment.dto.PaymentCancelRequest
-import com.sangdol.roomescape.payment.dto.PaymentConfirmRequest
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.responses.ApiResponses
@@ -16,13 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody
 
 interface PaymentAPI {
 
-    @UserOnly
-    @Operation(summary = "결제 승인")
-    @ApiResponses(ApiResponse(responseCode = "200", useReturnTypeSchema = true))
-    fun confirmPayment(
-        @Valid @RequestBody request: PaymentConfirmRequest
-    ): ResponseEntity<CommonApiResponse<PaymentGatewayResponse>>
-
     @Operation(summary = "결제 취소")
     @ApiResponses(ApiResponse(responseCode = "200", useReturnTypeSchema = true))
     fun cancelPayment(

service/src/main/kotlin/com/sangdol/roomescape/payment/dto/PaymentWriteDTO.kt

@@ -8,11 +8,6 @@ data class PaymentConfirmRequest(
     val amount: Int,
 )
 
-data class PaymentCreateResponse(
-    val paymentId: Long,
-    val detailId: Long
-)
-
 data class PaymentCancelRequest(
     val reservationId: Long,
     val cancelReason: String,

service/src/main/kotlin/com/sangdol/roomescape/payment/mapper/PaymentClientDTOMappingExtensions.kt

@@ -1,82 +1,14 @@
 package com.sangdol.roomescape.payment.mapper
 
+import com.sangdol.roomescape.payment.business.domain.*
+import com.sangdol.roomescape.payment.business.event.PaymentEvent
 import com.sangdol.roomescape.payment.dto.CancelDetail
 import com.sangdol.roomescape.payment.dto.PaymentGatewayResponse
 import com.sangdol.roomescape.payment.exception.PaymentErrorCode
 import com.sangdol.roomescape.payment.exception.PaymentException
-import com.sangdol.roomescape.payment.infrastructure.persistence.*
+import com.sangdol.roomescape.payment.infrastructure.persistence.CanceledPaymentEntity
 import java.time.Instant
 
-fun PaymentGatewayResponse.toEntity(
-    id: Long,
-    reservationId: Long,
-) = PaymentEntity(
-    id = id,
-    reservationId = reservationId,
-    paymentKey = this.paymentKey,
-    orderId = this.orderId,
-    totalAmount = this.totalAmount,
-    requestedAt = this.requestedAt.toInstant(),
-    approvedAt = this.approvedAt.toInstant(),
-    type = this.type,
-    method = this.method,
-    status = this.status,
-)
-
-fun PaymentGatewayResponse.toCardDetailEntity(id: Long, paymentId: Long): PaymentCardDetailEntity {
-    val cardDetail = this.card ?: throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
-
-    return PaymentCardDetailEntity(
-        id = id,
-        paymentId = paymentId,
-        suppliedAmount = this.suppliedAmount,
-        vat = this.vat,
-        issuerCode = cardDetail.issuerCode,
-        cardType = cardDetail.cardType,
-        ownerType = cardDetail.ownerType,
-        amount = cardDetail.amount,
-        cardNumber = cardDetail.number,
-        approvalNumber = cardDetail.approveNo,
-        installmentPlanMonths = cardDetail.installmentPlanMonths,
-        isInterestFree = cardDetail.isInterestFree,
-        easypayProviderCode = this.easyPay?.provider,
-        easypayDiscountAmount = this.easyPay?.discountAmount,
-    )
-}
-
-fun PaymentGatewayResponse.toEasypayPrepaidDetailEntity(
-    id: Long,
-    paymentId: Long
-): PaymentEasypayPrepaidDetailEntity {
-    val easyPayDetail = this.easyPay ?: throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
-
-    return PaymentEasypayPrepaidDetailEntity(
-        id = id,
-        paymentId = paymentId,
-        suppliedAmount = this.suppliedAmount,
-        vat = this.vat,
-        easypayProviderCode = easyPayDetail.provider,
-        amount = easyPayDetail.amount,
-        discountAmount = easyPayDetail.discountAmount
-    )
-}
-
-fun PaymentGatewayResponse.toTransferDetailEntity(
-    id: Long,
-    paymentId: Long
-): PaymentBankTransferDetailEntity {
-    val transferDetail = this.transfer ?: throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
-
-    return PaymentBankTransferDetailEntity(
-        id = id,
-        paymentId = paymentId,
-        suppliedAmount = this.suppliedAmount,
-        vat = this.vat,
-        bankCode = transferDetail.bankCode,
-        settlementStatus = transferDetail.settlementStatus
-    )
-}
-
 fun CancelDetail.toEntity(
     id: Long,
     paymentId: Long,
@@ -94,3 +26,88 @@ fun CancelDetail.toEntity(
     transferDiscountAmount = this.transferDiscountAmount,
     easypayDiscountAmount = this.easyPayDiscountAmount
 )
+
+fun PaymentGatewayResponse.toEvent(reservationId: Long): PaymentEvent {
+    return PaymentEvent(
+        reservationId = reservationId,
+        paymentKey = this.paymentKey,
+        orderId = this.orderId,
+        type = this.type,
+        status = this.status,
+        totalAmount = this.totalAmount,
+        vat = this.vat,
+        suppliedAmount = this.suppliedAmount,
+        method = this.method,
+        requestedAt = this.requestedAt.toInstant(),
+        approvedAt = this.approvedAt.toInstant(),
+        detail = this.toDetail()
+    )
+}
+
+fun PaymentGatewayResponse.toDetail(): PaymentDetail {
+    return when (this.method) {
+        PaymentMethod.TRANSFER -> this.toBankTransferDetail()
+        PaymentMethod.CARD -> this.toCardDetail()
+        PaymentMethod.EASY_PAY -> {
+            if (this.card != null) {
+                this.toEasypayCardDetail()
+            } else {
+                this.toEasypayPrepaidDetail()
+            }
+        }
+
+        else -> throw PaymentException(PaymentErrorCode.NOT_SUPPORTED_PAYMENT_TYPE)
+    }
+}
+
+private fun PaymentGatewayResponse.toBankTransferDetail(): BankTransferPaymentDetail {
+    val bankTransfer = this.transfer ?: throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
+
+    return BankTransferPaymentDetail(
+        bankCode = bankTransfer.bankCode,
+        settlementStatus = bankTransfer.settlementStatus
+    )
+}
+
+private fun PaymentGatewayResponse.toCardDetail(): CardPaymentDetail {
+    val cardDetail = this.card ?: throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
+
+    return CardPaymentDetail(
+        issuerCode = cardDetail.issuerCode,
+        number = cardDetail.number,
+        amount = cardDetail.amount,
+        cardType = cardDetail.cardType,
+        ownerType = cardDetail.ownerType,
+        isInterestFree = cardDetail.isInterestFree,
+        approveNo = cardDetail.approveNo,
+        installmentPlanMonths = cardDetail.installmentPlanMonths
+    )
+}
+
+private fun PaymentGatewayResponse.toEasypayCardDetail(): EasypayCardPaymentDetail {
+    val cardDetail = this.card ?: throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
+    val easypay = this.easyPay ?: throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
+
+    return EasypayCardPaymentDetail(
+        issuerCode = cardDetail.issuerCode,
+        number = cardDetail.number,
+        amount = cardDetail.amount,
+        cardType = cardDetail.cardType,
+        ownerType = cardDetail.ownerType,
+        isInterestFree = cardDetail.isInterestFree,
+        approveNo = cardDetail.approveNo,
+        installmentPlanMonths = cardDetail.installmentPlanMonths,
+        easypayProvider = easypay.provider,
+        easypayDiscountAmount = easypay.discountAmount
+    )
+}
+
+private fun PaymentGatewayResponse.toEasypayPrepaidDetail(): EasypayPrepaidPaymentDetail {
+    val easypay = this.easyPay ?: throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
+
+    return EasypayPrepaidPaymentDetail(
+        provider = easypay.provider,
+        amount = easypay.amount,
+        discountAmount = easypay.discountAmount
+    )
+}

service/src/main/kotlin/com/sangdol/roomescape/payment/mapper/PaymentDetailMappingExtensions.kt

@@ -0,0 +1,91 @@
+package com.sangdol.roomescape.payment.mapper
+
+import com.sangdol.roomescape.payment.business.domain.BankTransferPaymentDetail
+import com.sangdol.roomescape.payment.business.domain.CardPaymentDetail
+import com.sangdol.roomescape.payment.business.domain.EasypayCardPaymentDetail
+import com.sangdol.roomescape.payment.business.domain.EasypayPrepaidPaymentDetail
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentBankTransferDetailEntity
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentCardDetailEntity
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentDetailEntity
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentEasypayPrepaidDetailEntity
+
+fun BankTransferPaymentDetail.toEntity(
+    id: Long,
+    paymentId: Long,
+    suppliedAmount: Int,
+    vat: Int
+): PaymentDetailEntity {
+    return PaymentBankTransferDetailEntity(
+        id = id,
+        paymentId = paymentId,
+        suppliedAmount = suppliedAmount,
+        vat = vat,
+        bankCode = this.bankCode,
+        settlementStatus = this.settlementStatus
+    )
+}
+
+fun CardPaymentDetail.toEntity(
+    id: Long,
+    paymentId: Long,
+    suppliedAmount: Int,
+    vat: Int
+): PaymentDetailEntity {
+    return PaymentCardDetailEntity(
+        id = id,
+        paymentId = paymentId,
+        suppliedAmount = suppliedAmount,
+        vat = vat,
+        issuerCode = issuerCode,
+        cardType = cardType,
+        ownerType = ownerType,
+        amount = amount,
+        cardNumber = this.number,
+        approvalNumber = this.approveNo,
+        installmentPlanMonths = installmentPlanMonths,
+        isInterestFree = isInterestFree,
+        easypayProviderCode = null,
+        easypayDiscountAmount = null
+    )
+}
+
+fun EasypayCardPaymentDetail.toEntity(
+    id: Long,
+    paymentId: Long,
+    suppliedAmount: Int,
+    vat: Int
+): PaymentDetailEntity {
+    return PaymentCardDetailEntity(
+        id = id,
+        paymentId = paymentId,
+        suppliedAmount = suppliedAmount,
+        vat = vat,
+        issuerCode = issuerCode,
+        cardType = cardType,
+        ownerType = ownerType,
+        amount = amount,
+        cardNumber = this.number,
+        approvalNumber = this.approveNo,
+        installmentPlanMonths = installmentPlanMonths,
+        isInterestFree = isInterestFree,
+        easypayProviderCode = this.easypayProvider,
+        easypayDiscountAmount = this.easypayDiscountAmount
+    )
+}
+
+fun EasypayPrepaidPaymentDetail.toEntity(
+    id: Long,
+    paymentId: Long,
+    suppliedAmount: Int,
+    vat: Int
+): PaymentDetailEntity {
+    return PaymentEasypayPrepaidDetailEntity(
+        id = id,
+        paymentId = paymentId,
+        suppliedAmount = suppliedAmount,
+        vat = vat,
+        easypayProviderCode = this.provider,
+        amount = this.amount,
+        discountAmount = this.discountAmount
+    )
+}

service/src/main/kotlin/com/sangdol/roomescape/payment/mapper/PaymentEventMappingExtensions.kt

@@ -0,0 +1,53 @@
+package com.sangdol.roomescape.payment.mapper
+
+import com.sangdol.roomescape.payment.business.domain.*
+import com.sangdol.roomescape.payment.business.event.PaymentEvent
+import com.sangdol.roomescape.payment.exception.PaymentErrorCode
+import com.sangdol.roomescape.payment.exception.PaymentException
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentDetailEntity
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentEntity
+
+fun PaymentEvent.toEntity(id: Long) = PaymentEntity(
+    id = id,
+    reservationId = this.reservationId,
+    paymentKey = this.paymentKey,
+    orderId = this.orderId,
+    totalAmount = this.totalAmount,
+    requestedAt = this.requestedAt,
+    approvedAt = this.approvedAt,
+    type = this.type,
+    method = this.method,
+    status = this.status
+)
+
+fun PaymentEvent.toDetailEntity(id: Long, paymentId: Long): PaymentDetailEntity {
+    val suppliedAmount = this.suppliedAmount
+    val vat = this.vat
+
+    return when (this.method) {
+        PaymentMethod.TRANSFER -> {
+            (this.detail as? BankTransferPaymentDetail)
+                ?.toEntity(id, paymentId, suppliedAmount, vat)
+                ?: throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
+        }
+
+        PaymentMethod.EASY_PAY -> {
+            when (this.detail) {
+                is EasypayCardPaymentDetail -> { this.detail.toEntity(id, paymentId, suppliedAmount, vat) }
+                is EasypayPrepaidPaymentDetail -> { this.detail.toEntity(id, paymentId, suppliedAmount, vat) }
+
+                else -> {
+                    throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
+                }
+            }
+        }
+
+        PaymentMethod.CARD -> {
+            (this.detail as? CardPaymentDetail)
+                ?.toEntity(id, paymentId, suppliedAmount, vat)
+                ?: throw PaymentException(PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR)
+        }
+
+        else -> throw PaymentException(PaymentErrorCode.NOT_SUPPORTED_PAYMENT_TYPE)
+    }
+}

service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt

@@ -6,27 +6,18 @@ import com.sangdol.roomescape.common.types.CurrentUserContext
 import com.sangdol.roomescape.payment.business.PaymentService
 import com.sangdol.roomescape.payment.docs.PaymentAPI
 import com.sangdol.roomescape.payment.dto.PaymentCancelRequest
-import com.sangdol.roomescape.payment.dto.PaymentConfirmRequest
-import com.sangdol.roomescape.payment.dto.PaymentGatewayResponse
 import jakarta.validation.Valid
 import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
 
 @RestController
 @RequestMapping("/payments")
 class PaymentController(
     private val paymentService: PaymentService
 ) : PaymentAPI {
-
-    @PostMapping("/confirm")
-    override fun confirmPayment(
-        @Valid @RequestBody request: PaymentConfirmRequest
-    ): ResponseEntity<CommonApiResponse<PaymentGatewayResponse>> {
-        val response = paymentService.requestConfirm(request)
-
-        return ResponseEntity.ok(CommonApiResponse(response))
-    }
-
     @PostMapping("/cancel")
     override fun cancelPayment(
         @User user: CurrentUserContext,

service/src/main/kotlin/com/sangdol/roomescape/reservation/business/event/ReservationConfirmEvent.kt

@@ -0,0 +1,5 @@
+package com.sangdol.roomescape.reservation.business.event
+
+class ReservationConfirmEvent(
+    val reservationId: Long
+)

service/src/main/kotlin/com/sangdol/roomescape/reservation/business/event/ReservationEventListener.kt

@@ -0,0 +1,34 @@
+package com.sangdol.roomescape.reservation.business.event
+
+import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationRepository
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
+import org.springframework.context.event.EventListener
+import org.springframework.scheduling.annotation.Async
+import org.springframework.stereotype.Component
+import org.springframework.transaction.annotation.Transactional
+import java.time.Instant
+
+private val log: KLogger = KotlinLogging.logger {}
+
+@Component
+class ReservationEventListener(
+    private val reservationRepository: ReservationRepository
+) {
+
+    @Async
+    @EventListener
+    @Transactional
+    fun handleReservationConfirmEvent(event: ReservationConfirmEvent) {
+        val reservationId = event.reservationId
+
+        log.info { "[handleReservationConfirmEvent] 예약 확정 이벤트 수신: reservationId=${reservationId}" }
+        val modifiedRows = reservationRepository.confirmReservation(Instant.now(), reservationId)
+
+        if (modifiedRows == 0) {
+            log.warn { "[handleReservationConfirmEvent] 예상치 못한 예약 확정 실패 - 변경된 row 없음: reservationId=${reservationId}" }
+        }
+
+        log.info { "[handleReservationConfirmEvent] 예약 확정 이벤트 처리 완료" }
+    }
+}

service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt

@@ -16,8 +16,8 @@ interface ReservationRepository : JpaRepository<ReservationEntity, Long> {
     @Query("SELECT r FROM ReservationEntity r WHERE r._id = :id")
     fun findByIdForUpdate(@Param("id") id: Long): ReservationEntity?
 
-
+    @Query(
-    @Query("""
+        """
         SELECT 
             r.id
         FROM 
@@ -27,7 +27,8 @@ interface ReservationRepository : JpaRepository<ReservationEntity, Long> {
         WHERE 
             r.status = 'PENDING' AND r.created_at <= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 5 MINUTE)
         FOR UPDATE SKIP LOCKED
-    """, nativeQuery = true)
+    """, nativeQuery = true
+    )
     fun findAllExpiredReservation(): List<Long>
 
     @Modifying
@@ -47,4 +48,23 @@ interface ReservationRepository : JpaRepository<ReservationEntity, Long> {
     """, nativeQuery = true
     )
     fun expirePendingReservations(@Param("now") now: Instant, @Param("reservationIds") reservationIds: List<Long>): Int
+
+    @Modifying
+    @Query(
+        """
+            UPDATE 
+                reservation r
+            JOIN
+                schedule s ON r.schedule_id = s.id AND s.status = 'HOLD'
+            SET
+                r.status = 'CONFIRMED',
+                r.updated_at = :now,
+                s.status = 'RESERVED',
+                s.hold_expired_at = NULL
+            WHERE
+                r.id = :id 
+                AND r.status = 'PAYMENT_IN_PROGRESS'
+        """, nativeQuery = true
+    )
+    fun confirmReservation(@Param("now") now: Instant, @Param("id") id: Long): Int
 }

service/src/main/kotlin/com/sangdol/roomescape/schedule/infrastructure/persistence/ScheduleRepository.kt

@@ -1,7 +1,6 @@
 package com.sangdol.roomescape.schedule.infrastructure.persistence
 
 import com.sangdol.roomescape.schedule.business.domain.ScheduleOverview
-import com.sangdol.roomescape.test.ScheduleWithThemeId
 import jakarta.persistence.LockModeType
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Lock
@@ -160,18 +159,4 @@ interface ScheduleRepository : JpaRepository<ScheduleEntity, Long> {
         """
     )
     fun releaseHeldSchedules(@Param("scheduleIds") scheduleIds: List<Long>): Int
-
-    /**
-     * for test
-     */
-    @Query("""
-        SELECT 
-            s.id, s.theme_id
-        FROM 
-            schedule s
-        WHERE 
-            s.status = 'AVAILABLE'
-            AND s.date > CURRENT_DATE
-    """, nativeQuery = true)
-    fun findAllAvailableSchedules(): List<ScheduleWithThemeId>
 }

service/src/main/kotlin/com/sangdol/roomescape/test/TestSetupController.kt

@@ -42,4 +42,9 @@ class TestSetupController(
     fun findAllStoreIds(): StoreIdList {
         return testSetupService.findAllStores()
     }
+
+    @GetMapping("/reservations-with-user")
+    fun findAllReservationsWithUser(): ReservationWithUserList {
+        return testSetupService.findAllReservationWithUser()
+    }
 }

service/src/main/kotlin/com/sangdol/roomescape/test/TestSetupDTO.kt

@@ -45,3 +45,13 @@ data class StoreIdList(
 data class StoreId(
     val storeId: Long
 )
+
+data class ReservationWithUser(
+    val account: String,
+    val password: String,
+    val reservationId: Long
+)
+
+data class ReservationWithUserList(
+    val results: List<ReservationWithUser>
+)

service/src/main/kotlin/com/sangdol/roomescape/test/TestSetupRepositories.kt

@@ -0,0 +1,50 @@
+package com.sangdol.roomescape.test
+
+import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationEntity
+import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleEntity
+import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+
+interface TestSetupUserRepository: JpaRepository<UserEntity, Long> {
+    /**
+     * for test
+     */
+    @Query("""
+        SELECT * FROM users u LIMIT :count
+    """, nativeQuery = true)
+    fun findUsersByCount(count: Long): List<UserEntity>
+}
+
+interface TestSetupScheduleRepository: JpaRepository<ScheduleEntity, Long> {
+    /**
+     * for test
+     */
+    @Query("""
+        SELECT 
+            s.id, s.theme_id
+        FROM 
+            schedule s
+        WHERE 
+            s.status = 'AVAILABLE'
+            AND s.date > CURRENT_DATE
+    """, nativeQuery = true)
+    fun findAllAvailableSchedules(): List<ScheduleWithThemeId>
+
+}
+
+interface TestSetupReservationRepository: JpaRepository<ReservationEntity, Long> {
+    /**
+     * for test
+     */
+    @Query(
+        """
+            SELECT 
+                u.email, u.password, r.id
+            FROM 
+                reservation r
+            JOIN users u ON u.id = r.user_id
+        """, nativeQuery = true
+    )
+    fun findAllReservationWithUser(): List<ReservationWithUser>
+}

service/src/main/kotlin/com/sangdol/roomescape/test/TestSetupService.kt

@@ -3,10 +3,8 @@ package com.sangdol.roomescape.test
 import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel
 import com.sangdol.roomescape.admin.infrastructure.persistence.AdminRepository
 import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType
-import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository
 import com.sangdol.roomescape.store.infrastructure.persistence.StoreRepository
 import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeRepository
-import com.sangdol.roomescape.user.infrastructure.persistence.UserRepository
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.time.LocalTime
@@ -16,8 +14,9 @@ class TestSetupService(
     private val themeRepository: ThemeRepository,
     private val storeRepository: StoreRepository,
     private val adminRepository: AdminRepository,
-    private val userRepository: UserRepository,
+    private val userRepository: TestSetupUserRepository,
-    private val scheduleRepository: ScheduleRepository,
+    private val scheduleRepository: TestSetupScheduleRepository,
+    private val reservationRepository: TestSetupReservationRepository
 ) {
 
     @Transactional(readOnly = true)
@@ -85,4 +84,11 @@ class TestSetupService(
             StoreId(it.id)
         })
     }
+
+    @Transactional(readOnly = true)
+    fun findAllReservationWithUser(): ReservationWithUserList {
+        return ReservationWithUserList(
+            reservationRepository.findAllReservationWithUser()
+        )
+    }
 }

service/src/main/kotlin/com/sangdol/roomescape/user/infrastructure/persistence/UserRepositories.kt

@@ -1,21 +1,12 @@
 package com.sangdol.roomescape.user.infrastructure.persistence
 
 import org.springframework.data.jpa.repository.JpaRepository
-import org.springframework.data.jpa.repository.Query
 
 interface UserRepository : JpaRepository<UserEntity, Long> {
 
     fun existsByEmail(email: String): Boolean
     fun existsByPhone(phone: String): Boolean
     fun findByEmail(email: String): UserEntity?
-
-    /**
-     * for test
-     */
-    @Query("""
-        SELECT * FROM users u LIMIT :count
-    """, nativeQuery = true)
-    fun findUsersByCount(count: Long): List<UserEntity>
 }
 
 interface UserStatusHistoryRepository : JpaRepository<UserStatusHistoryEntity, Long>

service/src/main/resources/application.yaml

@@ -28,7 +28,7 @@ management:
       show-details: always
 
 payment:
-  api-base-url: ${PAYMENT_SERVER_ENDPOINT:https://api.tosspayments.com}
+  api-base-url: ${PAYMENT_SERVER_ENDPOINT:http://localhost:8000}
 
 springdoc:
   swagger-ui:

service/src/test/kotlin/com/sangdol/roomescape/order/OrderApiTest.kt

@@ -1,46 +1,38 @@
 package com.sangdol.roomescape.order
 
-import com.ninjasquad.springmockk.SpykBean
+import com.ninjasquad.springmockk.MockkBean
 import com.sangdol.common.utils.KoreaDate
 import com.sangdol.common.utils.KoreaTime
 import com.sangdol.roomescape.auth.exception.AuthErrorCode
 import com.sangdol.roomescape.order.exception.OrderErrorCode
-import com.sangdol.roomescape.order.infrastructure.persistence.AttemptResult
-import com.sangdol.roomescape.order.infrastructure.persistence.PaymentAttemptEntity
-import com.sangdol.roomescape.order.infrastructure.persistence.PaymentAttemptRepository
-import com.sangdol.roomescape.order.infrastructure.persistence.PostOrderTaskRepository
-import com.sangdol.roomescape.payment.business.PaymentService
 import com.sangdol.roomescape.payment.business.domain.PaymentMethod
+import com.sangdol.roomescape.payment.business.event.PaymentEvent
+import com.sangdol.roomescape.payment.business.event.PaymentEventListener
 import com.sangdol.roomescape.payment.dto.PaymentConfirmRequest
 import com.sangdol.roomescape.payment.dto.PaymentGatewayResponse
+import com.sangdol.roomescape.payment.exception.ExternalPaymentException
 import com.sangdol.roomescape.payment.exception.PaymentErrorCode
-import com.sangdol.roomescape.payment.exception.PaymentException
+import com.sangdol.roomescape.payment.infrastructure.client.TosspayClient
-import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentDetailRepository
+import com.sangdol.roomescape.reservation.business.event.ReservationConfirmEvent
-import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentRepository
+import com.sangdol.roomescape.reservation.business.event.ReservationEventListener
 import com.sangdol.roomescape.reservation.exception.ReservationErrorCode
 import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationRepository
 import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationStatus
-import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository
 import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus
 import com.sangdol.roomescape.supports.*
 import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity
 import io.kotest.assertions.assertSoftly
-import io.kotest.matchers.booleans.shouldBeTrue
-import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.shouldBe
-import io.mockk.every
+import io.mockk.*
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.http.HttpMethod
 import org.springframework.http.HttpStatus
 
 class OrderApiTest(
-    @SpykBean private val paymentService: PaymentService,
+    @MockkBean(relaxed = true) private val paymentClient: TosspayClient,
-    private val paymentAttemptRepository: PaymentAttemptRepository,
+    @MockkBean(relaxed = true) private val reservationEventListener: ReservationEventListener,
+    @MockkBean(relaxed = true) private val paymentEventListener: PaymentEventListener,
     private val reservationRepository: ReservationRepository,
-    private val postOrderTaskRepository: PostOrderTaskRepository,
-    private val scheduleRepository: ScheduleRepository,
-    private val paymentRepository: PaymentRepository,
-    private val paymentDetailRepository: PaymentDetailRepository
 ) : FunSpecSpringbootTest() {
 
     val paymentRequest: PaymentConfirmRequest = PaymentFixture.confirmRequest
@@ -82,39 +74,52 @@ class OrderApiTest(
             }
 
             test("정상 응답") {
-                val reservation = dummyInitializer.createPendingReservation(user)
+                val reservationId = dummyInitializer.createPendingReservation(user).id
+
+                val reservationConfirmEventSlot = slot<ReservationConfirmEvent>()
+                val paymentEventSlot = slot<PaymentEvent>()
 
                 every {
-                    paymentService.requestConfirm(paymentRequest)
+                    paymentClient.confirm(paymentRequest.paymentKey, paymentRequest.orderId, paymentRequest.amount)
                 } returns expectedPaymentResponse
 
+                every {
+                    paymentEventListener.handlePaymentEvent(capture(paymentEventSlot))
+                } just runs
+
+                every {
+                    reservationEventListener.handleReservationConfirmEvent(capture(reservationConfirmEventSlot))
+                } just runs
+
                 runTest(
                     token = token,
                     using = {
                         body(paymentRequest)
                     },
                     on = {
-                        post("/orders/${reservation.id}/confirm")
+                        post("/orders/${reservationId}/confirm")
                     },
                     expect = {
                         statusCode(HttpStatus.OK.value())
                     }
                 )
 
-                assertSoftly(scheduleRepository.findByIdOrNull(reservation.scheduleId)!!) {
+                verify(exactly = 1) {
-                    this.status shouldBe ScheduleStatus.RESERVED
+                    paymentEventListener.handlePaymentEvent(any())
-                    this.holdExpiredAt shouldBe null
+                }.also {
+                    assertSoftly(paymentEventSlot.captured) {
+                        this.paymentKey shouldBe expectedPaymentResponse.paymentKey
+                        this.reservationId shouldBe reservationId
                     }
-                reservationRepository.findByIdOrNull(reservation.id)!!.status shouldBe ReservationStatus.CONFIRMED
-
-                assertSoftly(paymentRepository.findByReservationId(reservation.id)) {
-                    this.shouldNotBeNull()
-                    this.status shouldBe expectedPaymentResponse.status
-
-                    paymentDetailRepository.findByPaymentId(this.id)!!.shouldNotBeNull()
                 }
 
-                paymentAttemptRepository.isSuccessAttemptExists(reservation.id).shouldBeTrue()
+                verify(exactly = 1) {
+                    reservationEventListener.handleReservationConfirmEvent(any())
+                }.also {
+                    assertSoftly(reservationConfirmEventSlot.captured) {
+                        this.reservationId shouldBe reservationId
+                    }
+                }
             }
 
             context("검증 과정에서의 실패 응답") {
@@ -128,24 +133,6 @@ class OrderApiTest(
                     )
                 }
 
-                test("이미 결제가 완료된 예약이면 실패한다.") {
-                    val reservation = dummyInitializer.createPendingReservation(user)
-
-                    paymentAttemptRepository.save(PaymentAttemptEntity(
-                        id = IDGenerator.create(),
-                        reservationId = reservation.id,
-                        result = AttemptResult.SUCCESS
-                    ))
-
-                    runExceptionTest(
-                        token = token,
-                        method = HttpMethod.POST,
-                        endpoint = "/orders/${reservation.id}/confirm",
-                        requestBody = paymentRequest,
-                        expectedErrorCode = OrderErrorCode.NOT_CONFIRMABLE
-                    )
-                }
-
                 test("이미 확정된 예약이면 실패한다.") {
                     val reservation = dummyInitializer.createConfirmReservation(user)
 
@@ -223,68 +210,23 @@ class OrderApiTest(
             }
 
             context("결제 과정에서의 실패 응답.") {
-                test("결제에 실패해도 검증을 통과하면 예약을 ${ReservationStatus.PAYMENT_IN_PROGRESS} 상태로 바꾸고, 결제 시도 이력을 기록한다.") {
+                test("결제에 실패해도 검증을 통과하면 예약을 ${ReservationStatus.PAYMENT_IN_PROGRESS} 상태가 된다.") {
-                    val reservation = dummyInitializer.createPendingReservation(user)
+                    val reservationId = dummyInitializer.createPendingReservation(user).id
 
                     every {
-                        paymentService.requestConfirm(paymentRequest)
+                        paymentClient.confirm(paymentRequest.paymentKey, paymentRequest.orderId, paymentRequest.amount)
-                    } throws PaymentException(PaymentErrorCode.PAYMENT_CLIENT_ERROR)
+                    } throws ExternalPaymentException(400, "INVALID_REQUEST", "잘못 요청함")
 
                     runExceptionTest(
                         token = token,
                         method = HttpMethod.POST,
-                        endpoint = "/orders/${reservation.id}/confirm",
+                        endpoint = "/orders/${reservationId}/confirm",
                         requestBody = paymentRequest,
                         expectedErrorCode = PaymentErrorCode.PAYMENT_CLIENT_ERROR
-                    ).also {
-                        it.extract().path<Long>("trial") shouldBe 0
-                    }
-
-                    assertSoftly(reservationRepository.findByIdOrNull(reservation.id)!!) {
-                        this.status shouldBe ReservationStatus.PAYMENT_IN_PROGRESS
-                    }
-
-                    val paymentAttempt = paymentAttemptRepository.findAll().first { it.reservationId == reservation.id }
-                    assertSoftly(paymentAttempt) {
-                        it.shouldNotBeNull()
-                        it.result shouldBe AttemptResult.FAILED
-                        it.errorCode shouldBe PaymentErrorCode.PAYMENT_CLIENT_ERROR.name
-                    }
-                }
-            }
-
-            context("결제 성공 이후 실패 응답.") {
-                test("결제 이력 저장 과정에서 예외가 발생하면 해당 작업을 저장하며, 사용자는 정상 응답을 받는다.") {
-                    val reservation = dummyInitializer.createPendingReservation(user)
-
-                    every {
-                        paymentService.requestConfirm(paymentRequest)
-                    } returns expectedPaymentResponse
-
-                    every {
-                        paymentService.savePayment(reservation.id, expectedPaymentResponse)
-                    } throws RuntimeException("결제 저장 실패!")
-
-                    runTest(
-                        token = token,
-                        using = {
-                            body(paymentRequest)
-                        },
-                        on = {
-                            post("/orders/${reservation.id}/confirm")
-                        },
-                        expect = {
-                            statusCode(HttpStatus.OK.value())
-                        }
                     )
 
-                    paymentAttemptRepository.isSuccessAttemptExists(reservation.id).shouldBeTrue()
+                    assertSoftly(reservationRepository.findByIdOrNull(reservationId)!!) {
-
+                        this.status shouldBe ReservationStatus.PAYMENT_IN_PROGRESS
-                    val postOrderTask = postOrderTaskRepository.findAll().first { it.reservationId == reservation.id }
-                    assertSoftly(postOrderTask) {
-                        it.shouldNotBeNull()
-                        it.paymentKey shouldBe paymentRequest.paymentKey
-                        it.trial shouldBe 1
                     }
                 }
             }

service/src/test/kotlin/com/sangdol/roomescape/order/OrderConcurrencyTest.kt

@@ -18,6 +18,7 @@ import com.sangdol.roomescape.supports.ReservationFixture
 import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity
 import io.kotest.assertions.assertSoftly
 import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
 import io.mockk.every
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -69,7 +70,7 @@ class OrderConcurrencyTest(
 
         test("결제 요청 직후 시작되는 예약 만료 배치는, 해당 예약이 만료되었더라도 적용되지 않는다.") {
             every {
-                paymentService.requestConfirm(paymentConfirmRequest)
+                paymentService.requestConfirm(reservation.id, paymentConfirmRequest)
             } returns paymentGatewayResponse
 
             withContext(Dispatchers.IO) {
@@ -87,18 +88,13 @@ class OrderConcurrencyTest(
             }
 
             assertSoftly(reservationRepository.findByIdOrNull(reservation.id)!!) {
-                this.status shouldBe ReservationStatus.CONFIRMED
+                this.status shouldNotBe ReservationStatus.EXPIRED
-            }
-
-            assertSoftly(scheduleRepository.findByIdOrNull(schedule.id)!!) {
-                this.status shouldBe ScheduleStatus.RESERVED
-                this.holdExpiredAt shouldBe null
             }
         }
 
         test("결제 요청 직전에 예약 만료 배치가 시작하면, 결제 요청은 실패한다.") {
             every {
-                paymentService.requestConfirm(paymentConfirmRequest)
+                paymentService.requestConfirm(reservation.id, paymentConfirmRequest)
             } returns paymentGatewayResponse
 
             withContext(Dispatchers.IO) {
@@ -113,8 +109,6 @@ class OrderConcurrencyTest(
                 async {
                     assertThrows<OrderException> {
                         orderService.confirm(reservation.id, paymentConfirmRequest)
-                    }.also {
-                        it.trial shouldBe 0
                     }
                 }
             }

service/src/test/kotlin/com/sangdol/roomescape/payment/PaymentAPITest.kt

@@ -4,22 +4,21 @@ import com.ninjasquad.springmockk.MockkBean
 import com.sangdol.common.types.web.HttpStatus
 import com.sangdol.roomescape.auth.exception.AuthErrorCode
 import com.sangdol.roomescape.payment.business.PaymentService
-import com.sangdol.roomescape.payment.business.domain.*
+import com.sangdol.roomescape.payment.business.domain.PaymentMethod
-import com.sangdol.roomescape.payment.dto.*
+import com.sangdol.roomescape.payment.business.domain.PaymentStatus
-import com.sangdol.roomescape.payment.exception.ExternalPaymentException
+import com.sangdol.roomescape.payment.dto.PaymentConfirmRequest
 import com.sangdol.roomescape.payment.exception.PaymentErrorCode
 import com.sangdol.roomescape.payment.infrastructure.client.TosspayClient
 import com.sangdol.roomescape.payment.infrastructure.persistence.CanceledPaymentRepository
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentDetailRepository
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentEntity
 import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentRepository
-import com.sangdol.roomescape.supports.FunSpecSpringbootTest
+import com.sangdol.roomescape.payment.mapper.toDetailEntity
-import com.sangdol.roomescape.supports.PaymentFixture
+import com.sangdol.roomescape.payment.mapper.toEntity
-import com.sangdol.roomescape.supports.runExceptionTest
+import com.sangdol.roomescape.payment.mapper.toEvent
-import com.sangdol.roomescape.supports.runTest
+import com.sangdol.roomescape.supports.*
 import io.kotest.matchers.shouldBe
-import io.mockk.clearMocks
 import io.mockk.every
-import org.hamcrest.CoreMatchers.containsString
-import org.hamcrest.CoreMatchers.equalTo
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.http.HttpMethod
 
@@ -28,211 +27,10 @@ class PaymentAPITest(
     private val tosspayClient: TosspayClient,
     private val paymentService: PaymentService,
     private val paymentRepository: PaymentRepository,
+    private val paymentDetailRepository: PaymentDetailRepository,
     private val canceledPaymentRepository: CanceledPaymentRepository
 ) : FunSpecSpringbootTest() {
     init {
-        context("결제를 승인한다.") {
-            context("권한이 없으면 접근할 수 없다.") {
-                val endpoint = "/payments/confirm"
-
-                test("비회원") {
-                    runExceptionTest(
-                        method = HttpMethod.POST,
-                        endpoint = endpoint,
-                        expectedErrorCode = AuthErrorCode.TOKEN_NOT_FOUND
-                    )
-                }
-
-                test("관리자") {
-                    runExceptionTest(
-                        token = testAuthUtil.defaultHqAdminLogin().second,
-                        method = HttpMethod.POST,
-                        endpoint = endpoint,
-                        expectedErrorCode = AuthErrorCode.ACCESS_DENIED
-                    )
-                }
-            }
-
-            val amount = 100_000
-            context("간편결제 + 카드로 ${amount}원을 결제한다.") {
-                context("일시불") {
-                    test("토스페이 + 토스뱅크카드(신용)") {
-                        runConfirmTest(
-                            amount = amount,
-                            cardDetail = PaymentFixture.cardDetail(
-                                amount = amount,
-                                issuerCode = CardIssuerCode.TOSS_BANK,
-                                cardType = CardType.CREDIT,
-                            ),
-                            easyPayDetail = PaymentFixture.easypayDetail(
-                                amount = 0,
-                                provider = EasyPayCompanyCode.TOSSPAY
-                            )
-                        )
-                    }
-
-                    test("삼성페이 + 삼성카드(법인)") {
-                        runConfirmTest(
-                            amount = amount,
-                            cardDetail = PaymentFixture.cardDetail(
-                                amount = amount,
-                                issuerCode = CardIssuerCode.SAMSUNG,
-                                cardType = CardType.CREDIT,
-                                ownerType = CardOwnerType.CORPORATE
-                            ),
-                            easyPayDetail = PaymentFixture.easypayDetail(
-                                amount = 0,
-                                provider = EasyPayCompanyCode.SAMSUNGPAY
-                            )
-                        )
-                    }
-                }
-
-                context("할부") {
-                    val installmentPlanMonths = 12
-                    test("네이버페이 + 신한카드 / 12개월") {
-                        runConfirmTest(
-                            amount = amount,
-                            cardDetail = PaymentFixture.cardDetail(
-                                amount = amount,
-                                issuerCode = CardIssuerCode.SHINHAN,
-                                installmentPlanMonths = installmentPlanMonths
-                            ),
-                            easyPayDetail = PaymentFixture.easypayDetail(
-                                amount = 0,
-                                provider = EasyPayCompanyCode.NAVERPAY
-                            )
-                        )
-                    }
-                }
-
-                context("간편결제사 포인트 일부 사용") {
-                    val point = (amount * 0.1).toInt()
-                    test("토스페이 + 국민카드(체크) / 일시불 / $point 포인트 사용") {
-                        runConfirmTest(
-                            amount = amount,
-                            cardDetail = PaymentFixture.cardDetail(
-                                amount = (amount - point),
-                                issuerCode = CardIssuerCode.KOOKMIN,
-                                cardType = CardType.CHECK
-                            ),
-                            easyPayDetail = PaymentFixture.easypayDetail(
-                                amount = 0,
-                                provider = EasyPayCompanyCode.TOSSPAY,
-                                discountAmount = point
-                            )
-                        )
-                    }
-                }
-            }
-
-            context("간편결제사의 선불 충전금액으로 ${amount}원을 결제한다.") {
-                test("토스페이 + 토스페이머니 / 전액") {
-                    runConfirmTest(
-                        easyPayDetail = PaymentFixture.easypayDetail(
-                            amount = amount,
-                            provider = EasyPayCompanyCode.TOSSPAY
-                        )
-                    )
-                }
-
-                val point = (amount * 0.05).toInt()
-
-                test("카카오페이 + 카카오페이머니 / $point 사용") {
-                    runConfirmTest(
-                        easyPayDetail = PaymentFixture.easypayDetail(
-                            amount = (amount - point),
-                            provider = EasyPayCompanyCode.KAKAOPAY,
-                            discountAmount = point
-                        )
-                    )
-                }
-            }
-
-            context("계좌이체로 결제한다.") {
-                test("토스뱅크") {
-                    runConfirmTest(
-                        transferDetail = PaymentFixture.transferDetail(bankCode = BankCode.TOSS_BANK)
-                    )
-                }
-            }
-
-            context("결제 처리중 오류가 발생한다.") {
-                lateinit var token: String
-                val commonRequest = PaymentFixture.confirmRequest
-
-                beforeTest {
-                    token = testAuthUtil.defaultUserLogin().second
-                }
-
-                afterTest {
-                    clearMocks(tosspayClient)
-                }
-
-                test("예외 코드가 UserFacingPaymentErrorCode에 있으면 결제 실패 메시지를 같이 담는다.") {
-                    val statusCode = HttpStatus.BAD_REQUEST.value()
-                    val message = "거래금액 한도를 초과했습니다."
-
-                    every {
-                        tosspayClient.confirm(commonRequest.paymentKey, commonRequest.orderId, commonRequest.amount)
-                    } throws ExternalPaymentException(
-                        httpStatusCode = statusCode,
-                        errorCode = UserFacingPaymentErrorCode.EXCEED_MAX_AMOUNT.name,
-                        message = message
-                    )
-
-                    runTest(
-                        token = token,
-                        using = {
-                            body(commonRequest)
-                        },
-                        on = {
-                            post("/payments/confirm")
-                        },
-                        expect = {
-                            statusCode(statusCode)
-                            body("code", equalTo(PaymentErrorCode.PAYMENT_CLIENT_ERROR.errorCode))
-                            body("message", containsString(message))
-                        }
-                    )
-                }
-
-                context("예외 코드가 UserFacingPaymentErrorCode에 없으면 Client의 상태 코드에 따라 다르게 처리한다.") {
-                    mapOf(
-                        HttpStatus.BAD_REQUEST.value() to PaymentErrorCode.PAYMENT_CLIENT_ERROR,
-                        HttpStatus.INTERNAL_SERVER_ERROR.value() to PaymentErrorCode.PAYMENT_PROVIDER_ERROR
-                    ).forEach { (statusCode, expectedErrorCode) ->
-                        test("statusCode=${statusCode}") {
-                            val message = "잘못된 시크릿키 연동 정보 입니다."
-
-                            every {
-                                tosspayClient.confirm(commonRequest.paymentKey, commonRequest.orderId, commonRequest.amount)
-                            } throws ExternalPaymentException(
-                                httpStatusCode = statusCode,
-                                errorCode = "INVALID_API_KEY",
-                                message = message
-                            )
-
-                            runTest(
-                                token = token,
-                                using = {
-                                    body(commonRequest)
-                                },
-                                on = {
-                                    post("/payments/confirm")
-                                },
-                                expect = {
-                                    statusCode(statusCode)
-                                    body("code", equalTo(expectedErrorCode.errorCode))
-                                    body("message", equalTo(expectedErrorCode.message))
-                                }
-                            )
-                        }
-                    }
-                }
-            }
-        }
-
         context("결제를 취소한다.") {
             context("권한이 없으면 접근할 수 없다.") {
                 val endpoint = "/payments/cancel"
@@ -262,7 +60,7 @@ class PaymentAPITest(
                 val reservation = dummyInitializer.createConfirmReservation(user = user)
                 val confirmRequest = PaymentFixture.confirmRequest
 
-                val paymentCreateResponse = createPayment(
+                val paymentEntity = createPayment(
                     request = confirmRequest,
                     reservationId = reservation.id
                 )
@@ -289,10 +87,10 @@ class PaymentAPITest(
                         statusCode(HttpStatus.OK.value())
                     }
                 ).also {
-                    val payment = paymentRepository.findByIdOrNull(paymentCreateResponse.paymentId)
+                    val payment = paymentRepository.findByIdOrNull(paymentEntity.id)
                         ?: throw AssertionError("Unexpected Exception Occurred.")
                     val canceledPayment =
-                        canceledPaymentRepository.findByPaymentId(paymentCreateResponse.paymentId)
+                        canceledPaymentRepository.findByPaymentId(paymentEntity.id)
                             ?: throw AssertionError("Unexpected Exception Occurred.")
 
                     payment.status shouldBe PaymentStatus.CANCELED
@@ -319,7 +117,7 @@ class PaymentAPITest(
     private fun createPayment(
         request: PaymentConfirmRequest,
         reservationId: Long,
-    ): PaymentCreateResponse {
+    ): PaymentEntity {
         every {
             tosspayClient.confirm(request.paymentKey, request.orderId, request.amount)
         } returns PaymentFixture.confirmResponse(
@@ -331,49 +129,10 @@ class PaymentAPITest(
             transferDetail = null,
         )
 
-        val paymentResponse = paymentService.requestConfirm(request)
+        val paymentEvent = paymentService.requestConfirm(reservationId, request).toEvent(reservationId)
-        return paymentService.savePayment(reservationId, paymentResponse)
-    }
 
-    fun runConfirmTest(
+        return paymentRepository.save(paymentEvent.toEntity(IDGenerator.create())).also {
-        cardDetail: CardDetailResponse? = null,
+            paymentDetailRepository.save(paymentEvent.toDetailEntity(IDGenerator.create(), it.id))
-        easyPayDetail: EasyPayDetailResponse? = null,
+        }
-        transferDetail: TransferDetailResponse? = null,
-        paymentKey: String = "paymentKey",
-        amount: Int = 10000,
-    ) {
-        val token = testAuthUtil.defaultUserLogin().second
-        val request = PaymentFixture.confirmRequest.copy(paymentKey = paymentKey, amount = amount)
-
-        val method = if (easyPayDetail != null) {
-            PaymentMethod.EASY_PAY
-        } else if (cardDetail != null) {
-            PaymentMethod.CARD
-        } else if (transferDetail != null) {
-            PaymentMethod.TRANSFER
-        } else {
-            throw AssertionError("결제타입 확인 필요.")
-        }
-
-        val clientResponse = PaymentFixture.confirmResponse(
-            paymentKey, amount, method, cardDetail, easyPayDetail, transferDetail
-        )
-
-        every {
-            tosspayClient.confirm(request.paymentKey, request.orderId, request.amount)
-        } returns clientResponse
-
-        runTest(
-            token = token,
-            using = {
-                body(request)
-            },
-            on = {
-                post("/payments/confirm")
-            },
-            expect = {
-                statusCode(HttpStatus.OK.value())
-            }
-        )
     }
 }

service/src/test/kotlin/com/sangdol/roomescape/payment/PaymentEventListenerTest.kt

@@ -0,0 +1,54 @@
+package com.sangdol.roomescape.payment
+
+import com.sangdol.roomescape.payment.business.domain.PaymentMethod
+import com.sangdol.roomescape.payment.business.event.PaymentEventListener
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentCardDetailEntity
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentDetailRepository
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentRepository
+import com.sangdol.roomescape.payment.mapper.toEvent
+import com.sangdol.roomescape.supports.FunSpecSpringbootTest
+import com.sangdol.roomescape.supports.PaymentFixture
+import com.sangdol.roomescape.supports.initialize
+import io.kotest.assertions.assertSoftly
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
+
+class PaymentEventListenerTest(
+    private val paymentEventListener: PaymentEventListener,
+    private val paymentRepository: PaymentRepository,
+    private val paymentDetailRepository: PaymentDetailRepository,
+) : FunSpecSpringbootTest() {
+
+    init {
+        test("결제 완료 이벤트를 처리한다.") {
+            val reservationId = initialize("FK 제약조건 해소를 위한 예약 생성") {
+                val user = testAuthUtil.defaultUser()
+                dummyInitializer.createPendingReservation(user)
+            }.id
+
+            val paymentExternalAPIResponse = PaymentFixture.confirmResponse(
+                paymentKey = "paymentKey",
+                amount = 100_000,
+                method = PaymentMethod.CARD
+            )
+
+            paymentEventListener.handlePaymentEvent(paymentExternalAPIResponse.toEvent(reservationId)).also {
+                Thread.sleep(100)
+            }
+
+            val payment = paymentRepository.findByReservationId(reservationId)
+            assertSoftly(payment!!) {
+                this.paymentKey shouldBe paymentExternalAPIResponse.paymentKey
+                this.totalAmount shouldBe paymentExternalAPIResponse.totalAmount
+                this.method shouldBe paymentExternalAPIResponse.method
+            }
+
+            val paymentDetail = paymentDetailRepository.findByPaymentId(payment.id)
+            assertSoftly(paymentDetail) {
+                this.shouldNotBeNull()
+                this::class shouldBe PaymentCardDetailEntity::class
+                (this as PaymentCardDetailEntity).amount shouldBe paymentExternalAPIResponse.totalAmount
+            }
+        }
+    }
+}

service/src/test/kotlin/com/sangdol/roomescape/payment/PaymentServiceTest.kt

@@ -0,0 +1,185 @@
+package com.sangdol.roomescape.payment
+
+import com.ninjasquad.springmockk.MockkBean
+import com.sangdol.roomescape.payment.business.PaymentService
+import com.sangdol.roomescape.payment.business.domain.*
+import com.sangdol.roomescape.payment.business.event.PaymentEvent
+import com.sangdol.roomescape.payment.business.event.PaymentEventListener
+import com.sangdol.roomescape.payment.dto.PaymentConfirmRequest
+import com.sangdol.roomescape.payment.dto.PaymentGatewayResponse
+import com.sangdol.roomescape.payment.exception.ExternalPaymentException
+import com.sangdol.roomescape.payment.exception.PaymentErrorCode
+import com.sangdol.roomescape.payment.exception.PaymentException
+import com.sangdol.roomescape.payment.infrastructure.client.TosspayClient
+import com.sangdol.roomescape.supports.FunSpecSpringbootTest
+import com.sangdol.roomescape.supports.PaymentFixture
+import io.kotest.assertions.assertSoftly
+import io.kotest.matchers.shouldBe
+import io.mockk.*
+import org.junit.jupiter.api.assertThrows
+
+class PaymentServiceTest(
+    private val paymentService: PaymentService,
+    @MockkBean(relaxed = true) private val paymentEventListener: PaymentEventListener,
+    @MockkBean(relaxed = true) private val tosspayClient: TosspayClient
+) : FunSpecSpringbootTest() {
+
+    init {
+        afterTest {
+            clearAllMocks()
+        }
+
+        context("결제를 승인한다.") {
+            val request = PaymentFixture.confirmRequest
+
+            context("결제 정상 승인 및 이벤트 발행 확인") {
+                test("간편결제 + 카드") {
+                    val tosspayAPIResponse = PaymentFixture.confirmResponse(
+                        paymentKey = request.paymentKey,
+                        amount = request.amount,
+                        orderId = request.orderId,
+                        method = PaymentMethod.EASY_PAY,
+                        cardDetail = PaymentFixture.cardDetail(100_000),
+                        easyPayDetail = PaymentFixture.easypayDetail(0)
+                    )
+
+                    runSuccessTest(request, tosspayAPIResponse) {
+                        assertSoftly(it.detail) {
+                            this::class shouldBe EasypayCardPaymentDetail::class
+                        }
+                    }
+                }
+
+                test("간편결제 - 충전식") {
+                    val tosspayAPIResponse = PaymentFixture.confirmResponse(
+                        paymentKey = request.paymentKey,
+                        amount = request.amount,
+                        orderId = request.orderId,
+                        method = PaymentMethod.EASY_PAY,
+                    )
+
+                    runSuccessTest(request, tosspayAPIResponse) {
+                        assertSoftly(it.detail) {
+                            this::class shouldBe EasypayPrepaidPaymentDetail::class
+                        }
+                    }
+                }
+
+                test("카드") {
+                    val tosspayAPIResponse = PaymentFixture.confirmResponse(
+                        paymentKey = request.paymentKey,
+                        amount = request.amount,
+                        orderId = request.orderId,
+                        method = PaymentMethod.CARD,
+                    )
+
+                    runSuccessTest(request, tosspayAPIResponse) {
+                        assertSoftly(it.detail) {
+                            this::class shouldBe CardPaymentDetail::class
+                        }
+                    }
+                }
+
+                test("계좌이체") {
+                    val tosspayAPIResponse = PaymentFixture.confirmResponse(
+                        paymentKey = request.paymentKey,
+                        amount = request.amount,
+                        orderId = request.orderId,
+                        method = PaymentMethod.TRANSFER,
+                    )
+
+                    runSuccessTest(request, tosspayAPIResponse) {
+                        assertSoftly(it.detail) {
+                            this::class shouldBe BankTransferPaymentDetail::class
+                        }
+                    }
+                }
+            }
+
+            context("외부 API 요청 과정에서 예외가 발생하면, 예외를 PaymentException으로 변환한 뒤 던진다.") {
+
+                test("외부 API가 4xx 응답을 보내면 ${PaymentErrorCode.PAYMENT_CLIENT_ERROR}로 변환하여 예외를 던진다.") {
+                    val expectedErrorCode = PaymentErrorCode.PAYMENT_CLIENT_ERROR
+                    val exception = ExternalPaymentException(400, "INVALID_REQUEST", "잘못된 요청입니다.")
+                    every {
+                        tosspayClient.confirm(request.paymentKey, request.orderId, request.amount)
+                    } throws exception
+
+                    assertThrows<PaymentException> {
+                        paymentService.requestConfirm(12345L, request)
+                    }.also {
+                        it.errorCode shouldBe expectedErrorCode
+                        it.message shouldBe expectedErrorCode.message
+                    }
+                }
+
+                test("외부 API가 5xx 응답을 보내면 ${PaymentErrorCode.PAYMENT_PROVIDER_ERROR}로 변환하여 예외를 던진다.") {
+                    val expectedErrorCode = PaymentErrorCode.PAYMENT_PROVIDER_ERROR
+                    val exception = ExternalPaymentException(500, "UNKNOWN_PAYMENT_ERROR", "결제에 실패했어요. 같은 문제가 반복된다면 은행이나 카드사로 문의해주세요.")
+                    every {
+                        tosspayClient.confirm(request.paymentKey, request.orderId, request.amount)
+                    } throws exception
+
+                    assertThrows<PaymentException> {
+                        paymentService.requestConfirm(12345L, request)
+                    }.also {
+                        it.errorCode shouldBe expectedErrorCode
+                        it.message shouldBe expectedErrorCode.message
+                    }
+                }
+
+                test("외부 API의 에러코드가 ${UserFacingPaymentErrorCode::class.simpleName}에 있으면 해당 예외 메시지를 담아 던진다.") {
+                    val expectedErrorCode = PaymentErrorCode.PAYMENT_CLIENT_ERROR
+                    val exception = ExternalPaymentException(400, "EXCEED_MAX_CARD_INSTALLMENT_PLAN", "설정 가능한 최대 할부 개월 수를 초과했습니다.")
+                    every {
+                        tosspayClient.confirm(request.paymentKey, request.orderId, request.amount)
+                    } throws exception
+
+                    assertThrows<PaymentException> {
+                        paymentService.requestConfirm(12345L, request)
+                    }.also {
+                        it.errorCode shouldBe expectedErrorCode
+                        it.message shouldBe "${expectedErrorCode.message}(${exception.message})"
+                    }
+                }
+
+                test("외부 API에서 예상치 못한 예외가 발생한 경우 ${PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR}로 변환한다.") {
+                    val expectedErrorCode = PaymentErrorCode.PAYMENT_UNEXPECTED_ERROR
+                    every {
+                        tosspayClient.confirm(request.paymentKey, request.orderId, request.amount)
+                    } throws Exception("unexpected")
+
+                    assertThrows<PaymentException> {
+                        paymentService.requestConfirm(12345L, request)
+                    }.also {
+                        it.errorCode shouldBe expectedErrorCode
+                        it.message shouldBe expectedErrorCode.message
+                    }
+                }
+            }
+        }
+    }
+
+    private fun runSuccessTest(request: PaymentConfirmRequest, tosspayAPIResponse: PaymentGatewayResponse, additionalAssertion: (PaymentEvent) -> Unit): PaymentEvent {
+        val paymentEventSlot = slot<PaymentEvent>()
+
+        every {
+            tosspayClient.confirm(request.paymentKey, request.orderId, request.amount)
+        } returns tosspayAPIResponse
+
+        every {
+            paymentEventListener.handlePaymentEvent(capture(paymentEventSlot))
+        } just runs
+
+        paymentService.requestConfirm(12345L, request)
+
+        assertSoftly(paymentEventSlot.captured) {
+            this.paymentKey shouldBe request.paymentKey
+            this.orderId shouldBe request.orderId
+            this.totalAmount shouldBe request.amount
+            this.method shouldBe tosspayAPIResponse.method
+        }
+
+        return paymentEventSlot.captured
+    }
+}

service/src/test/kotlin/com/sangdol/roomescape/reservation/business/event/ReservationEventListenerTest.kt

@@ -0,0 +1,45 @@
+package com.sangdol.roomescape.reservation.business.event
+
+import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationRepository
+import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationStatus
+import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository
+import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus
+import com.sangdol.roomescape.supports.FunSpecSpringbootTest
+import io.kotest.assertions.assertSoftly
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
+import org.springframework.data.repository.findByIdOrNull
+
+class ReservationEventListenerTest(
+    private val reservationEventListener: ReservationEventListener,
+    private val reservationRepository: ReservationRepository,
+    private val scheduleRepository: ScheduleRepository
+) : FunSpecSpringbootTest() {
+
+    init {
+        test("예약 확정 이벤트를 처리한다.") {
+            val pendingReservation = dummyInitializer.createPendingReservation(testAuthUtil.defaultUser()).also {
+               it.status = ReservationStatus.PAYMENT_IN_PROGRESS
+               reservationRepository.saveAndFlush(it)
+            }
+
+            val reservationConfirmEvent = ReservationConfirmEvent(pendingReservation.id)
+
+            reservationEventListener.handleReservationConfirmEvent(reservationConfirmEvent).also {
+                Thread.sleep(100)
+            }
+
+            assertSoftly(reservationRepository.findByIdOrNull(pendingReservation.id)) {
+                this.shouldNotBeNull()
+                this.status shouldBe ReservationStatus.CONFIRMED
+            }
+
+            assertSoftly(scheduleRepository.findByIdOrNull(pendingReservation.scheduleId)) {
+                this.shouldNotBeNull()
+                this.status shouldBe ScheduleStatus.RESERVED
+                this.holdExpiredAt shouldBe null
+            }
+        }
+    }
+}

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

@@ -1,11 +1,11 @@
 package com.sangdol.roomescape.supports
 
-import com.sangdol.roomescape.payment.business.PaymentWriter
 import com.sangdol.roomescape.payment.business.domain.PaymentMethod
 import com.sangdol.roomescape.payment.dto.*
-import com.sangdol.roomescape.payment.infrastructure.persistence.CanceledPaymentEntity
+import com.sangdol.roomescape.payment.infrastructure.persistence.*
-import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentEntity
+import com.sangdol.roomescape.payment.mapper.toDetailEntity
-import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentRepository
+import com.sangdol.roomescape.payment.mapper.toEntity
+import com.sangdol.roomescape.payment.mapper.toEvent
 import com.sangdol.roomescape.payment.mapper.toResponse
 import com.sangdol.roomescape.reservation.dto.PendingReservationCreateRequest
 import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationEntity
@@ -33,7 +33,8 @@ class DummyInitializer(
     private val scheduleRepository: ScheduleRepository,
     private val reservationRepository: ReservationRepository,
     private val paymentRepository: PaymentRepository,
-    private val paymentWriter: PaymentWriter
+    private val paymentDetailRepository: PaymentDetailRepository,
+    private val canceledPaymentRepository: CanceledPaymentRepository
 ) {
 
     fun createStore(
@@ -204,12 +205,10 @@ class DummyInitializer(
             transferDetail = transferDetail
         )
 
-        val payment = paymentWriter.createPayment(
+        val paymentEvent = clientConfirmResponse.toEvent(reservationId)
-            reservationId = reservationId,
+        val payment = paymentRepository.save(paymentEvent.toEntity(IDGenerator.create()))
-            paymentGatewayResponse = clientConfirmResponse
-        )
 
-        val detail = paymentWriter.createDetail(clientConfirmResponse, payment.id)
+        val detail = paymentDetailRepository.save(paymentEvent.toDetailEntity(IDGenerator.create(), payment.id))
 
         return payment.toResponse(detail = detail.toResponse(), cancel = null)
     }
@@ -227,11 +226,14 @@ class DummyInitializer(
             cancelReason = cancelReason,
         )
 
-        return paymentWriter.cancel(
+
-            userId,
+        return clientCancelResponse.cancels.toEntity(
-            payment,
+            id = IDGenerator.create(),
-            requestedAt = Instant.now(),
+            paymentId = payment.id,
-            clientCancelResponse
+            cancelRequestedAt = Instant.now(),
-        )
+            canceledBy = userId
+        ).also {
+            canceledPaymentRepository.save(it)
+        }
     }
 }

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

@@ -1,7 +1,8 @@
 package com.sangdol.roomescape.supports
 
 import com.sangdol.roomescape.admin.infrastructure.persistence.AdminRepository
-import com.sangdol.roomescape.payment.business.PaymentWriter
+import com.sangdol.roomescape.payment.infrastructure.persistence.CanceledPaymentRepository
+import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentDetailRepository
 import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentRepository
 import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationRepository
 import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository
@@ -43,13 +44,7 @@ abstract class FunSpecSpringbootTest(
     }
 }) {
     @Autowired
-    private lateinit var userRepository: UserRepository
+    lateinit var testAuthUtil: TestAuthUtil
-
-    @Autowired
-    private lateinit var adminRepository: AdminRepository
-
-    @Autowired
-    private lateinit var storeRepository: StoreRepository
 
     @Autowired
     lateinit var dummyInitializer: DummyInitializer
@@ -57,32 +52,40 @@ abstract class FunSpecSpringbootTest(
     @LocalServerPort
     var port: Int = 0
 
-    lateinit var testAuthUtil: TestAuthUtil
-
     override suspend fun beforeSpec(spec: Spec) {
         RestAssured.port = port
-        testAuthUtil = TestAuthUtil(userRepository, adminRepository, storeRepository)
     }
 }
 
 @TestConfiguration
 class TestConfig {
+    @Bean
+    fun testAuthUtil(
+        userRepository: UserRepository,
+        adminRepository: AdminRepository,
+        storeRepository: StoreRepository
+    ): TestAuthUtil {
+        return TestAuthUtil(userRepository, adminRepository, storeRepository)
+    }
+
     @Bean
     fun dummyInitializer(
         storeRepository: StoreRepository,
         themeRepository: ThemeRepository,
         scheduleRepository: ScheduleRepository,
         reservationRepository: ReservationRepository,
-        paymentWriter: PaymentWriter,
+        paymentRepository: PaymentRepository,
-        paymentRepository: PaymentRepository
+        paymentDetailRepository: PaymentDetailRepository,
+        canceledPaymentRepository: CanceledPaymentRepository
     ): DummyInitializer {
         return DummyInitializer(
             themeRepository = themeRepository,
             scheduleRepository = scheduleRepository,
             reservationRepository = reservationRepository,
-            paymentWriter = paymentWriter,
             paymentRepository = paymentRepository,
-            storeRepository = storeRepository
+            storeRepository = storeRepository,
+            paymentDetailRepository = paymentDetailRepository,
+            canceledPaymentRepository = canceledPaymentRepository
         )
     }
 }

test-scripts/common.js

@@ -22,7 +22,7 @@ export function parseIdToString(response) {
 }
 
 export function maxIterations() {
-    const maxIterationsRes = http.get(`${BASE_URL}/tests/max-iterations`)
+    const maxIterationsRes = http.get(`http://localhost:8080/tests/max-iterations`)
     if (maxIterationsRes.status !== 200) {
         throw new Error('max-iterations 조회 실패')
     }
@@ -57,7 +57,7 @@ export function login(account, password, principalType) {
         password: password,
         principalType: principalType
     })
-    const params = { headers: { 'Content-Type': 'application/json' } }
+    const params = { headers: { 'Content-Type': 'application/json' }, tags: { name: '/auth/login' } }
 
     const loginRes = http.post(`${BASE_URL}/auth/login`, loginPayload, params)
 
@@ -78,7 +78,7 @@ export function login(account, password, principalType) {
     }
 }
 
-export function getHeaders(token) {
+export function getHeaders(token, endpoint) {
     const headers = {
         'Content-Type': 'application/json',
     };
@@ -87,5 +87,5 @@ export function getHeaders(token) {
         headers['Authorization'] = `Bearer ${token}`;
     }
 
-    return { headers: headers };
+    return { headers: headers, tags: { name: endpoint } };
 }

test-scripts/create-reservation-scripts.js

@@ -15,10 +15,13 @@ export const options = {
     scenarios: {
         user_reservation: {
             executor: 'ramping-vus',
-            startVUs: 1500,
+            startVUs: 0,
             stages: [
-                { duration: '10m', target: 1500 },
+                { duration: '3m', target: 500 },
-                { duration: '1m', target: 0 }
+                { duration: '2m', target: 1000 },
+                { duration: '2m', target: 1500 },
+                { duration: '3m', target: 1500 },
+                { duration: '3m', target: 0 },
             ]
         }
     },
@@ -92,7 +95,8 @@ export default function (data) {
         while (searchTrial < 5) {
             storeId = randomItem(stores).storeId
             targetDate = randomDayBetween(1, 7)
-            const res = http.get(`${BASE_URL}/stores/${storeId}/schedules?date=${targetDate}`)
+            const params = getHeaders(accessToken, "/stores/${storeId}/schedules?date=${date}")
+            const res = http.get(`${BASE_URL}/stores/${storeId}/schedules?date=${targetDate}`, params)
             const result = check(res, {'일정 조회 성공': (r) => r.status === 200})
             if (result !== true) {
                 continue
@@ -118,7 +122,7 @@ export default function (data) {
             const randomThemesForFetchDetail = extractRandomThemeForFetchDetail(themesByStoreAndDate)
 
             randomThemesForFetchDetail.forEach(id => {
-                http.get(`${BASE_URL}/themes/${id}`)
+                http.get(`${BASE_URL}/themes/${id}`, getHeaders(accessToken, "/themes/${id}"))
                 sleep(10)
             })
         })
@@ -137,11 +141,11 @@ export default function (data) {
 
     let isScheduleHeld = false
     group(`일정 Holding 및 테마 정보 조회 -> 예약 과정중 첫 페이지의 작업 완료`, function () {
-        const holdRes = http.post(`${BASE_URL}/schedules/${availableScheduleId}/hold`, null, getHeaders(accessToken))
+        const holdRes = http.post(`${BASE_URL}/schedules/${availableScheduleId}/hold`, null, getHeaders(accessToken, "/schedules/${id}/hold"))
         const body = JSON.parse(holdRes.body)
 
         if (check(holdRes, {'일정 점유 성공': (r) => r.status === 200})) {
-            const themeInfoRes = http.get(`${BASE_URL}/themes/${selectedThemeId}`)
+            const themeInfoRes = http.get(`${BASE_URL}/themes/${selectedThemeId}`, { tag: { name: "/themes/${id}"}})
             selectedThemeInfo = parseIdToString(themeInfoRes).data
             isScheduleHeld = true
         } else {
@@ -160,7 +164,7 @@ export default function (data) {
     group(`예약 정보 입력 페이지`, function () {
         let userName, userContact
         group(`회원 연락처 조회`, function () {
-            const userContactRes = http.get(`${BASE_URL}/users/contact`, getHeaders(accessToken))
+            const userContactRes = http.get(`${BASE_URL}/users/contact`, getHeaders(accessToken, "/users/contact"))
 
             if (!check(userContactRes, {'회원 연락처 조회 성공': (r) => r.status === 200})) {
                 throw new Error("회원 연락처 조회 과정에서 예외 발생")
@@ -191,7 +195,7 @@ export default function (data) {
                 requirement: requirement
             })
 
-            const pendingReservationCreateRes = http.post(`${BASE_URL}/reservations/pending`, payload, getHeaders(accessToken))
+            const pendingReservationCreateRes = http.post(`${BASE_URL}/reservations/pending`, payload, getHeaders(accessToken, "/reservations/pending"))
             const responseBody = parseIdToString(pendingReservationCreateRes)
 
             if (pendingReservationCreateRes.status !== 200) {
@@ -229,7 +233,7 @@ export default function (data) {
         let isConfirmed = false
         while (trial < 2) {
             sleep(30)
-            const confirmOrderRes = http.post(`${BASE_URL}/orders/${reservationId}/confirm`, payload, getHeaders(accessToken))
+            const confirmOrderRes = http.post(`${BASE_URL}/orders/${reservationId}/confirm`, payload, getHeaders(accessToken, "/orders/${reservationId}/confirm"))
 
             if (check(confirmOrderRes, {'예약 확정 성공': (r) => r.status === 200})) {
                 isConfirmed = true

test-scripts/create-schedule-scripts.js

@@ -1,17 +1,17 @@
 import http from 'k6/http';
-import {check, sleep} from 'k6';
+import {check} from 'k6';
 import exec from 'k6/execution';
 import {BASE_URL, getHeaders, login, parseIdToString} from "./common.js";
 import {randomIntBetween} from 'https://jslib.k6.io/k6-utils/1.2.0/index.js';
 
 
-const TOTAL_ITERATIONS = 85212;
+const TOTAL_ITERATIONS = 200000;
 
 export const options = {
     scenarios: {
         schedule_creation: {
             executor: 'shared-iterations',
-            vus: 263,
+            vus: 100,
             iterations: TOTAL_ITERATIONS,
             maxDuration: '30m',
         },
@@ -97,7 +97,7 @@ function createSchedule(storeId, accessToken, schedule) {
         time: schedule.time,
         themeId: schedule.themeId,
     });
-    const params = getHeaders(accessToken)
+    const params = getHeaders(accessToken, "/admin/stores/${id}/schedules")
     const res = http.post(`${BASE_URL}/admin/stores/${storeId}/schedules`, payload, params);
 
     const success = check(res, {'일정 생성 성공': (r) => r.status === 200 || r.status === 201});
@@ -105,7 +105,6 @@ function createSchedule(storeId, accessToken, schedule) {
     if (!success) {
         console.error(`일정 생성 실패 [${res.status}]: 매장=${storeId}, ${schedule.date} ${schedule.time} (테마: ${schedule.themeId}) | 응답: ${res.body}`);
     }
-    sleep(5)
 
     return success;
 }