From fd96bd993962c18069e61bca79781bef873ed07f Mon Sep 17 00:00:00 2001 From: pricelees Date: Tue, 7 Oct 2025 16:20:55 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20PaymentClientConfirmResponse?= =?UTF-8?q?=EC=97=90=20paymentKey,=20paymentType=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sangdol/roomescape/payment/business/PaymentService.kt | 2 -- .../sangdol/roomescape/payment/business/PaymentWriter.kt | 7 +------ .../payment/infrastructure/client/TosspayConfirmDTO.kt | 8 ++++---- .../com/sangdol/roomescape/payment/web/PaymentDTO.kt | 1 - .../com/sangdol/roomescape/supports/DummyInitializer.kt | 3 +-- .../kotlin/com/sangdol/roomescape/supports/Fixtures.kt | 6 ++++-- 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentService.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentService.kt index ec874e10..654346f9 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentService.kt @@ -34,8 +34,6 @@ class PaymentService( return transactionExecutionUtil.withNewTransaction(isReadOnly = false) { val payment: PaymentEntity = paymentWriter.createPayment( reservationId = reservationId, - orderId = request.orderId, - paymentType = request.paymentType, paymentClientConfirmResponse = clientConfirmResponse ) val detail: PaymentDetailEntity = paymentWriter.createDetail(clientConfirmResponse, payment.id) diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentWriter.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentWriter.kt index bbeda832..a8f14a9f 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentWriter.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentWriter.kt @@ -5,7 +5,6 @@ import com.sangdol.roomescape.payment.exception.PaymentErrorCode import com.sangdol.roomescape.payment.exception.PaymentException import com.sangdol.roomescape.payment.infrastructure.client.* import com.sangdol.roomescape.payment.infrastructure.common.PaymentMethod -import com.sangdol.roomescape.payment.infrastructure.common.PaymentType import com.sangdol.roomescape.payment.infrastructure.persistence.* import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging @@ -24,15 +23,11 @@ class PaymentWriter( fun createPayment( reservationId: Long, - orderId: String, - paymentType: PaymentType, paymentClientConfirmResponse: PaymentClientConfirmResponse ): PaymentEntity { log.info { "[PaymentWriterV2.createPayment] 결제 승인 및 결제 정보 저장 시작: reservationId=${reservationId}, paymentKey=${paymentClientConfirmResponse.paymentKey}" } - return paymentClientConfirmResponse.toEntity( - id = idGenerator.create(), reservationId, orderId, paymentType - ).also { + return paymentClientConfirmResponse.toEntity(id = idGenerator.create(), reservationId = reservationId).also { paymentRepository.save(it) log.info { "[PaymentWriterV2.createPayment] 결제 승인 및 결제 정보 저장 완료: reservationId=${reservationId}, payment.id=${it.id}" } } diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt index ca8f549a..55258c22 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt @@ -11,6 +11,8 @@ import java.time.OffsetDateTime data class PaymentClientConfirmResponse( val paymentKey: String, + val orderId: String, + val type: PaymentType, val status: PaymentStatus, val totalAmount: Int, val vat: Int, @@ -26,17 +28,15 @@ data class PaymentClientConfirmResponse( fun PaymentClientConfirmResponse.toEntity( id: Long, reservationId: Long, - orderId: String, - paymentType: PaymentType ) = PaymentEntity( id = id, reservationId = reservationId, paymentKey = this.paymentKey, - orderId = orderId, + orderId = this.orderId, totalAmount = this.totalAmount, requestedAt = this.requestedAt.toInstant(), approvedAt = this.approvedAt.toInstant(), - type = paymentType, + type = this.type, method = this.method, status = this.status, ) diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentDTO.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentDTO.kt index 0ed997b0..bb94d916 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentDTO.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentDTO.kt @@ -12,7 +12,6 @@ data class PaymentConfirmRequest( val paymentKey: String, val orderId: String, val amount: Int, - val paymentType: PaymentType ) data class PaymentCreateResponse( diff --git a/service/src/test/kotlin/com/sangdol/roomescape/supports/DummyInitializer.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/DummyInitializer.kt index e8bd060f..d4422ae6 100644 --- a/service/src/test/kotlin/com/sangdol/roomescape/supports/DummyInitializer.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/DummyInitializer.kt @@ -180,6 +180,7 @@ class DummyInitializer( val clientConfirmResponse = PaymentFixture.confirmResponse( paymentKey = request.paymentKey, + orderId = request.orderId, amount = request.amount, method = method, cardDetail = cardDetail, @@ -189,8 +190,6 @@ class DummyInitializer( val payment = paymentWriter.createPayment( reservationId = reservationId, - orderId = request.orderId, - paymentType = request.paymentType, paymentClientConfirmResponse = clientConfirmResponse ) diff --git a/service/src/test/kotlin/com/sangdol/roomescape/supports/Fixtures.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/Fixtures.kt index 27ef1215..750d94a3 100644 --- a/service/src/test/kotlin/com/sangdol/roomescape/supports/Fixtures.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/Fixtures.kt @@ -241,7 +241,6 @@ object PaymentFixture { paymentKey = "paymentKey", orderId = "orderId", amount = 10000, - paymentType = PaymentType.NORMAL ) val cancelRequest: PaymentCancelRequest = PaymentCancelRequest( @@ -286,10 +285,13 @@ object PaymentFixture { method: PaymentMethod, cardDetail: CardDetail?, easyPayDetail: EasyPayDetail?, - transferDetail: TransferDetail? + transferDetail: TransferDetail?, + orderId: String = randomString(25), ) = PaymentClientConfirmResponse( paymentKey = paymentKey, status = PaymentStatus.DONE, + orderId = orderId, + type = PaymentType.NORMAL, totalAmount = amount, vat = (amount * 0.1).toInt(), suppliedAmount = (amount * 0.9).toInt(),