From 8557d647ab50fbf990ceac919a3ac33eb447f456 Mon Sep 17 00:00:00 2001 From: minor7295 <44902090+minor7295@users.noreply.github.com> Date: Fri, 5 Dec 2025 05:19:52 +0900 Subject: [PATCH 01/22] =?UTF-8?q?feat:=20PG=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#24)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pg-simulator/README.md | 42 ++++++ apps/pg-simulator/build.gradle.kts | 40 ++++++ .../com/loopers/PaymentGatewayApplication.kt | 24 ++++ .../loopers/application/payment/OrderInfo.kt | 14 ++ .../payment/PaymentApplicationService.kt | 88 ++++++++++++ .../application/payment/PaymentCommand.kt | 22 +++ .../application/payment/TransactionInfo.kt | 39 +++++ .../com/loopers/config/web/WebMvcConfig.kt | 13 ++ .../com/loopers/domain/payment/CardType.kt | 7 + .../com/loopers/domain/payment/Payment.kt | 87 +++++++++++ .../loopers/domain/payment/PaymentEvent.kt | 28 ++++ .../domain/payment/PaymentEventPublisher.kt | 6 + .../loopers/domain/payment/PaymentRelay.kt | 7 + .../domain/payment/PaymentRepository.kt | 8 ++ .../domain/payment/TransactionKeyGenerator.kt | 20 +++ .../domain/payment/TransactionStatus.kt | 7 + .../com/loopers/domain/user/UserInfo.kt | 8 ++ .../payment/PaymentCoreEventPublisher.kt | 19 +++ .../payment/PaymentCoreRelay.kt | 21 +++ .../payment/PaymentCoreRepository.kt | 32 +++++ .../payment/PaymentJpaRepository.kt | 9 ++ .../interfaces/api/ApiControllerAdvice.kt | 119 +++++++++++++++ .../com/loopers/interfaces/api/ApiResponse.kt | 32 +++++ .../UserInfoArgumentResolver.kt | 32 +++++ .../interfaces/api/payment/PaymentApi.kt | 60 ++++++++ .../interfaces/api/payment/PaymentDto.kt | 136 ++++++++++++++++++ .../event/payment/PaymentEventListener.kt | 28 ++++ .../loopers/support/error/CoreException.kt | 6 + .../com/loopers/support/error/ErrorType.kt | 11 ++ .../src/main/resources/application.yml | 77 ++++++++++ http/pg-simulator/payments.http | 20 +++ settings.gradle.kts | 1 + 32 files changed, 1063 insertions(+) create mode 100644 apps/pg-simulator/README.md create mode 100644 apps/pg-simulator/build.gradle.kts create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/PaymentGatewayApplication.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/OrderInfo.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/PaymentApplicationService.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/PaymentCommand.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/TransactionInfo.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/config/web/WebMvcConfig.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/CardType.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/Payment.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentEvent.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentEventPublisher.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentRelay.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentRepository.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/TransactionKeyGenerator.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/TransactionStatus.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/domain/user/UserInfo.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreEventPublisher.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreRelay.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreRepository.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentJpaRepository.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/ApiControllerAdvice.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/ApiResponse.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/argumentresolver/UserInfoArgumentResolver.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/payment/PaymentApi.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/payment/PaymentDto.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/event/payment/PaymentEventListener.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/support/error/CoreException.kt create mode 100644 apps/pg-simulator/src/main/kotlin/com/loopers/support/error/ErrorType.kt create mode 100644 apps/pg-simulator/src/main/resources/application.yml create mode 100644 http/pg-simulator/payments.http diff --git a/apps/pg-simulator/README.md b/apps/pg-simulator/README.md new file mode 100644 index 000000000..118642638 --- /dev/null +++ b/apps/pg-simulator/README.md @@ -0,0 +1,42 @@ +## PG-Simulator (PaymentGateway) + +### Description +Loopback BE 과정을 위해 PaymentGateway 를 시뮬레이션하는 App Module 입니다. +`local` 프로필로 실행 권장하며, 커머스 서비스와의 동시 실행을 위해 서버 포트가 조정되어 있습니다. +- server port : 8082 +- actuator port : 8083 + +### Getting Started +부트 서버를 아래 명령어 혹은 `intelliJ` 통해 실행해주세요. +```shell +./gradlew :apps:pg-simulator:bootRun +``` + +API 는 아래와 같이 주어지니, 커머스 서비스와 동시에 실행시킨 후 진행해주시면 됩니다. +- 결제 요청 API +- 결제 정보 확인 `by transactionKey` +- 결제 정보 목록 조회 `by orderId` + +```http request +### 결제 요청 +POST {{pg-simulator}}/api/v1/payments +X-USER-ID: 135135 +Content-Type: application/json + +{ + "orderId": "1351039135", + "cardType": "SAMSUNG", + "cardNo": "1234-5678-9814-1451", + "amount" : "5000", + "callbackUrl": "http://localhost:8080/api/v1/examples/callback" +} + +### 결제 정보 확인 +GET {{pg-simulator}}/api/v1/payments/20250816:TR:9577c5 +X-USER-ID: 135135 + +### 주문에 엮인 결제 정보 조회 +GET {{pg-simulator}}/api/v1/payments?orderId=1351039135 +X-USER-ID: 135135 + +``` \ No newline at end of file diff --git a/apps/pg-simulator/build.gradle.kts b/apps/pg-simulator/build.gradle.kts new file mode 100644 index 000000000..653d549da --- /dev/null +++ b/apps/pg-simulator/build.gradle.kts @@ -0,0 +1,40 @@ +plugins { + val kotlinVersion = "2.0.20" + + id("org.jetbrains.kotlin.jvm") version(kotlinVersion) + id("org.jetbrains.kotlin.kapt") version(kotlinVersion) + id("org.jetbrains.kotlin.plugin.spring") version(kotlinVersion) + id("org.jetbrains.kotlin.plugin.jpa") version(kotlinVersion) +} + +kotlin { + compilerOptions { + jvmToolchain(21) + freeCompilerArgs.addAll("-Xjsr305=strict") + } +} + +dependencies { + // add-ons + implementation(project(":modules:jpa")) + implementation(project(":modules:redis")) + implementation(project(":supports:jackson")) + implementation(project(":supports:logging")) + implementation(project(":supports:monitoring")) + + // kotlin + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + + // web + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:${project.properties["springDocOpenApiVersion"]}") + + // querydsl + kapt("com.querydsl:querydsl-apt::jakarta") + + // test-fixtures + testImplementation(testFixtures(project(":modules:jpa"))) + testImplementation(testFixtures(project(":modules:redis"))) +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/PaymentGatewayApplication.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/PaymentGatewayApplication.kt new file mode 100644 index 000000000..05595d135 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/PaymentGatewayApplication.kt @@ -0,0 +1,24 @@ +package com.loopers + +import jakarta.annotation.PostConstruct +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.context.properties.ConfigurationPropertiesScan +import org.springframework.boot.runApplication +import org.springframework.scheduling.annotation.EnableAsync +import java.util.TimeZone + +@ConfigurationPropertiesScan +@EnableAsync +@SpringBootApplication +class PaymentGatewayApplication { + + @PostConstruct + fun started() { + // set timezone + TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul")) + } +} + +fun main(args: Array) { + runApplication(*args) +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/OrderInfo.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/OrderInfo.kt new file mode 100644 index 000000000..7e04d1ce0 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/OrderInfo.kt @@ -0,0 +1,14 @@ +package com.loopers.application.payment + +/** + * 결제 주문 정보 + * + * 결제는 주문에 대한 다수 트랜잭션으로 구성됩니다. + * + * @property orderId 주문 정보 + * @property transactions 주문에 엮인 트랜잭션 목록 + */ +data class OrderInfo( + val orderId: String, + val transactions: List, +) diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/PaymentApplicationService.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/PaymentApplicationService.kt new file mode 100644 index 000000000..9a5ebdc5d --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/PaymentApplicationService.kt @@ -0,0 +1,88 @@ +package com.loopers.application.payment + +import com.loopers.domain.payment.Payment +import com.loopers.domain.payment.PaymentEvent +import com.loopers.domain.payment.PaymentEventPublisher +import com.loopers.domain.payment.PaymentRelay +import com.loopers.domain.payment.PaymentRepository +import com.loopers.domain.payment.TransactionKeyGenerator +import com.loopers.domain.user.UserInfo +import com.loopers.support.error.CoreException +import com.loopers.support.error.ErrorType +import org.springframework.stereotype.Component +import org.springframework.transaction.annotation.Transactional + +@Component +class PaymentApplicationService( + private val paymentRepository: PaymentRepository, + private val paymentEventPublisher: PaymentEventPublisher, + private val paymentRelay: PaymentRelay, + private val transactionKeyGenerator: TransactionKeyGenerator, +) { + companion object { + private val RATE_LIMIT_EXCEEDED = (1..20) + private val RATE_INVALID_CARD = (21..30) + } + + @Transactional + fun createTransaction(command: PaymentCommand.CreateTransaction): TransactionInfo { + command.validate() + + val transactionKey = transactionKeyGenerator.generate() + val payment = paymentRepository.save( + Payment( + transactionKey = transactionKey, + userId = command.userId, + orderId = command.orderId, + cardType = command.cardType, + cardNo = command.cardNo, + amount = command.amount, + callbackUrl = command.callbackUrl, + ), + ) + + paymentEventPublisher.publish(PaymentEvent.PaymentCreated.from(payment = payment)) + + return TransactionInfo.from(payment) + } + + @Transactional(readOnly = true) + fun getTransactionDetailInfo(userInfo: UserInfo, transactionKey: String): TransactionInfo { + val payment = paymentRepository.findByTransactionKey(userId = userInfo.userId, transactionKey = transactionKey) + ?: throw CoreException(ErrorType.NOT_FOUND, "(transactionKey: $transactionKey) 결제건이 존재하지 않습니다.") + return TransactionInfo.from(payment) + } + + @Transactional(readOnly = true) + fun findTransactionsByOrderId(userInfo: UserInfo, orderId: String): OrderInfo { + val payments = paymentRepository.findByOrderId(userId = userInfo.userId, orderId = orderId) + if (payments.isEmpty()) { + throw CoreException(ErrorType.NOT_FOUND, "(orderId: $orderId) 에 해당하는 결제건이 존재하지 않습니다.") + } + + return OrderInfo( + orderId = orderId, + transactions = payments.map { TransactionInfo.from(it) }, + ) + } + + @Transactional + fun handle(transactionKey: String) { + val payment = paymentRepository.findByTransactionKey(transactionKey) + ?: throw CoreException(ErrorType.NOT_FOUND, "(transactionKey: $transactionKey) 결제건이 존재하지 않습니다.") + + val rate = (1..100).random() + when (rate) { + in RATE_LIMIT_EXCEEDED -> payment.limitExceeded() + in RATE_INVALID_CARD -> payment.invalidCard() + else -> payment.approve() + } + paymentEventPublisher.publish(event = PaymentEvent.PaymentHandled.from(payment)) + } + + fun notifyTransactionResult(transactionKey: String) { + val payment = paymentRepository.findByTransactionKey(transactionKey) + ?: throw CoreException(ErrorType.NOT_FOUND, "(transactionKey: $transactionKey) 결제건이 존재하지 않습니다.") + paymentRelay.notify(callbackUrl = payment.callbackUrl, transactionInfo = TransactionInfo.from(payment)) + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/PaymentCommand.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/PaymentCommand.kt new file mode 100644 index 000000000..01d8ae440 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/PaymentCommand.kt @@ -0,0 +1,22 @@ +package com.loopers.application.payment + +import com.loopers.domain.payment.CardType +import com.loopers.support.error.CoreException +import com.loopers.support.error.ErrorType + +object PaymentCommand { + data class CreateTransaction( + val userId: String, + val orderId: String, + val cardType: CardType, + val cardNo: String, + val amount: Long, + val callbackUrl: String, + ) { + fun validate() { + if (amount <= 0L) { + throw CoreException(ErrorType.BAD_REQUEST, "요청 금액은 0 보다 큰 정수여야 합니다.") + } + } + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/TransactionInfo.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/TransactionInfo.kt new file mode 100644 index 000000000..5c21e51af --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/application/payment/TransactionInfo.kt @@ -0,0 +1,39 @@ +package com.loopers.application.payment + +import com.loopers.domain.payment.CardType +import com.loopers.domain.payment.Payment +import com.loopers.domain.payment.TransactionStatus + +/** + * 트랜잭션 정보 + * + * @property transactionKey 트랜잭션 KEY + * @property orderId 주문 ID + * @property cardType 카드 종류 + * @property cardNo 카드 번호 + * @property amount 금액 + * @property status 처리 상태 + * @property reason 처리 사유 + */ +data class TransactionInfo( + val transactionKey: String, + val orderId: String, + val cardType: CardType, + val cardNo: String, + val amount: Long, + val status: TransactionStatus, + val reason: String?, +) { + companion object { + fun from(payment: Payment): TransactionInfo = + TransactionInfo( + transactionKey = payment.transactionKey, + orderId = payment.orderId, + cardType = payment.cardType, + cardNo = payment.cardNo, + amount = payment.amount, + status = payment.status, + reason = payment.reason, + ) + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/config/web/WebMvcConfig.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/config/web/WebMvcConfig.kt new file mode 100644 index 000000000..8aec9dc82 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/config/web/WebMvcConfig.kt @@ -0,0 +1,13 @@ +package com.loopers.config.web + +import com.loopers.interfaces.api.argumentresolver.UserInfoArgumentResolver +import org.springframework.context.annotation.Configuration +import org.springframework.web.method.support.HandlerMethodArgumentResolver +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer + +@Configuration +class WebMvcConfig : WebMvcConfigurer { + override fun addArgumentResolvers(resolvers: MutableList) { + resolvers.add(UserInfoArgumentResolver()) + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/CardType.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/CardType.kt new file mode 100644 index 000000000..55008a95d --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/CardType.kt @@ -0,0 +1,7 @@ +package com.loopers.domain.payment + +enum class CardType { + SAMSUNG, + KB, + HYUNDAI, +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/Payment.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/Payment.kt new file mode 100644 index 000000000..cfc2386c1 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/Payment.kt @@ -0,0 +1,87 @@ +package com.loopers.domain.payment + +import com.loopers.support.error.CoreException +import com.loopers.support.error.ErrorType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.EnumType +import jakarta.persistence.Enumerated +import jakarta.persistence.Id +import jakarta.persistence.Index +import jakarta.persistence.Table +import java.time.LocalDateTime + +@Entity +@Table( + name = "payments", + indexes = [ + Index(name = "idx_user_transaction", columnList = "user_id, transaction_key"), + Index(name = "idx_user_order", columnList = "user_id, order_id"), + Index(name = "idx_unique_user_order_transaction", columnList = "user_id, order_id, transaction_key", unique = true), + ] +) +class Payment( + @Id + @Column(name = "transaction_key", nullable = false, unique = true) + val transactionKey: String, + + @Column(name = "user_id", nullable = false) + val userId: String, + + @Column(name = "order_id", nullable = false) + val orderId: String, + + @Enumerated(EnumType.STRING) + @Column(name = "card_type", nullable = false) + val cardType: CardType, + + @Column(name = "card_no", nullable = false) + val cardNo: String, + + @Column(name = "amount", nullable = false) + val amount: Long, + + @Column(name = "callback_url", nullable = false) + val callbackUrl: String, +) { + @Enumerated(EnumType.STRING) + @Column(name = "status", nullable = false) + var status: TransactionStatus = TransactionStatus.PENDING + private set + + @Column(name = "reason", nullable = true) + var reason: String? = null + private set + + @Column(name = "created_at", nullable = false) + var createdAt: LocalDateTime = LocalDateTime.now() + private set + + @Column(name = "updated_at", nullable = false) + var updatedAt: LocalDateTime = LocalDateTime.now() + private set + + fun approve() { + if (status != TransactionStatus.PENDING) { + throw CoreException(ErrorType.INTERNAL_ERROR, "결제승인은 대기상태에서만 가능합니다.") + } + status = TransactionStatus.SUCCESS + reason = "정상 승인되었습니다." + } + + fun invalidCard() { + if (status != TransactionStatus.PENDING) { + throw CoreException(ErrorType.INTERNAL_ERROR, "결제처리는 대기상태에서만 가능합니다.") + } + status = TransactionStatus.FAILED + reason = "잘못된 카드입니다. 다른 카드를 선택해주세요." + } + + fun limitExceeded() { + if (status != TransactionStatus.PENDING) { + throw CoreException(ErrorType.INTERNAL_ERROR, "한도초과 처리는 대기상태에서만 가능합니다.") + } + status = TransactionStatus.FAILED + reason = "한도초과입니다. 다른 카드를 선택해주세요." + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentEvent.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentEvent.kt new file mode 100644 index 000000000..8e495b2e3 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentEvent.kt @@ -0,0 +1,28 @@ +package com.loopers.domain.payment + +object PaymentEvent { + data class PaymentCreated( + val transactionKey: String, + ) { + companion object { + fun from(payment: Payment): PaymentCreated = PaymentCreated(transactionKey = payment.transactionKey) + } + } + + data class PaymentHandled( + val transactionKey: String, + val status: TransactionStatus, + val reason: String?, + val callbackUrl: String, + ) { + companion object { + fun from(payment: Payment): PaymentHandled = + PaymentHandled( + transactionKey = payment.transactionKey, + status = payment.status, + reason = payment.reason, + callbackUrl = payment.callbackUrl, + ) + } + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentEventPublisher.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentEventPublisher.kt new file mode 100644 index 000000000..251c68319 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentEventPublisher.kt @@ -0,0 +1,6 @@ +package com.loopers.domain.payment + +interface PaymentEventPublisher { + fun publish(event: PaymentEvent.PaymentCreated) + fun publish(event: PaymentEvent.PaymentHandled) +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentRelay.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentRelay.kt new file mode 100644 index 000000000..e622899b2 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentRelay.kt @@ -0,0 +1,7 @@ +package com.loopers.domain.payment + +import com.loopers.application.payment.TransactionInfo + +interface PaymentRelay { + fun notify(callbackUrl: String, transactionInfo: TransactionInfo) +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentRepository.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentRepository.kt new file mode 100644 index 000000000..c1173c0aa --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/PaymentRepository.kt @@ -0,0 +1,8 @@ +package com.loopers.domain.payment + +interface PaymentRepository { + fun save(payment: Payment): Payment + fun findByTransactionKey(transactionKey: String): Payment? + fun findByTransactionKey(userId: String, transactionKey: String): Payment? + fun findByOrderId(userId: String, orderId: String): List +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/TransactionKeyGenerator.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/TransactionKeyGenerator.kt new file mode 100644 index 000000000..c8703a763 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/TransactionKeyGenerator.kt @@ -0,0 +1,20 @@ +package com.loopers.domain.payment + +import org.springframework.stereotype.Component +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter +import java.util.UUID + +@Component +class TransactionKeyGenerator { + companion object { + private const val KEY_TRANSACTION = "TR" + private val DATETIME_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd") + } + + fun generate(): String { + val now = LocalDateTime.now() + val uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 6) + return "${DATETIME_FORMATTER.format(now)}:$KEY_TRANSACTION:$uuid" + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/TransactionStatus.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/TransactionStatus.kt new file mode 100644 index 000000000..0c94bcfb9 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/payment/TransactionStatus.kt @@ -0,0 +1,7 @@ +package com.loopers.domain.payment + +enum class TransactionStatus { + PENDING, + SUCCESS, + FAILED +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/domain/user/UserInfo.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/user/UserInfo.kt new file mode 100644 index 000000000..c51e660a9 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/domain/user/UserInfo.kt @@ -0,0 +1,8 @@ +package com.loopers.domain.user + +/** + * user 정보 + * + * @param userId 유저 식별자 + */ +data class UserInfo(val userId: String) diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreEventPublisher.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreEventPublisher.kt new file mode 100644 index 000000000..715516360 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreEventPublisher.kt @@ -0,0 +1,19 @@ +package com.loopers.infrastructure.payment + +import com.loopers.domain.payment.PaymentEvent +import com.loopers.domain.payment.PaymentEventPublisher +import org.springframework.context.ApplicationEventPublisher +import org.springframework.stereotype.Component + +@Component +class PaymentCoreEventPublisher( + private val applicationEventPublisher: ApplicationEventPublisher, +) : PaymentEventPublisher { + override fun publish(event: PaymentEvent.PaymentCreated) { + applicationEventPublisher.publishEvent(event) + } + + override fun publish(event: PaymentEvent.PaymentHandled) { + applicationEventPublisher.publishEvent(event) + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreRelay.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreRelay.kt new file mode 100644 index 000000000..ffd643c0f --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreRelay.kt @@ -0,0 +1,21 @@ +package com.loopers.infrastructure.payment + +import com.loopers.application.payment.TransactionInfo +import com.loopers.domain.payment.PaymentRelay +import org.slf4j.LoggerFactory +import org.springframework.stereotype.Component +import org.springframework.web.client.RestTemplate + +@Component +class PaymentCoreRelay : PaymentRelay { + companion object { + private val logger = LoggerFactory.getLogger(PaymentCoreRelay::class.java) + private val restTemplate = RestTemplate() + } + + override fun notify(callbackUrl: String, transactionInfo: TransactionInfo) { + runCatching { + restTemplate.postForEntity(callbackUrl, transactionInfo, Any::class.java) + }.onFailure { e -> logger.error("콜백 호출을 실패했습니다. {}", e.message, e) } + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreRepository.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreRepository.kt new file mode 100644 index 000000000..cf521c47d --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentCoreRepository.kt @@ -0,0 +1,32 @@ +package com.loopers.infrastructure.payment + +import com.loopers.domain.payment.Payment +import com.loopers.domain.payment.PaymentRepository +import org.springframework.stereotype.Component +import org.springframework.transaction.annotation.Transactional +import kotlin.jvm.optionals.getOrNull + +@Component +class PaymentCoreRepository( + private val paymentJpaRepository: PaymentJpaRepository, +) : PaymentRepository { + @Transactional + override fun save(payment: Payment): Payment { + return paymentJpaRepository.save(payment) + } + + @Transactional(readOnly = true) + override fun findByTransactionKey(transactionKey: String): Payment? { + return paymentJpaRepository.findById(transactionKey).getOrNull() + } + + @Transactional(readOnly = true) + override fun findByTransactionKey(userId: String, transactionKey: String): Payment? { + return paymentJpaRepository.findByUserIdAndTransactionKey(userId, transactionKey) + } + + override fun findByOrderId(userId: String, orderId: String): List { + return paymentJpaRepository.findByUserIdAndOrderId(userId, orderId) + .sortedByDescending { it.updatedAt } + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentJpaRepository.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentJpaRepository.kt new file mode 100644 index 000000000..a5ea32822 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/infrastructure/payment/PaymentJpaRepository.kt @@ -0,0 +1,9 @@ +package com.loopers.infrastructure.payment + +import com.loopers.domain.payment.Payment +import org.springframework.data.jpa.repository.JpaRepository + +interface PaymentJpaRepository : JpaRepository { + fun findByUserIdAndTransactionKey(userId: String, transactionKey: String): Payment? + fun findByUserIdAndOrderId(userId: String, orderId: String): List +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/ApiControllerAdvice.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/ApiControllerAdvice.kt new file mode 100644 index 000000000..434a229e2 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/ApiControllerAdvice.kt @@ -0,0 +1,119 @@ +package com.loopers.interfaces.api + +import com.fasterxml.jackson.databind.JsonMappingException +import com.fasterxml.jackson.databind.exc.InvalidFormatException +import com.fasterxml.jackson.databind.exc.MismatchedInputException +import com.loopers.support.error.CoreException +import com.loopers.support.error.ErrorType +import org.slf4j.LoggerFactory +import org.springframework.http.ResponseEntity +import org.springframework.http.converter.HttpMessageNotReadableException +import org.springframework.web.bind.MissingServletRequestParameterException +import org.springframework.web.bind.annotation.ExceptionHandler +import org.springframework.web.bind.annotation.RestControllerAdvice +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException +import org.springframework.web.server.ServerWebInputException +import org.springframework.web.servlet.resource.NoResourceFoundException +import kotlin.collections.joinToString +import kotlin.jvm.java +import kotlin.text.isNotEmpty +import kotlin.text.toRegex + +@RestControllerAdvice +class ApiControllerAdvice { + private val log = LoggerFactory.getLogger(ApiControllerAdvice::class.java) + + @ExceptionHandler + fun handle(e: CoreException): ResponseEntity> { + log.warn("CoreException : {}", e.customMessage ?: e.message, e) + return failureResponse(errorType = e.errorType, errorMessage = e.customMessage) + } + + @ExceptionHandler + fun handleBadRequest(e: MethodArgumentTypeMismatchException): ResponseEntity> { + val name = e.name + val type = e.requiredType?.simpleName ?: "unknown" + val value = e.value ?: "null" + val message = "요청 파라미터 '$name' (타입: $type)의 값 '$value'이(가) 잘못되었습니다." + return failureResponse(errorType = ErrorType.BAD_REQUEST, errorMessage = message) + } + + @ExceptionHandler + fun handleBadRequest(e: MissingServletRequestParameterException): ResponseEntity> { + val name = e.parameterName + val type = e.parameterType + val message = "필수 요청 파라미터 '$name' (타입: $type)가 누락되었습니다." + return failureResponse(errorType = ErrorType.BAD_REQUEST, errorMessage = message) + } + + @ExceptionHandler + fun handleBadRequest(e: HttpMessageNotReadableException): ResponseEntity> { + val errorMessage = when (val rootCause = e.rootCause) { + is InvalidFormatException -> { + val fieldName = rootCause.path.joinToString(".") { it.fieldName ?: "?" } + + val valueIndicationMessage = when { + rootCause.targetType.isEnum -> { + val enumClass = rootCause.targetType + val enumValues = enumClass.enumConstants.joinToString(", ") { it.toString() } + "사용 가능한 값 : [$enumValues]" + } + + else -> "" + } + + val expectedType = rootCause.targetType.simpleName + val value = rootCause.value + + "필드 '$fieldName'의 값 '$value'이(가) 예상 타입($expectedType)과 일치하지 않습니다. $valueIndicationMessage" + } + + is MismatchedInputException -> { + val fieldPath = rootCause.path.joinToString(".") { it.fieldName ?: "?" } + "필수 필드 '$fieldPath'이(가) 누락되었습니다." + } + + is JsonMappingException -> { + val fieldPath = rootCause.path.joinToString(".") { it.fieldName ?: "?" } + "필드 '$fieldPath'에서 JSON 매핑 오류가 발생했습니다: ${rootCause.originalMessage}" + } + + else -> "요청 본문을 처리하는 중 오류가 발생했습니다. JSON 메세지 규격을 확인해주세요." + } + + return failureResponse(errorType = ErrorType.BAD_REQUEST, errorMessage = errorMessage) + } + + @ExceptionHandler + fun handleBadRequest(e: ServerWebInputException): ResponseEntity> { + fun extractMissingParameter(message: String): String { + val regex = "'(.+?)'".toRegex() + return regex.find(message)?.groupValues?.get(1) ?: "" + } + + val missingParams = extractMissingParameter(e.reason ?: "") + return if (missingParams.isNotEmpty()) { + failureResponse(errorType = ErrorType.BAD_REQUEST, errorMessage = "필수 요청 값 \'$missingParams\'가 누락되었습니다.") + } else { + failureResponse(errorType = ErrorType.BAD_REQUEST) + } + } + + @ExceptionHandler + fun handleNotFound(e: NoResourceFoundException): ResponseEntity> { + return failureResponse(errorType = ErrorType.NOT_FOUND) + } + + @ExceptionHandler + fun handle(e: Throwable): ResponseEntity> { + log.error("Exception : {}", e.message, e) + val errorType = ErrorType.INTERNAL_ERROR + return failureResponse(errorType = errorType) + } + + private fun failureResponse(errorType: ErrorType, errorMessage: String? = null): ResponseEntity> = + ResponseEntity( + ApiResponse.fail(errorCode = errorType.code, errorMessage = errorMessage ?: errorType.message), + errorType.status, + ) +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/ApiResponse.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/ApiResponse.kt new file mode 100644 index 000000000..f5c38ab5e --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/ApiResponse.kt @@ -0,0 +1,32 @@ +package com.loopers.interfaces.api + +data class ApiResponse( + val meta: Metadata, + val data: T?, +) { + data class Metadata( + val result: Result, + val errorCode: String?, + val message: String?, + ) { + enum class Result { SUCCESS, FAIL } + + companion object { + fun success() = Metadata(Result.SUCCESS, null, null) + + fun fail(errorCode: String, errorMessage: String) = Metadata(Result.FAIL, errorCode, errorMessage) + } + } + + companion object { + fun success(): ApiResponse = ApiResponse(Metadata.success(), null) + + fun success(data: T? = null) = ApiResponse(Metadata.success(), data) + + fun fail(errorCode: String, errorMessage: String): ApiResponse = + ApiResponse( + meta = Metadata.fail(errorCode = errorCode, errorMessage = errorMessage), + data = null, + ) + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/argumentresolver/UserInfoArgumentResolver.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/argumentresolver/UserInfoArgumentResolver.kt new file mode 100644 index 000000000..9ef6c25da --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/argumentresolver/UserInfoArgumentResolver.kt @@ -0,0 +1,32 @@ +package com.loopers.interfaces.api.argumentresolver + +import com.loopers.domain.user.UserInfo +import com.loopers.support.error.CoreException +import com.loopers.support.error.ErrorType +import org.springframework.core.MethodParameter +import org.springframework.web.bind.support.WebDataBinderFactory +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.web.method.support.HandlerMethodArgumentResolver +import org.springframework.web.method.support.ModelAndViewContainer + +class UserInfoArgumentResolver: HandlerMethodArgumentResolver { + companion object { + private const val KEY_USER_ID = "X-USER-ID" + } + + override fun supportsParameter(parameter: MethodParameter): Boolean { + return UserInfo::class.java.isAssignableFrom(parameter.parameterType) + } + + override fun resolveArgument( + parameter: MethodParameter, + mavContainer: ModelAndViewContainer?, + webRequest: NativeWebRequest, + binderFactory: WebDataBinderFactory?, + ): UserInfo { + val userId = webRequest.getHeader(KEY_USER_ID) + ?: throw CoreException(ErrorType.BAD_REQUEST, "유저 ID 헤더는 필수입니다.") + + return UserInfo(userId) + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/payment/PaymentApi.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/payment/PaymentApi.kt new file mode 100644 index 000000000..22d5cbe38 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/payment/PaymentApi.kt @@ -0,0 +1,60 @@ +package com.loopers.interfaces.api.payment + +import com.loopers.application.payment.PaymentApplicationService +import com.loopers.interfaces.api.ApiResponse +import com.loopers.domain.user.UserInfo +import com.loopers.support.error.CoreException +import com.loopers.support.error.ErrorType +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +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.RequestParam +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/api/v1/payments") +class PaymentApi( + private val paymentApplicationService: PaymentApplicationService, +) { + @PostMapping + fun request( + userInfo: UserInfo, + @RequestBody request: PaymentDto.PaymentRequest, + ): ApiResponse { + request.validate() + + // 100ms ~ 500ms 지연 + Thread.sleep((100..500L).random()) + + // 40% 확률로 요청 실패 + if ((1..100).random() <= 40) { + throw CoreException(ErrorType.INTERNAL_ERROR, "현재 서버가 불안정합니다. 잠시 후 다시 시도해주세요.") + } + + return paymentApplicationService.createTransaction(request.toCommand(userInfo.userId)) + .let { PaymentDto.TransactionResponse.from(it) } + .let { ApiResponse.success(it) } + } + + @GetMapping("/{transactionKey}") + fun getTransaction( + userInfo: UserInfo, + @PathVariable("transactionKey") transactionKey: String, + ): ApiResponse { + return paymentApplicationService.getTransactionDetailInfo(userInfo, transactionKey) + .let { PaymentDto.TransactionDetailResponse.from(it) } + .let { ApiResponse.success(it) } + } + + @GetMapping + fun getTransactionsByOrder( + userInfo: UserInfo, + @RequestParam("orderId", required = false) orderId: String, + ): ApiResponse { + return paymentApplicationService.findTransactionsByOrderId(userInfo, orderId) + .let { PaymentDto.OrderResponse.from(it) } + .let { ApiResponse.success(it) } + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/payment/PaymentDto.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/payment/PaymentDto.kt new file mode 100644 index 000000000..52a00b156 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/api/payment/PaymentDto.kt @@ -0,0 +1,136 @@ +package com.loopers.interfaces.api.payment + +import com.loopers.application.payment.OrderInfo +import com.loopers.application.payment.PaymentCommand +import com.loopers.application.payment.TransactionInfo +import com.loopers.domain.payment.CardType +import com.loopers.domain.payment.TransactionStatus +import com.loopers.support.error.CoreException +import com.loopers.support.error.ErrorType + +object PaymentDto { + data class PaymentRequest( + val orderId: String, + val cardType: CardTypeDto, + val cardNo: String, + val amount: Long, + val callbackUrl: String, + ) { + companion object { + private val REGEX_CARD_NO = Regex("^\\d{4}-\\d{4}-\\d{4}-\\d{4}$") + private const val PREFIX_CALLBACK_URL = "http://localhost:8080" + } + + fun validate() { + if (orderId.isBlank() || orderId.length < 6) { + throw CoreException(ErrorType.BAD_REQUEST, "주문 ID는 6자리 이상 문자열이어야 합니다.") + } + if (!REGEX_CARD_NO.matches(cardNo)) { + throw CoreException(ErrorType.BAD_REQUEST, "카드 번호는 xxxx-xxxx-xxxx-xxxx 형식이어야 합니다.") + } + if (amount <= 0) { + throw CoreException(ErrorType.BAD_REQUEST, "결제금액은 양의 정수여야 합니다.") + } + if (!callbackUrl.startsWith(PREFIX_CALLBACK_URL)) { + throw CoreException(ErrorType.BAD_REQUEST, "콜백 URL 은 $PREFIX_CALLBACK_URL 로 시작해야 합니다.") + } + } + + fun toCommand(userId: String): PaymentCommand.CreateTransaction = + PaymentCommand.CreateTransaction( + userId = userId, + orderId = orderId, + cardType = cardType.toCardType(), + cardNo = cardNo, + amount = amount, + callbackUrl = callbackUrl, + ) + } + + data class TransactionDetailResponse( + val transactionKey: String, + val orderId: String, + val cardType: CardTypeDto, + val cardNo: String, + val amount: Long, + val status: TransactionStatusResponse, + val reason: String?, + ) { + companion object { + fun from(transactionInfo: TransactionInfo): TransactionDetailResponse = + TransactionDetailResponse( + transactionKey = transactionInfo.transactionKey, + orderId = transactionInfo.orderId, + cardType = CardTypeDto.from(transactionInfo.cardType), + cardNo = transactionInfo.cardNo, + amount = transactionInfo.amount, + status = TransactionStatusResponse.from(transactionInfo.status), + reason = transactionInfo.reason, + ) + } + } + + data class TransactionResponse( + val transactionKey: String, + val status: TransactionStatusResponse, + val reason: String?, + ) { + companion object { + fun from(transactionInfo: TransactionInfo): TransactionResponse = + TransactionResponse( + transactionKey = transactionInfo.transactionKey, + status = TransactionStatusResponse.from(transactionInfo.status), + reason = transactionInfo.reason, + ) + } + } + + data class OrderResponse( + val orderId: String, + val transactions: List, + ) { + companion object { + fun from(orderInfo: OrderInfo): OrderResponse = + OrderResponse( + orderId = orderInfo.orderId, + transactions = orderInfo.transactions.map { TransactionResponse.from(it) }, + ) + } + } + + enum class CardTypeDto { + SAMSUNG, + KB, + HYUNDAI, + ; + + fun toCardType(): CardType = when (this) { + SAMSUNG -> CardType.SAMSUNG + KB -> CardType.KB + HYUNDAI -> CardType.HYUNDAI + } + + companion object { + fun from(cardType: CardType) = when (cardType) { + CardType.SAMSUNG -> SAMSUNG + CardType.KB -> KB + CardType.HYUNDAI -> HYUNDAI + } + } + } + + enum class TransactionStatusResponse { + PENDING, + SUCCESS, + FAILED, + ; + + companion object { + fun from(transactionStatus: TransactionStatus) = when (transactionStatus) { + TransactionStatus.PENDING -> PENDING + TransactionStatus.SUCCESS -> SUCCESS + TransactionStatus.FAILED -> FAILED + } + } + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/event/payment/PaymentEventListener.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/event/payment/PaymentEventListener.kt new file mode 100644 index 000000000..241322890 --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/interfaces/event/payment/PaymentEventListener.kt @@ -0,0 +1,28 @@ +package com.loopers.interfaces.event.payment + +import com.loopers.application.payment.PaymentApplicationService +import com.loopers.domain.payment.PaymentEvent +import org.springframework.scheduling.annotation.Async +import org.springframework.stereotype.Component +import org.springframework.transaction.event.TransactionPhase +import org.springframework.transaction.event.TransactionalEventListener + +@Component +class PaymentEventListener( + private val paymentApplicationService: PaymentApplicationService, +) { + @Async + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + fun handle(event: PaymentEvent.PaymentCreated) { + val thresholdMillis = (1000L..5000L).random() + Thread.sleep(thresholdMillis) + + paymentApplicationService.handle(event.transactionKey) + } + + @Async + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + fun handle(event: PaymentEvent.PaymentHandled) { + paymentApplicationService.notifyTransactionResult(transactionKey = event.transactionKey) + } +} diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/support/error/CoreException.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/support/error/CoreException.kt new file mode 100644 index 000000000..120f7fc5f --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/support/error/CoreException.kt @@ -0,0 +1,6 @@ +package com.loopers.support.error + +class CoreException( + val errorType: ErrorType, + val customMessage: String? = null, +) : RuntimeException(customMessage ?: errorType.message) diff --git a/apps/pg-simulator/src/main/kotlin/com/loopers/support/error/ErrorType.kt b/apps/pg-simulator/src/main/kotlin/com/loopers/support/error/ErrorType.kt new file mode 100644 index 000000000..e0799a5ea --- /dev/null +++ b/apps/pg-simulator/src/main/kotlin/com/loopers/support/error/ErrorType.kt @@ -0,0 +1,11 @@ +package com.loopers.support.error + +import org.springframework.http.HttpStatus + +enum class ErrorType(val status: HttpStatus, val code: String, val message: String) { + /** 범용 에러 */ + INTERNAL_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, HttpStatus.INTERNAL_SERVER_ERROR.reasonPhrase, "일시적인 오류가 발생했습니다."), + BAD_REQUEST(HttpStatus.BAD_REQUEST, HttpStatus.BAD_REQUEST.reasonPhrase, "잘못된 요청입니다."), + NOT_FOUND(HttpStatus.NOT_FOUND, HttpStatus.NOT_FOUND.reasonPhrase, "존재하지 않는 요청입니다."), + CONFLICT(HttpStatus.CONFLICT, HttpStatus.CONFLICT.reasonPhrase, "이미 존재하는 리소스입니다."), +} diff --git a/apps/pg-simulator/src/main/resources/application.yml b/apps/pg-simulator/src/main/resources/application.yml new file mode 100644 index 000000000..addf0e29c --- /dev/null +++ b/apps/pg-simulator/src/main/resources/application.yml @@ -0,0 +1,77 @@ +server: + shutdown: graceful + tomcat: + threads: + max: 200 # 최대 워커 스레드 수 (default : 200) + min-spare: 10 # 최소 유지 스레드 수 (default : 10) + connection-timeout: 1m # 연결 타임아웃 (ms) (default : 60000ms = 1m) + max-connections: 8192 # 최대 동시 연결 수 (default : 8192) + accept-count: 100 # 대기 큐 크기 (default : 100) + keep-alive-timeout: 60s # 60s + max-http-request-header-size: 8KB + +spring: + main: + web-application-type: servlet + application: + name: commerce-api + profiles: + active: local + config: + import: + - jpa.yml + - redis.yml + - logging.yml + - monitoring.yml + +datasource: + mysql-jpa: + main: + jdbc-url: jdbc:mysql://localhost:3306/paymentgateway + +springdoc: + use-fqn: true + swagger-ui: + path: /swagger-ui.html + +--- +spring: + config: + activate: + on-profile: local, test + +server: + port: 8082 + +management: + server: + port: 8083 + +--- +spring: + config: + activate: + on-profile: dev + +server: + port: 8082 + +management: + server: + port: 8083 + +--- +spring: + config: + activate: + on-profile: qa + +--- +spring: + config: + activate: + on-profile: prd + +springdoc: + api-docs: + enabled: false \ No newline at end of file diff --git a/http/pg-simulator/payments.http b/http/pg-simulator/payments.http new file mode 100644 index 000000000..096dd2f0a --- /dev/null +++ b/http/pg-simulator/payments.http @@ -0,0 +1,20 @@ +### 결제 요청 +POST {{pg-simulator}}/api/v1/payments +X-USER-ID: 135135 +Content-Type: application/json + +{ + "orderId": "1351039135", + "cardType": "SAMSUNG", + "cardNo": "1234-5678-9814-1451", + "amount" : "5000", + "callbackUrl": "http://localhost:8080/api/v1/examples/callback" +} + +### 결제 정보 확인 +GET {{pg-simulator}}/api/v1/payments/20250816:TR:9577c5 +X-USER-ID: 135135 + +### 주문에 엮인 결제 정보 조회 +GET {{pg-simulator}}/api/v1/payments?orderId=1351039135 +X-USER-ID: 135135 diff --git a/settings.gradle.kts b/settings.gradle.kts index c99fb6360..161a1ba24 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,6 +2,7 @@ rootProject.name = "loopers-java-spring-template" include( ":apps:commerce-api", + ":apps:pg-simulator", ":apps:commerce-streamer", ":modules:jpa", ":modules:redis", From 178a328ffe38b5034bf1df166ab2f9b2571705c0 Mon Sep 17 00:00:00 2001 From: minor7295 <44902090+minor7295@users.noreply.github.com> Date: Fri, 5 Dec 2025 06:47:59 +0900 Subject: [PATCH 02/22] Feature/pg client (#27) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: PG 호출 테스트 코드 추가 * feat: PG 호출 로직 구현 * test: PG CircuitBreaker 테스트 코드 추가 * feat: CircuitBreaker 로직 구현 --- apps/commerce-api/build.gradle.kts | 12 + .../com/loopers/CommerceApiApplication.java | 2 + .../purchasing/PaymentFailureHandler.java | 107 +++ .../purchasing/PaymentRecoveryScheduler.java | 115 +++ .../purchasing/PaymentRecoveryService.java | 66 ++ .../purchasing/PaymentRequest.java | 20 + .../purchasing/PaymentRequestBuilder.java | 167 ++++ .../purchasing/PurchasingFacade.java | 413 ++++++++-- .../config/Resilience4jRetryConfig.java | 129 ++++ .../order/OrderCancellationService.java | 106 +++ .../loopers/domain/order/OrderRepository.java | 8 + .../domain/order/OrderStatusUpdater.java | 100 +++ .../order/PaymentFailureClassifier.java | 74 ++ .../domain/order/PaymentFailureType.java | 25 + .../loopers/domain/order/PaymentResult.java | 55 ++ .../loopers/domain/user/UserRepository.java | 8 + .../order/OrderJpaRepository.java | 2 + .../order/OrderRepositoryImpl.java | 5 + .../paymentgateway/DelayProvider.java | 24 + .../paymentgateway/PaymentGatewayAdapter.java | 136 ++++ .../paymentgateway/PaymentGatewayClient.java | 85 +++ .../paymentgateway/PaymentGatewayDto.java | 106 +++ .../paymentgateway/PaymentGatewayMetrics.java | 86 +++ .../PaymentGatewaySchedulerClient.java | 70 ++ .../paymentgateway/ThreadDelayProvider.java | 21 + .../user/UserRepositoryImpl.java | 8 + .../loopers/interfaces/api/ApiResponse.java | 4 + .../purchasing/PurchasingV1Controller.java | 40 +- .../api/purchasing/PurchasingV1Dto.java | 14 +- .../src/main/resources/application.yml | 102 +++ .../PurchasingFacadeCircuitBreakerTest.java | 711 ++++++++++++++++++ .../PurchasingFacadeConcurrencyTest.java | 10 +- .../PurchasingFacadePaymentCallbackTest.java | 307 ++++++++ .../PurchasingFacadePaymentGatewayTest.java | 280 +++++++ .../purchasing/PurchasingFacadeTest.java | 84 ++- .../PaymentGatewayClientTest.java | 277 +++++++ .../api/PurchasingV1ApiE2ETest.java | 535 +++++++++++++ .../testutil/CircuitBreakerTestUtil.java | 152 ++++ 38 files changed, 4380 insertions(+), 86 deletions(-) create mode 100644 apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentFailureHandler.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryScheduler.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryService.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequest.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestBuilder.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/config/Resilience4jRetryConfig.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/order/OrderStatusUpdater.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureClassifier.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureType.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentResult.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/DelayProvider.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClient.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayDto.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayMetrics.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewaySchedulerClient.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/ThreadDelayProvider.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClientTest.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/testutil/CircuitBreakerTestUtil.java diff --git a/apps/commerce-api/build.gradle.kts b/apps/commerce-api/build.gradle.kts index 969c6a1f0..83be16c09 100644 --- a/apps/commerce-api/build.gradle.kts +++ b/apps/commerce-api/build.gradle.kts @@ -10,6 +10,18 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-actuator") implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:${project.properties["springDocOpenApiVersion"]}") + + // feign client + implementation("org.springframework.cloud:spring-cloud-starter-openfeign") + + // resilience4j + implementation("io.github.resilience4j:resilience4j-spring-boot3") + implementation("io.github.resilience4j:resilience4j-core") // IntervalFunction을 위한 core 모듈 + implementation("io.github.resilience4j:resilience4j-circuitbreaker") + implementation("io.github.resilience4j:resilience4j-retry") + implementation("io.github.resilience4j:resilience4j-timelimiter") + implementation("io.github.resilience4j:resilience4j-bulkhead") // Bulkheads 패턴 구현 + implementation("org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j") // batch implementation("org.springframework.boot:spring-boot-starter-batch") diff --git a/apps/commerce-api/src/main/java/com/loopers/CommerceApiApplication.java b/apps/commerce-api/src/main/java/com/loopers/CommerceApiApplication.java index 0b4b1cde4..659d8ccdb 100644 --- a/apps/commerce-api/src/main/java/com/loopers/CommerceApiApplication.java +++ b/apps/commerce-api/src/main/java/com/loopers/CommerceApiApplication.java @@ -4,12 +4,14 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableScheduling; import java.util.TimeZone; @ConfigurationPropertiesScan @SpringBootApplication @EnableScheduling +@EnableFeignClients public class CommerceApiApplication { @PostConstruct diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentFailureHandler.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentFailureHandler.java new file mode 100644 index 000000000..52f240e13 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentFailureHandler.java @@ -0,0 +1,107 @@ +package com.loopers.application.purchasing; + +import com.loopers.domain.order.Order; +import com.loopers.domain.order.OrderRepository; +import com.loopers.domain.order.OrderStatus; +import com.loopers.domain.order.OrderCancellationService; +import com.loopers.domain.user.User; +import com.loopers.domain.user.UserRepository; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * 결제 실패 처리 서비스. + *

+ * 결제 실패 시 주문 취소 및 리소스 원복을 처리합니다. + *

+ *

+ * 트랜잭션 전략: + *

    + *
  • REQUIRES_NEW: 별도 트랜잭션으로 실행하여 외부 시스템 호출과 독립적으로 처리
    • + *
  • 결제 실패 처리 중 오류가 발생해도 기존 주문 생성 트랜잭션에 영향을 주지 않음
    • + *
  • Self-invocation 문제 해결: 별도 서비스로 분리하여 Spring AOP 프록시가 정상적으로 적용되도록 함
    • + *
+ *

+ *

+ * 주의사항: + *

    + *
  • 주문이 이미 취소되었거나 존재하지 않는 경우 로그만 기록합니다.
    • + *
  • 결제 실패 처리 중 오류 발생 시에도 로그만 기록합니다.
    • + *
+ *

+ * + * @author Loopers + * @version 1.0 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class PaymentFailureHandler { + + private final UserRepository userRepository; + private final OrderRepository orderRepository; + private final OrderCancellationService orderCancellationService; + + /** + * 결제 실패 시 주문 취소 및 리소스 원복을 처리합니다. + *

+ * 결제 요청이 실패한 경우, 이미 생성된 주문을 취소하고 + * 차감된 포인트를 환불하며 재고를 원복합니다. + *

+ *

+ * 처리 내용: + *

    + *
  • 주문 상태를 CANCELED로 변경
    • + *
  • 차감된 포인트 환불
    • + *
  • 차감된 재고 원복
    • + *
+ *

+ * + * @param userId 사용자 ID (로그인 ID) + * @param orderId 주문 ID + * @param errorCode 오류 코드 + * @param errorMessage 오류 메시지 + */ + @Transactional(propagation = Propagation.REQUIRES_NEW) + public void handle(String userId, Long orderId, String errorCode, String errorMessage) { + try { + // 사용자 조회 + User user = userRepository.findByUserId(userId); + + if (user == null) { + log.warn("결제 실패 처리 시 사용자를 찾을 수 없습니다. (userId: {}, orderId: {})", userId, orderId); + return; + } + + // 주문 조회 + Order order = orderRepository.findById(orderId) + .orElse(null); + + if (order == null) { + log.warn("결제 실패 처리 시 주문을 찾을 수 없습니다. (orderId: {})", orderId); + return; + } + + // 이미 취소된 주문인 경우 처리하지 않음 + if (order.getStatus() == OrderStatus.CANCELED) { + log.info("이미 취소된 주문입니다. 결제 실패 처리를 건너뜁니다. (orderId: {})", orderId); + return; + } + + // 주문 취소 및 리소스 원복 + orderCancellationService.cancel(order, user); + + log.info("결제 실패로 인한 주문 취소 완료. (orderId: {}, errorCode: {}, errorMessage: {})", + orderId, errorCode, errorMessage); + } catch (Exception e) { + // 결제 실패 처리 중 오류 발생 시에도 로그만 기록 + // 이미 주문은 생성되어 있으므로, 나중에 수동으로 처리할 수 있도록 로그 기록 + log.error("결제 실패 처리 중 오류 발생. (orderId: {}, errorCode: {})", + orderId, errorCode, e); + } + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryScheduler.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryScheduler.java new file mode 100644 index 000000000..6502a9cce --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryScheduler.java @@ -0,0 +1,115 @@ +package com.loopers.application.purchasing; + +import com.loopers.domain.order.Order; +import com.loopers.domain.order.OrderRepository; +import com.loopers.domain.order.OrderStatus; +import com.loopers.infrastructure.user.UserJpaRepository; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 결제 상태 복구 스케줄러. + *

+ * 콜백이 오지 않은 PENDING 상태의 주문들을 주기적으로 조회하여 + * PG 시스템의 결제 상태 확인 API를 통해 상태를 복구합니다. + *

+ *

+ * 동작 원리: + *

    + *
  1. 주기적으로 실행 (기본: 1분마다)
    2. + *
  2. PENDING 상태인 주문들을 조회
    3. + *
  3. 각 주문에 대해 PG 결제 상태 확인 API 호출
    4. + *
  4. 결제 상태에 따라 주문 상태 업데이트
    5. + *
+ *

+ *

+ * 설계 근거: + *

    + *
  • 주기적 복구: 콜백이 오지 않아도 자동으로 상태 복구
    • + *
  • Eventually Consistent: 약간의 지연 허용 가능
    • + *
  • 안전한 처리: 각 주문별로 독립적으로 처리하여 실패 시에도 다른 주문에 영향 없음
    • + *
  • 성능 고려: 배치로 처리하여 PG 시스템 부하 최소화
    • + *
+ *

+ * + * @author Loopers + * @version 1.0 + */ +@Slf4j +@RequiredArgsConstructor +@Component +public class PaymentRecoveryScheduler { + + private final OrderRepository orderRepository; + private final UserJpaRepository userJpaRepository; + private final PurchasingFacade purchasingFacade; + + /** + * PENDING 상태인 주문들의 결제 상태를 복구합니다. + *

+ * 1분마다 실행되어 PENDING 상태인 주문들을 조회하고, + * 각 주문에 대해 PG 결제 상태 확인 API를 호출하여 상태를 복구합니다. + *

+ *

+ * 처리 전략: + *

    + *
  • 배치 처리: 한 번에 여러 주문 처리
    • + *
  • 독립적 처리: 각 주문별로 독립적으로 처리하여 실패 시에도 다른 주문에 영향 없음
    • + *
  • 안전한 예외 처리: 개별 주문 처리 실패 시에도 계속 진행
    • + *
+ *

+ */ + @Scheduled(fixedDelay = 60000) // 1분마다 실행 + public void recoverPendingOrders() { + try { + log.debug("결제 상태 복구 스케줄러 시작"); + + // PENDING 상태인 주문들 조회 + List pendingOrders = orderRepository.findAllByStatus(OrderStatus.PENDING); + + if (pendingOrders.isEmpty()) { + log.debug("복구할 PENDING 상태 주문이 없습니다."); + return; + } + + log.info("PENDING 상태 주문 {}건에 대한 결제 상태 복구 시작", pendingOrders.size()); + + int successCount = 0; + int failureCount = 0; + + // 각 주문에 대해 결제 상태 확인 및 복구 + for (Order order : pendingOrders) { + try { + // Order의 userId는 User의 id (Long)이므로 User를 조회하여 userId (String)를 가져옴 + var userOptional = userJpaRepository.findById(order.getUserId()); + if (userOptional.isEmpty()) { + log.warn("주문의 사용자를 찾을 수 없습니다. 복구를 건너뜁니다. (orderId: {}, userId: {})", + order.getId(), order.getUserId()); + failureCount++; + continue; + } + + String userId = userOptional.get().getUserId(); + + // 결제 상태 확인 및 복구 + purchasingFacade.recoverOrderStatusByPaymentCheck(userId, order.getId()); + successCount++; + } catch (Exception e) { + // 개별 주문 처리 실패 시에도 계속 진행 + log.error("주문 상태 복구 중 오류 발생. (orderId: {})", order.getId(), e); + failureCount++; + } + } + + log.info("결제 상태 복구 완료. 성공: {}건, 실패: {}건", successCount, failureCount); + + } catch (Exception e) { + log.error("결제 상태 복구 스케줄러 실행 중 오류 발생", e); + } + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryService.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryService.java new file mode 100644 index 000000000..6c6ff0646 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryService.java @@ -0,0 +1,66 @@ +package com.loopers.application.purchasing; + +import com.loopers.domain.order.OrderStatusUpdater; +import com.loopers.infrastructure.paymentgateway.DelayProvider; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayAdapter; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.Duration; + +/** + * 결제 복구 서비스. + *

+ * 타임아웃 발생 후 결제 상태를 확인하여 주문 상태를 복구합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class PaymentRecoveryService { + + private final PaymentGatewayAdapter paymentGatewayAdapter; + private final OrderStatusUpdater orderStatusUpdater; + private final DelayProvider delayProvider; + + /** + * 타임아웃 발생 후 결제 상태를 확인하여 주문 상태를 복구합니다. + *

+ * 타임아웃은 요청이 전송되었을 수 있으므로, 실제 결제 상태를 확인하여 + * 결제가 성공했다면 주문을 완료하고, 실패했다면 주문을 취소합니다. + *

+ * + * @param userId 사용자 ID + * @param orderId 주문 ID + */ + public void recoverAfterTimeout(String userId, Long orderId) { + try { + // 잠시 대기 후 상태 확인 (PG 처리 시간 고려) + // 타임아웃이 발생했지만 요청은 전송되었을 수 있으므로, + // PG 시스템이 처리할 시간을 주기 위해 짧은 대기 + delayProvider.delay(Duration.ofSeconds(1)); + + // PG에서 주문별 결제 정보 조회 + var status = paymentGatewayAdapter.getPaymentStatus(userId, String.valueOf(orderId)); + + // 별도 트랜잭션으로 상태 업데이트 + boolean updated = orderStatusUpdater.updateByPaymentStatus(orderId, status, null, null); + + if (!updated) { + log.warn("타임아웃 후 상태 확인 실패. 주문 상태 업데이트에 실패했습니다. 나중에 스케줄러로 복구됩니다. (orderId: {})", orderId); + } + + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + log.warn("타임아웃 후 상태 확인 중 인터럽트 발생. (orderId: {})", orderId); + } catch (Exception e) { + // 기타 오류: 나중에 스케줄러로 복구 가능 + log.error("타임아웃 후 상태 확인 중 오류 발생. 나중에 스케줄러로 복구됩니다. (orderId: {})", orderId, e); + } + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequest.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequest.java new file mode 100644 index 000000000..4188fd2e6 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequest.java @@ -0,0 +1,20 @@ +package com.loopers.application.purchasing; + +import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; + +/** + * 결제 요청 도메인 모델. + * + * @author Loopers + * @version 1.0 + */ +public record PaymentRequest( + String userId, + String orderId, + PaymentGatewayDto.CardType cardType, + String cardNo, + Long amount, + String callbackUrl +) { +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestBuilder.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestBuilder.java new file mode 100644 index 000000000..21b7869d0 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestBuilder.java @@ -0,0 +1,167 @@ +package com.loopers.application.purchasing; + +import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +/** + * 결제 요청 빌더. + *

+ * 결제 요청 도메인 모델을 생성합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +@Component +@RequiredArgsConstructor +public class PaymentRequestBuilder { + + @Value("${payment.callback.base-url}") + private String callbackBaseUrl; + + /** + * 결제 요청을 생성합니다. + * + * @param userId 사용자 ID + * @param orderId 주문 ID + * @param cardType 카드 타입 문자열 + * @param cardNo 카드 번호 + * @param amount 결제 금액 + * @return 결제 요청 도메인 모델 + * @throws CoreException 잘못된 카드 타입인 경우 + */ + public PaymentRequest build(String userId, Long orderId, String cardType, String cardNo, Integer amount) { + // 카드 번호 유효성 검증 + validateCardNo(cardNo); + + // 주문 ID를 6자리 이상 문자열로 변환 (pg-simulator 검증 요구사항) + String orderIdString = formatOrderId(orderId); + return new PaymentRequest( + userId, + orderIdString, + parseCardType(cardType), + cardNo, + amount.longValue(), + generateCallbackUrl(orderId) + ); + } + + /** + * 카드 타입 문자열을 CardType enum으로 변환합니다. + * + * @param cardType 카드 타입 문자열 + * @return CardType enum + * @throws CoreException 잘못된 카드 타입인 경우 + */ + private PaymentGatewayDto.CardType parseCardType(String cardType) { + try { + return PaymentGatewayDto.CardType.valueOf(cardType.toUpperCase()); + } catch (IllegalArgumentException e) { + throw new CoreException(ErrorType.BAD_REQUEST, + String.format("잘못된 카드 타입입니다. (cardType: %s)", cardType)); + } + } + + /** + * 콜백 URL을 생성합니다. + *

+ * 환경변수 {@code payment.callback.base-url}을 사용하여 프로덕션 환경에 적합한 URL을 생성합니다. + *

+ * + * @param orderId 주문 ID + * @return 콜백 URL + */ + private String generateCallbackUrl(Long orderId) { + return String.format("%s/api/v1/orders/%d/callback", callbackBaseUrl, orderId); + } + + /** + * 카드 번호 유효성 검증을 수행합니다. + *

+ * 다음 사항들을 검증합니다: + *

    + *
  • null/empty 체크
    • + *
  • 공백/하이픈 제거 및 정규화
    • + *
  • 길이 검증 (13-19자리)
    • + *
  • 숫자만 포함하는지 검증
    • + *
  • Luhn 알고리즘 체크섬 검증
    • + *
+ *

+ * + * @param cardNo 카드 번호 + * @throws CoreException 유효하지 않은 카드 번호인 경우 + */ + private void validateCardNo(String cardNo) { + if (cardNo == null || cardNo.isEmpty()) { + throw new CoreException(ErrorType.BAD_REQUEST, "카드 번호는 필수입니다."); + } + + // 공백/하이픈 제거 및 정규화 + String normalized = cardNo.replaceAll("[\\s-]", ""); + + // 길이 검증 (13-19자리) + if (normalized.length() < 13 || normalized.length() > 19) { + throw new CoreException(ErrorType.BAD_REQUEST, + String.format("유효하지 않은 카드 번호 길이입니다. (길이: %d, 요구사항: 13-19자리)", normalized.length())); + } + + // 숫자만 포함하는지 검증 + if (!normalized.matches("\\d+")) { + throw new CoreException(ErrorType.BAD_REQUEST, "카드 번호는 숫자만 포함해야 합니다."); + } + + // Luhn 알고리즘 체크섬 검증 + if (!isValidLuhn(normalized)) { + throw new CoreException(ErrorType.BAD_REQUEST, "유효하지 않은 카드 번호입니다. (Luhn 알고리즘 검증 실패)"); + } + } + + /** + * Luhn 알고리즘을 사용하여 카드 번호의 체크섬을 검증합니다. + *

+ * Luhn 알고리즘은 신용카드 번호의 유효성을 검증하는 표준 알고리즘입니다. + *

+ * + * @param cardNo 정규화된 카드 번호 (숫자만 포함) + * @return 유효한 경우 true, 그렇지 않으면 false + */ + private boolean isValidLuhn(String cardNo) { + int sum = 0; + boolean alternate = false; + + // 오른쪽에서 왼쪽으로 순회 + for (int i = cardNo.length() - 1; i >= 0; i--) { + int digit = Character.getNumericValue(cardNo.charAt(i)); + + if (alternate) { + digit *= 2; + if (digit > 9) { + digit = (digit % 10) + 1; + } + } + + sum += digit; + alternate = !alternate; + } + + return (sum % 10) == 0; + } + + /** + * 주문 ID를 6자리 이상 문자열로 변환합니다. + *

+ * pg-simulator의 검증 요구사항에 맞추기 위해 최소 6자리로 패딩합니다. + *

+ * + * @param orderId 주문 ID (Long) + * @return 6자리 이상의 주문 ID 문자열 + */ + public String formatOrderId(Long orderId) { + return String.format("%06d", orderId); + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java index 82e55c406..0a2b1b208 100644 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java @@ -8,16 +8,28 @@ import com.loopers.domain.order.Order; import com.loopers.domain.order.OrderItem; import com.loopers.domain.order.OrderRepository; +import com.loopers.domain.order.OrderStatus; import org.springframework.orm.ObjectOptimisticLockingFailureException; import com.loopers.domain.product.Product; import com.loopers.domain.product.ProductRepository; import com.loopers.domain.user.Point; import com.loopers.domain.user.User; import com.loopers.domain.user.UserRepository; +import com.loopers.infrastructure.paymentgateway.PaymentGatewaySchedulerClient; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayAdapter; +import com.loopers.domain.order.PaymentFailureClassifier; +import com.loopers.domain.order.PaymentFailureType; +import com.loopers.domain.order.OrderStatusUpdater; +import com.loopers.domain.order.OrderCancellationService; import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; +import feign.FeignException; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.support.TransactionSynchronization; +import org.springframework.transaction.support.TransactionSynchronizationManager; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -32,6 +44,7 @@ * 주문 생성과 결제(포인트 차감), 재고 조정, 외부 연동을 조율한다. *

*/ +@Slf4j @RequiredArgsConstructor @Component public class PurchasingFacade { @@ -42,6 +55,14 @@ public class PurchasingFacade { private final CouponRepository couponRepository; private final UserCouponRepository userCouponRepository; private final CouponDiscountStrategyFactory couponDiscountStrategyFactory; + private final PaymentGatewaySchedulerClient paymentGatewaySchedulerClient; // 스케줄러용 (Retry 적용) + private final PaymentRequestBuilder paymentRequestBuilder; + private final PaymentGatewayAdapter paymentGatewayAdapter; + private final PaymentFailureClassifier paymentFailureClassifier; + private final PaymentRecoveryService paymentRecoveryService; + private final OrderCancellationService orderCancellationService; + private final OrderStatusUpdater orderStatusUpdater; + private final PaymentFailureHandler paymentFailureHandler; /** * 주문을 생성한다. @@ -49,7 +70,8 @@ public class PurchasingFacade { * 1. 사용자 조회 및 존재 여부 검증
* 2. 상품 재고 검증 및 차감
* 3. 사용자 포인트 검증 및 차감
- * 4. 주문 저장 + * 4. 주문 저장
+ * 5. PG 결제 요청 (비동기) *

*

* 동시성 제어 전략: @@ -81,10 +103,12 @@ public class PurchasingFacade { * * @param userId 사용자 식별자 (로그인 ID) * @param commands 주문 상품 정보 + * @param cardType 카드 타입 (SAMSUNG, KB, HYUNDAI) + * @param cardNo 카드 번호 (xxxx-xxxx-xxxx-xxxx 형식) * @return 생성된 주문 정보 */ @Transactional - public OrderInfo createOrder(String userId, List commands) { + public OrderInfo createOrder(String userId, List commands, String cardType, String cardNo) { if (userId == null || userId.isBlank()) { throw new CoreException(ErrorType.BAD_REQUEST, "사용자 ID는 필수입니다."); } @@ -149,15 +173,49 @@ public OrderInfo createOrder(String userId, List commands) { } Order order = Order.of(user.getId(), orderItems, couponCode, discountAmount); + // 주문은 PENDING 상태로 생성됨 (Order 생성자에서 기본값으로 설정) + // 결제 성공 후에만 COMPLETED로 변경됨 decreaseStocksForOrderItems(order.getItems(), products); deductUserPoint(user, order.getTotalAmount()); - order.complete(); + // 주문은 PENDING 상태로 유지 (결제 요청 중 상태) + // 결제 성공 시 콜백이나 상태 확인 API를 통해 COMPLETED로 변경됨 products.forEach(productRepository::save); userRepository.save(user); Order savedOrder = orderRepository.save(order); + // 주문은 PENDING 상태로 저장됨 + + // PG 결제 요청을 트랜잭션 커밋 후에 실행하여 DB 커넥션 풀 고갈 방지 + // 트랜잭션 내에서 외부 HTTP 호출을 하면 PG 지연/타임아웃 시 DB 커넥션이 오래 유지되어 커넥션 풀 고갈 위험 + Long orderId = savedOrder.getId(); + Integer totalAmount = savedOrder.getTotalAmount(); + TransactionSynchronizationManager.registerSynchronization( + new TransactionSynchronization() { + @Override + public void afterCommit() { + // 트랜잭션 커밋 후 PG 호출 (DB 커넥션 해제 후 실행) + try { + String transactionKey = requestPaymentToGateway(userId, orderId, cardType, cardNo, totalAmount); + if (transactionKey != null) { + // 결제 성공: 별도 트랜잭션에서 주문 상태를 COMPLETED로 변경 + updateOrderStatusToCompleted(orderId, transactionKey); + log.info("PG 결제 요청 완료. (orderId: {}, transactionKey: {})", orderId, transactionKey); + } else { + // PG 요청 실패: 외부 시스템 장애로 간주 + // 주문은 PENDING 상태로 유지되어 나중에 상태 확인 API나 콜백으로 복구 가능 + log.info("PG 결제 요청 실패. 주문은 PENDING 상태로 유지됩니다. (orderId: {})", orderId); + } + } catch (Exception e) { + // PG 요청 중 예외 발생 시에도 주문은 이미 저장되어 있으므로 유지 + // 외부 시스템 장애는 내부 시스템에 영향을 주지 않도록 함 + log.error("PG 결제 요청 중 예외 발생. 주문은 PENDING 상태로 유지됩니다. (orderId: {})", + orderId, e); + } + } + } + ); return OrderInfo.from(savedOrder); } @@ -175,48 +233,18 @@ public OrderInfo createOrder(String userId, List commands) { * @param order 주문 엔티티 * @param user 사용자 엔티티 */ + /** + * 주문을 취소하고 포인트를 환불하며 재고를 원복한다. + *

+ * OrderCancellationService를 사용하여 처리합니다. + *

+ * + * @param order 주문 엔티티 + * @param user 사용자 엔티티 + */ @Transactional public void cancelOrder(Order order, User user) { - if (order == null || user == null) { - throw new CoreException(ErrorType.BAD_REQUEST, "취소할 주문과 사용자 정보는 필수입니다."); - } - - // ✅ Deadlock 방지: User 락을 먼저 획득하여 createOrder와 동일한 락 획득 순서 보장 - // createOrder: User 락 → Product 락 (정렬됨) - // cancelOrder: User 락 → Product 락 (정렬됨) - 동일한 순서로 락 획득 - User lockedUser = userRepository.findByUserIdForUpdate(user.getUserId()); - if (lockedUser == null) { - throw new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."); - } - - // ✅ Deadlock 방지: 상품 ID를 정렬하여 일관된 락 획득 순서 보장 - List sortedProductIds = order.getItems().stream() - .map(OrderItem::getProductId) - .distinct() - .sorted() - .toList(); - - // 정렬된 순서대로 상품 락 획득 (Deadlock 방지) - Map productMap = new java.util.HashMap<>(); - for (Long productId : sortedProductIds) { - Product product = productRepository.findByIdForUpdate(productId) - .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, - String.format("상품을 찾을 수 없습니다. (상품 ID: %d)", productId))); - productMap.put(productId, product); - } - - // OrderItem 순서대로 Product 리스트 생성 - List products = order.getItems().stream() - .map(item -> productMap.get(item.getProductId())) - .toList(); - - order.cancel(); - increaseStocksForOrderItems(order.getItems(), products); - lockedUser.receivePoint(Point.of((long) order.getTotalAmount())); - - products.forEach(productRepository::save); - userRepository.save(lockedUser); - orderRepository.save(order); + orderCancellationService.cancel(order, user); } /** @@ -268,19 +296,6 @@ private void decreaseStocksForOrderItems(List items, List pr } } - private void increaseStocksForOrderItems(List items, List products) { - Map productMap = products.stream() - .collect(Collectors.toMap(Product::getId, product -> product)); - - for (OrderItem item : items) { - Product product = productMap.get(item.getProductId()); - if (product == null) { - throw new CoreException(ErrorType.NOT_FOUND, - String.format("상품을 찾을 수 없습니다. (상품 ID: %d)", item.getProductId())); - } - product.increaseStock(item.getQuantity()); - } - } private void deductUserPoint(User user, Integer totalAmount) { if (Objects.requireNonNullElse(totalAmount, 0) <= 0) { @@ -398,5 +413,291 @@ private Integer calculateSubtotal(List orderItems) { .mapToInt(item -> item.getPrice() * item.getQuantity()) .sum(); } + + /** + * 주문 상태를 COMPLETED로 업데이트합니다. + *

+ * 트랜잭션 커밋 후 별도 트랜잭션에서 실행되어 주문 상태를 업데이트합니다. + *

+ * + * @param orderId 주문 ID + * @param transactionKey 트랜잭션 키 + */ + @Transactional(propagation = org.springframework.transaction.annotation.Propagation.REQUIRES_NEW) + public void updateOrderStatusToCompleted(Long orderId, String transactionKey) { + Order order = orderRepository.findById(orderId).orElse(null); + if (order == null) { + log.warn("주문 상태 업데이트 시 주문을 찾을 수 없습니다. (orderId: {})", orderId); + return; + } + + if (order.getStatus() == OrderStatus.COMPLETED) { + log.info("이미 완료된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); + return; + } + + order.complete(); + orderRepository.save(order); + log.info("주문 상태를 COMPLETED로 업데이트했습니다. (orderId: {}, transactionKey: {})", orderId, transactionKey); + } + + /** + * PG 결제 게이트웨이에 결제 요청을 전송합니다. + *

+ * 트랜잭션 커밋 후 실행되어 DB 커넥션 풀 고갈을 방지합니다. + * 실패 시에도 주문은 이미 저장되어 있으므로, 로그만 기록합니다. + *

+ * + * @param userId 사용자 ID + * @param orderId 주문 ID + * @param cardType 카드 타입 + * @param cardNo 카드 번호 + * @param amount 결제 금액 + * @return transactionKey (성공 시), null (실패 시) + */ + private String requestPaymentToGateway(String userId, Long orderId, String cardType, String cardNo, Integer amount) { + try { + // 결제 요청 생성 + PaymentRequest request = paymentRequestBuilder.build(userId, orderId, cardType, cardNo, amount); + + // PG 결제 요청 전송 + var result = paymentGatewayAdapter.requestPayment(request); + + // 결과 처리 + return result.handle( + success -> { + log.info("PG 결제 요청 성공. (orderId: {}, transactionKey: {})", + orderId, success.transactionKey()); + return success.transactionKey(); + }, + failure -> { + PaymentFailureType failureType = paymentFailureClassifier.classify(failure.errorCode()); + + if (failureType == PaymentFailureType.BUSINESS_FAILURE) { + // 비즈니스 실패: 주문 취소 (별도 트랜잭션으로 처리) + paymentFailureHandler.handle(userId, orderId, failure.errorCode(), failure.message()); + } else if (failure.isTimeout()) { + // 타임아웃: 상태 확인 후 복구 + log.info("타임아웃 발생. PG 결제 상태 확인 API를 호출하여 실제 결제 상태를 확인합니다. (orderId: {})", orderId); + paymentRecoveryService.recoverAfterTimeout(userId, orderId); + } else { + // 외부 시스템 장애: 주문은 PENDING 상태로 유지 + log.info("외부 시스템 장애로 인한 실패. 주문은 PENDING 상태로 유지됩니다. (orderId: {}, errorCode: {})", + orderId, failure.errorCode()); + } + return null; + } + ); + } catch (CoreException e) { + // 잘못된 카드 타입 등 검증 오류 + log.warn("결제 요청 생성 실패. (orderId: {}, error: {})", orderId, e.getMessage()); + return null; + } catch (Exception e) { + // 기타 예외 처리 + log.error("PG 결제 요청 중 예상치 못한 오류 발생. (orderId: {})", orderId, e); + log.info("예상치 못한 오류 발생. 주문은 PENDING 상태로 유지됩니다. (orderId: {})", orderId); + return null; + } + } + + + /** + * PG 결제 콜백을 처리합니다. + *

+ * PG 시스템에서 결제 처리 완료 후 콜백으로 전송된 결제 결과를 받아 + * 주문 상태를 업데이트합니다. + *

+ *

+ * 보안 및 정합성 강화: + *

    + *
  • 콜백 정보를 직접 신뢰하지 않고 PG 조회 API로 교차 검증
    • + *
  • 불일치 시 PG 원장을 우선시하여 처리
    • + *
  • 콜백 정보와 PG 조회 결과가 일치하는지 검증
    • + *
+ *

+ *

+ * 처리 내용: + *

    + *
  • 결제 성공 (SUCCESS): 주문 상태를 COMPLETED로 변경
    • + *
  • 결제 실패 (FAILED): 주문 상태를 CANCELED로 변경하고 리소스 원복
    • + *
  • 결제 대기 (PENDING): 상태 유지 (추가 처리 없음)
    • + *
+ *

+ * + * @param orderId 주문 ID + * @param callbackRequest 콜백 요청 정보 + */ + @Transactional + public void handlePaymentCallback(Long orderId, PaymentGatewayDto.CallbackRequest callbackRequest) { + try { + // 주문 조회 + Order order = orderRepository.findById(orderId) + .orElse(null); + + if (order == null) { + log.warn("콜백 처리 시 주문을 찾을 수 없습니다. (orderId: {}, transactionKey: {})", + orderId, callbackRequest.transactionKey()); + return; + } + + // 이미 완료되거나 취소된 주문인 경우 처리하지 않음 + if (order.getStatus() == OrderStatus.COMPLETED) { + log.info("이미 완료된 주문입니다. 콜백 처리를 건너뜁니다. (orderId: {}, transactionKey: {})", + orderId, callbackRequest.transactionKey()); + return; + } + + if (order.getStatus() == OrderStatus.CANCELED) { + log.info("이미 취소된 주문입니다. 콜백 처리를 건너뜁니다. (orderId: {}, transactionKey: {})", + orderId, callbackRequest.transactionKey()); + return; + } + + // 콜백 정보와 PG 원장 교차 검증 + // 보안 및 정합성을 위해 PG 조회 API로 실제 결제 상태 확인 + PaymentGatewayDto.TransactionStatus verifiedStatus = verifyCallbackWithPgInquiry( + order.getUserId(), orderId, callbackRequest); + + // OrderStatusUpdater를 사용하여 상태 업데이트 + boolean updated = orderStatusUpdater.updateByPaymentStatus( + orderId, + verifiedStatus, + callbackRequest.transactionKey(), + callbackRequest.reason() + ); + + if (updated) { + log.info("PG 결제 콜백 처리 완료 (PG 원장 검증 완료). (orderId: {}, transactionKey: {}, status: {})", + orderId, callbackRequest.transactionKey(), verifiedStatus); + } else { + log.warn("PG 결제 콜백 처리 실패. 주문 상태 업데이트에 실패했습니다. (orderId: {}, transactionKey: {}, status: {})", + orderId, callbackRequest.transactionKey(), verifiedStatus); + } + } catch (Exception e) { + log.error("콜백 처리 중 오류 발생. (orderId: {}, transactionKey: {})", + orderId, callbackRequest.transactionKey(), e); + throw e; // 콜백 실패는 재시도 가능하도록 예외를 다시 던짐 + } + } + + /** + * 콜백 정보를 PG 조회 API로 교차 검증합니다. + *

+ * 보안 및 정합성을 위해 콜백 정보를 직접 신뢰하지 않고, + * PG 원장(조회 API)을 기준으로 검증합니다. + *

+ *

+ * 검증 전략: + *

    + *
  • PG 조회 API로 실제 결제 상태 확인
    • + *
  • 콜백 정보와 PG 조회 결과 비교
    • + *
  • 불일치 시 PG 원장을 우선시하여 처리
    • + *
  • PG 조회 실패 시 콜백 정보를 사용하되 경고 로그 기록
    • + *
+ *

+ * + * @param userId 사용자 ID (Long) + * @param orderId 주문 ID + * @param callbackRequest 콜백 요청 정보 + * @return 검증된 결제 상태 (PG 원장 기준) + */ + private PaymentGatewayDto.TransactionStatus verifyCallbackWithPgInquiry( + Long userId, Long orderId, PaymentGatewayDto.CallbackRequest callbackRequest) { + + try { + // User의 userId (String)를 가져오기 위해 User 조회 + User user = userRepository.findById(userId); + if (user == null) { + log.warn("콜백 검증 시 사용자를 찾을 수 없습니다. 콜백 정보를 사용합니다. (orderId: {}, userId: {})", + orderId, userId); + return callbackRequest.status(); // 사용자를 찾을 수 없으면 콜백 정보 사용 + } + + String userIdString = user.getUserId(); + + // PG에서 주문별 결제 정보 조회 (스케줄러 전용 클라이언트 사용 - Retry 적용) + // 주문 ID를 6자리 이상 문자열로 변환 (pg-simulator 검증 요구사항) + String orderIdString = paymentRequestBuilder.formatOrderId(orderId); + PaymentGatewayDto.ApiResponse response = + paymentGatewaySchedulerClient.getTransactionsByOrder(userIdString, orderIdString); + + if (response == null || response.meta() == null + || response.meta().result() != PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS + || response.data() == null || response.data().transactions() == null + || response.data().transactions().isEmpty()) { + // PG 조회 실패: 콜백 정보를 사용하되 경고 로그 기록 + log.warn("콜백 검증 시 PG 조회 API 호출 실패. 콜백 정보를 사용합니다. (orderId: {}, transactionKey: {})", + orderId, callbackRequest.transactionKey()); + return callbackRequest.status(); + } + + // 가장 최근 트랜잭션의 상태 확인 (PG 원장 기준) + PaymentGatewayDto.TransactionResponse latestTransaction = + response.data().transactions().get(response.data().transactions().size() - 1); + + PaymentGatewayDto.TransactionStatus pgStatus = latestTransaction.status(); + PaymentGatewayDto.TransactionStatus callbackStatus = callbackRequest.status(); + + // 콜백 정보와 PG 조회 결과 비교 + if (pgStatus != callbackStatus) { + // 불일치 시 PG 원장을 우선시하여 처리 + log.warn("콜백 정보와 PG 원장이 불일치합니다. PG 원장을 우선시하여 처리합니다. " + + "(orderId: {}, transactionKey: {}, 콜백 상태: {}, PG 원장 상태: {})", + orderId, callbackRequest.transactionKey(), callbackStatus, pgStatus); + return pgStatus; // PG 원장 기준으로 처리 + } + + // 일치하는 경우: 정상 처리 + log.debug("콜백 정보와 PG 원장이 일치합니다. (orderId: {}, transactionKey: {}, 상태: {})", + orderId, callbackRequest.transactionKey(), pgStatus); + return pgStatus; + + } catch (FeignException e) { + // PG 조회 API 호출 실패: 콜백 정보를 사용하되 경고 로그 기록 + log.warn("콜백 검증 시 PG 조회 API 호출 중 Feign 예외 발생. 콜백 정보를 사용합니다. " + + "(orderId: {}, transactionKey: {}, status: {})", + orderId, callbackRequest.transactionKey(), e.status(), e); + return callbackRequest.status(); + } catch (Exception e) { + // 기타 예외: 콜백 정보를 사용하되 경고 로그 기록 + log.warn("콜백 검증 시 예상치 못한 오류 발생. 콜백 정보를 사용합니다. " + + "(orderId: {}, transactionKey: {})", + orderId, callbackRequest.transactionKey(), e); + return callbackRequest.status(); + } + } + + /** + * 결제 상태 확인 API를 통해 주문 상태를 복구합니다. + *

+ * 콜백이 오지 않았거나 타임아웃된 경우, PG 시스템의 결제 상태 확인 API를 호출하여 + * 실제 결제 상태를 확인하고 주문 상태를 업데이트합니다. + *

+ * + * @param userId 사용자 ID (String - PG API 요구사항) + * @param orderId 주문 ID + */ + @Transactional + public void recoverOrderStatusByPaymentCheck(String userId, Long orderId) { + try { + // PG에서 결제 상태 조회 + // 주문 ID를 6자리 이상 문자열로 변환 (pg-simulator 검증 요구사항) + String orderIdString = paymentRequestBuilder.formatOrderId(orderId); + PaymentGatewayDto.TransactionStatus status = + paymentGatewayAdapter.getPaymentStatus(userId, orderIdString); + + // OrderStatusUpdater를 사용하여 상태 업데이트 + boolean updated = orderStatusUpdater.updateByPaymentStatus(orderId, status, null, null); + + if (!updated) { + log.warn("상태 복구 실패. 주문 상태 업데이트에 실패했습니다. (orderId: {})", orderId); + } + + } catch (Exception e) { + log.error("상태 복구 중 오류 발생. (orderId: {})", orderId, e); + // 기타 오류도 로그만 기록 + } + } + } diff --git a/apps/commerce-api/src/main/java/com/loopers/config/Resilience4jRetryConfig.java b/apps/commerce-api/src/main/java/com/loopers/config/Resilience4jRetryConfig.java new file mode 100644 index 000000000..90923e2f3 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/config/Resilience4jRetryConfig.java @@ -0,0 +1,129 @@ +package com.loopers.config; + +import io.github.resilience4j.retry.RetryConfig; +import io.github.resilience4j.retry.RetryRegistry; +import io.github.resilience4j.core.IntervalFunction; +import lombok.extern.slf4j.Slf4j; +import feign.FeignException; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.time.Duration; +import java.util.concurrent.TimeoutException; +import java.net.SocketTimeoutException; + +/** + * Resilience4j Retry 설정 커스터마이징. + *

+ * 실무 권장 패턴에 따라 메서드별로 다른 Retry 정책을 적용합니다: + *

+ *

+ * Retry 정책: + *

    + *
  • 결제 요청 API (requestPayment): Retry 없음 (유저 요청 경로 - 빠른 실패)
    • + *
  • 조회 API (getTransactionsByOrder, getTransaction): Exponential Backoff 적용 (스케줄러 - 안전)
    • + *
+ *

+ *

+ * Exponential Backoff 전략 (조회 API용): + *

    + *
  • 초기 대기 시간: 500ms
    • + *
  • 배수(multiplier): 2 (각 재시도마다 2배씩 증가)
    • + *
  • 최대 대기 시간: 5초 (너무 길어지지 않도록 제한)
    • + *
  • 랜덤 jitter: 활성화 (thundering herd 문제 방지)
    • + *
+ *

+ *

+ * 재시도 시퀀스 예시 (조회 API): + *

    + *
  1. 1차 시도: 즉시 실행
    2. + *
  2. 2차 시도: 500ms 후 (500ms * 2^0)
    3. + *
  3. 3차 시도: 1000ms 후 (500ms * 2^1)
    4. + *
+ *

+ *

+ * 설계 근거: + *

    + *
  • 유저 요청 경로: 긴 Retry는 스레드 점유 비용이 크므로 Retry 없이 빠르게 실패
    • + *
  • 스케줄러 경로: 비동기/배치 기반이므로 Retry가 안전하게 적용 가능 (Nice-to-Have 요구사항 충족)
    • + *
  • Eventually Consistent: 실패 시 주문은 PENDING 상태로 유지되어 스케줄러에서 복구
    • + *
  • 일시적 오류 복구: 네트워크 일시적 오류나 PG 서버 일시적 장애 시 자동 복구
    • + *
+ *

+ * + * @author Loopers + * @version 2.0 + */ +@Slf4j +@Configuration +public class Resilience4jRetryConfig { + + /** + * PaymentGatewayClient용 Retry 설정을 커스터마이징합니다. + *

+ * Exponential Backoff 전략을 적용하여 재시도 간격을 점진적으로 증가시킵니다. + *

+ * + * @return RetryRegistry (커스터마이징된 설정이 적용됨) + */ + @Bean + public RetryRegistry retryRegistry() { + RetryRegistry retryRegistry = io.github.resilience4j.retry.RetryRegistry.ofDefaults(); + // Exponential Backoff 설정 + // - 초기 대기 시간: 500ms + // - 배수: 2 (각 재시도마다 2배씩 증가) + // - 최대 대기 시간: 5초 + // - 랜덤 jitter: 활성화 (thundering herd 문제 방지) + IntervalFunction intervalFunction = IntervalFunction + .ofExponentialRandomBackoff( + Duration.ofMillis(500), // 초기 대기 시간 + 2.0, // 배수 (exponential multiplier) + Duration.ofSeconds(5) // 최대 대기 시간 + ); + + // RetryConfig 커스터마이징 + RetryConfig retryConfig = RetryConfig.custom() + .maxAttempts(3) // 최대 재시도 횟수 (초기 시도 포함) + .intervalFunction(intervalFunction) // Exponential Backoff 적용 + .retryOnException(throwable -> { + // 일시적 오류만 재시도: 5xx 서버 오류, 타임아웃, 네트워크 오류 + if (throwable instanceof FeignException feignException) { + int status = feignException.status(); + // 5xx 서버 오류만 재시도 + if (status >= 500 && status < 600) { + log.debug("재시도 대상 예외: FeignException (status: {})", status); + return true; + } + return false; + } + if (throwable instanceof SocketTimeoutException || + throwable instanceof TimeoutException) { + log.debug("재시도 대상 예외: {}", throwable.getClass().getSimpleName()); + return true; + } + return false; + }) + // ignoreExceptions는 사용하지 않음 + // retryOnException에서 5xx만 재시도하고 4xx는 제외하므로, + // 별도로 ignoreExceptions를 설정할 필요가 없음 + .build(); + + // 결제 요청 API: 유저 요청 경로에서 사용되므로 Retry 비활성화 (빠른 실패) + // 실패 시 주문은 PENDING 상태로 유지되어 스케줄러에서 복구됨 + RetryConfig noRetryConfig = RetryConfig.custom() + .maxAttempts(1) // 재시도 없음 (초기 시도만) + .build(); + retryRegistry.addConfiguration("paymentGatewayClient", noRetryConfig); + + // 스케줄러 전용 클라이언트: 비동기/배치 기반으로 Retry 적용 + // Exponential Backoff 적용하여 일시적 오류 자동 복구 + retryRegistry.addConfiguration("paymentGatewaySchedulerClient", retryConfig); + + log.info("Resilience4j Retry 설정 완료:"); + log.info(" - 결제 요청 API (paymentGatewayClient): Retry 없음 (유저 요청 경로 - 빠른 실패)"); + log.info(" - 조회 API (paymentGatewaySchedulerClient): Exponential Backoff 적용 (스케줄러 - 비동기/배치 기반 Retry)"); + + return retryRegistry; + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java new file mode 100644 index 000000000..643644749 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java @@ -0,0 +1,106 @@ +package com.loopers.domain.order; + +import com.loopers.domain.product.Product; +import com.loopers.domain.product.ProductRepository; +import com.loopers.domain.user.Point; +import com.loopers.domain.user.User; +import com.loopers.domain.user.UserRepository; +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 주문 취소 도메인 서비스. + *

+ * 주문 취소 및 리소스 원복을 처리합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class OrderCancellationService { + + private final OrderRepository orderRepository; + private final UserRepository userRepository; + private final ProductRepository productRepository; + + /** + * 주문을 취소하고 포인트를 환불하며 재고를 원복합니다. + *

+ * 동시성 제어: + *

    + *
  • 비관적 락 사용: 재고 원복 시 동시성 제어를 위해 findByIdForUpdate 사용
    • + *
  • Deadlock 방지: 상품 ID를 정렬하여 일관된 락 획득 순서 보장
    • + *
+ *

+ * + * @param order 주문 엔티티 + * @param user 사용자 엔티티 + */ + @Transactional + public void cancel(Order order, User user) { + if (order == null || user == null) { + throw new CoreException(ErrorType.BAD_REQUEST, "취소할 주문과 사용자 정보는 필수입니다."); + } + + // ✅ Deadlock 방지: User 락을 먼저 획득하여 createOrder와 동일한 락 획득 순서 보장 + User lockedUser = userRepository.findByUserIdForUpdate(user.getUserId()); + if (lockedUser == null) { + throw new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."); + } + + // ✅ Deadlock 방지: 상품 ID를 정렬하여 일관된 락 획득 순서 보장 + List sortedProductIds = order.getItems().stream() + .map(OrderItem::getProductId) + .distinct() + .sorted() + .toList(); + + // 정렬된 순서대로 상품 락 획득 (Deadlock 방지) + Map productMap = new HashMap<>(); + for (Long productId : sortedProductIds) { + Product product = productRepository.findByIdForUpdate(productId) + .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, + String.format("상품을 찾을 수 없습니다. (상품 ID: %d)", productId))); + productMap.put(productId, product); + } + + // OrderItem 순서대로 Product 리스트 생성 + List products = order.getItems().stream() + .map(item -> productMap.get(item.getProductId())) + .toList(); + + order.cancel(); + increaseStocksForOrderItems(order.getItems(), products); + lockedUser.receivePoint(Point.of((long) order.getTotalAmount())); + + products.forEach(productRepository::save); + userRepository.save(lockedUser); + orderRepository.save(order); + } + + private void increaseStocksForOrderItems(List items, List products) { + Map productMap = products.stream() + .collect(java.util.stream.Collectors.toMap(Product::getId, product -> product)); + + for (OrderItem item : items) { + Product product = productMap.get(item.getProductId()); + if (product == null) { + throw new CoreException(ErrorType.NOT_FOUND, + String.format("상품을 찾을 수 없습니다. (상품 ID: %d)", item.getProductId())); + } + product.increaseStock(item.getQuantity()); + } + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderRepository.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderRepository.java index a6f9870dc..10b80fc16 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderRepository.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderRepository.java @@ -34,6 +34,14 @@ public interface OrderRepository { * @return 해당 사용자의 주문 목록 */ List findAllByUserId(Long userId); + + /** + * 주문 상태로 주문 목록을 조회합니다. + * + * @param status 주문 상태 + * @return 해당 상태의 주문 목록 + */ + List findAllByStatus(OrderStatus status); } diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderStatusUpdater.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderStatusUpdater.java new file mode 100644 index 000000000..6e9abcc1f --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderStatusUpdater.java @@ -0,0 +1,100 @@ +package com.loopers.domain.order; + +import com.loopers.domain.user.User; +import com.loopers.domain.user.UserRepository; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * 주문 상태 업데이트 도메인 서비스. + *

+ * 결제 상태에 따라 주문 상태를 업데이트합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class OrderStatusUpdater { + + private final OrderRepository orderRepository; + private final UserRepository userRepository; + private final OrderCancellationService orderCancellationService; + + /** + * 결제 상태에 따라 주문 상태를 업데이트합니다. + *

+ * 별도 트랜잭션으로 실행하여 외부 시스템 호출과 독립적으로 처리합니다. + *

+ * + * @param orderId 주문 ID + * @param status 결제 상태 + * @param transactionKey 트랜잭션 키 + * @param reason 실패 사유 (실패 시) + * @return 업데이트 성공 여부 (true: 성공, false: 실패) + */ + @Transactional(propagation = Propagation.REQUIRES_NEW) + public boolean updateByPaymentStatus( + Long orderId, + PaymentGatewayDto.TransactionStatus status, + String transactionKey, + String reason + ) { + try { + Order order = orderRepository.findById(orderId) + .orElse(null); + + if (order == null) { + log.warn("주문 상태 업데이트 시 주문을 찾을 수 없습니다. (orderId: {})", orderId); + return false; + } + + // 이미 완료되거나 취소된 주문인 경우 처리하지 않음 (정상적인 경우이므로 true 반환) + if (order.getStatus() == OrderStatus.COMPLETED) { + log.info("이미 완료된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); + return true; + } + + if (order.getStatus() == OrderStatus.CANCELED) { + log.info("이미 취소된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); + return true; + } + + if (status == PaymentGatewayDto.TransactionStatus.SUCCESS) { + // 결제 성공: 주문 완료 + order.complete(); + orderRepository.save(order); + log.info("결제 상태 확인 결과, 주문 상태를 COMPLETED로 업데이트했습니다. (orderId: {}, transactionKey: {})", + orderId, transactionKey); + return true; + } else if (status == PaymentGatewayDto.TransactionStatus.FAILED) { + // 결제 실패: 주문 취소 및 리소스 원복 + User user = userRepository.findById(order.getUserId()); + if (user == null) { + log.warn("주문 상태 업데이트 시 사용자를 찾을 수 없습니다. (orderId: {}, userId: {})", + orderId, order.getUserId()); + return false; + } + orderCancellationService.cancel(order, user); + log.info("결제 상태 확인 결과, 주문 상태를 CANCELED로 업데이트했습니다. (orderId: {}, transactionKey: {}, reason: {})", + orderId, transactionKey, reason); + return true; + } else { + // PENDING 상태: 아직 처리 중 (정상적인 경우이므로 true 반환) + log.info("결제 상태 확인 결과, 아직 처리 중입니다. 주문은 PENDING 상태로 유지됩니다. (orderId: {}, transactionKey: {})", + orderId, transactionKey); + return true; + } + } catch (Exception e) { + log.error("주문 상태 업데이트 중 오류 발생. (orderId: {})", orderId, e); + return false; + } + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureClassifier.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureClassifier.java new file mode 100644 index 000000000..804b9c123 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureClassifier.java @@ -0,0 +1,74 @@ +package com.loopers.domain.order; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.Set; + +/** + * 결제 실패 분류 도메인 서비스. + *

+ * 결제 실패를 비즈니스 실패와 외부 시스템 장애로 분류합니다. + *

+ *

+ * 비즈니스 실패 예시: + *

    + *
  • 카드 한도 초과 (LIMIT_EXCEEDED)
    • + *
  • 잘못된 카드 번호 (INVALID_CARD)
    • + *
  • 카드 오류 (CARD_ERROR)
    • + *
  • 잔액 부족 (INSUFFICIENT_FUNDS)
    • + *
+ *

+ *

+ * 외부 시스템 장애 예시: + *

    + *
  • CircuitBreaker Open (CIRCUIT_BREAKER_OPEN)
    • + *
  • 서버 오류 (5xx)
    • + *
  • 타임아웃
    • + *
  • 네트워크 오류
    • + *
+ *

+ * + * @author Loopers + * @version 1.0 + */ +@Component +@RequiredArgsConstructor +public class PaymentFailureClassifier { + + private static final Set BUSINESS_FAILURE_CODES = Set.of( + "LIMIT_EXCEEDED", + "INVALID_CARD", + "CARD_ERROR", + "INSUFFICIENT_FUNDS", + "PAYMENT_FAILED" + ); + + private static final String CIRCUIT_BREAKER_OPEN = "CIRCUIT_BREAKER_OPEN"; + + /** + * 오류 코드를 기반으로 결제 실패 유형을 분류합니다. + * + * @param errorCode 오류 코드 + * @return 결제 실패 유형 + */ + public PaymentFailureType classify(String errorCode) { + if (errorCode == null) { + return PaymentFailureType.EXTERNAL_SYSTEM_FAILURE; + } + + // CircuitBreaker Open 상태는 명시적으로 외부 시스템 장애로 간주 + if (CIRCUIT_BREAKER_OPEN.equals(errorCode)) { + return PaymentFailureType.EXTERNAL_SYSTEM_FAILURE; + } + + // 명확한 비즈니스 실패 오류 코드만 취소 처리 + boolean isBusinessFailure = BUSINESS_FAILURE_CODES.stream() + .anyMatch(errorCode::contains); + + return isBusinessFailure + ? PaymentFailureType.BUSINESS_FAILURE + : PaymentFailureType.EXTERNAL_SYSTEM_FAILURE; + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureType.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureType.java new file mode 100644 index 000000000..2cc7f03af --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureType.java @@ -0,0 +1,25 @@ +package com.loopers.domain.order; + +/** + * 결제 실패 유형. + *

+ * 결제 실패를 비즈니스 실패와 외부 시스템 장애로 구분합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +public enum PaymentFailureType { + /** + * 비즈니스 실패: 주문 취소 필요 + * 예: 카드 한도 초과, 잘못된 카드 번호 등 + */ + BUSINESS_FAILURE, + + /** + * 외부 시스템 장애: 주문 PENDING 상태 유지 + * 예: CircuitBreaker Open, 서버 오류, 타임아웃 등 + */ + EXTERNAL_SYSTEM_FAILURE +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentResult.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentResult.java new file mode 100644 index 000000000..f1c953c70 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentResult.java @@ -0,0 +1,55 @@ +package com.loopers.domain.order; + +import java.util.function.Function; + +/** + * 결제 결과 도메인 모델. + *

+ * 결제 요청의 성공/실패 결과를 표현합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +public sealed interface PaymentResult { + + /** + * 성공 결과. + */ + record Success(String transactionKey) implements PaymentResult { + } + + /** + * 실패 결과. + */ + record Failure( + String errorCode, + String message, + boolean isTimeout, + boolean isServerError, + boolean isClientError + ) implements PaymentResult { + } + + /** + * 결과에 따라 처리합니다. + * + * @param successHandler 성공 시 처리 함수 + * @param failureHandler 실패 시 처리 함수 + * @param 반환 타입 + * @return 처리 결과 + */ + default T handle( + Function successHandler, + Function failureHandler + ) { + if (this instanceof Success success) { + return successHandler.apply(success); + } else if (this instanceof Failure failure) { + return failureHandler.apply(failure); + } else { + throw new IllegalStateException("Unknown PaymentResult type: " + this.getClass()); + } + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/user/UserRepository.java b/apps/commerce-api/src/main/java/com/loopers/domain/user/UserRepository.java index 09d47afe2..88ac6434c 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/user/UserRepository.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/user/UserRepository.java @@ -44,4 +44,12 @@ public interface UserRepository { * @return 조회된 사용자, 없으면 null */ User findByUserIdForUpdate(String userId); + + /** + * 사용자 ID (PK)로 사용자를 조회합니다. + * + * @param id 사용자 ID (PK) + * @return 조회된 사용자, 없으면 null + */ + User findById(Long id); } diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/order/OrderJpaRepository.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/order/OrderJpaRepository.java index 02808e69c..0c91bd190 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/order/OrderJpaRepository.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/order/OrderJpaRepository.java @@ -10,6 +10,8 @@ */ public interface OrderJpaRepository extends JpaRepository { List findAllByUserId(Long userId); + + List findAllByStatus(com.loopers.domain.order.OrderStatus status); } diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/order/OrderRepositoryImpl.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/order/OrderRepositoryImpl.java index 9440a7aa8..763d6e927 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/order/OrderRepositoryImpl.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/order/OrderRepositoryImpl.java @@ -31,6 +31,11 @@ public Optional findById(Long orderId) { public List findAllByUserId(Long userId) { return orderJpaRepository.findAllByUserId(userId); } + + @Override + public List findAllByStatus(com.loopers.domain.order.OrderStatus status) { + return orderJpaRepository.findAllByStatus(status); + } } diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/DelayProvider.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/DelayProvider.java new file mode 100644 index 000000000..11cc69f71 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/DelayProvider.java @@ -0,0 +1,24 @@ +package com.loopers.infrastructure.paymentgateway; + +import java.time.Duration; + +/** + * 지연 제공자 인터페이스. + *

+ * 테스트 가능성을 위해 Thread.sleep을 추상화합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +public interface DelayProvider { + + /** + * 지정된 시간만큼 대기합니다. + * + * @param duration 대기 시간 + * @throws InterruptedException 인터럽트 발생 시 + */ + void delay(Duration duration) throws InterruptedException; +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java new file mode 100644 index 000000000..2084f2139 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java @@ -0,0 +1,136 @@ +package com.loopers.infrastructure.paymentgateway; + +import com.loopers.application.purchasing.PaymentRequest; +import com.loopers.domain.order.PaymentResult; +import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * 결제 게이트웨이 어댑터. + *

+ * 인프라 관심사(FeignClient 호출, 예외 처리)를 도메인 모델로 변환합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class PaymentGatewayAdapter { + + private final PaymentGatewayClient paymentGatewayClient; + private final PaymentGatewaySchedulerClient paymentGatewaySchedulerClient; + private final PaymentGatewayMetrics metrics; + + /** + * 결제 요청을 전송합니다. + * + * @param request 결제 요청 + * @return 결제 결과 (성공 또는 실패) + */ + @CircuitBreaker(name = "pgCircuit", fallbackMethod = "fallback") + public PaymentResult requestPayment(PaymentRequest request) { + PaymentGatewayDto.PaymentRequest dtoRequest = toDto(request); + PaymentGatewayDto.ApiResponse response = + paymentGatewayClient.requestPayment(request.userId(), dtoRequest); + + return toDomainResult(response, request.orderId()); + } + + /** + * Circuit Breaker fallback 메서드. + * + * @param request 결제 요청 + * @param t 발생한 예외 + * @return 결제 대기 상태의 실패 결과 + */ + public PaymentResult fallback(PaymentRequest request, Throwable t) { + log.warn("Circuit Breaker fallback 호출됨. (orderId: {}, exception: {})", + request.orderId(), t.getClass().getSimpleName(), t); + metrics.recordFallback("paymentGatewayClient"); + return new PaymentResult.Failure( + "CIRCUIT_BREAKER_OPEN", + "결제 대기 상태", + false, + false, + false + ); + } + + /** + * Circuit Breaker fallback 메서드 (결제 상태 조회). + * + * @param userId 사용자 ID + * @param orderId 주문 ID + * @param t 발생한 예외 + * @return PENDING 상태 반환 + */ + public PaymentGatewayDto.TransactionStatus getPaymentStatusFallback(String userId, String orderId, Throwable t) { + log.warn("Circuit Breaker fallback 호출됨 (결제 상태 조회). (orderId: {}, exception: {})", + orderId, t.getClass().getSimpleName(), t); + metrics.recordFallback("paymentGatewaySchedulerClient"); + return PaymentGatewayDto.TransactionStatus.PENDING; + } + + /** + * 결제 상태를 조회합니다. + * + * @param userId 사용자 ID + * @param orderId 주문 ID + * @return 결제 상태 (SUCCESS, FAILED, PENDING) + */ + @CircuitBreaker(name = "pgCircuit", fallbackMethod = "getPaymentStatusFallback") + public PaymentGatewayDto.TransactionStatus getPaymentStatus(String userId, String orderId) { + PaymentGatewayDto.ApiResponse response = + paymentGatewaySchedulerClient.getTransactionsByOrder(userId, orderId); + + if (response == null || response.meta() == null + || response.meta().result() != PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS + || response.data() == null || response.data().transactions() == null + || response.data().transactions().isEmpty()) { + return PaymentGatewayDto.TransactionStatus.PENDING; + } + + // 가장 최근 트랜잭션의 상태 반환 + PaymentGatewayDto.TransactionResponse latestTransaction = + response.data().transactions().get(response.data().transactions().size() - 1); + return latestTransaction.status(); + } + + private PaymentGatewayDto.PaymentRequest toDto(PaymentRequest request) { + return new PaymentGatewayDto.PaymentRequest( + request.orderId(), + request.cardType(), + request.cardNo(), + request.amount(), + request.callbackUrl() + ); + } + + private PaymentResult toDomainResult( + PaymentGatewayDto.ApiResponse response, + String orderId + ) { + if (response != null && response.meta() != null + && response.meta().result() == PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS + && response.data() != null) { + String transactionKey = response.data().transactionKey(); + log.info("PG 결제 요청 성공. (orderId: {}, transactionKey: {})", orderId, transactionKey); + metrics.recordSuccess("paymentGatewayClient"); + return new PaymentResult.Success(transactionKey); + } else { + String errorCode = response != null && response.meta() != null + ? response.meta().errorCode() : "UNKNOWN"; + String message = response != null && response.meta() != null + ? response.meta().message() : "응답이 null입니다."; + log.warn("PG 결제 요청 실패. (orderId: {}, errorCode: {}, message: {})", + orderId, errorCode, message); + return new PaymentResult.Failure(errorCode, message, false, false, false); + } + } + +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClient.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClient.java new file mode 100644 index 000000000..9357ec6d3 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClient.java @@ -0,0 +1,85 @@ +package com.loopers.infrastructure.paymentgateway; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * PG 결제 게이트웨이 FeignClient. + *

+ * CircuitBreaker, Bulkhead가 적용되어 있습니다. + *

+ *

+ * Bulkhead 패턴: + *

    + *
  • 동시 호출 최대 20개로 제한 (Building Resilient Distributed Systems: 격벽 패턴)
    • + *
  • PG 호출 실패가 다른 API에 영향을 주지 않도록 격리
    • + *
+ *

+ *

+ * Retry 정책: + *

    + *
  • 결제 요청 API (requestPayment): 5xx 서버 오류만 재시도, 4xx 클라이언트 오류는 재시도하지 않음
    • + *
  • 조회 API (getTransactionsByOrder, getTransaction): Exponential Backoff 적용 (스케줄러 - 비동기/배치 기반 Retry)
    • + *
+ *

+ *

+ * 설계 근거: + *

    + *
  • 5xx 서버 오류: 일시적 오류이므로 재시도하여 복구 가능
    • + *
  • 4xx 클라이언트 오류: 비즈니스 로직 오류이므로 재시도해도 성공하지 않음
    • + *
  • Eventually Consistent: 실패 시 주문은 PENDING 상태로 유지되어 스케줄러에서 복구
    • + *
+ *

+ */ +@FeignClient( + name = "paymentGatewayClient", + url = "${payment-gateway.url}", + path = "/api/v1/payments" +) +public interface PaymentGatewayClient { + + /** + * 결제 요청. + * + * @param userId 사용자 ID (X-USER-ID 헤더) + * @param request 결제 요청 정보 + * @return 결제 응답 + */ + @PostMapping + PaymentGatewayDto.ApiResponse requestPayment( + @RequestHeader("X-USER-ID") String userId, + @RequestBody PaymentGatewayDto.PaymentRequest request + ); + + /** + * 결제 정보 확인 (트랜잭션 키로 조회). + * + * @param userId 사용자 ID (X-USER-ID 헤더) + * @param transactionKey 트랜잭션 키 + * @return 결제 상세 정보 + */ + @GetMapping("/{transactionKey}") + PaymentGatewayDto.ApiResponse getTransaction( + @RequestHeader("X-USER-ID") String userId, + @PathVariable("transactionKey") String transactionKey + ); + + /** + * 주문에 엮인 결제 정보 조회. + * + * @param userId 사용자 ID (X-USER-ID 헤더) + * @param orderId 주문 ID + * @return 주문별 결제 목록 + */ + @GetMapping + PaymentGatewayDto.ApiResponse getTransactionsByOrder( + @RequestHeader("X-USER-ID") String userId, + @RequestParam("orderId") String orderId + ); +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayDto.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayDto.java new file mode 100644 index 000000000..812fbed96 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayDto.java @@ -0,0 +1,106 @@ +package com.loopers.infrastructure.paymentgateway; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * PG 결제 게이트웨이 DTO. + */ +public class PaymentGatewayDto { + + /** + * PG 결제 요청 DTO. + */ + public record PaymentRequest( + @JsonProperty("orderId") String orderId, + @JsonProperty("cardType") CardType cardType, + @JsonProperty("cardNo") String cardNo, + @JsonProperty("amount") Long amount, + @JsonProperty("callbackUrl") String callbackUrl + ) { + } + + /** + * PG 결제 응답 DTO. + */ + public record TransactionResponse( + @JsonProperty("transactionKey") String transactionKey, + @JsonProperty("status") TransactionStatus status, + @JsonProperty("reason") String reason + ) { + } + + /** + * PG 결제 상세 응답 DTO. + */ + public record TransactionDetailResponse( + @JsonProperty("transactionKey") String transactionKey, + @JsonProperty("orderId") String orderId, + @JsonProperty("cardType") CardType cardType, + @JsonProperty("cardNo") String cardNo, + @JsonProperty("amount") Long amount, + @JsonProperty("status") TransactionStatus status, + @JsonProperty("reason") String reason + ) { + } + + /** + * PG 주문별 결제 목록 응답 DTO. + */ + public record OrderResponse( + @JsonProperty("orderId") String orderId, + @JsonProperty("transactions") java.util.List transactions + ) { + } + + /** + * 카드 타입. + */ + public enum CardType { + SAMSUNG, + KB, + HYUNDAI + } + + /** + * 거래 상태. + */ + public enum TransactionStatus { + PENDING, + SUCCESS, + FAILED + } + + /** + * PG 콜백 요청 DTO (PG에서 보내는 TransactionInfo). + */ + public record CallbackRequest( + @JsonProperty("transactionKey") String transactionKey, + @JsonProperty("orderId") String orderId, + @JsonProperty("cardType") CardType cardType, + @JsonProperty("cardNo") String cardNo, + @JsonProperty("amount") Long amount, + @JsonProperty("status") TransactionStatus status, + @JsonProperty("reason") String reason + ) { + } + + /** + * PG API 응답 래퍼. + */ + public record ApiResponse( + @JsonProperty("meta") Metadata meta, + @JsonProperty("data") T data + ) { + public record Metadata( + @JsonProperty("result") Result result, + @JsonProperty("errorCode") String errorCode, + @JsonProperty("message") String message + ) { + public enum Result { + SUCCESS, + FAIL + } + } + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayMetrics.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayMetrics.java new file mode 100644 index 000000000..57c97df10 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayMetrics.java @@ -0,0 +1,86 @@ +package com.loopers.infrastructure.paymentgateway; + +import io.micrometer.core.instrument.MeterRegistry; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 결제 게이트웨이 메트릭. + *

+ * PG 서버 오류, 타임아웃, Fallback 등의 이벤트를 Prometheus 메트릭으로 기록합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +@Component +@RequiredArgsConstructor +public class PaymentGatewayMetrics { + + private final MeterRegistry meterRegistry; + + /** + * PG 서버 오류(5xx) 발생 횟수를 기록합니다. + * + * @param clientName 클라이언트 이름 (paymentGatewayClient, paymentGatewaySchedulerClient) + * @param status HTTP 상태 코드 + */ + public void recordServerError(String clientName, int status) { + meterRegistry.counter( + "payment.gateway.server.error", + "client", clientName, + "status", String.valueOf(status) + ).increment(); + } + + /** + * PG 타임아웃 발생 횟수를 기록합니다. + * + * @param clientName 클라이언트 이름 + */ + public void recordTimeout(String clientName) { + meterRegistry.counter( + "payment.gateway.timeout", + "client", clientName + ).increment(); + } + + /** + * PG 클라이언트 오류(4xx) 발생 횟수를 기록합니다. + * + * @param clientName 클라이언트 이름 + * @param status HTTP 상태 코드 + */ + public void recordClientError(String clientName, int status) { + meterRegistry.counter( + "payment.gateway.client.error", + "client", clientName, + "status", String.valueOf(status) + ).increment(); + } + + /** + * Fallback 호출 횟수를 기록합니다. + * + * @param clientName 클라이언트 이름 + */ + public void recordFallback(String clientName) { + meterRegistry.counter( + "payment.gateway.fallback", + "client", clientName + ).increment(); + } + + /** + * PG 결제 요청 성공 횟수를 기록합니다. + * + * @param clientName 클라이언트 이름 + */ + public void recordSuccess(String clientName) { + meterRegistry.counter( + "payment.gateway.request.success", + "client", clientName + ).increment(); + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewaySchedulerClient.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewaySchedulerClient.java new file mode 100644 index 000000000..44d693912 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewaySchedulerClient.java @@ -0,0 +1,70 @@ +package com.loopers.infrastructure.paymentgateway; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * PG 결제 게이트웨이 FeignClient (스케줄러 전용). + *

+ * 스케줄러에서 사용하는 조회 API에 Retry를 적용합니다. + *

+ *

+ * Retry 정책: + *

    + *
  • Exponential Backoff 적용: 초기 500ms → 1000ms (최대 5초)
    • + *
  • 최대 재시도 횟수: 3회 (초기 시도 포함)
    • + *
  • 재시도 대상: 5xx 서버 오류, 타임아웃, 네트워크 오류
    • + *
+ *

+ *

+ * 설계 근거: + *

    + *
  • 비동기/배치 기반: 스케줄러는 배치 작업이므로 Retry가 안전하게 적용 가능
    • + *
  • 일시적 오류 복구: 네트워크 일시적 오류나 PG 서버 일시적 장애 시 자동 복구
    • + *
  • 유저 요청 스레드 점유 없음: 스케줄러 스레드에서 실행되므로 유저 경험에 영향 없음
    • + *
+ *

+ */ +@FeignClient( + name = "paymentGatewaySchedulerClient", + url = "${payment-gateway.url}", + path = "/api/v1/payments" +) +public interface PaymentGatewaySchedulerClient { + + /** + * 결제 정보 확인 (트랜잭션 키로 조회). + *

+ * 스케줄러에서 사용하며, Retry가 적용됩니다. + *

+ * + * @param userId 사용자 ID (X-USER-ID 헤더) + * @param transactionKey 트랜잭션 키 + * @return 결제 상세 정보 + */ + @GetMapping("/{transactionKey}") + PaymentGatewayDto.ApiResponse getTransaction( + @RequestHeader("X-USER-ID") String userId, + @PathVariable("transactionKey") String transactionKey + ); + + /** + * 주문에 엮인 결제 정보 조회. + *

+ * 스케줄러에서 사용하며, Retry가 적용됩니다. + *

+ * + * @param userId 사용자 ID (X-USER-ID 헤더) + * @param orderId 주문 ID + * @return 주문별 결제 목록 + */ + @GetMapping + PaymentGatewayDto.ApiResponse getTransactionsByOrder( + @RequestHeader("X-USER-ID") String userId, + @RequestParam("orderId") String orderId + ); +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/ThreadDelayProvider.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/ThreadDelayProvider.java new file mode 100644 index 000000000..803a6f304 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/ThreadDelayProvider.java @@ -0,0 +1,21 @@ +package com.loopers.infrastructure.paymentgateway; + +import org.springframework.stereotype.Component; + +import java.time.Duration; + +/** + * Thread.sleep을 사용하는 DelayProvider 구현체. + * + * @author Loopers + * @version 1.0 + */ +@Component +public class ThreadDelayProvider implements DelayProvider { + + @Override + public void delay(Duration duration) throws InterruptedException { + Thread.sleep(duration.toMillis()); + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/user/UserRepositoryImpl.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/user/UserRepositoryImpl.java index 62d2512cf..defb715e9 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/user/UserRepositoryImpl.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/user/UserRepositoryImpl.java @@ -43,4 +43,12 @@ public User findByUserId(String userId) { public User findByUserIdForUpdate(String userId) { return userJpaRepository.findByUserIdForUpdate(userId).orElse(null); } + + /** + * {@inheritDoc} + */ + @Override + public User findById(Long id) { + return userJpaRepository.findById(id).orElse(null); + } } diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/ApiResponse.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/ApiResponse.java index 33b77b529..0eba8be22 100644 --- a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/ApiResponse.java +++ b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/ApiResponse.java @@ -19,6 +19,10 @@ public static ApiResponse success() { return new ApiResponse<>(Metadata.success(), null); } + public static ApiResponse successVoid() { + return new ApiResponse<>(Metadata.success(), null); + } + public static ApiResponse success(T data) { return new ApiResponse<>(Metadata.success(), data); } diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java index 744ca1b15..fcea74ac2 100644 --- a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java +++ b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java @@ -2,6 +2,7 @@ import com.loopers.application.purchasing.OrderInfo; import com.loopers.application.purchasing.PurchasingFacade; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; import com.loopers.interfaces.api.ApiResponse; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -37,7 +38,12 @@ public ApiResponse createOrder( @RequestHeader("X-USER-ID") String userId, @Valid @RequestBody PurchasingV1Dto.CreateRequest request ) { - OrderInfo orderInfo = purchasingFacade.createOrder(userId, request.toCommands()); + OrderInfo orderInfo = purchasingFacade.createOrder( + userId, + request.toCommands(), + request.payment().cardType(), + request.payment().cardNo() + ); return ApiResponse.success(PurchasingV1Dto.OrderResponse.from(orderInfo)); } @@ -70,6 +76,38 @@ public ApiResponse getOrder( OrderInfo orderInfo = purchasingFacade.getOrder(userId, orderId); return ApiResponse.success(PurchasingV1Dto.OrderResponse.from(orderInfo)); } + + /** + * PG 결제 콜백을 처리합니다. + * + * @param orderId 주문 ID + * @param callbackRequest 콜백 요청 정보 + * @return 성공 응답 + */ + @PostMapping("/{orderId}/callback") + public ApiResponse handlePaymentCallback( + @PathVariable Long orderId, + @RequestBody PaymentGatewayDto.CallbackRequest callbackRequest + ) { + purchasingFacade.handlePaymentCallback(orderId, callbackRequest); + return ApiResponse.successVoid(); + } + + /** + * 결제 상태 확인 API를 통해 주문 상태를 복구합니다. + * + * @param userId X-USER-ID 헤더 + * @param orderId 주문 ID + * @return 성공 응답 + */ + @PostMapping("/{orderId}/recover") + public ApiResponse recoverOrderStatus( + @RequestHeader("X-USER-ID") String userId, + @PathVariable Long orderId + ) { + purchasingFacade.recoverOrderStatusByPaymentCheck(userId, orderId); + return ApiResponse.successVoid(); + } } diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Dto.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Dto.java index ce278fc49..e1307ca42 100644 --- a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Dto.java +++ b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Dto.java @@ -21,7 +21,8 @@ private PurchasingV1Dto() { */ public record CreateRequest( @NotEmpty(message = "주문 상품은 1개 이상이어야 합니다.") - List<@Valid ItemRequest> items + List<@Valid ItemRequest> items, + @Valid PaymentRequest payment ) { public List toCommands() { return items.stream() @@ -30,6 +31,17 @@ public List toCommands() { } } + /** + * 결제 정보 요청 DTO. + */ + public record PaymentRequest( + @NotNull(message = "카드 타입은 필수입니다.") + String cardType, + @NotNull(message = "카드 번호는 필수입니다.") + String cardNo + ) { + } + /** * 주문 생성 요청 아이템 DTO. */ diff --git a/apps/commerce-api/src/main/resources/application.yml b/apps/commerce-api/src/main/resources/application.yml index 0f9239776..f8971a2f0 100644 --- a/apps/commerce-api/src/main/resources/application.yml +++ b/apps/commerce-api/src/main/resources/application.yml @@ -29,6 +29,108 @@ spring: job: enabled: false # 스케줄러에서 수동 실행하므로 자동 실행 비활성화 +payment-gateway: + url: http://localhost:8082 + +payment: + callback: + base-url: ${PAYMENT_CALLBACK_BASE_URL:http://localhost:8080} + +feign: + client: + config: + default: + connectTimeout: 2000 # 연결 타임아웃 (2초) + readTimeout: 6000 # 읽기 타임아웃 (6초) - PG 처리 지연 1s~5s 고려 + paymentGatewayClient: + connectTimeout: 2000 # 연결 타임아웃 (2초) + readTimeout: 6000 # 읽기 타임아웃 (6초) - PG 처리 지연 1s~5s 고려 + loggerLevel: full # 로깅 레벨 (디버깅용) + paymentGatewaySchedulerClient: + connectTimeout: 2000 # 연결 타임아웃 (2초) + readTimeout: 6000 # 읽기 타임아웃 (6초) - PG 처리 지연 1s~5s 고려 + loggerLevel: full # 로깅 레벨 (디버깅용) + circuitbreaker: + enabled: false # FeignClient 자동 Circuit Breaker 비활성화 (어댑터 레벨에서 pgCircuit 사용) + resilience4j: + enabled: true # Resilience4j 활성화 + +resilience4j: + circuitbreaker: + configs: + default: + registerHealthIndicator: true + slidingWindowSize: 20 # 슬라이딩 윈도우 크기 (Building Resilient Distributed Systems 권장: 20~50) + minimumNumberOfCalls: 1 # 최소 호출 횟수 (첫 호출부터 통계 수집하여 메트릭 즉시 노출) + permittedNumberOfCallsInHalfOpenState: 3 # Half-Open 상태에서 허용되는 호출 수 + automaticTransitionFromOpenToHalfOpenEnabled: true # 자동으로 Half-Open으로 전환 + waitDurationInOpenState: 10s # Open 상태 유지 시간 (10초 후 Half-Open으로 전환) + failureRateThreshold: 50 # 실패율 임계값 (50% 이상 실패 시 Open) + slowCallRateThreshold: 50 # 느린 호출 비율 임계값 (50% 이상 느리면 Open) - Release It! 권장: 50~70% + slowCallDurationThreshold: ${RESILIENCE4J_CIRCUITBREAKER_SCHEDULER_SLOW_CALL_DURATION_THRESHOLD:2s} # 느린 호출 기준 시간 (2초 이상) - Building Resilient Distributed Systems 권장: 2s (환경 변수로 동적 설정 가능) + recordExceptions: + - feign.FeignException + - feign.FeignException$InternalServerError + - feign.FeignException$ServiceUnavailable + - feign.FeignException$GatewayTimeout + - feign.FeignException$BadGateway + - java.net.SocketTimeoutException + - java.util.concurrent.TimeoutException + ignoreExceptions: [] # 모든 예외를 기록 (무시할 예외 없음) + instances: + pgCircuit: + baseConfig: default + slidingWindowSize: 20 # Building Resilient Distributed Systems 권장: 20 (과제 권장값) + minimumNumberOfCalls: 1 # 첫 호출부터 통계 수집하여 메트릭 즉시 노출 + waitDurationInOpenState: 10s + failureRateThreshold: 50 + slowCallRateThreshold: 50 # 느린 호출 비율 임계값 (50% 이상 느리면 Open) - Release It! 권장: 50~70% + slowCallDurationThreshold: ${RESILIENCE4J_CIRCUITBREAKER_PAYMENT_GATEWAY_SLOW_CALL_DURATION_THRESHOLD:2s} # 느린 호출 기준 시간 (2초 이상) - Building Resilient Distributed Systems 권장: 2s (환경 변수로 동적 설정 가능) + retry: + configs: + default: + maxAttempts: 3 # 최대 재시도 횟수 (초기 시도 포함) + waitDuration: 500ms # 재시도 대기 시간 (기본값, paymentGatewayClient는 Java Config에서 Exponential Backoff 적용) + retryExceptions: + # 일시적 오류만 재시도: 5xx 서버 오류, 타임아웃, 네트워크 오류 + - feign.FeignException$InternalServerError # 500 에러 + - feign.FeignException$ServiceUnavailable # 503 에러 + - feign.FeignException$GatewayTimeout # 504 에러 + - java.net.SocketTimeoutException + - java.util.concurrent.TimeoutException + ignoreExceptions: + # 클라이언트 오류(4xx)는 재시도하지 않음: 비즈니스 로직 오류이므로 재시도해도 성공하지 않음 + - feign.FeignException$BadRequest # 400 에러 + - feign.FeignException$Unauthorized # 401 에러 + - feign.FeignException$Forbidden # 403 에러 + - feign.FeignException$NotFound # 404 에러 + timelimiter: + configs: + default: + timeoutDuration: 6s # 타임아웃 시간 (Feign readTimeout과 동일) + cancelRunningFuture: true # 실행 중인 Future 취소 + instances: + paymentGatewayClient: + baseConfig: default + timeoutDuration: 6s + paymentGatewaySchedulerClient: + baseConfig: default + timeoutDuration: 6s + bulkhead: + configs: + default: + maxConcurrentCalls: 20 # 동시 호출 최대 수 (Building Resilient Distributed Systems: 격벽 패턴) + maxWaitDuration: 5s # 대기 시간 (5초 초과 시 BulkheadFullException 발생) + instances: + paymentGatewayClient: + baseConfig: default + maxConcurrentCalls: 20 # PG 호출용 전용 격벽: 동시 호출 최대 20개로 제한 + maxWaitDuration: 5s + paymentGatewaySchedulerClient: + baseConfig: default + maxConcurrentCalls: 10 # 스케줄러용 격벽: 동시 호출 최대 10개로 제한 (배치 작업이므로 더 보수적) + maxWaitDuration: 5s + springdoc: use-fqn: true swagger-ui: diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java new file mode 100644 index 000000000..72b6052a8 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java @@ -0,0 +1,711 @@ +package com.loopers.application.purchasing; + +import com.loopers.domain.brand.Brand; +import com.loopers.domain.brand.BrandRepository; +import com.loopers.domain.order.Order; +import com.loopers.domain.order.OrderRepository; +import com.loopers.infrastructure.order.OrderJpaRepository; +import com.loopers.domain.order.OrderStatus; +import com.loopers.domain.product.Product; +import com.loopers.domain.product.ProductRepository; +import com.loopers.domain.user.Gender; +import com.loopers.domain.user.Point; +import com.loopers.domain.user.User; +import com.loopers.domain.user.UserRepository; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayClient; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.utils.DatabaseCleanUp; +import io.github.resilience4j.circuitbreaker.CircuitBreaker; +import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import feign.FeignException; +import feign.Request; + +import java.util.Collections; +import org.springframework.test.context.ActiveProfiles; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.*; + +/** + * PurchasingFacade 서킷 브레이커 테스트. + *

+ * 서킷 브레이커의 동작을 검증합니다. + * - CLOSED → OPEN 전환 (실패율 임계값 초과) + * - OPEN → HALF_OPEN 전환 (일정 시간 후) + * - HALF_OPEN → CLOSED 전환 (성공 시) + * - HALF_OPEN → OPEN 전환 (실패 시) + * - 서킷 브레이커 OPEN 상태에서 Fallback 동작 + *

+ */ +@SpringBootTest +@ActiveProfiles("test") +@DisplayName("PurchasingFacade 서킷 브레이커 테스트") +class PurchasingFacadeCircuitBreakerTest { + + @Autowired + private PurchasingFacade purchasingFacade; + + @Autowired + private UserRepository userRepository; + + @Autowired + private ProductRepository productRepository; + + @Autowired + private BrandRepository brandRepository; + + @Autowired + private OrderRepository orderRepository; + + @Autowired + private OrderJpaRepository orderJpaRepository; + + @MockitoBean + private PaymentGatewayClient paymentGatewayClient; + + @Autowired + private CircuitBreakerRegistry circuitBreakerRegistry; + + @Autowired + private DatabaseCleanUp databaseCleanUp; + + @AfterEach + void tearDown() { + databaseCleanUp.truncateAllTables(); + // 서킷 브레이커 상태 초기화 + if (circuitBreakerRegistry != null) { + circuitBreakerRegistry.getAllCircuitBreakers().forEach(cb -> cb.reset()); + } + } + + private User createAndSaveUser(String userId, String email, long point) { + User user = User.of(userId, email, "1990-01-01", Gender.MALE, Point.of(point)); + return userRepository.save(user); + } + + private Brand createAndSaveBrand(String brandName) { + Brand brand = Brand.of(brandName); + return brandRepository.save(brand); + } + + private Product createAndSaveProduct(String productName, int price, int stock, Long brandId) { + Product product = Product.of(productName, price, stock, brandId); + return productRepository.save(product); + } + + @Test + @DisplayName("PG 연속 실패 시 서킷 브레이커가 CLOSED에서 OPEN으로 전환된다") + void createOrder_consecutiveFailures_circuitBreakerOpens() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // PG 연속 실패 시뮬레이션 + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenThrow(new FeignException.ServiceUnavailable( + "Service unavailable", + Request.create(Request.HttpMethod.POST, "/api/v1/payments", Collections.emptyMap(), null, null, null), + null, + Collections.emptyMap() + )); + + // CircuitBreaker를 리셋하여 초기 상태로 만듦 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + circuitBreaker.reset(); + } + } + + // act + // 서킷 브레이커 설정: minimumNumberOfCalls=1, failureRateThreshold=50% + // 첫 번째 호출이 실패하면 100% 실패율이 되어 임계값 50%를 초과하므로 OPEN 상태로 전환됨 + // 따라서 첫 번째 호출만 실제로 PaymentGatewayClient를 호출하고, + // 이후 호출들은 서킷 브레이커가 OPEN 상태이므로 fallback이 호출됨 + int numberOfCalls = 5; + for (int i = 0; i < numberOfCalls; i++) { + purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + } + + // assert + // 재시도 정책에 따라 5xx 에러는 최대 3번까지 재시도됨 (maxAttempts: 3) + // 첫 번째 createOrder 호출에서 재시도가 일어나면서 최대 3번 호출될 수 있음 + // Circuit Breaker가 OPEN 상태가 되면 이후 호출들은 fallback이 호출되어 실제 호출되지 않음 + verify(paymentGatewayClient, atMost(3)) + .requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + // 서킷 브레이커 상태 확인 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + // 연속 실패 후에는 OPEN 상태여야 함 + // 첫 번째 호출이 실패하면 100% 실패율이 되어 임계값 50%를 초과하므로 OPEN 상태로 전환됨 + assertThat(circuitBreaker.getState()).isEqualTo(CircuitBreaker.State.OPEN); + } + } + } + + @Test + @DisplayName("서킷 브레이커가 OPEN 상태일 때 Fallback이 동작한다") + void createOrder_circuitBreakerOpen_fallbackExecuted() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // 서킷 브레이커를 OPEN 상태로 만듦 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + circuitBreaker.transitionToOpenState(); + } + } + + // act + purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + + // assert + // 서킷 브레이커가 OPEN 상태일 때는 PG API가 호출되지 않아야 함 (Fallback 동작) + verify(paymentGatewayClient, never()) + .requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + } + + @Test + @DisplayName("서킷 브레이커가 HALF_OPEN 상태에서 성공 시 CLOSED로 전환된다") + void createOrder_circuitBreakerHalfOpen_success_transitionsToClosed() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // 서킷 브레이커를 HALF_OPEN 상태로 만듦 + // 서킷 브레이커는 CLOSED → OPEN → HALF_OPEN 순서로만 전환 가능 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + // 먼저 OPEN 상태로 전환 + circuitBreaker.transitionToOpenState(); + // 그 다음 HALF_OPEN 상태로 전환 + circuitBreaker.transitionToHalfOpenState(); + } + } + + // PG 성공 응답 + PaymentGatewayDto.ApiResponse successResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.TransactionResponse( + "TXN123456", + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ) + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(successResponse); + + // act + purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + + // assert + // 서킷 브레이커 상태가 CLOSED로 전환되었는지 확인 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + // 성공 시 CLOSED로 전환될 수 있음 + assertThat(circuitBreaker.getState()).isIn( + CircuitBreaker.State.CLOSED, + CircuitBreaker.State.HALF_OPEN + ); + } + } + } + + @Test + @DisplayName("서킷 브레이커가 HALF_OPEN 상태에서 실패 시 OPEN으로 전환된다") + void createOrder_circuitBreakerHalfOpen_failure_transitionsToOpen() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // 서킷 브레이커를 HALF_OPEN 상태로 만듦 + // 서킷 브레이커는 CLOSED → OPEN → HALF_OPEN 순서로만 전환 가능 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + // 먼저 OPEN 상태로 전환 + circuitBreaker.transitionToOpenState(); + // 그 다음 HALF_OPEN 상태로 전환 + circuitBreaker.transitionToHalfOpenState(); + } + } + + // PG 실패 응답 + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenThrow(new FeignException.ServiceUnavailable( + "Service unavailable", + Request.create(Request.HttpMethod.POST, "/api/v1/payments", Collections.emptyMap(), null, null, null), + null, + Collections.emptyMap() + )); + + // act + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + + // assert + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); + + // 서킷 브레이커 상태가 OPEN으로 전환되었는지 확인 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + // HALF_OPEN 상태에서 실패 시 OPEN으로 전환되어야 함 + assertThat(circuitBreaker.getState()).isEqualTo(CircuitBreaker.State.OPEN); + } + } + } + + @Test + @DisplayName("서킷 브레이커가 OPEN 상태일 때도 내부 시스템은 정상적으로 응답한다") + void createOrder_circuitBreakerOpen_internalSystemRespondsNormally() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // 서킷 브레이커를 OPEN 상태로 만듦 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + circuitBreaker.transitionToOpenState(); + } + } + + // act + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + + // assert + // 내부 시스템은 정상적으로 응답해야 함 (예외가 발생하지 않아야 함) + assertThat(orderInfo).isNotNull(); + assertThat(orderInfo.orderId()).isNotNull(); + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); + + // 재고와 포인트는 정상적으로 차감되어야 함 + Product savedProduct = productRepository.findById(product.getId()).orElseThrow(); + assertThat(savedProduct.getStock()).isEqualTo(9); + + User savedUser = userRepository.findByUserId(user.getUserId()); + assertThat(savedUser.getPoint().getValue()).isEqualTo(40_000L); + } + + @Test + @DisplayName("Fallback 응답의 CIRCUIT_BREAKER_OPEN 에러 코드가 올바르게 처리되어 주문이 PENDING 상태로 유지된다") + void createOrder_fallbackResponseWithCircuitBreakerOpen_orderRemainsPending() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // 서킷 브레이커를 OPEN 상태로 만들어 Fallback이 호출되도록 함 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + circuitBreaker.transitionToOpenState(); + } + } + + // Fallback이 CIRCUIT_BREAKER_OPEN 에러 코드를 반환하도록 Mock 설정 + // (실제로는 PaymentGatewayClientFallback이 호출되지만, 테스트를 위해 명시적으로 설정) + PaymentGatewayDto.ApiResponse fallbackResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.FAIL, + "CIRCUIT_BREAKER_OPEN", + "PG 서비스가 일시적으로 사용할 수 없습니다. 잠시 후 다시 시도해주세요." + ), + null + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(fallbackResponse); + + // act + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + + // assert + // CIRCUIT_BREAKER_OPEN은 외부 시스템 장애로 간주되어 주문이 PENDING 상태로 유지되어야 함 + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); + + // 주문이 저장되었는지 확인 + Order savedOrder = orderRepository.findById(orderInfo.orderId()).orElseThrow(); + assertThat(savedOrder.getStatus()).isEqualTo(OrderStatus.PENDING); + + // 비즈니스 실패 처리(주문 취소)가 호출되지 않았는지 확인 + // 주문이 CANCELED 상태가 아니어야 함 + assertThat(savedOrder.getStatus()).isNotEqualTo(OrderStatus.CANCELED); + } + + @Test + @DisplayName("Retry 실패 후 CircuitBreaker가 OPEN 상태가 되어 Fallback이 호출된다") + void createOrder_retryFailure_circuitBreakerOpens_fallbackExecuted() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 100_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // 모든 재시도가 실패하도록 설정 (5xx 서버 오류) + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenThrow(new FeignException.InternalServerError( + "Internal Server Error", + Request.create(Request.HttpMethod.POST, "/api/v1/payments", Collections.emptyMap(), null, null, null), + null, + Collections.emptyMap() + )); + + // CircuitBreaker를 리셋하여 초기 상태로 만듦 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + circuitBreaker.reset(); + } + } + + // act + // 서킷 브레이커 설정: minimumNumberOfCalls=1, failureRateThreshold=50% + // 첫 번째 호출이 실패하면 100% 실패율이 되어 임계값 50%를 초과하므로 OPEN 상태로 전환됨 + // 따라서 첫 번째 호출만 실제로 PaymentGatewayClient를 호출하고 (재시도 포함하여 3번), + // 이후 호출들은 서킷 브레이커가 OPEN 상태이므로 fallback이 호출되어 실제 호출되지 않음 + int numberOfCalls = 6; // 여러 번 호출하여 서킷 브레이커 동작 확인 + for (int i = 0; i < numberOfCalls; i++) { + purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + } + + // assert + // 재시도 정책에 따라 5xx 에러는 최대 3번까지 재시도됨 (maxAttempts: 3) + // 첫 번째 createOrder 호출에서 재시도가 일어나면서 최대 3번 호출될 수 있음 + // Circuit Breaker가 OPEN 상태가 되면 이후 호출들은 fallback이 호출되어 실제 호출되지 않음 + verify(paymentGatewayClient, atMost(3)) + .requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + // CircuitBreaker 상태 확인 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + // 실패율이 임계값을 초과했으므로 OPEN 상태로 전환되어야 함 + // 첫 번째 호출이 실패하면 100% 실패율이 되어 임계값 50%를 초과하므로 OPEN 상태로 전환됨 + assertThat(circuitBreaker.getState()).isEqualTo(CircuitBreaker.State.OPEN); + } + } + + // 모든 주문이 PENDING 상태로 생성되었는지 확인 + // Circuit Breaker가 언제 OPEN 상태로 전환될지 정확히 예측하기 어려우므로, + // 최소 1개 이상의 주문이 생성되었는지 확인 + List orders = orderJpaRepository.findAll(); + assertThat(orders.size()).isGreaterThanOrEqualTo(1); + orders.forEach(order -> { + assertThat(order.getStatus()).isEqualTo(OrderStatus.PENDING); + }); + } + + @Test + @DisplayName("Retry 실패 후 Fallback이 호출되고 CIRCUIT_BREAKER_OPEN 응답이 올바르게 처리된다") + void createOrder_retryFailure_fallbackCalled_circuitBreakerOpenHandled() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // CircuitBreaker를 OPEN 상태로 만들어 Fallback이 호출되도록 함 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + circuitBreaker.transitionToOpenState(); + } + } + + // Fallback이 CIRCUIT_BREAKER_OPEN 에러 코드를 반환하도록 설정 + // 실제로는 PaymentGatewayClientFallback이 호출되지만, 테스트를 위해 Mock으로 시뮬레이션 + PaymentGatewayDto.ApiResponse fallbackResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.FAIL, + "CIRCUIT_BREAKER_OPEN", + "PG 서비스가 일시적으로 사용할 수 없습니다. 잠시 후 다시 시도해주세요." + ), + null + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(fallbackResponse); + + // act + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + + // assert + // 1. Fallback 응답이 올바르게 처리되어 주문이 PENDING 상태로 유지되어야 함 + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); + + // 2. 주문이 저장되었는지 확인 + Order savedOrder = orderRepository.findById(orderInfo.orderId()).orElseThrow(); + assertThat(savedOrder.getStatus()).isEqualTo(OrderStatus.PENDING); + + // 3. CIRCUIT_BREAKER_OPEN은 외부 시스템 장애로 간주되므로 주문 취소가 발생하지 않아야 함 + assertThat(savedOrder.getStatus()).isNotEqualTo(OrderStatus.CANCELED); + + // 4. 재고와 포인트는 정상적으로 차감되어야 함 (주문은 생성되었지만 결제는 PENDING) + Product savedProduct = productRepository.findById(product.getId()).orElseThrow(); + assertThat(savedProduct.getStock()).isEqualTo(9); + + User savedUser = userRepository.findByUserId(user.getUserId()); + assertThat(savedUser.getPoint().getValue()).isEqualTo(40_000L); + } + + @Test + @DisplayName("Fallback 응답 처리 로직: CIRCUIT_BREAKER_OPEN 에러 코드는 외부 시스템 장애로 간주되어 주문이 PENDING 상태로 유지된다") + void createOrder_fallbackResponse_circuitBreakerOpenErrorCode_orderRemainsPending() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // CircuitBreaker를 OPEN 상태로 만들어 Fallback이 호출되도록 함 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + circuitBreaker.transitionToOpenState(); + } + } + + // Fallback 응답 시뮬레이션: CIRCUIT_BREAKER_OPEN 에러 코드 반환 + PaymentGatewayDto.ApiResponse fallbackResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.FAIL, + "CIRCUIT_BREAKER_OPEN", // Fallback이 반환하는 에러 코드 + "PG 서비스가 일시적으로 사용할 수 없습니다. 잠시 후 다시 시도해주세요." + ), + null + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(fallbackResponse); + + // act + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + + // assert + // 1. Fallback 응답의 CIRCUIT_BREAKER_OPEN 에러 코드가 올바르게 처리되어야 함 + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); + + // 2. 주문이 저장되었는지 확인 + Order savedOrder = orderRepository.findById(orderInfo.orderId()).orElseThrow(); + assertThat(savedOrder.getStatus()).isEqualTo(OrderStatus.PENDING); + + // 3. CIRCUIT_BREAKER_OPEN은 비즈니스 실패가 아니므로 주문 취소가 발생하지 않아야 함 + // PurchasingFacade의 isBusinessFailure() 메서드는 CIRCUIT_BREAKER_OPEN을 false로 반환해야 함 + assertThat(savedOrder.getStatus()).isNotEqualTo(OrderStatus.CANCELED); + + // 4. 외부 시스템 장애로 인한 실패이므로 주문은 PENDING 상태로 유지되어 나중에 복구 가능해야 함 + // (상태 확인 API나 콜백을 통해 나중에 상태를 업데이트할 수 있어야 함) + } + + @Test + @DisplayName("Retry가 모두 실패한 후 CircuitBreaker가 OPEN 상태가 되면 Fallback이 호출되어 주문이 PENDING 상태로 유지된다") + void createOrder_retryExhausted_circuitBreakerOpens_fallbackCalled_orderPending() { + // arrange + // 6번의 주문 생성 + fallback 테스트 1번 = 총 7번의 주문 생성 + // 각 주문마다 10,000 포인트가 필요하므로 최소 70,000 포인트 필요 + // 여유를 두고 100,000 포인트로 설정 + User user = createAndSaveUser("testuser", "test@example.com", 100_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // 모든 재시도가 실패하도록 설정 (5xx 서버 오류) + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenThrow(new FeignException.InternalServerError( + "Internal Server Error", + Request.create(Request.HttpMethod.POST, "/api/v1/payments", Collections.emptyMap(), null, null, null), + null, + Collections.emptyMap() + )); + + // CircuitBreaker를 리셋하여 초기 상태로 만듦 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + circuitBreaker.reset(); + } + } + + // act + // 서킷 브레이커 설정: minimumNumberOfCalls=1, failureRateThreshold=50% + // 첫 번째 호출이 실패하면 100% 실패율이 되어 임계값 50%를 초과하므로 OPEN 상태로 전환됨 + // 따라서 첫 번째 호출만 실제로 PaymentGatewayClient를 호출하고, + // 이후 호출들은 서킷 브레이커가 OPEN 상태이므로 fallback이 호출되어 실제 호출되지 않음 + int numberOfCalls = 6; // 여러 번 호출하여 서킷 브레이커 동작 확인 + + for (int i = 0; i < numberOfCalls; i++) { + purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + } + + // CircuitBreaker 상태 확인 + CircuitBreaker circuitBreaker = null; + if (circuitBreakerRegistry != null) { + circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + } + + // assert + // 1. 재시도 정책에 따라 5xx 에러는 최대 3번까지 재시도됨 (maxAttempts: 3) + // 첫 번째 createOrder 호출에서 재시도가 일어나면서 최대 3번 호출될 수 있음 + // Circuit Breaker가 OPEN 상태가 되면 이후 호출들은 fallback이 호출되어 실제 호출되지 않음 + verify(paymentGatewayClient, atMost(3)) + .requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + // 2. CircuitBreaker가 OPEN 상태로 전환되었는지 확인 + if (circuitBreaker != null) { + // 실패율이 임계값을 초과했으므로 OPEN 상태로 전환되어야 함 + assertThat(circuitBreaker.getState()).isEqualTo(CircuitBreaker.State.OPEN); + } + + // 3. CircuitBreaker가 OPEN 상태가 되면 다음 호출에서 Fallback이 호출되어야 함 + // Fallback 응답 시뮬레이션 + PaymentGatewayDto.ApiResponse fallbackResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.FAIL, + "CIRCUIT_BREAKER_OPEN", + "PG 서비스가 일시적으로 사용할 수 없습니다. 잠시 후 다시 시도해주세요." + ), + null + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(fallbackResponse); + + // CircuitBreaker를 강제로 OPEN 상태로 만듦 (Fallback 호출 보장) + if (circuitBreaker != null) { + circuitBreaker.transitionToOpenState(); + } + + // Fallback이 호출되는 시나리오 테스트 + OrderInfo fallbackOrderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" + ); + + // 4. Fallback 응답이 올바르게 처리되어 주문이 PENDING 상태로 유지되어야 함 + assertThat(fallbackOrderInfo.status()).isEqualTo(OrderStatus.PENDING); + + // 5. 모든 주문이 PENDING 상태로 생성되었는지 확인 + List orders = orderJpaRepository.findAll(); + assertThat(orders.size()).isGreaterThanOrEqualTo(numberOfCalls + 1); // numberOfCalls + fallback 테스트 1번 + orders.forEach(order -> { + assertThat(order.getStatus()).isEqualTo(OrderStatus.PENDING); + assertThat(order.getStatus()).isNotEqualTo(OrderStatus.CANCELED); + }); + } +} + diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeConcurrencyTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeConcurrencyTest.java index 3220b41c0..bdfda839d 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeConcurrencyTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeConcurrencyTest.java @@ -128,7 +128,7 @@ void concurrencyTest_pointShouldProperlyDecreaseWhenOrderCreated() throws Interr List commands = List.of( OrderItemCommand.of(products.get(index).getId(), 1) ); - purchasingFacade.createOrder(userId, commands); + purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); successCount.incrementAndGet(); } catch (Exception e) { synchronized (exceptions) { @@ -176,7 +176,7 @@ void concurrencyTest_stockShouldBeProperlyDecreasedWhenOrdersCreated() throws In List commands = List.of( OrderItemCommand.of(productId, quantityPerOrder) ); - purchasingFacade.createOrder(userId, commands); + purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); successCount.incrementAndGet(); } catch (Exception e) { synchronized (exceptions) { @@ -228,7 +228,7 @@ void concurrencyTest_couponShouldBeUsedOnlyOnceWhenOrdersCreated() throws Interr List commands = List.of( new OrderItemCommand(product.getId(), 1, couponCode) ); - purchasingFacade.createOrder(userId, commands); + purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); successCount.incrementAndGet(); } catch (Exception e) { synchronized (exceptions) { @@ -277,7 +277,7 @@ void concurrencyTest_cancelOrderShouldRestoreStockAccuratelyDuringConcurrentStoc List commands = List.of( OrderItemCommand.of(productId, orderQuantity) ); - OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands); + OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); Long orderId = orderInfo.orderId(); // 주문 취소 전 재고 확인 (100 - 5 = 95) @@ -317,7 +317,7 @@ void concurrencyTest_cancelOrderShouldRestoreStockAccuratelyDuringConcurrentStoc List otherCommands = List.of( OrderItemCommand.of(productId, 3) ); - purchasingFacade.createOrder(userId, otherCommands); + purchasingFacade.createOrder(userId, otherCommands, "SAMSUNG", "4111-1111-1111-1111"); orderSuccess.incrementAndGet(); } catch (Exception e) { synchronized (exceptions) { diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java new file mode 100644 index 000000000..24195fab4 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java @@ -0,0 +1,307 @@ +package com.loopers.application.purchasing; + +import com.loopers.domain.brand.Brand; +import com.loopers.domain.brand.BrandRepository; +import com.loopers.domain.order.Order; +import com.loopers.domain.order.OrderRepository; +import com.loopers.domain.order.OrderStatus; +import com.loopers.domain.product.Product; +import com.loopers.domain.product.ProductRepository; +import com.loopers.domain.user.Gender; +import com.loopers.domain.user.Point; +import com.loopers.domain.user.User; +import com.loopers.domain.user.UserRepository; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayClient; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.infrastructure.paymentgateway.PaymentGatewaySchedulerClient; +import com.loopers.utils.DatabaseCleanUp; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.context.ActiveProfiles; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; + +/** + * PurchasingFacade 결제 콜백 및 상태 확인 테스트. + *

+ * PG 결제 콜백 처리 및 상태 확인 API를 통한 복구 로직을 검증합니다. + * - 콜백 수신 시 주문 상태 업데이트 + * - 콜백 미수신 시 상태 확인 API로 복구 + * - 타임아웃 후 상태 확인 API로 복구 + *

+ */ +@SpringBootTest +@ActiveProfiles("test") +@DisplayName("PurchasingFacade 결제 콜백 및 상태 확인 테스트") +class PurchasingFacadePaymentCallbackTest { + + @Autowired + private PurchasingFacade purchasingFacade; + + @Autowired + private UserRepository userRepository; + + @Autowired + private ProductRepository productRepository; + + @Autowired + private BrandRepository brandRepository; + + @Autowired + private OrderRepository orderRepository; + + @MockitoBean + private PaymentGatewayClient paymentGatewayClient; + + @MockitoBean + private PaymentGatewaySchedulerClient paymentGatewaySchedulerClient; + + @Autowired + private DatabaseCleanUp databaseCleanUp; + + @AfterEach + void tearDown() { + databaseCleanUp.truncateAllTables(); + } + + private User createAndSaveUser(String userId, String email, long point) { + User user = User.of(userId, email, "1990-01-01", Gender.MALE, Point.of(point)); + return userRepository.save(user); + } + + private Brand createAndSaveBrand(String brandName) { + Brand brand = Brand.of(brandName); + return brandRepository.save(brand); + } + + private Product createAndSaveProduct(String productName, int price, int stock, Long brandId) { + Product product = Product.of(productName, price, stock, brandId); + return productRepository.save(product); + } + + @Test + @DisplayName("PG 결제 성공 콜백을 수신하면 주문 상태가 COMPLETED로 변경된다") + void handlePaymentCallback_successCallback_orderStatusUpdatedToCompleted() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // PG 결제 요청 성공 (트랜잭션 키 반환) + PaymentGatewayDto.ApiResponse paymentResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.TransactionResponse( + "TXN123456", + PaymentGatewayDto.TransactionStatus.PENDING, + null + ) + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(paymentResponse); + + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 + ); + Long orderId = orderInfo.orderId(); + + // 콜백 검증을 위한 PG 조회 API Mock (SUCCESS 상태 반환) + PaymentGatewayDto.ApiResponse pgInquiryResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.OrderResponse( + String.format("%06d", orderId), + List.of( + new PaymentGatewayDto.TransactionResponse( + "TXN123456", + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ) + ) + ) + ); + when(paymentGatewaySchedulerClient.getTransactionsByOrder(eq(user.getUserId()), eq(String.format("%06d", orderId)))) + .thenReturn(pgInquiryResponse); + + // act + PaymentGatewayDto.CallbackRequest callbackRequest = new PaymentGatewayDto.CallbackRequest( + "TXN123456", + String.format("%06d", orderId), + PaymentGatewayDto.CardType.SAMSUNG, + "4111-1111-1111-1111", + 10_000L, + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ); + purchasingFacade.handlePaymentCallback(orderId, callbackRequest); + + // assert + Order savedOrder = orderRepository.findById(orderId).orElseThrow(); + assertThat(savedOrder.getStatus()).isEqualTo(OrderStatus.COMPLETED); + } + + @Test + @DisplayName("PG 결제 실패 콜백을 수신하면 주문 상태가 CANCELED로 변경된다") + void handlePaymentCallback_failureCallback_orderStatusUpdatedToCanceled() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // PG 결제 요청 성공 (트랜잭션 키 반환) + PaymentGatewayDto.ApiResponse paymentResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.TransactionResponse( + "TXN123456", + PaymentGatewayDto.TransactionStatus.PENDING, + null + ) + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(paymentResponse); + + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 + ); + Long orderId = orderInfo.orderId(); + + // 콜백 검증을 위한 PG 조회 API Mock (FAILED 상태 반환) + PaymentGatewayDto.ApiResponse pgInquiryResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.OrderResponse( + String.format("%06d", orderId), + List.of( + new PaymentGatewayDto.TransactionResponse( + "TXN123456", + PaymentGatewayDto.TransactionStatus.FAILED, + "카드 한도 초과" + ) + ) + ) + ); + when(paymentGatewaySchedulerClient.getTransactionsByOrder(eq(user.getUserId()), eq(String.format("%06d", orderId)))) + .thenReturn(pgInquiryResponse); + + // act + PaymentGatewayDto.CallbackRequest callbackRequest = new PaymentGatewayDto.CallbackRequest( + "TXN123456", + String.format("%06d", orderId), + PaymentGatewayDto.CardType.SAMSUNG, + "4111-1111-1111-1111", + 10_000L, + PaymentGatewayDto.TransactionStatus.FAILED, + "카드 한도 초과" + ); + purchasingFacade.handlePaymentCallback(orderId, callbackRequest); + + // assert + Order savedOrder = orderRepository.findById(orderId).orElseThrow(); + assertThat(savedOrder.getStatus()).isEqualTo(OrderStatus.CANCELED); + + // 재고와 포인트가 원복되었는지 확인 + Product savedProduct = productRepository.findById(product.getId()).orElseThrow(); + assertThat(savedProduct.getStock()).isEqualTo(10); + + User savedUser = userRepository.findByUserId(user.getUserId()); + assertThat(savedUser.getPoint().getValue()).isEqualTo(50_000L); + } + + @Test + @DisplayName("타임아웃 후 상태 확인 API로 주문 상태를 복구할 수 있다") + void recoverOrderStatus_afterTimeout_statusRecoveredByStatusCheck() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // PG 결제 요청 타임아웃 + String transactionKey = "TXN123456"; + doThrow(new RuntimeException(new java.net.SocketTimeoutException("Request timeout"))) + .when(paymentGatewayClient).requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 + ); + Long orderId = orderInfo.orderId(); + + // 상태 확인 API 응답 (결제 성공) - 주문 ID로 조회 + PaymentGatewayDto.ApiResponse orderResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.OrderResponse( + String.valueOf(orderId), + List.of( + new PaymentGatewayDto.TransactionResponse( + transactionKey, + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ) + ) + ) + ); + when(paymentGatewaySchedulerClient.getTransactionsByOrder(eq(user.getUserId()), eq(String.format("%06d", orderId)))) + .thenReturn(orderResponse); + + // act + purchasingFacade.recoverOrderStatusByPaymentCheck(user.getUserId(), orderId); + + // assert + Order savedOrder = orderRepository.findById(orderId).orElseThrow(); + assertThat(savedOrder.getStatus()).isEqualTo(OrderStatus.COMPLETED); + } + +} + diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java new file mode 100644 index 000000000..6a3f9f837 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java @@ -0,0 +1,280 @@ +package com.loopers.application.purchasing; + +import com.loopers.domain.brand.Brand; +import com.loopers.domain.brand.BrandRepository; +import com.loopers.domain.order.Order; +import com.loopers.domain.order.OrderRepository; +import com.loopers.domain.order.OrderStatus; +import com.loopers.domain.product.Product; +import com.loopers.domain.product.ProductRepository; +import com.loopers.domain.user.Gender; +import com.loopers.domain.user.Point; +import com.loopers.domain.user.User; +import com.loopers.domain.user.UserRepository; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayClient; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.utils.DatabaseCleanUp; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import feign.FeignException; +import feign.Request; +import org.springframework.test.context.ActiveProfiles; + +import java.net.SocketTimeoutException; +import java.util.Collections; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.*; + +/** + * PurchasingFacade PG 연동 테스트. + *

+ * PG 결제 게이트웨이와의 연동에서 발생할 수 있는 다양한 시나리오를 검증합니다. + * - PG 연동 실패 시 주문 처리 + * - 타임아웃 발생 시 주문 상태 + * - 서킷 브레이커 동작 + * - 재시도 정책 동작 + *

+ */ +@SpringBootTest +@ActiveProfiles("test") +@DisplayName("PurchasingFacade PG 연동 테스트") +class PurchasingFacadePaymentGatewayTest { + + @Autowired + private PurchasingFacade purchasingFacade; + + @Autowired + private UserRepository userRepository; + + @Autowired + private ProductRepository productRepository; + + @Autowired + private BrandRepository brandRepository; + + @Autowired + private OrderRepository orderRepository; + + @MockitoBean + private PaymentGatewayClient paymentGatewayClient; + + @Autowired + private DatabaseCleanUp databaseCleanUp; + + @AfterEach + void tearDown() { + databaseCleanUp.truncateAllTables(); + reset(paymentGatewayClient); // Mock 초기화 + } + + private User createAndSaveUser(String userId, String email, long point) { + User user = User.of(userId, email, "1990-01-01", Gender.MALE, Point.of(point)); + return userRepository.save(user); + } + + private Brand createAndSaveBrand(String brandName) { + Brand brand = Brand.of(brandName); + return brandRepository.save(brand); + } + + private Product createAndSaveProduct(String productName, int price, int stock, Long brandId) { + Product product = Product.of(productName, price, stock, brandId); + return productRepository.save(product); + } + + @Test + @DisplayName("PG 결제 요청이 타임아웃되어도 주문은 생성되고 PENDING 상태로 유지된다") + void createOrder_paymentGatewayTimeout_orderCreatedWithPendingStatus() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // PG 결제 요청이 타임아웃 발생 + doThrow(new RuntimeException(new SocketTimeoutException("Request timeout"))) + .when(paymentGatewayClient).requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + // act + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 + ); + + // assert + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); + + // 재고는 차감되었는지 확인 + Product savedProduct = productRepository.findById(product.getId()).orElseThrow(); + assertThat(savedProduct.getStock()).isEqualTo(9); + + // 포인트는 차감되었는지 확인 + User savedUser = userRepository.findByUserId(user.getUserId()); + assertThat(savedUser.getPoint().getValue()).isEqualTo(40_000L); + + // 주문이 저장되었는지 확인 + Order savedOrder = orderRepository.findById(orderInfo.orderId()).orElseThrow(); + assertThat(savedOrder.getStatus()).isEqualTo(OrderStatus.PENDING); + } + + @Test + @DisplayName("PG 결제 요청이 실패해도 주문은 생성되고 PENDING 상태로 유지된다") + void createOrder_paymentGatewayFailure_orderCreatedWithPendingStatus() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // PG 결제 요청이 실패 (외부 시스템 장애 - 주문은 PENDING 상태로 유지) + PaymentGatewayDto.ApiResponse failureResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.FAIL, + "INTERNAL_SERVER_ERROR", // 외부 시스템 장애로 분류되어 주문이 PENDING 상태로 유지됨 + "서버 오류가 발생했습니다" + ), + null + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(failureResponse); + + // act + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 + ); + + // assert + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); + + // 주문이 저장되었는지 확인 + Order savedOrder = orderRepository.findById(orderInfo.orderId()).orElseThrow(); + assertThat(savedOrder.getStatus()).isEqualTo(OrderStatus.PENDING); + } + + @Test + @DisplayName("PG 서버가 500 에러를 반환해도 주문은 생성되고 PENDING 상태로 유지된다") + void createOrder_paymentGatewayServerError_orderCreatedWithPendingStatus() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // PG 서버가 500 에러 반환 + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenThrow(new FeignException.InternalServerError( + "Internal Server Error", + Request.create(Request.HttpMethod.POST, "/api/v1/payments", Collections.emptyMap(), null, null, null), + null, + Collections.emptyMap() + )); + + // act + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 + ); + + // assert + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); + + // 주문이 저장되었는지 확인 + Order savedOrder = orderRepository.findById(orderInfo.orderId()).orElseThrow(); + assertThat(savedOrder.getStatus()).isEqualTo(OrderStatus.PENDING); + } + + @Test + @DisplayName("PG 연결이 실패해도 주문은 생성되고 PENDING 상태로 유지된다") + void createOrder_paymentGatewayConnectionFailure_orderCreatedWithPendingStatus() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // PG 연결 실패 + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenThrow(new FeignException.ServiceUnavailable( + "Service unavailable", + Request.create(Request.HttpMethod.POST, "/api/v1/payments", Collections.emptyMap(), null, null, null), + null, + Collections.emptyMap() + )); + + // act + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 + ); + + // assert + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); + + // 주문이 저장되었는지 확인 + Order savedOrder = orderRepository.findById(orderInfo.orderId()).orElseThrow(); + assertThat(savedOrder.getStatus()).isEqualTo(OrderStatus.PENDING); + } + + @Test + @DisplayName("PG 결제 요청이 타임아웃되어도 내부 시스템은 정상적으로 응답한다") + void createOrder_paymentGatewayTimeout_internalSystemRespondsNormally() { + // arrange + User user = createAndSaveUser("testuser", "test@example.com", 50_000L); + Brand brand = createAndSaveBrand("브랜드"); + Product product = createAndSaveProduct("상품", 10_000, 10, brand.getId()); + + List commands = List.of( + OrderItemCommand.of(product.getId(), 1) + ); + + // PG 결제 요청이 타임아웃 발생 + doThrow(new RuntimeException(new SocketTimeoutException("Request timeout"))) + .when(paymentGatewayClient).requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + // act + OrderInfo orderInfo = purchasingFacade.createOrder( + user.getUserId(), + commands, + "SAMSUNG", + "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 + ); + + // assert + // 내부 시스템은 정상적으로 응답해야 함 (예외가 발생하지 않아야 함) + assertThat(orderInfo).isNotNull(); + assertThat(orderInfo.orderId()).isNotNull(); + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); + } +} + diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java index 6464e9552..e9b01e55e 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java @@ -15,17 +15,25 @@ import com.loopers.domain.user.Point; import com.loopers.domain.user.User; import com.loopers.domain.user.UserRepository; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayClient; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; import com.loopers.utils.DatabaseCleanUp; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.util.List; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.when; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -56,6 +64,30 @@ class PurchasingFacadeTest { @Autowired private DatabaseCleanUp databaseCleanUp; + + @MockitoBean + private PaymentGatewayClient paymentGatewayClient; + + @BeforeEach + void setUp() { + // 기본적으로 모든 테스트에서 결제 성공 응답을 반환하도록 설정 + // 개별 테스트에서 필요시 재설정 가능 + PaymentGatewayDto.ApiResponse successResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.TransactionResponse( + "TXN123456", + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ) + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(successResponse); + } @AfterEach void tearDown() { @@ -121,10 +153,11 @@ void createOrder_successFlow() { ); // act - OrderInfo orderInfo = purchasingFacade.createOrder(user.getUserId(), commands); + OrderInfo orderInfo = purchasingFacade.createOrder(user.getUserId(), commands, "SAMSUNG", "4111-1111-1111-1111"); // assert - assertThat(orderInfo.status()).isEqualTo(OrderStatus.COMPLETED); + // createOrder는 주문을 PENDING 상태로 생성하고, PG 결제 요청은 afterCommit 콜백에서 비동기로 실행됨 + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); // 재고 차감 확인 Product savedProduct1 = productRepository.findById(product1.getId()).orElseThrow(); @@ -145,7 +178,7 @@ void createOrder_emptyItems_throwsException() { List emptyCommands = List.of(); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, emptyCommands)) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, emptyCommands, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); } @@ -160,7 +193,7 @@ void createOrder_userNotFound() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(unknownUserId, commands)) + assertThatThrownBy(() -> purchasingFacade.createOrder(unknownUserId, commands, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.NOT_FOUND); } @@ -182,7 +215,7 @@ void createOrder_stockNotEnough() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands)) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); @@ -212,7 +245,7 @@ void createOrder_stockZero() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands)) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); @@ -242,7 +275,7 @@ void createOrder_pointNotEnough() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands)) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); @@ -272,7 +305,7 @@ void createOrder_duplicateProducts_throwsException() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands)) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); @@ -292,14 +325,15 @@ void getOrders_returnsUserOrders() { List commands = List.of( OrderItemCommand.of(product.getId(), 1) ); - purchasingFacade.createOrder(user.getUserId(), commands); + purchasingFacade.createOrder(user.getUserId(), commands, "SAMSUNG", "4111-1111-1111-1111"); // act List orders = purchasingFacade.getOrders(user.getUserId()); // assert assertThat(orders).hasSize(1); - assertThat(orders.get(0).status()).isEqualTo(OrderStatus.COMPLETED); + // createOrder는 주문을 PENDING 상태로 생성하고, PG 결제 요청은 afterCommit 콜백에서 비동기로 실행됨 + assertThat(orders.get(0).status()).isEqualTo(OrderStatus.PENDING); } @Test @@ -313,14 +347,15 @@ void getOrder_returnsSingleOrder() { List commands = List.of( OrderItemCommand.of(product.getId(), 1) ); - OrderInfo createdOrder = purchasingFacade.createOrder(user.getUserId(), commands); + OrderInfo createdOrder = purchasingFacade.createOrder(user.getUserId(), commands, "SAMSUNG", "4111-1111-1111-1111"); // act OrderInfo found = purchasingFacade.getOrder(user.getUserId(), createdOrder.orderId()); // assert assertThat(found.orderId()).isEqualTo(createdOrder.orderId()); - assertThat(found.status()).isEqualTo(OrderStatus.COMPLETED); + // createOrder는 주문을 PENDING 상태로 생성하고, PG 결제 요청은 afterCommit 콜백에서 비동기로 실행됨 + assertThat(found.status()).isEqualTo(OrderStatus.PENDING); } @Test @@ -338,7 +373,7 @@ void getOrder_withDifferentUser_throwsException() { List commands = List.of( OrderItemCommand.of(product.getId(), 1) ); - OrderInfo user1Order = purchasingFacade.createOrder(user1Id, commands); + OrderInfo user1Order = purchasingFacade.createOrder(user1Id, commands, "SAMSUNG", "4111-1111-1111-1111"); final Long orderId = user1Order.orderId(); // act & assert @@ -370,7 +405,7 @@ void createOrder_atomicityGuaranteed() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands)) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); @@ -412,11 +447,12 @@ void createOrder_success_allOperationsReflected() { final int totalAmount = (10_000 * 3) + (15_000 * 2); // act - OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands); + OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); // assert // 주문이 정상적으로 생성되었는지 확인 - assertThat(orderInfo.status()).isEqualTo(OrderStatus.COMPLETED); + // createOrder는 주문을 PENDING 상태로 생성하고, PG 결제 요청은 afterCommit 콜백에서 비동기로 실행됨 + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); assertThat(orderInfo.items()).hasSize(2); // 재고가 정상적으로 차감되었는지 확인 @@ -452,10 +488,11 @@ void createOrder_withFixedAmountCoupon_success() { ); // act - OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands); + OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); // assert - assertThat(orderInfo.status()).isEqualTo(OrderStatus.COMPLETED); + // createOrder는 주문을 PENDING 상태로 생성하고, PG 결제 요청은 afterCommit 콜백에서 비동기로 실행됨 + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); assertThat(orderInfo.totalAmount()).isEqualTo(5_000); // 10,000 - 5,000 = 5,000 // 쿠폰이 사용되었는지 확인 @@ -481,10 +518,11 @@ void createOrder_withPercentageCoupon_success() { ); // act - OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands); + OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); // assert - assertThat(orderInfo.status()).isEqualTo(OrderStatus.COMPLETED); + // createOrder는 주문을 PENDING 상태로 생성하고, PG 결제 요청은 afterCommit 콜백에서 비동기로 실행됨 + assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); assertThat(orderInfo.totalAmount()).isEqualTo(8_000); // 10,000 - (10,000 * 20%) = 8,000 // 쿠폰이 사용되었는지 확인 @@ -507,7 +545,7 @@ void createOrder_withNonExistentCoupon_shouldFail() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands)) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.NOT_FOUND); } @@ -530,7 +568,7 @@ void createOrder_withCouponNotOwnedByUser_shouldFail() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands)) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.NOT_FOUND); } @@ -554,7 +592,7 @@ void createOrder_withUsedCoupon_shouldFail() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands)) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); } diff --git a/apps/commerce-api/src/test/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClientTest.java b/apps/commerce-api/src/test/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClientTest.java new file mode 100644 index 000000000..89b3eef61 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClientTest.java @@ -0,0 +1,277 @@ +package com.loopers.infrastructure.paymentgateway; + +import com.loopers.utils.DatabaseCleanUp; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import feign.FeignException; +import feign.Request; +import org.springframework.test.context.ActiveProfiles; + +import java.net.SocketTimeoutException; +import java.util.Collections; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.*; + +/** + * PaymentGatewayClient 타임아웃 및 실패 처리 테스트. + *

+ * 외부 PG 시스템과의 통신에서 발생할 수 있는 다양한 장애 시나리오를 검증합니다. + * - 타임아웃 처리 + * - 네트워크 오류 처리 + * - 서버 오류 처리 + *

+ */ +@SpringBootTest +@ActiveProfiles("test") +@DisplayName("PaymentGatewayClient 타임아웃 및 실패 처리 테스트") +class PaymentGatewayClientTest { + + @MockitoBean + private PaymentGatewayClient paymentGatewayClient; + + @Autowired + private DatabaseCleanUp databaseCleanUp; + + @AfterEach + void tearDown() { + databaseCleanUp.truncateAllTables(); + reset(paymentGatewayClient); + } + + @Test + @DisplayName("PG 결제 요청 시 타임아웃이 발생하면 적절한 예외가 발생한다") + void requestPayment_timeout_throwsException() { + // arrange + String userId = "testuser"; + PaymentGatewayDto.PaymentRequest request = new PaymentGatewayDto.PaymentRequest( + "ORDER001", + PaymentGatewayDto.CardType.SAMSUNG, + "4111-1111-1111-1111", + 10_000L, + "http://localhost:8080/api/v1/orders/1/callback" + ); + + // Mock 서버에서 타임아웃 예외 발생 + SocketTimeoutException timeoutException = new SocketTimeoutException("Request timeout"); + doThrow(new RuntimeException(timeoutException)) + .when(paymentGatewayClient).requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + // act & assert + assertThatThrownBy(() -> paymentGatewayClient.requestPayment(userId, request)) + .isInstanceOf(RuntimeException.class) + .hasCauseInstanceOf(SocketTimeoutException.class) + .hasMessageContaining("Request timeout"); + } + + @Test + @DisplayName("PG 결제 요청 시 연결 타임아웃이 발생하면 적절한 예외가 발생한다") + void requestPayment_connectionTimeout_throwsException() { + // arrange + String userId = "testuser"; + PaymentGatewayDto.PaymentRequest request = new PaymentGatewayDto.PaymentRequest( + "ORDER001", + PaymentGatewayDto.CardType.SAMSUNG, + "4111-1111-1111-1111", + 10_000L, + "http://localhost:8080/api/v1/orders/1/callback" + ); + + // Mock 서버에서 연결 실패 예외 발생 + SocketTimeoutException timeoutException = new SocketTimeoutException("Connection timeout"); + doThrow(new RuntimeException(timeoutException)) + .when(paymentGatewayClient).requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + // act & assert + assertThatThrownBy(() -> paymentGatewayClient.requestPayment(userId, request)) + .isInstanceOf(RuntimeException.class) + .hasCauseInstanceOf(SocketTimeoutException.class) + .hasMessageContaining("Connection timeout"); + } + + @Test + @DisplayName("PG 결제 요청 시 읽기 타임아웃이 발생하면 적절한 예외가 발생한다") + void requestPayment_readTimeout_throwsException() { + // arrange + String userId = "testuser"; + PaymentGatewayDto.PaymentRequest request = new PaymentGatewayDto.PaymentRequest( + "ORDER001", + PaymentGatewayDto.CardType.SAMSUNG, + "4111-1111-1111-1111", + 10_000L, + "http://localhost:8080/api/v1/orders/1/callback" + ); + + // Mock 서버에서 읽기 타임아웃 예외 발생 + SocketTimeoutException timeoutException = new SocketTimeoutException("Read timed out"); + doThrow(new RuntimeException(timeoutException)) + .when(paymentGatewayClient).requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + // act & assert + assertThatThrownBy(() -> paymentGatewayClient.requestPayment(userId, request)) + .isInstanceOf(RuntimeException.class) + .hasCauseInstanceOf(SocketTimeoutException.class) + .hasMessageContaining("Read timed out"); + } + + @Test + @DisplayName("PG 결제 상태 확인 API 호출 시 타임아웃이 발생하면 적절한 예외가 발생한다") + void getTransaction_timeout_throwsException() { + // arrange + String userId = "testuser"; + String transactionKey = "TXN123456"; + + // Mock 서버에서 타임아웃 예외 발생 + SocketTimeoutException timeoutException = new SocketTimeoutException("Request timeout"); + doThrow(new RuntimeException(timeoutException)) + .when(paymentGatewayClient).getTransaction(anyString(), anyString()); + + // act & assert + assertThatThrownBy(() -> paymentGatewayClient.getTransaction(userId, transactionKey)) + .isInstanceOf(RuntimeException.class) + .hasCauseInstanceOf(SocketTimeoutException.class) + .hasMessageContaining("Request timeout"); + } + + @Test + @DisplayName("PG 서버가 500 에러를 반환하면 적절한 예외가 발생한다") + void requestPayment_serverError_throwsException() { + // arrange + String userId = "testuser"; + PaymentGatewayDto.PaymentRequest request = new PaymentGatewayDto.PaymentRequest( + "ORDER001", + PaymentGatewayDto.CardType.SAMSUNG, + "4111-1111-1111-1111", + 10_000L, + "http://localhost:8080/api/v1/orders/1/callback" + ); + + // Mock 서버에서 500 에러 반환 + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenThrow(new FeignException.InternalServerError( + "Internal Server Error", + Request.create(Request.HttpMethod.POST, "/api/v1/payments", Collections.emptyMap(), null, null, null), + null, + Collections.emptyMap() + )); + + // act & assert + assertThatThrownBy(() -> paymentGatewayClient.requestPayment(userId, request)) + .isInstanceOf(FeignException.class) + .matches(e -> ((FeignException) e).status() == 500); + } + + @Test + @DisplayName("PG 서버가 400 에러를 반환하면 적절한 예외가 발생한다") + void requestPayment_badRequest_throwsException() { + // arrange + String userId = "testuser"; + PaymentGatewayDto.PaymentRequest request = new PaymentGatewayDto.PaymentRequest( + "ORDER001", + PaymentGatewayDto.CardType.SAMSUNG, + "INVALID_CARD", // 잘못된 카드 번호 + 10_000L, + "http://localhost:8080/api/v1/orders/1/callback" + ); + + // Mock 서버에서 400 에러 반환 + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenThrow(new FeignException.BadRequest( + "Bad Request", + Request.create(Request.HttpMethod.POST, "/api/v1/payments", Collections.emptyMap(), null, null, null), + null, + Collections.emptyMap() + )); + + // act & assert + assertThatThrownBy(() -> paymentGatewayClient.requestPayment(userId, request)) + .isInstanceOf(FeignException.class) + .matches(e -> ((FeignException) e).status() == 400); + } + + @Test + @DisplayName("PG 결제 요청이 성공하면 정상적인 응답을 받는다") + void requestPayment_success_returnsResponse() { + // arrange + String userId = "testuser"; + PaymentGatewayDto.PaymentRequest request = new PaymentGatewayDto.PaymentRequest( + "ORDER001", + PaymentGatewayDto.CardType.SAMSUNG, + "4111-1111-1111-1111", + 10_000L, + "http://localhost:8080/api/v1/orders/1/callback" + ); + + // Mock 서버에서 성공 응답 반환 + PaymentGatewayDto.ApiResponse successResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.TransactionResponse( + "TXN123456", + PaymentGatewayDto.TransactionStatus.PENDING, + null + ) + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(successResponse); + + // act + PaymentGatewayDto.ApiResponse response = + paymentGatewayClient.requestPayment(userId, request); + + // assert + assertThat(response.meta().result()).isEqualTo(PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS); + assertThat(response.data()).isNotNull(); + assertThat(response.data().transactionKey()).isNotNull(); + } + + @Test + @DisplayName("PG 결제 상태 확인 API가 성공하면 정상적인 응답을 받는다") + void getTransaction_success_returnsResponse() { + // arrange + String userId = "testuser"; + String transactionKey = "TXN123456"; + + // Mock 서버에서 성공 응답 반환 + PaymentGatewayDto.ApiResponse successResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.TransactionDetailResponse( + transactionKey, + "ORDER001", + PaymentGatewayDto.CardType.SAMSUNG, + "4111-1111-1111-1111", + 10_000L, + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ) + ); + when(paymentGatewayClient.getTransaction(anyString(), anyString())) + .thenReturn(successResponse); + + // act + PaymentGatewayDto.ApiResponse response = + paymentGatewayClient.getTransaction(userId, transactionKey); + + // assert + assertThat(response.meta().result()).isEqualTo(PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS); + assertThat(response.data()).isNotNull(); + assertThat(response.data().transactionKey()).isEqualTo(transactionKey); + } +} + diff --git a/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java b/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java new file mode 100644 index 000000000..46e6f964a --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java @@ -0,0 +1,535 @@ +package com.loopers.interfaces.api; + +import com.loopers.application.pointwallet.PointWalletFacade; +import com.loopers.application.signup.SignUpFacade; +import com.loopers.domain.brand.Brand; +import com.loopers.domain.brand.BrandRepository; +import com.loopers.domain.order.OrderStatus; +import com.loopers.domain.product.Product; +import com.loopers.domain.product.ProductRepository; +import com.loopers.domain.user.Gender; +import com.loopers.domain.user.UserTestFixture; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayClient; +import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.infrastructure.paymentgateway.PaymentGatewaySchedulerClient; +import com.loopers.interfaces.api.ApiResponse; +import com.loopers.interfaces.api.purchasing.PurchasingV1Dto; +import com.loopers.utils.DatabaseCleanUp; +import io.github.resilience4j.circuitbreaker.CircuitBreaker; +import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.boot.test.web.client.TestRestTemplate; +import feign.FeignException; +import feign.Request; + +import java.net.SocketTimeoutException; +import java.util.Collections; +import org.springframework.core.ParameterizedTypeReference; +import static org.mockito.Mockito.doThrow; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.ActiveProfiles; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; + +/** + * PurchasingV1Api E2E 테스트. + *

+ * PG 연동 관련 E2E 시나리오를 검증합니다. + * - PG 타임아웃 시나리오 + * - PG 실패 시나리오 + * - 서킷 브레이커 동작 + *

+ */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles("test") +@DisplayName("PurchasingV1Api E2E 테스트") +public class PurchasingV1ApiE2ETest { + + private static final String ENDPOINT_ORDERS = "/api/v1/orders"; + + @Autowired + private TestRestTemplate testRestTemplate; + + @Autowired + private SignUpFacade signUpFacade; + + @Autowired + private PointWalletFacade pointWalletFacade; + + @Autowired + private ProductRepository productRepository; + + @Autowired + private BrandRepository brandRepository; + + @MockitoBean + private PaymentGatewayClient paymentGatewayClient; + + @MockitoBean + private PaymentGatewaySchedulerClient paymentGatewaySchedulerClient; + + @Autowired + private CircuitBreakerRegistry circuitBreakerRegistry; + + @Autowired + private DatabaseCleanUp databaseCleanUp; + + @AfterEach + void tearDown() { + databaseCleanUp.truncateAllTables(); + reset(paymentGatewayClient, paymentGatewaySchedulerClient); + // 서킷 브레이커 상태 초기화 + if (circuitBreakerRegistry != null) { + circuitBreakerRegistry.getAllCircuitBreakers().forEach(CircuitBreaker::reset); + } + } + + // 테스트 데이터 준비 헬퍼 메서드 + private HttpEntity createOrderRequest(Long productId) { + String userId = UserTestFixture.ValidUser.USER_ID; + String email = UserTestFixture.ValidUser.EMAIL; + String birthDate = UserTestFixture.ValidUser.BIRTH_DATE; + signUpFacade.signUp(userId, email, birthDate, Gender.MALE.name()); + pointWalletFacade.chargePoint(userId, 500_000L); + + Brand brand = Brand.of("테스트 브랜드"); + Brand savedBrand = brandRepository.save(brand); + Product product = Product.of("테스트 상품", 10_000, 10, savedBrand.getId()); + Product savedProduct = productRepository.save(product); + + PurchasingV1Dto.CreateRequest requestBody = new PurchasingV1Dto.CreateRequest( + List.of( + new PurchasingV1Dto.ItemRequest(savedProduct.getId(), 1) + ), + new PurchasingV1Dto.PaymentRequest("SAMSUNG", "4111-1111-1111-1111") + ); + + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.add("X-USER-ID", userId); + return new HttpEntity<>(requestBody, headers); + } + + @DisplayName("POST /api/v1/orders") + @Nested + class CreateOrder { + @DisplayName("외부 시스템(PG) 장애 시에도 항상 200 응답을 반환한다") + @Nested + class ExternalSystemFailureIsolation { + @DisplayName("PG 타임아웃 시에도 200 응답을 반환한다") + @Test + void returns200_whenPaymentGatewayTimeout() { + // arrange + HttpEntity httpEntity = createOrderRequest(null); + doThrow(new RuntimeException(new SocketTimeoutException("Request timeout"))) + .when(paymentGatewayClient).requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + // act + ParameterizedTypeReference> responseType = + new ParameterizedTypeReference<>() {}; + ResponseEntity> response = + testRestTemplate.exchange(ENDPOINT_ORDERS, HttpMethod.POST, httpEntity, responseType); + + // assert - 외부 시스템 장애 격리 원칙: 항상 200 응답 + assertAll( + () -> assertTrue(response.getStatusCode().is2xxSuccessful()), + () -> assertThat(response.getBody().meta().result()).isEqualTo(ApiResponse.Metadata.Result.SUCCESS), + () -> assertThat(response.getBody().data().status()).isEqualTo(OrderStatus.PENDING) + ); + } + + @DisplayName("PG 서버 500 에러 시에도 200 응답을 반환한다") + @Test + void returns200_whenPaymentGatewayServerError() { + // arrange + HttpEntity httpEntity = createOrderRequest(null); + + // 서킷 브레이커를 리셋하여 CLOSED 상태로 시작 + if (circuitBreakerRegistry != null) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker("pgCircuit"); + if (circuitBreaker != null) { + circuitBreaker.reset(); + } + } + + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenThrow(new FeignException.InternalServerError( + "Internal Server Error", + Request.create(Request.HttpMethod.POST, "/api/v1/payments", Collections.emptyMap(), null, null, null), + null, + Collections.emptyMap() + )); + + // act + ParameterizedTypeReference> responseType = + new ParameterizedTypeReference<>() {}; + ResponseEntity> response = + testRestTemplate.exchange(ENDPOINT_ORDERS, HttpMethod.POST, httpEntity, responseType); + + // assert - 외부 시스템 장애 격리 원칙: 항상 200 응답 + assertAll( + () -> assertTrue(response.getStatusCode().is2xxSuccessful()), + () -> assertThat(response.getBody().meta().result()).isEqualTo(ApiResponse.Metadata.Result.SUCCESS), + () -> assertThat(response.getBody().data().status()).isEqualTo(OrderStatus.PENDING) + ); + } + + @DisplayName("PG 실패 응답 시에도 200 응답을 반환한다") + @Test + void returns200_whenPaymentGatewayFailure() { + // arrange + HttpEntity httpEntity = createOrderRequest(null); + + PaymentGatewayDto.ApiResponse failureResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.FAIL, + "INTERNAL_SERVER_ERROR", + "PG 서버 내부 오류가 발생했습니다" + ), + null + ); + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(failureResponse); + + // act + ParameterizedTypeReference> responseType = + new ParameterizedTypeReference<>() {}; + ResponseEntity> response = + testRestTemplate.exchange(ENDPOINT_ORDERS, HttpMethod.POST, httpEntity, responseType); + + // assert - 외부 시스템 장애 격리 원칙: 항상 200 응답 + assertAll( + () -> assertTrue(response.getStatusCode().is2xxSuccessful()), + () -> assertThat(response.getBody().meta().result()).isEqualTo(ApiResponse.Metadata.Result.SUCCESS), + () -> assertThat(response.getBody().data().status()).isEqualTo(OrderStatus.PENDING) + ); + } + } + + } + + @DisplayName("POST /api/v1/orders/{orderId}/callback") + @Nested + class HandlePaymentCallback { + private static final String ENDPOINT_CALLBACK = "/api/v1/orders/{orderId}/callback"; + + @DisplayName("PG 결제 성공 콜백을 수신하면 주문 상태가 COMPLETED로 변경되고 200 응답을 반환한다") + @Test + void returns200_whenPaymentCallbackSuccess() { + // arrange + String userId = UserTestFixture.ValidUser.USER_ID; + String email = UserTestFixture.ValidUser.EMAIL; + String birthDate = UserTestFixture.ValidUser.BIRTH_DATE; + signUpFacade.signUp(userId, email, birthDate, Gender.MALE.name()); + pointWalletFacade.chargePoint(userId, 500_000L); + + Brand brand = Brand.of("테스트 브랜드"); + Brand savedBrand = brandRepository.save(brand); + Product product = Product.of("테스트 상품", 10_000, 10, savedBrand.getId()); + Product savedProduct = productRepository.save(product); + + // 주문 생성 (PENDING 상태) + PurchasingV1Dto.CreateRequest createRequest = new PurchasingV1Dto.CreateRequest( + List.of( + new PurchasingV1Dto.ItemRequest(savedProduct.getId(), 1) + ), + new PurchasingV1Dto.PaymentRequest("SAMSUNG", "4111-1111-1111-1111") + ); + + HttpHeaders createHeaders = new HttpHeaders(); + createHeaders.setContentType(MediaType.APPLICATION_JSON); + createHeaders.add("X-USER-ID", userId); + HttpEntity createHttpEntity = new HttpEntity<>(createRequest, createHeaders); + + // PG 결제 요청 성공 Mock + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.TransactionResponse( + "TXN123456", + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ) + )); + + ParameterizedTypeReference> createResponseType = + new ParameterizedTypeReference<>() {}; + ResponseEntity> createResponse = + testRestTemplate.exchange(ENDPOINT_ORDERS, HttpMethod.POST, createHttpEntity, createResponseType); + + Long orderId = createResponse.getBody().data().orderId(); + String transactionKey = "TXN123456"; + + // 콜백 검증을 위한 PG 조회 API Mock (SUCCESS 상태 반환) + PaymentGatewayDto.ApiResponse pgInquiryResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.OrderResponse( + String.format("%06d", orderId), + List.of( + new PaymentGatewayDto.TransactionResponse( + transactionKey, + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ) + ) + ) + ); + when(paymentGatewaySchedulerClient.getTransactionsByOrder(eq(userId), eq(String.format("%06d", orderId)))) + .thenReturn(pgInquiryResponse); + + // 콜백 요청 생성 + PaymentGatewayDto.CallbackRequest callbackRequest = new PaymentGatewayDto.CallbackRequest( + transactionKey, + String.format("%06d", orderId), + PaymentGatewayDto.CardType.SAMSUNG, + "4111-1111-1111-1111", + 10_000L, + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ); + + HttpHeaders callbackHeaders = new HttpHeaders(); + callbackHeaders.setContentType(MediaType.APPLICATION_JSON); + HttpEntity callbackHttpEntity = new HttpEntity<>(callbackRequest, callbackHeaders); + + // act + ResponseEntity> response = testRestTemplate.exchange( + ENDPOINT_CALLBACK, + HttpMethod.POST, + callbackHttpEntity, + new ParameterizedTypeReference>() {}, + orderId + ); + + // assert + assertAll( + () -> assertTrue(response.getStatusCode().is2xxSuccessful()), + () -> assertThat(response.getBody()).isNotNull(), + () -> assertThat(response.getBody().meta().result()).isEqualTo(ApiResponse.Metadata.Result.SUCCESS) + ); + } + + @DisplayName("PG 결제 실패 콜백을 수신하면 주문 상태가 CANCELED로 변경되고 200 응답을 반환한다") + @Test + void returns200_whenPaymentCallbackFailure() { + // arrange + String userId = UserTestFixture.ValidUser.USER_ID; + String email = UserTestFixture.ValidUser.EMAIL; + String birthDate = UserTestFixture.ValidUser.BIRTH_DATE; + signUpFacade.signUp(userId, email, birthDate, Gender.MALE.name()); + pointWalletFacade.chargePoint(userId, 500_000L); + + Brand brand = Brand.of("테스트 브랜드"); + Brand savedBrand = brandRepository.save(brand); + Product product = Product.of("테스트 상품", 10_000, 10, savedBrand.getId()); + Product savedProduct = productRepository.save(product); + + // 주문 생성 (PENDING 상태) + PurchasingV1Dto.CreateRequest createRequest = new PurchasingV1Dto.CreateRequest( + List.of( + new PurchasingV1Dto.ItemRequest(savedProduct.getId(), 1) + ), + new PurchasingV1Dto.PaymentRequest("SAMSUNG", "4111-1111-1111-1111") + ); + + HttpHeaders createHeaders = new HttpHeaders(); + createHeaders.setContentType(MediaType.APPLICATION_JSON); + createHeaders.add("X-USER-ID", userId); + HttpEntity createHttpEntity = new HttpEntity<>(createRequest, createHeaders); + + // PG 결제 요청 성공 Mock + when(paymentGatewayClient.requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class))) + .thenReturn(new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.TransactionResponse( + "TXN123456", + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ) + )); + + ParameterizedTypeReference> createResponseType = + new ParameterizedTypeReference<>() {}; + ResponseEntity> createResponse = + testRestTemplate.exchange(ENDPOINT_ORDERS, HttpMethod.POST, createHttpEntity, createResponseType); + + Long orderId = createResponse.getBody().data().orderId(); + String transactionKey = "TXN123456"; + + // 콜백 검증을 위한 PG 조회 API Mock (FAILED 상태 반환) + PaymentGatewayDto.ApiResponse pgInquiryResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.OrderResponse( + String.format("%06d", orderId), + List.of( + new PaymentGatewayDto.TransactionResponse( + transactionKey, + PaymentGatewayDto.TransactionStatus.FAILED, + "카드 한도 초과" + ) + ) + ) + ); + when(paymentGatewaySchedulerClient.getTransactionsByOrder(eq(userId), eq(String.format("%06d", orderId)))) + .thenReturn(pgInquiryResponse); + + // 콜백 요청 생성 (FAILED 상태) + PaymentGatewayDto.CallbackRequest callbackRequest = new PaymentGatewayDto.CallbackRequest( + transactionKey, + String.format("%06d", orderId), + PaymentGatewayDto.CardType.SAMSUNG, + "4111-1111-1111-1111", + 10_000L, + PaymentGatewayDto.TransactionStatus.FAILED, + "카드 한도 초과" + ); + + HttpHeaders callbackHeaders = new HttpHeaders(); + callbackHeaders.setContentType(MediaType.APPLICATION_JSON); + HttpEntity callbackHttpEntity = new HttpEntity<>(callbackRequest, callbackHeaders); + + // act + ResponseEntity> response = testRestTemplate.exchange( + ENDPOINT_CALLBACK, + HttpMethod.POST, + callbackHttpEntity, + new ParameterizedTypeReference>() {}, + orderId + ); + + // assert + assertAll( + () -> assertTrue(response.getStatusCode().is2xxSuccessful()), + () -> assertThat(response.getBody()).isNotNull(), + () -> assertThat(response.getBody().meta().result()).isEqualTo(ApiResponse.Metadata.Result.SUCCESS) + ); + } + } + + @DisplayName("POST /api/v1/orders/{orderId}/recover") + @Nested + class RecoverOrderStatus { + private static final String ENDPOINT_RECOVER = "/api/v1/orders/{orderId}/recover"; + + @DisplayName("수동으로 주문 상태를 복구할 수 있다") + @Test + void returns200_whenOrderStatusRecovered() { + // arrange + String userId = UserTestFixture.ValidUser.USER_ID; + String email = UserTestFixture.ValidUser.EMAIL; + String birthDate = UserTestFixture.ValidUser.BIRTH_DATE; + signUpFacade.signUp(userId, email, birthDate, Gender.MALE.name()); + pointWalletFacade.chargePoint(userId, 500_000L); + + Brand brand = Brand.of("테스트 브랜드"); + Brand savedBrand = brandRepository.save(brand); + Product product = Product.of("테스트 상품", 10_000, 10, savedBrand.getId()); + Product savedProduct = productRepository.save(product); + + // 주문 생성 (타임아웃으로 인해 PENDING 상태 유지) + PurchasingV1Dto.CreateRequest createRequest = new PurchasingV1Dto.CreateRequest( + List.of( + new PurchasingV1Dto.ItemRequest(savedProduct.getId(), 1) + ), + new PurchasingV1Dto.PaymentRequest("SAMSUNG", "4111-1111-1111-1111") + ); + + HttpHeaders createHeaders = new HttpHeaders(); + createHeaders.setContentType(MediaType.APPLICATION_JSON); + createHeaders.add("X-USER-ID", userId); + HttpEntity createHttpEntity = new HttpEntity<>(createRequest, createHeaders); + + // PG 결제 요청 타임아웃 Mock (주문은 PENDING 상태로 유지) + doThrow(new RuntimeException(new SocketTimeoutException("Request timeout"))) + .when(paymentGatewayClient).requestPayment(anyString(), any(PaymentGatewayDto.PaymentRequest.class)); + + ParameterizedTypeReference> createResponseType = + new ParameterizedTypeReference<>() {}; + ResponseEntity> createResponse = + testRestTemplate.exchange(ENDPOINT_ORDERS, HttpMethod.POST, createHttpEntity, createResponseType); + + Long orderId = createResponse.getBody().data().orderId(); + String transactionKey = "TXN123456"; + + // 상태 복구를 위한 PG 조회 API Mock (SUCCESS 상태 반환) + PaymentGatewayDto.ApiResponse pgInquiryResponse = + new PaymentGatewayDto.ApiResponse<>( + new PaymentGatewayDto.ApiResponse.Metadata( + PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS, + null, + null + ), + new PaymentGatewayDto.OrderResponse( + String.format("%06d", orderId), + List.of( + new PaymentGatewayDto.TransactionResponse( + transactionKey, + PaymentGatewayDto.TransactionStatus.SUCCESS, + null + ) + ) + ) + ); + when(paymentGatewaySchedulerClient.getTransactionsByOrder(eq(userId), eq(String.format("%06d", orderId)))) + .thenReturn(pgInquiryResponse); + + HttpHeaders recoverHeaders = new HttpHeaders(); + recoverHeaders.add("X-USER-ID", userId); + HttpEntity recoverHttpEntity = new HttpEntity<>(recoverHeaders); + + // act + ResponseEntity> response = testRestTemplate.exchange( + ENDPOINT_RECOVER, + HttpMethod.POST, + recoverHttpEntity, + new ParameterizedTypeReference>() {}, + orderId + ); + + // assert + assertAll( + () -> assertTrue(response.getStatusCode().is2xxSuccessful()), + () -> assertThat(response.getBody()).isNotNull(), + () -> assertThat(response.getBody().meta().result()).isEqualTo(ApiResponse.Metadata.Result.SUCCESS) + ); + } + } +} + diff --git a/apps/commerce-api/src/test/java/com/loopers/testutil/CircuitBreakerTestUtil.java b/apps/commerce-api/src/test/java/com/loopers/testutil/CircuitBreakerTestUtil.java new file mode 100644 index 000000000..96ce26e96 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/testutil/CircuitBreakerTestUtil.java @@ -0,0 +1,152 @@ +package com.loopers.testutil; + +import io.github.resilience4j.circuitbreaker.CircuitBreaker; +import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * Circuit Breaker 테스트 유틸리티. + *

+ * Circuit Breaker를 특정 상태로 만들거나, 실패를 유발하여 Circuit Breaker를 열리게 하는 유틸리티 메서드를 제공합니다. + *

+ */ +@Component +public class CircuitBreakerTestUtil { + + private static final Logger log = LoggerFactory.getLogger(CircuitBreakerTestUtil.class); + private final CircuitBreakerRegistry circuitBreakerRegistry; + + @Autowired + public CircuitBreakerTestUtil(CircuitBreakerRegistry circuitBreakerRegistry) { + this.circuitBreakerRegistry = circuitBreakerRegistry; + } + + /** + * Circuit Breaker를 OPEN 상태로 전환합니다. + * + * @param circuitBreakerName Circuit Breaker 이름 (예: "paymentGatewayClient") + */ + public void openCircuitBreaker(String circuitBreakerName) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker(circuitBreakerName); + if (circuitBreaker != null) { + circuitBreaker.transitionToOpenState(); + log.info("Circuit Breaker '{}'를 OPEN 상태로 전환했습니다.", circuitBreakerName); + } else { + log.warn("Circuit Breaker '{}'를 찾을 수 없습니다.", circuitBreakerName); + } + } + + /** + * Circuit Breaker를 HALF_OPEN 상태로 전환합니다. + * + * @param circuitBreakerName Circuit Breaker 이름 + */ + public void halfOpenCircuitBreaker(String circuitBreakerName) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker(circuitBreakerName); + if (circuitBreaker != null) { + circuitBreaker.transitionToHalfOpenState(); + log.info("Circuit Breaker '{}'를 HALF_OPEN 상태로 전환했습니다.", circuitBreakerName); + } else { + log.warn("Circuit Breaker '{}'를 찾을 수 없습니다.", circuitBreakerName); + } + } + + /** + * Circuit Breaker를 CLOSED 상태로 리셋합니다. + * + * @param circuitBreakerName Circuit Breaker 이름 + */ + public void resetCircuitBreaker(String circuitBreakerName) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker(circuitBreakerName); + if (circuitBreaker != null) { + circuitBreaker.reset(); + log.info("Circuit Breaker '{}'를 리셋했습니다.", circuitBreakerName); + } else { + log.warn("Circuit Breaker '{}'를 찾을 수 없습니다.", circuitBreakerName); + } + } + + /** + * Circuit Breaker의 현재 상태를 반환합니다. + * + * @param circuitBreakerName Circuit Breaker 이름 + * @return Circuit Breaker 상태 (CLOSED, OPEN, HALF_OPEN) + */ + public CircuitBreaker.State getCircuitBreakerState(String circuitBreakerName) { + CircuitBreaker circuitBreaker = circuitBreakerRegistry.circuitBreaker(circuitBreakerName); + if (circuitBreaker != null) { + return circuitBreaker.getState(); + } + return null; + } + + /** + * 실패를 유발하여 Circuit Breaker를 OPEN 상태로 만듭니다. + *

+ * 이 메서드는 실패 임계값을 초과하도록 여러 번 실패를 유발합니다. + *

+ * + * @param circuitBreakerName Circuit Breaker 이름 + * @param failureFunction 실패를 유발하는 함수 (예: PG API 호출) + * @param minFailures 최소 실패 횟수 (실패율 임계값을 초과하기 위해 필요한 실패 횟수) + */ + public void triggerCircuitBreakerOpen(String circuitBreakerName, Runnable failureFunction, int minFailures) { + log.info("Circuit Breaker '{}'를 OPEN 상태로 만들기 위해 {}번의 실패를 유발합니다.", circuitBreakerName, minFailures); + + // Circuit Breaker 리셋 + resetCircuitBreaker(circuitBreakerName); + + // 실패 유발 + AtomicInteger failureCount = new AtomicInteger(0); + for (int i = 0; i < minFailures; i++) { + try { + failureFunction.run(); + } catch (Exception e) { + failureCount.incrementAndGet(); + log.debug("실패 {}번 발생: {}", failureCount.get(), e.getMessage()); + } + } + + log.info("총 {}번의 실패를 유발했습니다. Circuit Breaker 상태: {}", + failureCount.get(), getCircuitBreakerState(circuitBreakerName)); + } + + /** + * Circuit Breaker가 OPEN 상태인지 확인합니다. + * + * @param circuitBreakerName Circuit Breaker 이름 + * @return OPEN 상태이면 true + */ + public boolean isCircuitBreakerOpen(String circuitBreakerName) { + CircuitBreaker.State state = getCircuitBreakerState(circuitBreakerName); + return state == CircuitBreaker.State.OPEN; + } + + /** + * Circuit Breaker가 HALF_OPEN 상태인지 확인합니다. + * + * @param circuitBreakerName Circuit Breaker 이름 + * @return HALF_OPEN 상태이면 true + */ + public boolean isCircuitBreakerHalfOpen(String circuitBreakerName) { + CircuitBreaker.State state = getCircuitBreakerState(circuitBreakerName); + return state == CircuitBreaker.State.HALF_OPEN; + } + + /** + * Circuit Breaker가 CLOSED 상태인지 확인합니다. + * + * @param circuitBreakerName Circuit Breaker 이름 + * @return CLOSED 상태이면 true + */ + public boolean isCircuitBreakerClosed(String circuitBreakerName) { + CircuitBreaker.State state = getCircuitBreakerState(circuitBreakerName); + return state == CircuitBreaker.State.CLOSED; + } +} + From 69c895c4b204c346601d1c2ceda3f5d78c5477af Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 18:34:11 +0900 Subject: [PATCH 03/22] =?UTF-8?q?test:=20payment=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EB=8B=A8=EC=9C=84=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loopers/domain/payment/PaymentTest.java | 283 ++++++++++++++++++ .../domain/payment/PaymentTestFixture.java | 30 ++ 2 files changed, 313 insertions(+) create mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTest.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTestFixture.java diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTest.java new file mode 100644 index 000000000..c4c8787b7 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTest.java @@ -0,0 +1,283 @@ +package com.loopers.domain.payment; + +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.time.LocalDateTime; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class PaymentTest { + + @DisplayName("필수 입력값 검증") + @Nested + class InputValidation { + @DisplayName("결제 생성 시 주문 ID가 null이면 예외가 발생한다.") + @Test + void throwsException_whenOrderIdIsNull() { + // arrange + Long userId = PaymentTestFixture.ValidPayment.USER_ID; + Long amount = PaymentTestFixture.ValidPayment.AMOUNT; + + // act + CoreException result = assertThrows(CoreException.class, () -> { + Payment.of(null, userId, PaymentTestFixture.ValidPayment.CARD_TYPE, PaymentTestFixture.ValidPayment.CARD_NO, amount, PaymentTestFixture.ValidPayment.REQUESTED_AT); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + } + + @DisplayName("결제 생성 시 결제 금액이 0 이하이면 예외가 발생한다.") + @Test + void throwsException_whenAmountIsNotPositive() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + Long userId = PaymentTestFixture.ValidPayment.USER_ID; + Long invalidAmount = PaymentTestFixture.InvalidPayment.INVALID_AMOUNT; + + // act + CoreException result = assertThrows(CoreException.class, () -> { + Payment.of(orderId, userId, PaymentTestFixture.ValidPayment.CARD_TYPE, PaymentTestFixture.ValidPayment.CARD_NO, invalidAmount, PaymentTestFixture.ValidPayment.REQUESTED_AT); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + } + } + + @DisplayName("상태 검증") + @Nested + class StatusValidation { + @DisplayName("포인트로 전액 결제하면 SUCCESS 상태로 생성된다.") + @Test + void hasSuccessStatus_whenPointCoversTotalAmount() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + Long userId = PaymentTestFixture.ValidPayment.USER_ID; + Long totalAmount = PaymentTestFixture.ValidPayment.AMOUNT; + Long usedPoint = totalAmount; // 포인트로 전액 결제 + + // act + Payment payment = Payment.of(orderId, userId, totalAmount, usedPoint, PaymentTestFixture.ValidPayment.REQUESTED_AT); + + // assert + assertThat(payment.getStatus()).isEqualTo(PaymentStatus.SUCCESS); + assertThat(payment.getUsedPoint()).isEqualTo(usedPoint); + assertThat(payment.getPaidAmount()).isEqualTo(0L); + } + + @DisplayName("포인트로 결제하지 않으면 PENDING 상태로 생성된다.") + @Test + void hasPendingStatus_whenPointDoesNotCoverTotalAmount() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + Long userId = PaymentTestFixture.ValidPayment.USER_ID; + Long totalAmount = PaymentTestFixture.ValidPayment.AMOUNT; + Long usedPoint = 0L; // 포인트 미사용 + + // act + Payment payment = Payment.of(orderId, userId, totalAmount, usedPoint, PaymentTestFixture.ValidPayment.REQUESTED_AT); + + // assert + assertThat(payment.getStatus()).isEqualTo(PaymentStatus.PENDING); + assertThat(payment.getUsedPoint()).isEqualTo(usedPoint); + assertThat(payment.getPaidAmount()).isEqualTo(totalAmount); + } + + @DisplayName("포인트로 부분 결제하면 PENDING 상태로 생성된다.") + @Test + void hasPendingStatus_whenPointPartiallyCoversTotalAmount() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + Long userId = PaymentTestFixture.ValidPayment.USER_ID; + Long totalAmount = PaymentTestFixture.ValidPayment.AMOUNT; + Long usedPoint = totalAmount / 2; // 포인트로 절반 결제 + + // act + Payment payment = Payment.of(orderId, userId, totalAmount, usedPoint, PaymentTestFixture.ValidPayment.REQUESTED_AT); + + // assert + assertThat(payment.getStatus()).isEqualTo(PaymentStatus.PENDING); + assertThat(payment.getUsedPoint()).isEqualTo(usedPoint); + assertThat(payment.getPaidAmount()).isEqualTo(totalAmount - usedPoint); + } + + @DisplayName("결제는 PENDING 상태에서 SUCCESS 상태로 전이할 수 있다.") + @Test + void canTransitionToSuccess_whenPending() { + // arrange + Payment payment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + LocalDateTime completedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); + + // act + payment.toSuccess(completedAt); + + // assert + assertThat(payment.getStatus()).isEqualTo(PaymentStatus.SUCCESS); + assertThat(payment.getPgCompletedAt()).isEqualTo(completedAt); + } + + @DisplayName("결제는 PENDING 상태에서 FAILED 상태로 전이할 수 있다.") + @Test + void canTransitionToFailed_whenPending() { + // arrange + Payment payment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + LocalDateTime completedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); + String failureReason = "카드 한도 초과"; + + // act + payment.toFailed(failureReason, completedAt); + + // assert + assertThat(payment.getStatus()).isEqualTo(PaymentStatus.FAILED); + assertThat(payment.getFailureReason()).isEqualTo(failureReason); + assertThat(payment.getPgCompletedAt()).isEqualTo(completedAt); + } + + @DisplayName("FAILED 상태에서 SUCCESS로 전이할 수 없다.") + @Test + void throwsException_whenTransitioningToSuccessFromFailed() { + // arrange + Payment payment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + payment.toFailed("실패 사유", LocalDateTime.now()); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + payment.toSuccess(LocalDateTime.now()); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + } + + @DisplayName("SUCCESS 상태에서 FAILED로 전이할 수 없다.") + @Test + void throwsException_whenTransitioningToFailedFromSuccess() { + // arrange + Payment payment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + payment.toSuccess(LocalDateTime.now()); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + payment.toFailed("실패 사유", LocalDateTime.now()); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + } + + @DisplayName("완료된 결제는 isCompleted가 true를 반환한다.") + @Test + void returnsTrue_whenPaymentIsCompleted() { + // arrange + Payment successPayment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + successPayment.toSuccess(LocalDateTime.now()); + + Payment failedPayment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + failedPayment.toFailed("ERROR", LocalDateTime.now()); + + Payment pendingPayment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + + // assert + assertThat(successPayment.isCompleted()).isTrue(); + assertThat(failedPayment.isCompleted()).isTrue(); + assertThat(pendingPayment.isCompleted()).isFalse(); + } + + @DisplayName("이미 SUCCESS 상태인 결제를 다시 SUCCESS로 전이해도 예외가 발생하지 않는다.") + @Test + void doesNotThrowException_whenTransitioningToSuccessFromSuccess() { + // arrange + Payment payment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + LocalDateTime firstCompletedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); + LocalDateTime secondCompletedAt = LocalDateTime.of(2025, 12, 1, 10, 6, 0); + payment.toSuccess(firstCompletedAt); + + // act + payment.toSuccess(secondCompletedAt); // 멱등성: 이미 SUCCESS 상태면 아무 작업도 하지 않음 + + // assert + assertThat(payment.getStatus()).isEqualTo(PaymentStatus.SUCCESS); + assertThat(payment.getPgCompletedAt()).isEqualTo(firstCompletedAt); // 첫 번째 시각 유지 + } + + @DisplayName("이미 FAILED 상태인 결제를 다시 FAILED로 전이해도 예외가 발생하지 않는다.") + @Test + void doesNotThrowException_whenTransitioningToFailedFromFailed() { + // arrange + Payment payment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + LocalDateTime firstCompletedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); + LocalDateTime secondCompletedAt = LocalDateTime.of(2025, 12, 1, 10, 6, 0); + String firstReason = "첫 번째 실패 사유"; + String secondReason = "두 번째 실패 사유"; + payment.toFailed(firstReason, firstCompletedAt); + + // act + payment.toFailed(secondReason, secondCompletedAt); // 멱등성: 이미 FAILED 상태면 아무 작업도 하지 않음 + + // assert + assertThat(payment.getStatus()).isEqualTo(PaymentStatus.FAILED); + assertThat(payment.getFailureReason()).isEqualTo(firstReason); // 첫 번째 사유 유지 + assertThat(payment.getPgCompletedAt()).isEqualTo(firstCompletedAt); // 첫 번째 시각 유지 + } + } +} diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTestFixture.java b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTestFixture.java new file mode 100644 index 000000000..ec8165a9c --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTestFixture.java @@ -0,0 +1,30 @@ +package com.loopers.domain.payment; + +import java.time.LocalDateTime; + +/** + * 테스트용 고정 데이터 (Fixture) 클래스 + * 모든 Payment 관련 테스트에서 사용하는 공통 데이터를 관리 + */ +public class PaymentTestFixture { + + // 기본 유효한 테스트 데이터 + public static final class ValidPayment { + public static final Long ORDER_ID = 1L; + public static final Long USER_ID = 100L; + public static final Long AMOUNT = 50000L; + public static final CardType CARD_TYPE = CardType.SAMSUNG; + public static final String CARD_NO = "1234-5678-9012-3456"; + public static final LocalDateTime REQUESTED_AT = LocalDateTime.of(2025, 12, 1, 10, 0, 0); + public static final String TRANSACTION_KEY = "tx-key-12345"; + public static final Long ZERO_POINT = 0L; + public static final Long FULL_POINT = AMOUNT; // 전액 포인트 + public static final Long PARTIAL_POINT = AMOUNT / 2; // 부분 포인트 + } + + // 유효하지 않은 테스트 데이터 + public static final class InvalidPayment { + public static final Long INVALID_AMOUNT = 0L; + } +} + From db0aa8f6aab8813d283e4f3d5c90cbee9a0572e6 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 18:34:50 +0900 Subject: [PATCH 04/22] =?UTF-8?q?feat:=20payment=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/loopers/domain/payment/CardType.java | 11 + .../com/loopers/domain/payment/Payment.java | 253 ++++++++++++++++++ .../domain/payment/PaymentRepository.java | 54 ++++ .../loopers/domain/payment/PaymentStatus.java | 29 ++ .../payment/PaymentJpaRepository.java | 20 ++ .../payment/PaymentRepositoryImpl.java | 46 ++++ 6 files changed, 413 insertions(+) create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/payment/CardType.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRepository.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentStatus.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentJpaRepository.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentRepositoryImpl.java diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/CardType.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/CardType.java new file mode 100644 index 000000000..ea3ab7d43 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/CardType.java @@ -0,0 +1,11 @@ +package com.loopers.domain.payment; + +/** + * 카드 타입. + */ +public enum CardType { + SAMSUNG, + KB, + HYUNDAI +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java new file mode 100644 index 000000000..45e7c7ac6 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java @@ -0,0 +1,253 @@ +package com.loopers.domain.payment; + +import com.loopers.domain.BaseEntity; +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +/** + * 결제 도메인 엔티티. + *

+ * 결제의 상태, 금액, 포인트 사용 정보를 관리합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +@Entity +@Table( + name = "payment", + indexes = { + @Index(name = "idx_payment_order_id", columnList = "ref_order_id"), + @Index(name = "idx_payment_user_id", columnList = "ref_user_id"), + @Index(name = "idx_payment_status", columnList = "status") + } +) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +public class Payment extends BaseEntity { + + @Column(name = "ref_order_id", nullable = false) + private Long orderId; + + @Column(name = "ref_user_id", nullable = false) + private Long userId; + + @Column(name = "total_amount", nullable = false) + private Long totalAmount; + + @Column(name = "used_point", nullable = false) + private Long usedPoint; + + @Column(name = "paid_amount", nullable = false) + private Long paidAmount; + + @Enumerated(EnumType.STRING) + @Column(name = "status", nullable = false) + private PaymentStatus status; + + @Enumerated(EnumType.STRING) + @Column(name = "card_type") + private CardType cardType; + + @Column(name = "card_no") + private String cardNo; + + @Column(name = "failure_reason", length = 500) + private String failureReason; + + @Column(name = "pg_requested_at", nullable = false) + private LocalDateTime pgRequestedAt; + + @Column(name = "pg_completed_at") + private LocalDateTime pgCompletedAt; + + /** + * 카드 결제용 Payment를 생성합니다. + * + * @param orderId 주문 ID + * @param userId 사용자 ID + * @param cardType 카드 타입 + * @param cardNo 카드 번호 + * @param amount 결제 금액 + * @param requestedAt PG 요청 시각 + * @return 생성된 Payment 인스턴스 + * @throws CoreException 유효성 검증 실패 시 + */ + public static Payment of( + Long orderId, + Long userId, + CardType cardType, + String cardNo, + Long amount, + LocalDateTime requestedAt + ) { + validateOrderId(orderId); + validateUserId(userId); + validateCardType(cardType); + validateCardNo(cardNo); + validateAmount(amount); + validateRequestedAt(requestedAt); + + Payment payment = new Payment(); + payment.orderId = orderId; + payment.userId = userId; + payment.totalAmount = amount; + payment.usedPoint = 0L; + payment.paidAmount = amount; + payment.status = PaymentStatus.PENDING; + payment.cardType = cardType; + payment.cardNo = cardNo; + payment.pgRequestedAt = requestedAt; + + return payment; + } + + /** + * 포인트 결제용 Payment를 생성합니다. + * + * @param orderId 주문 ID + * @param userId 사용자 ID + * @param totalAmount 총 결제 금액 + * @param usedPoint 사용 포인트 + * @param requestedAt PG 요청 시각 + * @return 생성된 Payment 인스턴스 + * @throws CoreException 유효성 검증 실패 시 + */ + public static Payment of( + Long orderId, + Long userId, + Long totalAmount, + Long usedPoint, + LocalDateTime requestedAt + ) { + validateOrderId(orderId); + validateUserId(userId); + validateAmount(totalAmount); + validateUsedPoint(usedPoint); + validateRequestedAt(requestedAt); + + Long paidAmount = totalAmount - usedPoint; + validatePaidAmount(paidAmount); + + Payment payment = new Payment(); + payment.orderId = orderId; + payment.userId = userId; + payment.totalAmount = totalAmount; + payment.usedPoint = usedPoint; + payment.paidAmount = paidAmount; + payment.status = (paidAmount == 0L) ? PaymentStatus.SUCCESS : PaymentStatus.PENDING; + payment.cardType = null; + payment.cardNo = null; + payment.pgRequestedAt = requestedAt; + + return payment; + } + + /** + * 결제를 SUCCESS 상태로 전이합니다. + *

+ * 멱등성 보장: 이미 SUCCESS 상태인 경우 아무 작업도 하지 않습니다. + *

+ * + * @param completedAt PG 완료 시각 + * @throws CoreException PENDING 상태가 아닌 경우 (SUCCESS는 제외) + */ + public void toSuccess(LocalDateTime completedAt) { + if (status == PaymentStatus.SUCCESS) { + // 멱등성: 이미 성공 상태면 아무 작업도 하지 않음 + return; + } + if (status != PaymentStatus.PENDING) { + throw new CoreException(ErrorType.BAD_REQUEST, "결제 대기 상태에서만 성공으로 전이할 수 있습니다."); + } + this.status = PaymentStatus.SUCCESS; + this.pgCompletedAt = completedAt; + } + + /** + * 결제를 FAILED 상태로 전이합니다. + *

+ * 멱등성 보장: 이미 FAILED 상태인 경우 아무 작업도 하지 않습니다. + *

+ * + * @param failureReason 실패 사유 + * @param completedAt PG 완료 시각 + * @throws CoreException PENDING 상태가 아닌 경우 (FAILED는 제외) + */ + public void toFailed(String failureReason, LocalDateTime completedAt) { + if (status == PaymentStatus.FAILED) { + // 멱등성: 이미 실패 상태면 아무 작업도 하지 않음 + return; + } + if (status != PaymentStatus.PENDING) { + throw new CoreException(ErrorType.BAD_REQUEST, "결제 대기 상태에서만 실패로 전이할 수 있습니다."); + } + this.status = PaymentStatus.FAILED; + this.failureReason = failureReason; + this.pgCompletedAt = completedAt; + } + + /** + * 결제가 완료되었는지 확인합니다. + * + * @return 완료 여부 + */ + public boolean isCompleted() { + return status.isCompleted(); + } + + private static void validateOrderId(Long orderId) { + if (orderId == null) { + throw new CoreException(ErrorType.BAD_REQUEST, "주문 ID는 필수입니다."); + } + } + + private static void validateUserId(Long userId) { + if (userId == null) { + throw new CoreException(ErrorType.BAD_REQUEST, "사용자 ID는 필수입니다."); + } + } + + private static void validateCardType(CardType cardType) { + if (cardType == null) { + throw new CoreException(ErrorType.BAD_REQUEST, "카드 타입은 필수입니다."); + } + } + + private static void validateCardNo(String cardNo) { + if (cardNo == null || cardNo.isBlank()) { + throw new CoreException(ErrorType.BAD_REQUEST, "카드 번호는 필수입니다."); + } + } + + private static void validateAmount(Long amount) { + if (amount == null || amount <= 0) { + throw new CoreException(ErrorType.BAD_REQUEST, "결제 금액은 0보다 커야 합니다."); + } + } + + private static void validateUsedPoint(Long usedPoint) { + if (usedPoint == null || usedPoint < 0) { + throw new CoreException(ErrorType.BAD_REQUEST, "사용 포인트는 0 이상이어야 합니다."); + } + } + + private static void validatePaidAmount(Long paidAmount) { + if (paidAmount < 0) { + throw new CoreException(ErrorType.BAD_REQUEST, "포인트와 쿠폰 할인의 합이 주문 금액을 초과합니다."); + } + } + + private static void validateRequestedAt(LocalDateTime requestedAt) { + if (requestedAt == null) { + throw new CoreException(ErrorType.BAD_REQUEST, "PG 요청 시각은 필수입니다."); + } + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRepository.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRepository.java new file mode 100644 index 000000000..7d3a73868 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRepository.java @@ -0,0 +1,54 @@ +package com.loopers.domain.payment; + +import java.util.List; +import java.util.Optional; + +/** + * 결제 저장소 인터페이스. + *

+ * Payment 엔티티의 영속성 계층 접근을 추상화합니다. + *

+ */ +public interface PaymentRepository { + + /** + * 결제를 저장합니다. + * + * @param payment 저장할 결제 + * @return 저장된 결제 + */ + Payment save(Payment payment); + + /** + * 결제 ID로 결제를 조회합니다. + * + * @param paymentId 조회할 결제 ID + * @return 조회된 결제 + */ + Optional findById(Long paymentId); + + /** + * 주문 ID로 결제를 조회합니다. + * + * @param orderId 주문 ID + * @return 조회된 결제 + */ + Optional findByOrderId(Long orderId); + + /** + * 사용자 ID로 결제 목록을 조회합니다. + * + * @param userId 사용자 ID + * @return 해당 사용자의 결제 목록 + */ + List findAllByUserId(Long userId); + + /** + * 결제 상태로 결제 목록을 조회합니다. + * + * @param status 결제 상태 + * @return 해당 상태의 결제 목록 + */ + List findAllByStatus(PaymentStatus status); +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentStatus.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentStatus.java new file mode 100644 index 000000000..7335929c3 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentStatus.java @@ -0,0 +1,29 @@ +package com.loopers.domain.payment; + +/** + * 결제 상태. + */ +public enum PaymentStatus { + PENDING, + SUCCESS, + FAILED; + + /** + * 결제가 완료되었는지 확인합니다. + * + * @return 완료 여부 (SUCCESS 또는 FAILED) + */ + public boolean isCompleted() { + return this == SUCCESS || this == FAILED; + } + + /** + * 결제가 성공했는지 확인합니다. + * + * @return 성공 여부 + */ + public boolean isSuccess() { + return this == SUCCESS; + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentJpaRepository.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentJpaRepository.java new file mode 100644 index 000000000..a34757237 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentJpaRepository.java @@ -0,0 +1,20 @@ +package com.loopers.infrastructure.payment; + +import com.loopers.domain.payment.Payment; +import com.loopers.domain.payment.PaymentStatus; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +/** + * Payment JPA Repository. + */ +public interface PaymentJpaRepository extends JpaRepository { + Optional findByOrderId(Long orderId); + + List findAllByUserId(Long userId); + + List findAllByStatus(PaymentStatus status); +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentRepositoryImpl.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentRepositoryImpl.java new file mode 100644 index 000000000..9b38ff60a --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentRepositoryImpl.java @@ -0,0 +1,46 @@ +package com.loopers.infrastructure.payment; + +import com.loopers.domain.payment.Payment; +import com.loopers.domain.payment.PaymentRepository; +import com.loopers.domain.payment.PaymentStatus; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +/** + * Payment Repository 구현체. + */ +@Repository +@RequiredArgsConstructor +public class PaymentRepositoryImpl implements PaymentRepository { + + private final PaymentJpaRepository paymentJpaRepository; + + @Override + public Payment save(Payment payment) { + return paymentJpaRepository.save(payment); + } + + @Override + public Optional findById(Long paymentId) { + return paymentJpaRepository.findById(paymentId); + } + + @Override + public Optional findByOrderId(Long orderId) { + return paymentJpaRepository.findByOrderId(orderId); + } + + @Override + public List findAllByUserId(Long userId) { + return paymentJpaRepository.findAllByUserId(userId); + } + + @Override + public List findAllByStatus(PaymentStatus status) { + return paymentJpaRepository.findAllByStatus(status); + } +} + From 9f55c9bb0dacc26c5330b27e62601e98460b8554 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 19:18:00 +0900 Subject: [PATCH 05/22] =?UTF-8?q?test:=20PaymentService=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/payment/PaymentServiceTest.java | 227 ++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java new file mode 100644 index 000000000..8a84c93e8 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java @@ -0,0 +1,227 @@ +package com.loopers.domain.payment; + +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.time.LocalDateTime; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +/** + * PaymentService 테스트. + */ +@ExtendWith(MockitoExtension.class) +@DisplayName("PaymentService") +public class PaymentServiceTest { + + @Mock + private PaymentRepository paymentRepository; + + @InjectMocks + private PaymentService paymentService; + + @DisplayName("결제 생성") + @Nested + class CreatePayment { + @DisplayName("카드 결제를 생성할 수 있다.") + @Test + void createsCardPayment() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + Long userId = PaymentTestFixture.ValidPayment.USER_ID; + CardType cardType = PaymentTestFixture.ValidPayment.CARD_TYPE; + String cardNo = PaymentTestFixture.ValidPayment.CARD_NO; + Long amount = PaymentTestFixture.ValidPayment.AMOUNT; + LocalDateTime requestedAt = PaymentTestFixture.ValidPayment.REQUESTED_AT; + + Payment expectedPayment = Payment.of(orderId, userId, cardType, cardNo, amount, requestedAt); + when(paymentRepository.save(any(Payment.class))).thenReturn(expectedPayment); + + // act + Payment result = paymentService.create(orderId, userId, cardType, cardNo, amount, requestedAt); + + // assert + assertThat(result).isNotNull(); + verify(paymentRepository, times(1)).save(any(Payment.class)); + } + + @DisplayName("포인트 결제를 생성할 수 있다.") + @Test + void createsPointPayment() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + Long userId = PaymentTestFixture.ValidPayment.USER_ID; + Long totalAmount = PaymentTestFixture.ValidPayment.AMOUNT; + Long usedPoint = PaymentTestFixture.ValidPayment.ZERO_POINT; + LocalDateTime requestedAt = PaymentTestFixture.ValidPayment.REQUESTED_AT; + + Payment expectedPayment = Payment.of(orderId, userId, totalAmount, usedPoint, requestedAt); + when(paymentRepository.save(any(Payment.class))).thenReturn(expectedPayment); + + // act + Payment result = paymentService.create(orderId, userId, totalAmount, usedPoint, requestedAt); + + // assert + assertThat(result).isNotNull(); + verify(paymentRepository, times(1)).save(any(Payment.class)); + } + } + + @DisplayName("결제 상태 변경") + @Nested + class UpdatePaymentStatus { + @DisplayName("결제를 SUCCESS 상태로 전이할 수 있다.") + @Test + void transitionsToSuccess() { + // arrange + Long paymentId = 1L; + Payment payment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + LocalDateTime completedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); + + when(paymentRepository.findById(paymentId)).thenReturn(Optional.of(payment)); + when(paymentRepository.save(any(Payment.class))).thenReturn(payment); + + // act + paymentService.toSuccess(paymentId, completedAt); + + // assert + verify(paymentRepository, times(1)).findById(paymentId); + verify(paymentRepository, times(1)).save(payment); + // 상태 변경 검증은 PaymentTest에서 이미 검증했으므로 제거 + } + + @DisplayName("결제를 FAILED 상태로 전이할 수 있다.") + @Test + void transitionsToFailed() { + // arrange + Long paymentId = 1L; + Payment payment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + LocalDateTime completedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); + String failureReason = "카드 한도 초과"; + + when(paymentRepository.findById(paymentId)).thenReturn(Optional.of(payment)); + when(paymentRepository.save(any(Payment.class))).thenReturn(payment); + + // act + paymentService.toFailed(paymentId, failureReason, completedAt); + + // assert + verify(paymentRepository, times(1)).findById(paymentId); + verify(paymentRepository, times(1)).save(payment); + // 상태 변경 검증은 PaymentTest에서 이미 검증했으므로 제거 + } + + @DisplayName("결제를 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenPaymentNotFound() { + // arrange + Long paymentId = 999L; + LocalDateTime completedAt = LocalDateTime.now(); + + when(paymentRepository.findById(paymentId)).thenReturn(Optional.empty()); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + paymentService.toSuccess(paymentId, completedAt); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + verify(paymentRepository, times(1)).findById(paymentId); + verify(paymentRepository, never()).save(any(Payment.class)); + } + } + + @DisplayName("결제 조회") + @Nested + class FindPayment { + @DisplayName("결제 ID로 결제를 조회할 수 있다.") + @Test + void findsById() { + // arrange + Long paymentId = 1L; + Payment expectedPayment = Payment.of( + PaymentTestFixture.ValidPayment.ORDER_ID, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + + when(paymentRepository.findById(paymentId)).thenReturn(Optional.of(expectedPayment)); + + // act + Payment result = paymentService.findById(paymentId); + + // assert + assertThat(result).isEqualTo(expectedPayment); + verify(paymentRepository, times(1)).findById(paymentId); + } + + @DisplayName("주문 ID로 결제를 조회할 수 있다.") + @Test + void findsByOrderId() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + Payment expectedPayment = Payment.of( + orderId, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); + + when(paymentRepository.findByOrderId(orderId)).thenReturn(Optional.of(expectedPayment)); + + // act + Optional result = paymentService.findByOrderId(orderId); + + // assert + assertThat(result).isPresent(); + assertThat(result.get()).isEqualTo(expectedPayment); + verify(paymentRepository, times(1)).findByOrderId(orderId); + } + + @DisplayName("결제를 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenPaymentNotFound() { + // arrange + Long paymentId = 999L; + + when(paymentRepository.findById(paymentId)).thenReturn(Optional.empty()); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + paymentService.findById(paymentId); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + verify(paymentRepository, times(1)).findById(paymentId); + } + } +} + From d3ac90b3c865661acad3c5f6711565cc22dafbab Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 19:18:15 +0900 Subject: [PATCH 06/22] =?UTF-8?q?feat:=20PaymentService=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/payment/PaymentService.java | 158 ++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java new file mode 100644 index 000000000..f1e60f179 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java @@ -0,0 +1,158 @@ +package com.loopers.domain.payment; + +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +/** + * 결제 도메인 서비스. + *

+ * 결제의 생성, 조회, 상태 변경을 담당합니다. + * 도메인 로직은 Payment 엔티티에 위임하며, Service는 조회/저장만 담당합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +@Component +@RequiredArgsConstructor +public class PaymentService { + + private final PaymentRepository paymentRepository; + + /** + * 카드 결제를 생성합니다. + * + * @param orderId 주문 ID + * @param userId 사용자 ID + * @param cardType 카드 타입 + * @param cardNo 카드 번호 + * @param amount 결제 금액 + * @param requestedAt PG 요청 시각 + * @return 생성된 Payment + */ + @Transactional + public Payment create( + Long orderId, + Long userId, + CardType cardType, + String cardNo, + Long amount, + LocalDateTime requestedAt + ) { + Payment payment = Payment.of(orderId, userId, cardType, cardNo, amount, requestedAt); + return paymentRepository.save(payment); + } + + /** + * 포인트 결제를 생성합니다. + * + * @param orderId 주문 ID + * @param userId 사용자 ID + * @param totalAmount 총 결제 금액 + * @param usedPoint 사용 포인트 + * @param requestedAt PG 요청 시각 + * @return 생성된 Payment + */ + @Transactional + public Payment create( + Long orderId, + Long userId, + Long totalAmount, + Long usedPoint, + LocalDateTime requestedAt + ) { + Payment payment = Payment.of(orderId, userId, totalAmount, usedPoint, requestedAt); + return paymentRepository.save(payment); + } + + /** + * 결제를 SUCCESS 상태로 전이합니다. + *

+ * 멱등성 보장: 이미 SUCCESS 상태인 경우 아무 작업도 하지 않습니다. + *

+ * + * @param paymentId 결제 ID + * @param completedAt PG 완료 시각 + * @throws CoreException 결제를 찾을 수 없는 경우 + */ + @Transactional + public void toSuccess(Long paymentId, LocalDateTime completedAt) { + Payment payment = paymentRepository.findById(paymentId) + .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, "결제를 찾을 수 없습니다.")); + payment.toSuccess(completedAt); // Entity에 위임 + paymentRepository.save(payment); + } + + /** + * 결제를 FAILED 상태로 전이합니다. + *

+ * 멱등성 보장: 이미 FAILED 상태인 경우 아무 작업도 하지 않습니다. + *

+ * + * @param paymentId 결제 ID + * @param failureReason 실패 사유 + * @param completedAt PG 완료 시각 + * @throws CoreException 결제를 찾을 수 없는 경우 + */ + @Transactional + public void toFailed(Long paymentId, String failureReason, LocalDateTime completedAt) { + Payment payment = paymentRepository.findById(paymentId) + .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, "결제를 찾을 수 없습니다.")); + payment.toFailed(failureReason, completedAt); // Entity에 위임 + paymentRepository.save(payment); + } + + /** + * 결제 ID로 결제를 조회합니다. + * + * @param paymentId 결제 ID + * @return 조회된 Payment + * @throws CoreException 결제를 찾을 수 없는 경우 + */ + @Transactional(readOnly = true) + public Payment findById(Long paymentId) { + return paymentRepository.findById(paymentId) + .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, "결제를 찾을 수 없습니다.")); + } + + /** + * 주문 ID로 결제를 조회합니다. + * + * @param orderId 주문 ID + * @return 조회된 Payment (없으면 Optional.empty()) + */ + @Transactional(readOnly = true) + public Optional findByOrderId(Long orderId) { + return paymentRepository.findByOrderId(orderId); + } + + /** + * 사용자 ID로 결제 목록을 조회합니다. + * + * @param userId 사용자 ID + * @return 해당 사용자의 결제 목록 + */ + @Transactional(readOnly = true) + public List findAllByUserId(Long userId) { + return paymentRepository.findAllByUserId(userId); + } + + /** + * 결제 상태로 결제 목록을 조회합니다. + * + * @param status 결제 상태 + * @return 해당 상태의 결제 목록 + */ + @Transactional(readOnly = true) + public List findAllByStatus(PaymentStatus status) { + return paymentRepository.findAllByStatus(status); + } +} + From 74ac71350fe8bb8539db96f8ec80fa99be9d494a Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 19:53:25 +0900 Subject: [PATCH 07/22] =?UTF-8?q?refactor:=20payment=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=EC=9D=98=20=EC=B1=85=EC=9E=84=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EB=A7=8C=20order=20=EB=8F=84=EB=A9=94=EC=9D=B8=EC=97=90=20?= =?UTF-8?q?=EC=9E=88=EB=8D=98=20=EB=A1=9C=EC=A7=81=EB=93=A4=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/{order => payment}/PaymentFailureClassifier.java | 2 +- .../loopers/domain/{order => payment}/PaymentFailureType.java | 2 +- .../com/loopers/domain/{order => payment}/PaymentResult.java | 2 +- .../infrastructure/paymentgateway/PaymentGatewayAdapter.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename apps/commerce-api/src/main/java/com/loopers/domain/{order => payment}/PaymentFailureClassifier.java (98%) rename apps/commerce-api/src/main/java/com/loopers/domain/{order => payment}/PaymentFailureType.java (93%) rename apps/commerce-api/src/main/java/com/loopers/domain/{order => payment}/PaymentResult.java (97%) diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureClassifier.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentFailureClassifier.java similarity index 98% rename from apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureClassifier.java rename to apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentFailureClassifier.java index 804b9c123..e590916bc 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureClassifier.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentFailureClassifier.java @@ -1,4 +1,4 @@ -package com.loopers.domain.order; +package com.loopers.domain.payment; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureType.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentFailureType.java similarity index 93% rename from apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureType.java rename to apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentFailureType.java index 2cc7f03af..353b8e9d9 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentFailureType.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentFailureType.java @@ -1,4 +1,4 @@ -package com.loopers.domain.order; +package com.loopers.domain.payment; /** * 결제 실패 유형. diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentResult.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentResult.java similarity index 97% rename from apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentResult.java rename to apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentResult.java index f1c953c70..792362f02 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/order/PaymentResult.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentResult.java @@ -1,4 +1,4 @@ -package com.loopers.domain.order; +package com.loopers.domain.payment; import java.util.function.Function; diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java index 2084f2139..8145ebd4a 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java @@ -1,7 +1,7 @@ package com.loopers.infrastructure.paymentgateway; import com.loopers.application.purchasing.PaymentRequest; -import com.loopers.domain.order.PaymentResult; +import com.loopers.domain.payment.PaymentResult; import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; From b11c85e0d4eae0db35eed8c5af65c07cb39b442a Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 21:21:43 +0900 Subject: [PATCH 08/22] =?UTF-8?q?test:=20Order=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderCancellationServiceTest.java | 183 +++++++++++++ .../order/OrderPaymentResultServiceTest.java | 242 ++++++++++++++++++ .../domain/order/OrderServiceTest.java | 238 +++++++++++++++++ 3 files changed, 663 insertions(+) create mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/order/OrderPaymentResultServiceTest.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/order/OrderServiceTest.java diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java new file mode 100644 index 000000000..3f2deed68 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java @@ -0,0 +1,183 @@ +package com.loopers.domain.order; + +import com.loopers.domain.product.Product; +import com.loopers.domain.product.ProductRepository; +import com.loopers.domain.user.Gender; +import com.loopers.domain.user.Point; +import com.loopers.domain.user.User; +import com.loopers.domain.user.UserRepository; +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.List; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +/** + * OrderCancellationService 테스트. + */ +@ExtendWith(MockitoExtension.class) +@DisplayName("OrderCancellationService") +public class OrderCancellationServiceTest { + + @Mock + private OrderRepository orderRepository; + + @Mock + private UserRepository userRepository; + + @Mock + private ProductRepository productRepository; + + @InjectMocks + private OrderCancellationService orderCancellationService; + + @DisplayName("주문 취소") + @Nested + class CancelOrder { + @DisplayName("주문을 취소하고 리소스를 원복할 수 있다.") + @Test + void cancelsOrderAndRecoversResources() { + // arrange + Long userId = OrderTestFixture.ValidOrder.USER_ID; + User user = createUser(userId); + Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); + + List items = order.getItems(); + Product product1 = createProduct(items.get(0).getProductId()); + Product product2 = createProduct(items.get(1).getProductId()); + + when(userRepository.findByUserIdForUpdate(user.getUserId())).thenReturn(user); + when(productRepository.findByIdForUpdate(items.get(0).getProductId())) + .thenReturn(Optional.of(product1)); + when(productRepository.findByIdForUpdate(items.get(1).getProductId())) + .thenReturn(Optional.of(product2)); + when(orderRepository.save(any(Order.class))).thenReturn(order); + when(userRepository.save(any(User.class))).thenReturn(user); + when(productRepository.save(any(Product.class))).thenReturn(product1, product2); + + // act + orderCancellationService.cancel(order, user); + + // assert + verify(userRepository, times(1)).findByUserIdForUpdate(user.getUserId()); + verify(productRepository, times(1)).findByIdForUpdate(items.get(0).getProductId()); + verify(productRepository, times(1)).findByIdForUpdate(items.get(1).getProductId()); + verify(orderRepository, times(1)).save(order); + verify(userRepository, times(1)).save(user); + verify(productRepository, times(2)).save(any(Product.class)); + // 상태 변경 검증은 OrderTest에서 이미 검증했으므로 제거 + } + + @DisplayName("주문이 null이면 예외가 발생한다.") + @Test + void throwsException_whenOrderIsNull() { + // arrange + User user = createUser(OrderTestFixture.ValidOrder.USER_ID); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + orderCancellationService.cancel(null, user); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + verify(orderRepository, never()).save(any(Order.class)); + } + + @DisplayName("사용자가 null이면 예외가 발생한다.") + @Test + void throwsException_whenUserIsNull() { + // arrange + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + orderCancellationService.cancel(order, null); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + verify(orderRepository, never()).save(any(Order.class)); + } + + @DisplayName("사용자를 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenUserNotFound() { + // arrange + Long userId = OrderTestFixture.ValidOrder.USER_ID; + User user = createUser(userId); + Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); + + when(userRepository.findByUserIdForUpdate(user.getUserId())).thenReturn(null); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + orderCancellationService.cancel(order, user); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + verify(userRepository, times(1)).findByUserIdForUpdate(user.getUserId()); + verify(orderRepository, never()).save(any(Order.class)); + } + + @DisplayName("상품을 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenProductNotFound() { + // arrange + Long userId = OrderTestFixture.ValidOrder.USER_ID; + User user = createUser(userId); + Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); + List items = order.getItems(); + + when(userRepository.findByUserIdForUpdate(user.getUserId())).thenReturn(user); + when(productRepository.findByIdForUpdate(items.get(0).getProductId())) + .thenReturn(Optional.empty()); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + orderCancellationService.cancel(order, user); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + verify(userRepository, times(1)).findByUserIdForUpdate(user.getUserId()); + verify(productRepository, times(1)).findByIdForUpdate(items.get(0).getProductId()); + verify(orderRepository, never()).save(any(Order.class)); + } + } + + private User createUser(Long userId) { + return User.of( + String.valueOf(userId), + "test@example.com", + "1990-01-01", + Gender.MALE, + Point.of(0L) + ); + } + + private Product createProduct(Long productId) { + // Mock을 사용하여 ID 설정 + Product mockedProduct = mock(Product.class); + when(mockedProduct.getId()).thenReturn(productId); + doNothing().when(mockedProduct).increaseStock(any(Integer.class)); + return mockedProduct; + } +} + diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderPaymentResultServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderPaymentResultServiceTest.java new file mode 100644 index 000000000..0d70ee580 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderPaymentResultServiceTest.java @@ -0,0 +1,242 @@ +package com.loopers.domain.order; + +import com.loopers.domain.payment.PaymentStatus; +import com.loopers.domain.user.Gender; +import com.loopers.domain.user.Point; +import com.loopers.domain.user.User; +import com.loopers.domain.user.UserRepository; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +/** + * OrderPaymentResultService 테스트. + */ +@ExtendWith(MockitoExtension.class) +@DisplayName("OrderPaymentResultService") +public class OrderPaymentResultServiceTest { + + @Mock + private OrderRepository orderRepository; + + @Mock + private UserRepository userRepository; + + @Mock + private OrderCancellationService orderCancellationService; + + @InjectMocks + private OrderPaymentResultService orderPaymentResultService; + + @DisplayName("결제 결과에 따른 주문 처리") + @Nested + class ProcessByPaymentResult { + @DisplayName("결제 성공 시 주문을 완료 상태로 변경할 수 있다.") + @Test + void completesOrder_whenPaymentSuccess() { + // arrange + Long orderId = 1L; + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + String transactionKey = "TXN123456"; + + when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); + when(orderRepository.save(any(Order.class))).thenReturn(order); + + // act + boolean result = orderPaymentResultService.updateByPaymentStatus( + orderId, + PaymentStatus.SUCCESS, + transactionKey, + null + ); + + // assert + assertThat(result).isTrue(); + verify(orderRepository, times(1)).findById(orderId); + verify(orderRepository, times(1)).save(order); + verify(orderCancellationService, never()).cancel(any(), any()); + // 상태 변경 검증은 OrderTest에서 이미 검증했으므로 제거 + } + + @DisplayName("결제 실패 시 주문을 취소 상태로 변경할 수 있다.") + @Test + void cancelsOrder_whenPaymentFailed() { + // arrange + Long orderId = 1L; + Long userId = OrderTestFixture.ValidOrder.USER_ID; + Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); + User user = createUser(userId); + String transactionKey = "TXN123456"; + String reason = "카드 한도 초과"; + + when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); + when(userRepository.findById(userId)).thenReturn(user); + doNothing().when(orderCancellationService).cancel(any(Order.class), any(User.class)); + + // act + boolean result = orderPaymentResultService.updateByPaymentStatus( + orderId, + PaymentStatus.FAILED, + transactionKey, + reason + ); + + // assert + assertThat(result).isTrue(); + verify(orderRepository, times(1)).findById(orderId); + verify(userRepository, times(1)).findById(userId); + verify(orderCancellationService, times(1)).cancel(order, user); + } + + @DisplayName("결제 대기 상태면 주문 상태를 유지한다.") + @Test + void maintainsOrderStatus_whenPaymentPending() { + // arrange + Long orderId = 1L; + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + String transactionKey = "TXN123456"; + + when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); + + // act + boolean result = orderPaymentResultService.updateByPaymentStatus( + orderId, + PaymentStatus.PENDING, + transactionKey, + null + ); + + // assert + assertThat(result).isTrue(); + verify(orderRepository, times(1)).findById(orderId); + verify(orderRepository, never()).save(any(Order.class)); + verify(orderCancellationService, never()).cancel(any(), any()); + } + + @DisplayName("이미 완료된 주문은 처리하지 않는다.") + @Test + void skipsProcessing_whenOrderAlreadyCompleted() { + // arrange + Long orderId = 1L; + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + order.complete(); // 이미 완료 상태 + + when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); + + // act + boolean result = orderPaymentResultService.updateByPaymentStatus( + orderId, + PaymentStatus.SUCCESS, + "TXN123456", + null + ); + + // assert + assertThat(result).isTrue(); + verify(orderRepository, times(1)).findById(orderId); + verify(orderRepository, never()).save(any(Order.class)); + } + + @DisplayName("이미 취소된 주문은 처리하지 않는다.") + @Test + void skipsProcessing_whenOrderAlreadyCanceled() { + // arrange + Long orderId = 1L; + Long userId = OrderTestFixture.ValidOrder.USER_ID; + Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); + order.cancel(); // 이미 취소 상태 + + when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); + + // act + boolean result = orderPaymentResultService.updateByPaymentStatus( + orderId, + PaymentStatus.FAILED, + "TXN123456", + "실패 사유" + ); + + // assert + assertThat(result).isTrue(); + verify(orderRepository, times(1)).findById(orderId); + verify(orderCancellationService, never()).cancel(any(), any()); + } + + @DisplayName("주문을 찾을 수 없으면 false를 반환한다.") + @Test + void returnsFalse_whenOrderNotFound() { + // arrange + Long orderId = 999L; + when(orderRepository.findById(orderId)).thenReturn(Optional.empty()); + + // act + boolean result = orderPaymentResultService.updateByPaymentStatus( + orderId, + PaymentStatus.SUCCESS, + "TXN123456", + null + ); + + // assert + assertThat(result).isFalse(); + verify(orderRepository, times(1)).findById(orderId); + verify(orderRepository, never()).save(any(Order.class)); + } + + @DisplayName("결제 실패 시 사용자를 찾을 수 없으면 false를 반환한다.") + @Test + void returnsFalse_whenUserNotFound() { + // arrange + Long orderId = 1L; + Long userId = OrderTestFixture.ValidOrder.USER_ID; + Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); + + when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); + when(userRepository.findById(userId)).thenReturn(null); + + // act + boolean result = orderPaymentResultService.updateByPaymentStatus( + orderId, + PaymentStatus.FAILED, + "TXN123456", + "실패 사유" + ); + + // assert + assertThat(result).isFalse(); + verify(orderRepository, times(1)).findById(orderId); + verify(userRepository, times(1)).findById(userId); + verify(orderCancellationService, never()).cancel(any(Order.class), any(User.class)); + } + } + + private User createUser(Long userId) { + return User.of( + String.valueOf(userId), + "test@example.com", + "1990-01-01", + Gender.MALE, + Point.of(0L) + ); + } +} + diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderServiceTest.java new file mode 100644 index 000000000..11964d67d --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderServiceTest.java @@ -0,0 +1,238 @@ +package com.loopers.domain.order; + +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.List; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +/** + * OrderService 테스트. + */ +@ExtendWith(MockitoExtension.class) +@DisplayName("OrderService") +public class OrderServiceTest { + + @Mock + private OrderRepository orderRepository; + + @InjectMocks + private OrderService orderService; + + @DisplayName("주문 저장") + @Nested + class SaveOrder { + @DisplayName("주문을 저장할 수 있다.") + @Test + void savesOrder() { + // arrange + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + when(orderRepository.save(any(Order.class))).thenReturn(order); + + // act + Order result = orderService.save(order); + + // assert + assertThat(result).isNotNull(); + verify(orderRepository, times(1)).save(order); + } + } + + @DisplayName("주문 조회") + @Nested + class FindOrder { + @DisplayName("주문 ID로 주문을 조회할 수 있다.") + @Test + void findsById() { + // arrange + Long orderId = 1L; + Order expectedOrder = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + when(orderRepository.findById(orderId)).thenReturn(Optional.of(expectedOrder)); + + // act + Order result = orderService.getById(orderId); + + // assert + assertThat(result).isEqualTo(expectedOrder); + verify(orderRepository, times(1)).findById(orderId); + } + + @DisplayName("주문 ID로 주문을 조회할 수 있다 (Optional 반환).") + @Test + void findsByIdOptional() { + // arrange + Long orderId = 1L; + Order expectedOrder = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + when(orderRepository.findById(orderId)).thenReturn(Optional.of(expectedOrder)); + + // act + Optional result = orderService.findById(orderId); + + // assert + assertThat(result).isPresent(); + assertThat(result.get()).isEqualTo(expectedOrder); + verify(orderRepository, times(1)).findById(orderId); + } + + @DisplayName("주문을 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenOrderNotFound() { + // arrange + Long orderId = 999L; + when(orderRepository.findById(orderId)).thenReturn(Optional.empty()); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + orderService.getById(orderId); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + verify(orderRepository, times(1)).findById(orderId); + } + + @DisplayName("사용자 ID로 주문 목록을 조회할 수 있다.") + @Test + void findsAllByUserId() { + // arrange + Long userId = OrderTestFixture.ValidOrder.USER_ID; + List expectedOrders = List.of( + Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()) + ); + when(orderRepository.findAllByUserId(userId)).thenReturn(expectedOrders); + + // act + List result = orderService.findAllByUserId(userId); + + // assert + assertThat(result).hasSize(1); + assertThat(result).isEqualTo(expectedOrders); + verify(orderRepository, times(1)).findAllByUserId(userId); + } + + @DisplayName("주문 상태로 주문 목록을 조회할 수 있다.") + @Test + void findsAllByStatus() { + // arrange + OrderStatus status = OrderStatus.PENDING; + List expectedOrders = List.of( + Order.of(OrderTestFixture.ValidOrder.USER_ID, OrderTestFixture.ValidOrderItem.createMultipleItems()) + ); + when(orderRepository.findAllByStatus(status)).thenReturn(expectedOrders); + + // act + List result = orderService.findAllByStatus(status); + + // assert + assertThat(result).hasSize(1); + assertThat(result).isEqualTo(expectedOrders); + verify(orderRepository, times(1)).findAllByStatus(status); + } + } + + @DisplayName("주문 생성") + @Nested + class CreateOrder { + @DisplayName("주문을 생성할 수 있다 (쿠폰 없음).") + @Test + void createsOrder() { + // arrange + Long userId = OrderTestFixture.ValidOrder.USER_ID; + List items = OrderTestFixture.ValidOrderItem.createMultipleItems(); + Order expectedOrder = Order.of(userId, items); + when(orderRepository.save(any(Order.class))).thenReturn(expectedOrder); + + // act + Order result = orderService.create(userId, items); + + // assert + assertThat(result).isNotNull(); + verify(orderRepository, times(1)).save(any(Order.class)); + } + + @DisplayName("주문을 생성할 수 있다 (쿠폰 포함).") + @Test + void createsOrderWithCoupon() { + // arrange + Long userId = OrderTestFixture.ValidOrder.USER_ID; + List items = OrderTestFixture.ValidOrderItem.createMultipleItems(); + String couponCode = "COUPON123"; + Integer discountAmount = 1000; + Order expectedOrder = Order.of(userId, items, couponCode, discountAmount); + when(orderRepository.save(any(Order.class))).thenReturn(expectedOrder); + + // act + Order result = orderService.create(userId, items, couponCode, discountAmount); + + // assert + assertThat(result).isNotNull(); + verify(orderRepository, times(1)).save(any(Order.class)); + } + } + + @DisplayName("주문 완료") + @Nested + class CompleteOrder { + @DisplayName("주문을 완료 상태로 변경할 수 있다.") + @Test + void completesOrder() { + // arrange + Long orderId = 1L; + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); + when(orderRepository.save(any(Order.class))).thenReturn(order); + + // act + Order result = orderService.completeOrder(orderId); + + // assert + assertThat(result).isNotNull(); + verify(orderRepository, times(1)).findById(orderId); + verify(orderRepository, times(1)).save(order); + // 상태 변경 검증은 OrderTest에서 이미 검증했으므로 제거 + } + + @DisplayName("주문을 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenOrderNotFound() { + // arrange + Long orderId = 999L; + when(orderRepository.findById(orderId)).thenReturn(Optional.empty()); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + orderService.completeOrder(orderId); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + verify(orderRepository, times(1)).findById(orderId); + verify(orderRepository, never()).save(any(Order.class)); + } + } +} + From a513f1e28ce0c5aea3271c2d4a264c4effa6e254 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 21:25:13 +0900 Subject: [PATCH 09/22] =?UTF-8?q?refactor:=20Order=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=EC=9D=98=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=84=9C?= =?UTF-8?q?=EB=B9=84=EC=8A=A4=20=EB=A1=9C=EC=A7=81=20=EC=9E=AC=EA=B5=AC?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...er.java => OrderPaymentResultService.java} | 16 +-- .../loopers/domain/order/OrderService.java | 126 ++++++++++++++++++ 2 files changed, 134 insertions(+), 8 deletions(-) rename apps/commerce-api/src/main/java/com/loopers/domain/order/{OrderStatusUpdater.java => OrderPaymentResultService.java} (89%) create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/order/OrderService.java diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderStatusUpdater.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderPaymentResultService.java similarity index 89% rename from apps/commerce-api/src/main/java/com/loopers/domain/order/OrderStatusUpdater.java rename to apps/commerce-api/src/main/java/com/loopers/domain/order/OrderPaymentResultService.java index 6e9abcc1f..001336252 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderStatusUpdater.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderPaymentResultService.java @@ -1,8 +1,8 @@ package com.loopers.domain.order; +import com.loopers.domain.payment.PaymentStatus; import com.loopers.domain.user.User; import com.loopers.domain.user.UserRepository; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -10,9 +10,9 @@ import org.springframework.transaction.annotation.Transactional; /** - * 주문 상태 업데이트 도메인 서비스. + * 주문 결제 결과 처리 도메인 서비스. *

- * 결제 상태에 따라 주문 상태를 업데이트합니다. + * 결제 결과에 따라 주문 상태를 처리합니다. *

* * @author Loopers @@ -21,7 +21,7 @@ @Slf4j @Component @RequiredArgsConstructor -public class OrderStatusUpdater { +public class OrderPaymentResultService { private final OrderRepository orderRepository; private final UserRepository userRepository; @@ -34,7 +34,7 @@ public class OrderStatusUpdater { *

* * @param orderId 주문 ID - * @param status 결제 상태 + * @param paymentStatus 결제 상태 (도메인 모델) * @param transactionKey 트랜잭션 키 * @param reason 실패 사유 (실패 시) * @return 업데이트 성공 여부 (true: 성공, false: 실패) @@ -42,7 +42,7 @@ public class OrderStatusUpdater { @Transactional(propagation = Propagation.REQUIRES_NEW) public boolean updateByPaymentStatus( Long orderId, - PaymentGatewayDto.TransactionStatus status, + PaymentStatus paymentStatus, String transactionKey, String reason ) { @@ -66,14 +66,14 @@ public boolean updateByPaymentStatus( return true; } - if (status == PaymentGatewayDto.TransactionStatus.SUCCESS) { + if (paymentStatus == PaymentStatus.SUCCESS) { // 결제 성공: 주문 완료 order.complete(); orderRepository.save(order); log.info("결제 상태 확인 결과, 주문 상태를 COMPLETED로 업데이트했습니다. (orderId: {}, transactionKey: {})", orderId, transactionKey); return true; - } else if (status == PaymentGatewayDto.TransactionStatus.FAILED) { + } else if (paymentStatus == PaymentStatus.FAILED) { // 결제 실패: 주문 취소 및 리소스 원복 User user = userRepository.findById(order.getUserId()); if (user == null) { diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderService.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderService.java new file mode 100644 index 000000000..88207b645 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderService.java @@ -0,0 +1,126 @@ +package com.loopers.domain.order; + +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; + +/** + * 주문 도메인 서비스. + *

+ * 주문의 기본 CRUD 및 상태 변경을 담당합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +@Component +@RequiredArgsConstructor +public class OrderService { + + private final OrderRepository orderRepository; + + /** + * 주문을 저장합니다. + * + * @param order 저장할 주문 + * @return 저장된 주문 + */ + @Transactional + public Order save(Order order) { + return orderRepository.save(order); + } + + /** + * 주문 ID로 주문을 조회합니다. + * + * @param orderId 주문 ID + * @return 조회된 주문 + * @throws CoreException 주문을 찾을 수 없는 경우 + */ + @Transactional(readOnly = true) + public Order getById(Long orderId) { + return orderRepository.findById(orderId) + .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, "주문을 찾을 수 없습니다.")); + } + + /** + * 주문 ID로 주문을 조회합니다 (Optional 반환). + * + * @param orderId 주문 ID + * @return 조회된 주문 (없으면 Optional.empty()) + */ + @Transactional(readOnly = true) + public Optional findById(Long orderId) { + return orderRepository.findById(orderId); + } + + /** + * 사용자 ID로 주문 목록을 조회합니다. + * + * @param userId 사용자 ID + * @return 해당 사용자의 주문 목록 + */ + @Transactional(readOnly = true) + public List findAllByUserId(Long userId) { + return orderRepository.findAllByUserId(userId); + } + + /** + * 주문 상태로 주문 목록을 조회합니다. + * + * @param status 주문 상태 + * @return 해당 상태의 주문 목록 + */ + @Transactional(readOnly = true) + public List findAllByStatus(OrderStatus status) { + return orderRepository.findAllByStatus(status); + } + + /** + * 주문을 생성합니다. + * + * @param userId 사용자 ID + * @param items 주문 아이템 목록 + * @param couponCode 쿠폰 코드 (선택) + * @param discountAmount 할인 금액 (선택) + * @return 생성된 주문 + */ + @Transactional + public Order create(Long userId, List items, String couponCode, Integer discountAmount) { + Order order = Order.of(userId, items, couponCode, discountAmount); + return orderRepository.save(order); + } + + /** + * 주문을 생성합니다 (쿠폰 없음). + * + * @param userId 사용자 ID + * @param items 주문 아이템 목록 + * @return 생성된 주문 + */ + @Transactional + public Order create(Long userId, List items) { + Order order = Order.of(userId, items); + return orderRepository.save(order); + } + + /** + * 주문을 완료 상태로 변경합니다. + * + * @param orderId 주문 ID + * @return 완료된 주문 + * @throws CoreException 주문을 찾을 수 없는 경우 + */ + @Transactional + public Order completeOrder(Long orderId) { + Order order = getById(orderId); + order.complete(); + return orderRepository.save(order); + } +} + From 0eba13a1d5d5ab5a7692de31fa5541761a3f4612 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 23:34:35 +0900 Subject: [PATCH 10/22] =?UTF-8?q?refactor:=20purchasing=20facade=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=B2=98=EB=A6=AC=ED=95=98=EA=B3=A0=20=EC=9E=88?= =?UTF-8?q?=EB=8D=98=20=EB=82=B4=EC=9A=A9=20=EC=A4=91=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EB=A0=88=EC=9D=B4=EC=96=B4=EB=A1=9C=20=EC=9C=84?= =?UTF-8?q?=EC=9E=84=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=EB=93=A4=20=EC=9E=AC=EB=B0=B0=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasing/PaymentFailureHandler.java | 107 -------- .../purchasing/PaymentRequest.java | 20 -- .../purchasing/PaymentRequestBuilder.java | 167 ------------ .../domain/payment/PaymentRequestCommand.java | 44 +++ .../domain/payment/PaymentRequestResult.java | 30 ++ .../domain/payment/PaymentService.java | 256 +++++++++++++++++- 6 files changed, 328 insertions(+), 296 deletions(-) delete mode 100644 apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentFailureHandler.java delete mode 100644 apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequest.java delete mode 100644 apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestBuilder.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestCommand.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestResult.java diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentFailureHandler.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentFailureHandler.java deleted file mode 100644 index 52f240e13..000000000 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentFailureHandler.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.loopers.application.purchasing; - -import com.loopers.domain.order.Order; -import com.loopers.domain.order.OrderRepository; -import com.loopers.domain.order.OrderStatus; -import com.loopers.domain.order.OrderCancellationService; -import com.loopers.domain.user.User; -import com.loopers.domain.user.UserRepository; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -/** - * 결제 실패 처리 서비스. - *

- * 결제 실패 시 주문 취소 및 리소스 원복을 처리합니다. - *

- *

- * 트랜잭션 전략: - *

    - *
  • REQUIRES_NEW: 별도 트랜잭션으로 실행하여 외부 시스템 호출과 독립적으로 처리
    • - *
  • 결제 실패 처리 중 오류가 발생해도 기존 주문 생성 트랜잭션에 영향을 주지 않음
    • - *
  • Self-invocation 문제 해결: 별도 서비스로 분리하여 Spring AOP 프록시가 정상적으로 적용되도록 함
    • - *
- *

- *

- * 주의사항: - *

    - *
  • 주문이 이미 취소되었거나 존재하지 않는 경우 로그만 기록합니다.
    • - *
  • 결제 실패 처리 중 오류 발생 시에도 로그만 기록합니다.
    • - *
- *

- * - * @author Loopers - * @version 1.0 - */ -@Slf4j -@Component -@RequiredArgsConstructor -public class PaymentFailureHandler { - - private final UserRepository userRepository; - private final OrderRepository orderRepository; - private final OrderCancellationService orderCancellationService; - - /** - * 결제 실패 시 주문 취소 및 리소스 원복을 처리합니다. - *

- * 결제 요청이 실패한 경우, 이미 생성된 주문을 취소하고 - * 차감된 포인트를 환불하며 재고를 원복합니다. - *

- *

- * 처리 내용: - *

    - *
  • 주문 상태를 CANCELED로 변경
    • - *
  • 차감된 포인트 환불
    • - *
  • 차감된 재고 원복
    • - *
- *

- * - * @param userId 사용자 ID (로그인 ID) - * @param orderId 주문 ID - * @param errorCode 오류 코드 - * @param errorMessage 오류 메시지 - */ - @Transactional(propagation = Propagation.REQUIRES_NEW) - public void handle(String userId, Long orderId, String errorCode, String errorMessage) { - try { - // 사용자 조회 - User user = userRepository.findByUserId(userId); - - if (user == null) { - log.warn("결제 실패 처리 시 사용자를 찾을 수 없습니다. (userId: {}, orderId: {})", userId, orderId); - return; - } - - // 주문 조회 - Order order = orderRepository.findById(orderId) - .orElse(null); - - if (order == null) { - log.warn("결제 실패 처리 시 주문을 찾을 수 없습니다. (orderId: {})", orderId); - return; - } - - // 이미 취소된 주문인 경우 처리하지 않음 - if (order.getStatus() == OrderStatus.CANCELED) { - log.info("이미 취소된 주문입니다. 결제 실패 처리를 건너뜁니다. (orderId: {})", orderId); - return; - } - - // 주문 취소 및 리소스 원복 - orderCancellationService.cancel(order, user); - - log.info("결제 실패로 인한 주문 취소 완료. (orderId: {}, errorCode: {}, errorMessage: {})", - orderId, errorCode, errorMessage); - } catch (Exception e) { - // 결제 실패 처리 중 오류 발생 시에도 로그만 기록 - // 이미 주문은 생성되어 있으므로, 나중에 수동으로 처리할 수 있도록 로그 기록 - log.error("결제 실패 처리 중 오류 발생. (orderId: {}, errorCode: {})", - orderId, errorCode, e); - } - } -} - diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequest.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequest.java deleted file mode 100644 index 4188fd2e6..000000000 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.loopers.application.purchasing; - -import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; - -/** - * 결제 요청 도메인 모델. - * - * @author Loopers - * @version 1.0 - */ -public record PaymentRequest( - String userId, - String orderId, - PaymentGatewayDto.CardType cardType, - String cardNo, - Long amount, - String callbackUrl -) { -} - diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestBuilder.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestBuilder.java deleted file mode 100644 index 21b7869d0..000000000 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestBuilder.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.loopers.application.purchasing; - -import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; -import com.loopers.support.error.CoreException; -import com.loopers.support.error.ErrorType; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -/** - * 결제 요청 빌더. - *

- * 결제 요청 도메인 모델을 생성합니다. - *

- * - * @author Loopers - * @version 1.0 - */ -@Component -@RequiredArgsConstructor -public class PaymentRequestBuilder { - - @Value("${payment.callback.base-url}") - private String callbackBaseUrl; - - /** - * 결제 요청을 생성합니다. - * - * @param userId 사용자 ID - * @param orderId 주문 ID - * @param cardType 카드 타입 문자열 - * @param cardNo 카드 번호 - * @param amount 결제 금액 - * @return 결제 요청 도메인 모델 - * @throws CoreException 잘못된 카드 타입인 경우 - */ - public PaymentRequest build(String userId, Long orderId, String cardType, String cardNo, Integer amount) { - // 카드 번호 유효성 검증 - validateCardNo(cardNo); - - // 주문 ID를 6자리 이상 문자열로 변환 (pg-simulator 검증 요구사항) - String orderIdString = formatOrderId(orderId); - return new PaymentRequest( - userId, - orderIdString, - parseCardType(cardType), - cardNo, - amount.longValue(), - generateCallbackUrl(orderId) - ); - } - - /** - * 카드 타입 문자열을 CardType enum으로 변환합니다. - * - * @param cardType 카드 타입 문자열 - * @return CardType enum - * @throws CoreException 잘못된 카드 타입인 경우 - */ - private PaymentGatewayDto.CardType parseCardType(String cardType) { - try { - return PaymentGatewayDto.CardType.valueOf(cardType.toUpperCase()); - } catch (IllegalArgumentException e) { - throw new CoreException(ErrorType.BAD_REQUEST, - String.format("잘못된 카드 타입입니다. (cardType: %s)", cardType)); - } - } - - /** - * 콜백 URL을 생성합니다. - *

- * 환경변수 {@code payment.callback.base-url}을 사용하여 프로덕션 환경에 적합한 URL을 생성합니다. - *

- * - * @param orderId 주문 ID - * @return 콜백 URL - */ - private String generateCallbackUrl(Long orderId) { - return String.format("%s/api/v1/orders/%d/callback", callbackBaseUrl, orderId); - } - - /** - * 카드 번호 유효성 검증을 수행합니다. - *

- * 다음 사항들을 검증합니다: - *

    - *
  • null/empty 체크
    • - *
  • 공백/하이픈 제거 및 정규화
    • - *
  • 길이 검증 (13-19자리)
    • - *
  • 숫자만 포함하는지 검증
    • - *
  • Luhn 알고리즘 체크섬 검증
    • - *
- *

- * - * @param cardNo 카드 번호 - * @throws CoreException 유효하지 않은 카드 번호인 경우 - */ - private void validateCardNo(String cardNo) { - if (cardNo == null || cardNo.isEmpty()) { - throw new CoreException(ErrorType.BAD_REQUEST, "카드 번호는 필수입니다."); - } - - // 공백/하이픈 제거 및 정규화 - String normalized = cardNo.replaceAll("[\\s-]", ""); - - // 길이 검증 (13-19자리) - if (normalized.length() < 13 || normalized.length() > 19) { - throw new CoreException(ErrorType.BAD_REQUEST, - String.format("유효하지 않은 카드 번호 길이입니다. (길이: %d, 요구사항: 13-19자리)", normalized.length())); - } - - // 숫자만 포함하는지 검증 - if (!normalized.matches("\\d+")) { - throw new CoreException(ErrorType.BAD_REQUEST, "카드 번호는 숫자만 포함해야 합니다."); - } - - // Luhn 알고리즘 체크섬 검증 - if (!isValidLuhn(normalized)) { - throw new CoreException(ErrorType.BAD_REQUEST, "유효하지 않은 카드 번호입니다. (Luhn 알고리즘 검증 실패)"); - } - } - - /** - * Luhn 알고리즘을 사용하여 카드 번호의 체크섬을 검증합니다. - *

- * Luhn 알고리즘은 신용카드 번호의 유효성을 검증하는 표준 알고리즘입니다. - *

- * - * @param cardNo 정규화된 카드 번호 (숫자만 포함) - * @return 유효한 경우 true, 그렇지 않으면 false - */ - private boolean isValidLuhn(String cardNo) { - int sum = 0; - boolean alternate = false; - - // 오른쪽에서 왼쪽으로 순회 - for (int i = cardNo.length() - 1; i >= 0; i--) { - int digit = Character.getNumericValue(cardNo.charAt(i)); - - if (alternate) { - digit *= 2; - if (digit > 9) { - digit = (digit % 10) + 1; - } - } - - sum += digit; - alternate = !alternate; - } - - return (sum % 10) == 0; - } - - /** - * 주문 ID를 6자리 이상 문자열로 변환합니다. - *

- * pg-simulator의 검증 요구사항에 맞추기 위해 최소 6자리로 패딩합니다. - *

- * - * @param orderId 주문 ID (Long) - * @return 6자리 이상의 주문 ID 문자열 - */ - public String formatOrderId(Long orderId) { - return String.format("%06d", orderId); - } -} - diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestCommand.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestCommand.java new file mode 100644 index 000000000..9931d48c9 --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestCommand.java @@ -0,0 +1,44 @@ +package com.loopers.domain.payment; + +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; + +/** + * 결제 요청 명령. + *

+ * PG 결제 요청에 필요한 정보를 담는 도메인 모델입니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +public record PaymentRequestCommand( + String userId, + Long orderId, + String cardType, + String cardNo, + Long amount, + String callbackUrl +) { + public PaymentRequestCommand { + if (userId == null || userId.isBlank()) { + throw new CoreException(ErrorType.BAD_REQUEST, "userId는 필수입니다."); + } + if (orderId == null) { + throw new CoreException(ErrorType.BAD_REQUEST, "orderId는 필수입니다."); + } + if (cardType == null || cardType.isBlank()) { + throw new CoreException(ErrorType.BAD_REQUEST, "cardType은 필수입니다."); + } + if (cardNo == null || cardNo.isBlank()) { + throw new CoreException(ErrorType.BAD_REQUEST, "cardNo는 필수입니다."); + } + if (amount == null || amount <= 0) { + throw new CoreException(ErrorType.BAD_REQUEST, "amount는 0보다 커야 합니다."); + } + if (callbackUrl == null || callbackUrl.isBlank()) { + throw new CoreException(ErrorType.BAD_REQUEST, "callbackUrl은 필수입니다."); + } + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestResult.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestResult.java new file mode 100644 index 000000000..9c62dee8c --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestResult.java @@ -0,0 +1,30 @@ +package com.loopers.domain.payment; + +/** + * 결제 요청 결과. + *

+ * PG 결제 요청의 결과를 나타내는 도메인 모델입니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +public sealed interface PaymentRequestResult { + /** + * 결제 요청 성공. + * + * @param transactionKey 트랜잭션 키 + */ + record Success(String transactionKey) implements PaymentRequestResult {} + + /** + * 결제 요청 실패. + * + * @param errorCode 오류 코드 + * @param message 오류 메시지 + * @param isTimeout 타임아웃 여부 + * @param isRetryable 재시도 가능 여부 + */ + record Failure(String errorCode, String message, boolean isTimeout, boolean isRetryable) implements PaymentRequestResult {} +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java index f1e60f179..3cb2a562c 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java @@ -3,9 +3,12 @@ import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.time.Duration; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -13,18 +16,24 @@ /** * 결제 도메인 서비스. *

- * 결제의 생성, 조회, 상태 변경을 담당합니다. - * 도메인 로직은 Payment 엔티티에 위임하며, Service는 조회/저장만 담당합니다. + * 결제의 생성, 조회, 상태 변경 및 PG 연동을 담당합니다. + * 도메인 로직은 Payment 엔티티에 위임하며, Service는 조회/저장 및 PG 연동을 담당합니다. *

* * @author Loopers * @version 1.0 */ +@Slf4j @Component @RequiredArgsConstructor public class PaymentService { private final PaymentRepository paymentRepository; + private final PaymentGateway paymentGateway; // 인터페이스에 의존 (DIP 준수) + private final PaymentFailureClassifier paymentFailureClassifier; + + @Value("${payment.callback.base-url}") + private String callbackBaseUrl; /** * 카드 결제를 생성합니다. @@ -154,5 +163,248 @@ public List findAllByUserId(Long userId) { public List findAllByStatus(PaymentStatus status) { return paymentRepository.findAllByStatus(status); } + + /** + * PG 결제 요청을 생성하고 전송합니다. + *

+ * 결제를 생성하고 PG에 결제 요청을 전송합니다. + *

+ * + * @param orderId 주문 ID + * @param userId 사용자 ID (String - User.userId) + * @param userEntityId 사용자 엔티티 ID (Long - User.id) + * @param cardType 카드 타입 + * @param cardNo 카드 번호 + * @param amount 결제 금액 + * @return 결제 요청 결과 + */ + @Transactional + public PaymentRequestResult requestPayment( + Long orderId, + String userId, + Long userEntityId, + String cardType, + String cardNo, + Long amount + ) { + // 1. 카드 번호 유효성 검증 + validateCardNo(cardNo); + + // 2. 결제 생성 (User 엔티티의 id 사용) + Payment payment = create( + orderId, + userEntityId, + convertCardType(cardType), + cardNo, + amount, + LocalDateTime.now() + ); + + // 3. 결제 요청 명령 생성 (PG 요청에는 String userId 사용) + String callbackUrl = generateCallbackUrl(orderId); + PaymentRequestCommand command = new PaymentRequestCommand( + userId, + orderId, + cardType, + cardNo, + amount, + callbackUrl + ); + + // 4. PG 결제 요청 전송 + PaymentRequestResult result = paymentGateway.requestPayment(command); + + // 5. 결과 처리 + if (result instanceof PaymentRequestResult.Success success) { + log.info("PG 결제 요청 성공. (orderId: {}, transactionKey: {})", orderId, success.transactionKey()); + return result; + } else if (result instanceof PaymentRequestResult.Failure failure) { + // 실패 분류 + PaymentFailureType failureType = paymentFailureClassifier.classify(failure.errorCode()); + if (failureType == PaymentFailureType.BUSINESS_FAILURE) { + // 비즈니스 실패: 결제 상태를 FAILED로 변경 + toFailed(payment.getId(), failure.message(), LocalDateTime.now()); + } + // 외부 시스템 장애는 PENDING 상태 유지 + log.warn("PG 결제 요청 실패. (orderId: {}, errorCode: {}, message: {})", + orderId, failure.errorCode(), failure.message()); + return result; + } + + return result; + } + + /** + * 결제 상태를 조회합니다. + * + * @param userId 사용자 ID + * @param orderId 주문 ID + * @return 결제 상태 + */ + @Transactional(readOnly = true) + public PaymentStatus getPaymentStatus(String userId, Long orderId) { + return paymentGateway.getPaymentStatus(userId, orderId); + } + + /** + * PG 콜백을 처리합니다. + * + * @param orderId 주문 ID + * @param transactionKey 트랜잭션 키 + * @param status 결제 상태 + * @param reason 실패 사유 (실패 시) + */ + @Transactional + public void handleCallback(Long orderId, String transactionKey, PaymentStatus status, String reason) { + Optional paymentOpt = findByOrderId(orderId); + if (paymentOpt.isEmpty()) { + log.warn("콜백 처리 시 결제를 찾을 수 없습니다. (orderId: {})", orderId); + return; + } + + Payment payment = paymentOpt.get(); + + if (status == PaymentStatus.SUCCESS) { + toSuccess(payment.getId(), LocalDateTime.now()); + log.info("결제 콜백 처리 완료: SUCCESS. (orderId: {}, transactionKey: {})", orderId, transactionKey); + } else if (status == PaymentStatus.FAILED) { + toFailed(payment.getId(), reason != null ? reason : "결제 실패", LocalDateTime.now()); + log.warn("결제 콜백 처리 완료: FAILED. (orderId: {}, transactionKey: {}, reason: {})", + orderId, transactionKey, reason); + } else { + // PENDING 상태: 상태 유지 + log.info("결제 콜백 처리: PENDING 상태 유지. (orderId: {}, transactionKey: {})", orderId, transactionKey); + } + } + + /** + * 타임아웃 후 결제 상태를 복구합니다. + *

+ * 타임아웃 발생 후 실제 결제 상태를 확인하여 결제 상태를 업데이트합니다. + *

+ * + * @param userId 사용자 ID + * @param orderId 주문 ID + * @param delayDuration 대기 시간 (PG 처리 시간 고려) + */ + public void recoverAfterTimeout(String userId, Long orderId, Duration delayDuration) { + try { + // 잠시 대기 후 상태 확인 (PG 처리 시간 고려) + if (delayDuration != null && !delayDuration.isZero()) { + Thread.sleep(delayDuration.toMillis()); + } + + // 결제 상태 조회 + PaymentStatus status = getPaymentStatus(userId, orderId); + Optional paymentOpt = findByOrderId(orderId); + + if (paymentOpt.isEmpty()) { + log.warn("복구 시 결제를 찾을 수 없습니다. (orderId: {})", orderId); + return; + } + + Payment payment = paymentOpt.get(); + + if (status == PaymentStatus.SUCCESS) { + toSuccess(payment.getId(), LocalDateTime.now()); + log.info("타임아웃 후 상태 확인 완료: SUCCESS. (orderId: {})", orderId); + } else if (status == PaymentStatus.FAILED) { + toFailed(payment.getId(), "타임아웃 후 상태 확인 실패", LocalDateTime.now()); + log.warn("타임아웃 후 상태 확인 완료: FAILED. (orderId: {})", orderId); + } else { + // PENDING 상태: 상태 유지 + log.info("타임아웃 후 상태 확인: PENDING 상태 유지. (orderId: {})", orderId); + } + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + log.warn("타임아웃 후 상태 확인 중 인터럽트 발생. (orderId: {})", orderId); + } catch (Exception e) { + log.error("타임아웃 후 상태 확인 중 오류 발생. (orderId: {})", orderId, e); + } + } + + /** + * 타임아웃 후 결제 상태를 복구합니다 (기본 대기 시간: 1초). + * + * @param userId 사용자 ID + * @param orderId 주문 ID + */ + public void recoverAfterTimeout(String userId, Long orderId) { + recoverAfterTimeout(userId, orderId, Duration.ofSeconds(1)); + } + + // 내부 헬퍼 메서드들 + + private CardType convertCardType(String cardType) { + try { + return CardType.valueOf(cardType.toUpperCase()); + } catch (IllegalArgumentException e) { + throw new CoreException(ErrorType.BAD_REQUEST, + String.format("잘못된 카드 타입입니다. (cardType: %s)", cardType)); + } + } + + private String generateCallbackUrl(Long orderId) { + return String.format("%s/api/v1/orders/%d/callback", callbackBaseUrl, orderId); + } + + /** + * 카드 번호 유효성 검증을 수행합니다. + * + * @param cardNo 카드 번호 + * @throws CoreException 유효하지 않은 카드 번호인 경우 + */ + private void validateCardNo(String cardNo) { + if (cardNo == null || cardNo.isEmpty()) { + throw new CoreException(ErrorType.BAD_REQUEST, "카드 번호는 필수입니다."); + } + + // 공백/하이픈 제거 및 정규화 + String normalized = cardNo.replaceAll("[\\s-]", ""); + + // 길이 검증 (13-19자리) + if (normalized.length() < 13 || normalized.length() > 19) { + throw new CoreException(ErrorType.BAD_REQUEST, + String.format("유효하지 않은 카드 번호 길이입니다. (길이: %d, 요구사항: 13-19자리)", normalized.length())); + } + + // 숫자만 포함하는지 검증 + if (!normalized.matches("\\d+")) { + throw new CoreException(ErrorType.BAD_REQUEST, "카드 번호는 숫자만 포함해야 합니다."); + } + + // Luhn 알고리즘 체크섬 검증 + if (!isValidLuhn(normalized)) { + throw new CoreException(ErrorType.BAD_REQUEST, "유효하지 않은 카드 번호입니다. (Luhn 알고리즘 검증 실패)"); + } + } + + /** + * Luhn 알고리즘을 사용하여 카드 번호의 체크섬을 검증합니다. + * + * @param cardNo 정규화된 카드 번호 (숫자만 포함) + * @return 유효한 경우 true, 그렇지 않으면 false + */ + private boolean isValidLuhn(String cardNo) { + int sum = 0; + boolean alternate = false; + + // 오른쪽에서 왼쪽으로 순회 + for (int i = cardNo.length() - 1; i >= 0; i--) { + int digit = Character.getNumericValue(cardNo.charAt(i)); + + if (alternate) { + digit *= 2; + if (digit > 9) { + digit = (digit % 10) + 1; + } + } + + sum += digit; + alternate = !alternate; + } + + return (sum % 10) == 0; + } } From 8060272d201dba250894150ff507511e25b9b05b Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 23:38:02 +0900 Subject: [PATCH 11/22] =?UTF-8?q?refactor:=20DIP=20=EC=9B=90=EC=B9=99?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EC=B6=B0=20PG=20=EB=A1=9C=EC=A7=81?= =?UTF-8?q?=EC=97=90=EC=84=9C=20infra=20=EB=A0=88=EC=9D=B4=EC=96=B4?= =?UTF-8?q?=EA=B0=80=20domain=20=EB=A0=88=EC=9D=B4=EC=96=B4=EB=A5=BC=20?= =?UTF-8?q?=EC=9D=98=EC=A1=B4=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=9E=AC?= =?UTF-8?q?=EA=B5=AC=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/payment/PaymentGateway.java | 31 ++++++++ ...ayAdapter.java => PaymentGatewayImpl.java} | 78 +++++++++++-------- 2 files changed, 77 insertions(+), 32 deletions(-) create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentGateway.java rename apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/{PaymentGatewayAdapter.java => PaymentGatewayImpl.java} (61%) diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentGateway.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentGateway.java new file mode 100644 index 000000000..cc51f65ae --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentGateway.java @@ -0,0 +1,31 @@ +package com.loopers.domain.payment; + +/** + * 결제 게이트웨이 인터페이스. + *

+ * 도메인 계층에 정의하여 DIP를 준수합니다. + * 인프라 계층이 이 인터페이스를 구현합니다. + *

+ * + * @author Loopers + * @version 1.0 + */ +public interface PaymentGateway { + /** + * PG 결제 요청을 전송합니다. + * + * @param command 결제 요청 명령 + * @return 결제 요청 결과 + */ + PaymentRequestResult requestPayment(PaymentRequestCommand command); + + /** + * 결제 상태를 조회합니다. + * + * @param userId 사용자 ID + * @param orderId 주문 ID + * @return 결제 상태 + */ + PaymentStatus getPaymentStatus(String userId, Long orderId); +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayImpl.java similarity index 61% rename from apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java rename to apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayImpl.java index 8145ebd4a..62530d59d 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayAdapter.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayImpl.java @@ -1,15 +1,18 @@ package com.loopers.infrastructure.paymentgateway; -import com.loopers.application.purchasing.PaymentRequest; -import com.loopers.domain.payment.PaymentResult; +import com.loopers.domain.payment.PaymentGateway; +import com.loopers.domain.payment.PaymentRequestCommand; +import com.loopers.domain.payment.PaymentRequestResult; +import com.loopers.domain.payment.PaymentStatus; import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; /** - * 결제 게이트웨이 어댑터. + * PaymentGateway 인터페이스의 구현체. *

+ * 도메인 계층의 PaymentGateway 인터페이스를 구현합니다. * 인프라 관심사(FeignClient 호출, 예외 처리)를 도메인 모델로 변환합니다. *

* @@ -19,43 +22,43 @@ @Slf4j @Component @RequiredArgsConstructor -public class PaymentGatewayAdapter { +public class PaymentGatewayImpl implements PaymentGateway { private final PaymentGatewayClient paymentGatewayClient; private final PaymentGatewaySchedulerClient paymentGatewaySchedulerClient; private final PaymentGatewayMetrics metrics; /** - * 결제 요청을 전송합니다. + * PG 결제 요청을 전송합니다. * - * @param request 결제 요청 - * @return 결제 결과 (성공 또는 실패) + * @param command 결제 요청 명령 + * @return 결제 요청 결과 */ + @Override @CircuitBreaker(name = "pgCircuit", fallbackMethod = "fallback") - public PaymentResult requestPayment(PaymentRequest request) { - PaymentGatewayDto.PaymentRequest dtoRequest = toDto(request); + public PaymentRequestResult requestPayment(PaymentRequestCommand command) { + PaymentGatewayDto.PaymentRequest dtoRequest = toDto(command); PaymentGatewayDto.ApiResponse response = - paymentGatewayClient.requestPayment(request.userId(), dtoRequest); + paymentGatewayClient.requestPayment(command.userId(), dtoRequest); - return toDomainResult(response, request.orderId()); + return toDomainResult(response, command.orderId()); } /** * Circuit Breaker fallback 메서드. * - * @param request 결제 요청 + * @param command 결제 요청 명령 * @param t 발생한 예외 * @return 결제 대기 상태의 실패 결과 */ - public PaymentResult fallback(PaymentRequest request, Throwable t) { + public PaymentRequestResult fallback(PaymentRequestCommand command, Throwable t) { log.warn("Circuit Breaker fallback 호출됨. (orderId: {}, exception: {})", - request.orderId(), t.getClass().getSimpleName(), t); + command.orderId(), t.getClass().getSimpleName(), t); metrics.recordFallback("paymentGatewayClient"); - return new PaymentResult.Failure( + return new PaymentRequestResult.Failure( "CIRCUIT_BREAKER_OPEN", "결제 대기 상태", false, - false, false ); } @@ -68,11 +71,11 @@ public PaymentResult fallback(PaymentRequest request, Throwable t) { * @param t 발생한 예외 * @return PENDING 상태 반환 */ - public PaymentGatewayDto.TransactionStatus getPaymentStatusFallback(String userId, String orderId, Throwable t) { + public PaymentStatus getPaymentStatusFallback(String userId, Long orderId, Throwable t) { log.warn("Circuit Breaker fallback 호출됨 (결제 상태 조회). (orderId: {}, exception: {})", orderId, t.getClass().getSimpleName(), t); metrics.recordFallback("paymentGatewaySchedulerClient"); - return PaymentGatewayDto.TransactionStatus.PENDING; + return PaymentStatus.PENDING; } /** @@ -82,37 +85,40 @@ public PaymentGatewayDto.TransactionStatus getPaymentStatusFallback(String userI * @param orderId 주문 ID * @return 결제 상태 (SUCCESS, FAILED, PENDING) */ + @Override @CircuitBreaker(name = "pgCircuit", fallbackMethod = "getPaymentStatusFallback") - public PaymentGatewayDto.TransactionStatus getPaymentStatus(String userId, String orderId) { + public PaymentStatus getPaymentStatus(String userId, Long orderId) { + // 주문 ID를 6자리 이상 문자열로 변환 (pg-simulator 검증 요구사항) + String orderIdString = String.format("%06d", orderId); PaymentGatewayDto.ApiResponse response = - paymentGatewaySchedulerClient.getTransactionsByOrder(userId, orderId); + paymentGatewaySchedulerClient.getTransactionsByOrder(userId, orderIdString); if (response == null || response.meta() == null || response.meta().result() != PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS || response.data() == null || response.data().transactions() == null || response.data().transactions().isEmpty()) { - return PaymentGatewayDto.TransactionStatus.PENDING; + return PaymentStatus.PENDING; } // 가장 최근 트랜잭션의 상태 반환 PaymentGatewayDto.TransactionResponse latestTransaction = response.data().transactions().get(response.data().transactions().size() - 1); - return latestTransaction.status(); + return convertToPaymentStatus(latestTransaction.status()); } - private PaymentGatewayDto.PaymentRequest toDto(PaymentRequest request) { + private PaymentGatewayDto.PaymentRequest toDto(PaymentRequestCommand command) { return new PaymentGatewayDto.PaymentRequest( - request.orderId(), - request.cardType(), - request.cardNo(), - request.amount(), - request.callbackUrl() + String.format("%06d", command.orderId()), // 주문 ID를 6자리 이상 문자열로 변환 + PaymentGatewayDto.CardType.valueOf(command.cardType().toUpperCase()), + command.cardNo(), + command.amount(), + command.callbackUrl() ); } - private PaymentResult toDomainResult( + private PaymentRequestResult toDomainResult( PaymentGatewayDto.ApiResponse response, - String orderId + Long orderId ) { if (response != null && response.meta() != null && response.meta().result() == PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS @@ -120,7 +126,7 @@ private PaymentResult toDomainResult( String transactionKey = response.data().transactionKey(); log.info("PG 결제 요청 성공. (orderId: {}, transactionKey: {})", orderId, transactionKey); metrics.recordSuccess("paymentGatewayClient"); - return new PaymentResult.Success(transactionKey); + return new PaymentRequestResult.Success(transactionKey); } else { String errorCode = response != null && response.meta() != null ? response.meta().errorCode() : "UNKNOWN"; @@ -128,9 +134,17 @@ private PaymentResult toDomainResult( ? response.meta().message() : "응답이 null입니다."; log.warn("PG 결제 요청 실패. (orderId: {}, errorCode: {}, message: {})", orderId, errorCode, message); - return new PaymentResult.Failure(errorCode, message, false, false, false); + return new PaymentRequestResult.Failure(errorCode, message, false, false); } } + private PaymentStatus convertToPaymentStatus(PaymentGatewayDto.TransactionStatus status) { + return switch (status) { + case SUCCESS -> PaymentStatus.SUCCESS; + case FAILED -> PaymentStatus.FAILED; + case PENDING -> PaymentStatus.PENDING; + }; + } + } From a8205fb88ceef5cc9632deb486fec7c0d871cc9c Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 23:39:11 +0900 Subject: [PATCH 12/22] =?UTF-8?q?refactor:=20payment=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20=EC=8A=A4=EC=BC=80=EC=A4=84=EB=A7=81=20=EB=A1=9C=EC=A7=81?= =?UTF-8?q?=EB=93=A4=EC=9D=80=20infra=20=EB=A0=88=EC=9D=B4=EC=96=B4?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasing/PaymentRecoveryService.java | 66 ------------------- .../scheduler}/PaymentRecoveryScheduler.java | 10 ++- 2 files changed, 9 insertions(+), 67 deletions(-) delete mode 100644 apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryService.java rename apps/commerce-api/src/main/java/com/loopers/{application/purchasing => infrastructure/scheduler}/PaymentRecoveryScheduler.java (92%) diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryService.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryService.java deleted file mode 100644 index 6c6ff0646..000000000 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.loopers.application.purchasing; - -import com.loopers.domain.order.OrderStatusUpdater; -import com.loopers.infrastructure.paymentgateway.DelayProvider; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayAdapter; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.time.Duration; - -/** - * 결제 복구 서비스. - *

- * 타임아웃 발생 후 결제 상태를 확인하여 주문 상태를 복구합니다. - *

- * - * @author Loopers - * @version 1.0 - */ -@Slf4j -@Component -@RequiredArgsConstructor -public class PaymentRecoveryService { - - private final PaymentGatewayAdapter paymentGatewayAdapter; - private final OrderStatusUpdater orderStatusUpdater; - private final DelayProvider delayProvider; - - /** - * 타임아웃 발생 후 결제 상태를 확인하여 주문 상태를 복구합니다. - *

- * 타임아웃은 요청이 전송되었을 수 있으므로, 실제 결제 상태를 확인하여 - * 결제가 성공했다면 주문을 완료하고, 실패했다면 주문을 취소합니다. - *

- * - * @param userId 사용자 ID - * @param orderId 주문 ID - */ - public void recoverAfterTimeout(String userId, Long orderId) { - try { - // 잠시 대기 후 상태 확인 (PG 처리 시간 고려) - // 타임아웃이 발생했지만 요청은 전송되었을 수 있으므로, - // PG 시스템이 처리할 시간을 주기 위해 짧은 대기 - delayProvider.delay(Duration.ofSeconds(1)); - - // PG에서 주문별 결제 정보 조회 - var status = paymentGatewayAdapter.getPaymentStatus(userId, String.valueOf(orderId)); - - // 별도 트랜잭션으로 상태 업데이트 - boolean updated = orderStatusUpdater.updateByPaymentStatus(orderId, status, null, null); - - if (!updated) { - log.warn("타임아웃 후 상태 확인 실패. 주문 상태 업데이트에 실패했습니다. 나중에 스케줄러로 복구됩니다. (orderId: {})", orderId); - } - - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - log.warn("타임아웃 후 상태 확인 중 인터럽트 발생. (orderId: {})", orderId); - } catch (Exception e) { - // 기타 오류: 나중에 스케줄러로 복구 가능 - log.error("타임아웃 후 상태 확인 중 오류 발생. 나중에 스케줄러로 복구됩니다. (orderId: {})", orderId, e); - } - } -} - diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryScheduler.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/scheduler/PaymentRecoveryScheduler.java similarity index 92% rename from apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryScheduler.java rename to apps/commerce-api/src/main/java/com/loopers/infrastructure/scheduler/PaymentRecoveryScheduler.java index 6502a9cce..048e91755 100644 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRecoveryScheduler.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/scheduler/PaymentRecoveryScheduler.java @@ -1,5 +1,6 @@ -package com.loopers.application.purchasing; +package com.loopers.infrastructure.scheduler; +import com.loopers.application.purchasing.PurchasingFacade; import com.loopers.domain.order.Order; import com.loopers.domain.order.OrderRepository; import com.loopers.domain.order.OrderStatus; @@ -35,6 +36,13 @@ *
  • 성능 고려: 배치로 처리하여 PG 시스템 부하 최소화
    • * *

    + *

    + * 레이어 위치 근거: + *

      + *
    • 스케줄링은 기술적 관심사이므로 Infrastructure Layer에 위치
      • + *
    • 비즈니스 로직은 Application Layer의 PurchasingFacade에 위임
      • + *
    + *

    * * @author Loopers * @version 1.0 From 818e0c27a0de14e5a951126961b94afc1d08c02c Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 23:40:19 +0900 Subject: [PATCH 13/22] =?UTF-8?q?refactor:=20PurchasingFacade=EA=B0=80=20r?= =?UTF-8?q?epository=EB=A5=BC=20=EC=A7=81=EC=A0=91=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=9E=AC=EA=B5=AC=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loopers/domain/coupon/CouponService.java | 84 +++++++++++++++++++ .../domain/product/ProductService.java | 53 ++++++++++++ .../com/loopers/domain/user/UserService.java | 64 +++++++++++++- 3 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/coupon/CouponService.java create mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/product/ProductService.java diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/coupon/CouponService.java b/apps/commerce-api/src/main/java/com/loopers/domain/coupon/CouponService.java new file mode 100644 index 000000000..ec0b09d2b --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/coupon/CouponService.java @@ -0,0 +1,84 @@ +package com.loopers.domain.coupon; + +import com.loopers.domain.coupon.discount.CouponDiscountStrategyFactory; +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import lombok.RequiredArgsConstructor; +import org.springframework.orm.ObjectOptimisticLockingFailureException; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +/** + * 쿠폰 도메인 서비스. + *

    + * 쿠폰 조회, 사용 등의 도메인 로직을 처리합니다. + * Repository에 의존하며 비즈니스 규칙을 캡슐화합니다. + *

    + * + * @author Loopers + * @version 1.0 + */ +@RequiredArgsConstructor +@Component +public class CouponService { + private final CouponRepository couponRepository; + private final UserCouponRepository userCouponRepository; + private final CouponDiscountStrategyFactory couponDiscountStrategyFactory; + + /** + * 쿠폰을 적용하여 할인 금액을 계산하고 쿠폰을 사용 처리합니다. + *

    + * 동시성 제어 전략: + *

      + *
    • OPTIMISTIC_LOCK 사용 근거: 쿠폰 중복 사용 방지, Hot Spot 대응
      • + *
    • @Version 필드: UserCoupon 엔티티의 version 필드를 통해 자동으로 낙관적 락 적용
      • + *
    • 동시 사용 시: 한 명만 성공하고 나머지는 OptimisticLockException 발생
      • + *
    • 사용 목적: 동일 쿠폰으로 여러 기기에서 동시 주문해도 한 번만 사용되도록 보장
      • + *
    + *

    + * + * @param userId 사용자 ID + * @param couponCode 쿠폰 코드 + * @param subtotal 주문 소계 금액 + * @return 할인 금액 + * @throws CoreException 쿠폰을 찾을 수 없거나 사용 불가능한 경우, 동시 사용으로 인한 충돌 시 + */ + @Transactional + public Integer applyCoupon(Long userId, String couponCode, Integer subtotal) { + // 쿠폰 존재 여부 확인 + Coupon coupon = couponRepository.findByCode(couponCode) + .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, + String.format("쿠폰을 찾을 수 없습니다. (쿠폰 코드: %s)", couponCode))); + + // 낙관적 락을 사용하여 사용자 쿠폰 조회 (동시성 제어) + // @Version 필드가 있어 자동으로 낙관적 락이 적용됨 + UserCoupon userCoupon = userCouponRepository.findByUserIdAndCouponCodeForUpdate(userId, couponCode) + .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, + String.format("사용자가 소유한 쿠폰을 찾을 수 없습니다. (쿠폰 코드: %s)", couponCode))); + + // 쿠폰 사용 가능 여부 확인 + if (!userCoupon.isAvailable()) { + throw new CoreException(ErrorType.BAD_REQUEST, + String.format("이미 사용된 쿠폰입니다. (쿠폰 코드: %s)", couponCode)); + } + + // 쿠폰 사용 처리 + userCoupon.use(); + + // 할인 금액 계산 (전략 패턴 사용) + Integer discountAmount = coupon.calculateDiscountAmount(subtotal, couponDiscountStrategyFactory); + + try { + // 사용자 쿠폰 저장 (version 체크 자동 수행) + // 다른 트랜잭션이 먼저 수정했다면 OptimisticLockException 발생 + userCouponRepository.save(userCoupon); + } catch (ObjectOptimisticLockingFailureException e) { + // 낙관적 락 충돌: 다른 트랜잭션이 먼저 쿠폰을 사용함 + throw new CoreException(ErrorType.CONFLICT, + String.format("쿠폰이 이미 사용되었습니다. (쿠폰 코드: %s)", couponCode)); + } + + return discountAmount; + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/product/ProductService.java b/apps/commerce-api/src/main/java/com/loopers/domain/product/ProductService.java new file mode 100644 index 000000000..dde8b402b --- /dev/null +++ b/apps/commerce-api/src/main/java/com/loopers/domain/product/ProductService.java @@ -0,0 +1,53 @@ +package com.loopers.domain.product; + +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 상품 도메인 서비스. + *

    + * 상품 조회, 저장 등의 도메인 로직을 처리합니다. + * Repository에 의존하며 비즈니스 규칙을 캡슐화합니다. + *

    + * + * @author Loopers + * @version 1.0 + */ +@RequiredArgsConstructor +@Component +public class ProductService { + private final ProductRepository productRepository; + + /** + * 상품 ID로 상품을 조회합니다. (비관적 락) + *

    + * 동시성 제어가 필요한 경우 사용합니다. (예: 재고 차감) + *

    + * + * @param productId 조회할 상품 ID + * @return 조회된 상품 + * @throws CoreException 상품을 찾을 수 없는 경우 + */ + @Transactional + public Product findByIdForUpdate(Long productId) { + return productRepository.findByIdForUpdate(productId) + .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, + String.format("상품을 찾을 수 없습니다. (상품 ID: %d)", productId))); + } + + /** + * 상품 목록을 저장합니다. + * + * @param products 저장할 상품 목록 + */ + @Transactional + public void saveAll(List products) { + products.forEach(productRepository::save); + } +} + diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/user/UserService.java b/apps/commerce-api/src/main/java/com/loopers/domain/user/UserService.java index 6621a8b62..8c6d062e2 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/user/UserService.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/user/UserService.java @@ -5,11 +5,12 @@ import lombok.RequiredArgsConstructor; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; /** * 사용자 도메인 서비스. *

    - * 사용자 생성 등의 도메인 로직을 처리합니다. + * 사용자 생성, 조회 등의 도메인 로직을 처리합니다. * Repository에 의존하며 데이터 무결성 제약 조건을 처리합니다. *

    * @@ -43,4 +44,65 @@ public User create(String userId, String email, String birthDateStr, Gender gend } } + /** + * 사용자 ID로 사용자를 조회합니다. + * + * @param userId 조회할 사용자 ID + * @return 조회된 사용자 + * @throws CoreException 사용자를 찾을 수 없는 경우 + */ + @Transactional(readOnly = true) + public User findByUserId(String userId) { + User user = userRepository.findByUserId(userId); + if (user == null) { + throw new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."); + } + return user; + } + + /** + * 사용자 ID로 사용자를 조회합니다. (비관적 락) + *

    + * 포인트 차감 등 동시성 제어가 필요한 경우 사용합니다. + *

    + * + * @param userId 조회할 사용자 ID + * @return 조회된 사용자 + * @throws CoreException 사용자를 찾을 수 없는 경우 + */ + @Transactional + public User findByUserIdForUpdate(String userId) { + User user = userRepository.findByUserIdForUpdate(userId); + if (user == null) { + throw new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."); + } + return user; + } + + /** + * 사용자 ID (PK)로 사용자를 조회합니다. + * + * @param id 사용자 ID (PK) + * @return 조회된 사용자 + * @throws CoreException 사용자를 찾을 수 없는 경우 + */ + @Transactional(readOnly = true) + public User findById(Long id) { + User user = userRepository.findById(id); + if (user == null) { + throw new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."); + } + return user; + } + + /** + * 사용자를 저장합니다. + * + * @param user 저장할 사용자 + * @return 저장된 사용자 + */ + @Transactional + public User save(User user) { + return userRepository.save(user); + } } From 5e2b04cc51bb1beba881cb43d2a07244b0fd95d8 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 23:40:58 +0900 Subject: [PATCH 14/22] =?UTF-8?q?refactor:=20PuhrchasingFacade=EA=B0=80=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4?= =?UTF-8?q?=EB=A5=BC=20=EC=A1=B0=ED=95=A9=ED=95=B4=EC=84=9C=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8A=94=20=EC=97=AD=ED=95=A0=EB=A7=8C=20?= =?UTF-8?q?=EB=8B=B4=EB=8B=B9=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=9E=AC?= =?UTF-8?q?=EA=B5=AC=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasing/PurchasingFacade.java | 444 ++++++++++-------- 1 file changed, 238 insertions(+), 206 deletions(-) diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java index 0a2b1b208..e24f92f05 100644 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java @@ -1,30 +1,26 @@ package com.loopers.application.purchasing; -import com.loopers.domain.coupon.Coupon; -import com.loopers.domain.coupon.CouponRepository; -import com.loopers.domain.coupon.UserCoupon; -import com.loopers.domain.coupon.UserCouponRepository; -import com.loopers.domain.coupon.discount.CouponDiscountStrategyFactory; import com.loopers.domain.order.Order; import com.loopers.domain.order.OrderItem; -import com.loopers.domain.order.OrderRepository; +import com.loopers.domain.order.OrderService; import com.loopers.domain.order.OrderStatus; -import org.springframework.orm.ObjectOptimisticLockingFailureException; import com.loopers.domain.product.Product; -import com.loopers.domain.product.ProductRepository; +import com.loopers.domain.product.ProductService; import com.loopers.domain.user.Point; import com.loopers.domain.user.User; -import com.loopers.domain.user.UserRepository; -import com.loopers.infrastructure.paymentgateway.PaymentGatewaySchedulerClient; +import com.loopers.domain.user.UserService; +import com.loopers.domain.coupon.CouponService; import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayAdapter; -import com.loopers.domain.order.PaymentFailureClassifier; -import com.loopers.domain.order.PaymentFailureType; -import com.loopers.domain.order.OrderStatusUpdater; +import com.loopers.domain.payment.PaymentRequestResult; +import com.loopers.domain.order.OrderPaymentResultService; import com.loopers.domain.order.OrderCancellationService; +import com.loopers.domain.payment.PaymentService; +import com.loopers.domain.payment.PaymentStatus; +import com.loopers.domain.payment.CardType; import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; import feign.FeignException; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; @@ -49,20 +45,13 @@ @Component public class PurchasingFacade { - private final UserRepository userRepository; - private final ProductRepository productRepository; - private final OrderRepository orderRepository; - private final CouponRepository couponRepository; - private final UserCouponRepository userCouponRepository; - private final CouponDiscountStrategyFactory couponDiscountStrategyFactory; - private final PaymentGatewaySchedulerClient paymentGatewaySchedulerClient; // 스케줄러용 (Retry 적용) - private final PaymentRequestBuilder paymentRequestBuilder; - private final PaymentGatewayAdapter paymentGatewayAdapter; - private final PaymentFailureClassifier paymentFailureClassifier; - private final PaymentRecoveryService paymentRecoveryService; + private final UserService userService; + private final ProductService productService; + private final CouponService couponService; + private final OrderService orderService; private final OrderCancellationService orderCancellationService; - private final OrderStatusUpdater orderStatusUpdater; - private final PaymentFailureHandler paymentFailureHandler; + private final OrderPaymentResultService orderPaymentResultService; + private final PaymentService paymentService; // Payment 관련: PaymentService만 의존 (DIP 준수) /** * 주문을 생성한다. @@ -120,7 +109,7 @@ public OrderInfo createOrder(String userId, List commands, Str // - userId는 UNIQUE 인덱스가 있어 Lock 범위 최소화 (Record Lock만 적용) // - Lost Update 방지: 동시 주문 시 포인트 중복 차감 방지 (금전적 손실 방지) // - 트랜잭션 내부에 외부 I/O 없음, lock holding time 매우 짧음 - User user = loadUserForUpdate(userId); + User user = userService.findByUserIdForUpdate(userId); // ✅ Deadlock 방지: 상품 ID를 정렬하여 일관된 락 획득 순서 보장 // 여러 상품을 주문할 때, 항상 동일한 순서로 락을 획득하여 deadlock 방지 @@ -144,9 +133,7 @@ public OrderInfo createOrder(String userId, List commands, Str // - Lost Update 방지: 동시 주문 시 재고 음수 방지 및 정확한 차감 보장 (재고 oversell 방지) // - 트랜잭션 내부에 외부 I/O 없음, lock holding time 매우 짧음 // - ✅ 정렬된 순서로 락 획득하여 deadlock 방지 - Product product = productRepository.findByIdForUpdate(productId) - .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, - String.format("상품을 찾을 수 없습니다. (상품 ID: %d)", productId))); + Product product = productService.findByIdForUpdate(productId); productMap.put(productId, product); } @@ -169,24 +156,33 @@ public OrderInfo createOrder(String userId, List commands, Str String couponCode = extractCouponCode(commands); Integer discountAmount = 0; if (couponCode != null && !couponCode.isBlank()) { - discountAmount = applyCoupon(user.getId(), couponCode, calculateSubtotal(orderItems)); + discountAmount = couponService.applyCoupon(user.getId(), couponCode, calculateSubtotal(orderItems)); } - Order order = Order.of(user.getId(), orderItems, couponCode, discountAmount); + // OrderService를 사용하여 주문 생성 + Order savedOrder = orderService.create(user.getId(), orderItems, couponCode, discountAmount); // 주문은 PENDING 상태로 생성됨 (Order 생성자에서 기본값으로 설정) // 결제 성공 후에만 COMPLETED로 변경됨 - decreaseStocksForOrderItems(order.getItems(), products); - deductUserPoint(user, order.getTotalAmount()); + decreaseStocksForOrderItems(savedOrder.getItems(), products); + deductUserPoint(user, savedOrder.getTotalAmount()); // 주문은 PENDING 상태로 유지 (결제 요청 중 상태) // 결제 성공 시 콜백이나 상태 확인 API를 통해 COMPLETED로 변경됨 - products.forEach(productRepository::save); - userRepository.save(user); - - Order savedOrder = orderRepository.save(order); + productService.saveAll(products); + userService.save(user); // 주문은 PENDING 상태로 저장됨 + // Payment 생성 (PaymentService 사용) + paymentService.create( + savedOrder.getId(), + user.getId(), + convertCardType(cardType), + cardNo, + savedOrder.getTotalAmount().longValue(), + java.time.LocalDateTime.now() + ); + // PG 결제 요청을 트랜잭션 커밋 후에 실행하여 DB 커넥션 풀 고갈 방지 // 트랜잭션 내에서 외부 HTTP 호출을 하면 PG 지연/타임아웃 시 DB 커넥션이 오래 유지되어 커넥션 풀 고갈 위험 Long orderId = savedOrder.getId(); @@ -197,7 +193,7 @@ public OrderInfo createOrder(String userId, List commands, Str public void afterCommit() { // 트랜잭션 커밋 후 PG 호출 (DB 커넥션 해제 후 실행) try { - String transactionKey = requestPaymentToGateway(userId, orderId, cardType, cardNo, totalAmount); + String transactionKey = requestPaymentToGateway(userId, user.getId(), orderId, cardType, cardNo, totalAmount); if (transactionKey != null) { // 결제 성공: 별도 트랜잭션에서 주문 상태를 COMPLETED로 변경 updateOrderStatusToCompleted(orderId, transactionKey); @@ -255,8 +251,8 @@ public void cancelOrder(Order order, User user) { */ @Transactional(readOnly = true) public List getOrders(String userId) { - User user = loadUser(userId); - List orders = orderRepository.findAllByUserId(user.getId()); + User user = userService.findByUserId(userId); + List orders = orderService.findAllByUserId(user.getId()); return orders.stream() .map(OrderInfo::from) .toList(); @@ -271,9 +267,8 @@ public List getOrders(String userId) { */ @Transactional(readOnly = true) public OrderInfo getOrder(String userId, Long orderId) { - User user = loadUser(userId); - Order order = orderRepository.findById(orderId) - .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, "주문을 찾을 수 없습니다.")); + User user = userService.findByUserId(userId); + Order order = orderService.getById(orderId); if (!order.getUserId().equals(user.getId())) { throw new CoreException(ErrorType.NOT_FOUND, "주문을 찾을 수 없습니다."); @@ -304,34 +299,6 @@ private void deductUserPoint(User user, Integer totalAmount) { user.deductPoint(Point.of(totalAmount.longValue())); } - private User loadUser(String userId) { - User user = userRepository.findByUserId(userId); - if (user == null) { - throw new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."); - } - return user; - } - - /** - * 비관적 락을 사용하여 사용자를 조회합니다. - *

    - * 포인트 차감 등 동시성 제어가 필요한 경우 사용합니다. - *

    - *

    - * 전제 조건: userId는 상위 계층에서 이미 null/blank 검증이 완료되어야 합니다. - *

    - * - * @param userId 사용자 ID (null이 아니고 비어있지 않아야 함) - * @return 조회된 사용자 - * @throws CoreException 사용자를 찾을 수 없는 경우 - */ - private User loadUserForUpdate(String userId) { - User user = userRepository.findByUserIdForUpdate(userId); - if (user == null) { - throw new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."); - } - return user; - } /** * 주문 명령에서 쿠폰 코드를 추출합니다. @@ -347,60 +314,6 @@ private String extractCouponCode(List commands) { .orElse(null); } - /** - * 쿠폰을 적용하여 할인 금액을 계산하고 쿠폰을 사용 처리합니다. - *

    - * 동시성 제어 전략: - *

      - *
    • OPTIMISTIC_LOCK 사용 근거: 쿠폰 중복 사용 방지, Hot Spot 대응
      • - *
    • @Version 필드: UserCoupon 엔티티의 version 필드를 통해 자동으로 낙관적 락 적용
      • - *
    • 동시 사용 시: 한 명만 성공하고 나머지는 OptimisticLockException 발생
      • - *
    • 사용 목적: 동일 쿠폰으로 여러 기기에서 동시 주문해도 한 번만 사용되도록 보장
      • - *
    - *

    - * - * @param userId 사용자 ID - * @param couponCode 쿠폰 코드 - * @param subtotal 주문 소계 금액 - * @return 할인 금액 - * @throws CoreException 쿠폰을 찾을 수 없거나 사용 불가능한 경우, 동시 사용으로 인한 충돌 시 - */ - private Integer applyCoupon(Long userId, String couponCode, Integer subtotal) { - // 쿠폰 존재 여부 확인 - Coupon coupon = couponRepository.findByCode(couponCode) - .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, - String.format("쿠폰을 찾을 수 없습니다. (쿠폰 코드: %s)", couponCode))); - - // 낙관적 락을 사용하여 사용자 쿠폰 조회 (동시성 제어) - // @Version 필드가 있어 자동으로 낙관적 락이 적용됨 - UserCoupon userCoupon = userCouponRepository.findByUserIdAndCouponCodeForUpdate(userId, couponCode) - .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, - String.format("사용자가 소유한 쿠폰을 찾을 수 없습니다. (쿠폰 코드: %s)", couponCode))); - - // 쿠폰 사용 가능 여부 확인 - if (!userCoupon.isAvailable()) { - throw new CoreException(ErrorType.BAD_REQUEST, - String.format("이미 사용된 쿠폰입니다. (쿠폰 코드: %s)", couponCode)); - } - - // 쿠폰 사용 처리 - userCoupon.use(); - - // 할인 금액 계산 (전략 패턴 사용) - Integer discountAmount = coupon.calculateDiscountAmount(subtotal, couponDiscountStrategyFactory); - - try { - // 사용자 쿠폰 저장 (version 체크 자동 수행) - // 다른 트랜잭션이 먼저 수정했다면 OptimisticLockException 발생 - userCouponRepository.save(userCoupon); - } catch (ObjectOptimisticLockingFailureException e) { - // 낙관적 락 충돌: 다른 트랜잭션이 먼저 쿠폰을 사용함 - throw new CoreException(ErrorType.CONFLICT, - String.format("쿠폰이 이미 사용되었습니다. (쿠폰 코드: %s)", couponCode)); - } - - return discountAmount; - } /** * 주문 아이템 목록으로부터 소계 금액을 계산합니다. @@ -414,6 +327,52 @@ private Integer calculateSubtotal(List orderItems) { .sum(); } + /** + * 카드 타입 문자열을 CardType enum으로 변환합니다. + * + * @param cardType 카드 타입 문자열 + * @return CardType enum + * @throws CoreException 잘못된 카드 타입인 경우 + */ + private CardType convertCardType(String cardType) { + try { + return CardType.valueOf(cardType.toUpperCase()); + } catch (IllegalArgumentException e) { + throw new CoreException(ErrorType.BAD_REQUEST, + String.format("잘못된 카드 타입입니다. (cardType: %s)", cardType)); + } + } + + /** + * PaymentGatewayDto.TransactionStatus를 PaymentStatus 도메인 모델로 변환합니다. + * + * @param transactionStatus 인프라 계층의 TransactionStatus + * @return 도메인 모델의 PaymentStatus + */ + private PaymentStatus convertToPaymentStatus( + PaymentGatewayDto.TransactionStatus transactionStatus + ) { + return switch (transactionStatus) { + case SUCCESS -> PaymentStatus.SUCCESS; + case FAILED -> PaymentStatus.FAILED; + case PENDING -> PaymentStatus.PENDING; + }; + } + + /** + * PaymentStatus 도메인 모델을 PaymentGatewayDto.TransactionStatus로 변환합니다. + * + * @param paymentStatus 도메인 모델의 PaymentStatus + * @return 인프라 계층의 TransactionStatus + */ + private PaymentGatewayDto.TransactionStatus convertToInfraStatus(PaymentStatus paymentStatus) { + return switch (paymentStatus) { + case SUCCESS -> PaymentGatewayDto.TransactionStatus.SUCCESS; + case FAILED -> PaymentGatewayDto.TransactionStatus.FAILED; + case PENDING -> PaymentGatewayDto.TransactionStatus.PENDING; + }; + } + /** * 주문 상태를 COMPLETED로 업데이트합니다. *

    @@ -425,20 +384,26 @@ private Integer calculateSubtotal(List orderItems) { */ @Transactional(propagation = org.springframework.transaction.annotation.Propagation.REQUIRES_NEW) public void updateOrderStatusToCompleted(Long orderId, String transactionKey) { - Order order = orderRepository.findById(orderId).orElse(null); - if (order == null) { + try { + Order order = orderService.getById(orderId); + + if (order.getStatus() == OrderStatus.COMPLETED) { + log.info("이미 완료된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); + return; + } + + // Payment 상태 업데이트 (PaymentService 사용) + paymentService.findByOrderId(orderId).ifPresent(payment -> { + if (payment.getStatus() == PaymentStatus.PENDING) { + paymentService.toSuccess(payment.getId(), java.time.LocalDateTime.now()); + } + }); + + orderService.completeOrder(orderId); + log.info("주문 상태를 COMPLETED로 업데이트했습니다. (orderId: {}, transactionKey: {})", orderId, transactionKey); + } catch (CoreException e) { log.warn("주문 상태 업데이트 시 주문을 찾을 수 없습니다. (orderId: {})", orderId); - return; - } - - if (order.getStatus() == OrderStatus.COMPLETED) { - log.info("이미 완료된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); - return; } - - order.complete(); - orderRepository.save(order); - log.info("주문 상태를 COMPLETED로 업데이트했습니다. (orderId: {}, transactionKey: {})", orderId, transactionKey); } /** @@ -448,49 +413,46 @@ public void updateOrderStatusToCompleted(Long orderId, String transactionKey) { * 실패 시에도 주문은 이미 저장되어 있으므로, 로그만 기록합니다. *

    * - * @param userId 사용자 ID + * @param userId 사용자 ID (String - User.userId, PG 요청용) + * @param userEntityId 사용자 엔티티 ID (Long - User.id, Payment 엔티티용) * @param orderId 주문 ID * @param cardType 카드 타입 * @param cardNo 카드 번호 * @param amount 결제 금액 * @return transactionKey (성공 시), null (실패 시) */ - private String requestPaymentToGateway(String userId, Long orderId, String cardType, String cardNo, Integer amount) { + private String requestPaymentToGateway(String userId, Long userEntityId, Long orderId, String cardType, String cardNo, Integer amount) { try { - // 결제 요청 생성 - PaymentRequest request = paymentRequestBuilder.build(userId, orderId, cardType, cardNo, amount); - - // PG 결제 요청 전송 - var result = paymentGatewayAdapter.requestPayment(request); + // PaymentService를 통한 PG 결제 요청 + PaymentRequestResult result = paymentService.requestPayment( + orderId, userId, userEntityId, cardType, cardNo, amount.longValue() + ); // 결과 처리 - return result.handle( - success -> { - log.info("PG 결제 요청 성공. (orderId: {}, transactionKey: {})", - orderId, success.transactionKey()); - return success.transactionKey(); - }, - failure -> { - PaymentFailureType failureType = paymentFailureClassifier.classify(failure.errorCode()); - - if (failureType == PaymentFailureType.BUSINESS_FAILURE) { - // 비즈니스 실패: 주문 취소 (별도 트랜잭션으로 처리) - paymentFailureHandler.handle(userId, orderId, failure.errorCode(), failure.message()); - } else if (failure.isTimeout()) { - // 타임아웃: 상태 확인 후 복구 - log.info("타임아웃 발생. PG 결제 상태 확인 API를 호출하여 실제 결제 상태를 확인합니다. (orderId: {})", orderId); - paymentRecoveryService.recoverAfterTimeout(userId, orderId); - } else { - // 외부 시스템 장애: 주문은 PENDING 상태로 유지 - log.info("외부 시스템 장애로 인한 실패. 주문은 PENDING 상태로 유지됩니다. (orderId: {}, errorCode: {})", - orderId, failure.errorCode()); - } - return null; + if (result instanceof PaymentRequestResult.Success success) { + log.info("PG 결제 요청 성공. (orderId: {}, transactionKey: {})", + orderId, success.transactionKey()); + return success.transactionKey(); + } else if (result instanceof PaymentRequestResult.Failure failure) { + // PaymentService 내부에서 이미 실패 분류가 완료되었으므로, 여기서는 처리만 수행 + // 비즈니스 실패는 PaymentService에서 이미 처리되었으므로, 여기서는 타임아웃/외부 시스템 장애만 처리 + + if (failure.isTimeout()) { + // 타임아웃: 상태 확인 후 복구 + log.info("타임아웃 발생. PG 결제 상태 확인 API를 호출하여 실제 결제 상태를 확인합니다. (orderId: {})", orderId); + paymentService.recoverAfterTimeout(userId, orderId); + } else if (!failure.isRetryable()) { + // 비즈니스 실패: 주문 취소 (별도 트랜잭션으로 처리) + handlePaymentFailure(userId, orderId, failure.errorCode(), failure.message()); } - ); + // 외부 시스템 장애는 PaymentService에서 이미 PENDING 상태로 유지하므로 추가 처리 불필요 + return null; + } + + return null; } catch (CoreException e) { // 잘못된 카드 타입 등 검증 오류 - log.warn("결제 요청 생성 실패. (orderId: {}, error: {})", orderId, e.getMessage()); + log.warn("결제 요청 실패. (orderId: {}, error: {})", orderId, e.getMessage()); return null; } catch (Exception e) { // 기타 예외 처리 @@ -531,10 +493,10 @@ private String requestPaymentToGateway(String userId, Long orderId, String cardT public void handlePaymentCallback(Long orderId, PaymentGatewayDto.CallbackRequest callbackRequest) { try { // 주문 조회 - Order order = orderRepository.findById(orderId) - .orElse(null); - - if (order == null) { + Order order; + try { + order = orderService.getById(orderId); + } catch (CoreException e) { log.warn("콜백 처리 시 주문을 찾을 수 없습니다. (orderId: {}, transactionKey: {})", orderId, callbackRequest.transactionKey()); return; @@ -558,10 +520,19 @@ public void handlePaymentCallback(Long orderId, PaymentGatewayDto.CallbackReques PaymentGatewayDto.TransactionStatus verifiedStatus = verifyCallbackWithPgInquiry( order.getUserId(), orderId, callbackRequest); - // OrderStatusUpdater를 사용하여 상태 업데이트 - boolean updated = orderStatusUpdater.updateByPaymentStatus( + // PaymentService를 통한 콜백 처리 (도메인 모델로 변환) + PaymentStatus paymentStatus = convertToPaymentStatus(verifiedStatus); + paymentService.handleCallback( orderId, - verifiedStatus, + callbackRequest.transactionKey(), + paymentStatus, + callbackRequest.reason() + ); + + // OrderPaymentResultService를 사용하여 주문 상태 업데이트 + boolean updated = orderPaymentResultService.updateByPaymentStatus( + orderId, + paymentStatus, callbackRequest.transactionKey(), callbackRequest.reason() ); @@ -606,8 +577,10 @@ private PaymentGatewayDto.TransactionStatus verifyCallbackWithPgInquiry( try { // User의 userId (String)를 가져오기 위해 User 조회 - User user = userRepository.findById(userId); - if (user == null) { + User user; + try { + user = userService.findById(userId); + } catch (CoreException e) { log.warn("콜백 검증 시 사용자를 찾을 수 없습니다. 콜백 정보를 사용합니다. (orderId: {}, userId: {})", orderId, userId); return callbackRequest.status(); // 사용자를 찾을 수 없으면 콜백 정보 사용 @@ -615,27 +588,11 @@ private PaymentGatewayDto.TransactionStatus verifyCallbackWithPgInquiry( String userIdString = user.getUserId(); - // PG에서 주문별 결제 정보 조회 (스케줄러 전용 클라이언트 사용 - Retry 적용) - // 주문 ID를 6자리 이상 문자열로 변환 (pg-simulator 검증 요구사항) - String orderIdString = paymentRequestBuilder.formatOrderId(orderId); - PaymentGatewayDto.ApiResponse response = - paymentGatewaySchedulerClient.getTransactionsByOrder(userIdString, orderIdString); - - if (response == null || response.meta() == null - || response.meta().result() != PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS - || response.data() == null || response.data().transactions() == null - || response.data().transactions().isEmpty()) { - // PG 조회 실패: 콜백 정보를 사용하되 경고 로그 기록 - log.warn("콜백 검증 시 PG 조회 API 호출 실패. 콜백 정보를 사용합니다. (orderId: {}, transactionKey: {})", - orderId, callbackRequest.transactionKey()); - return callbackRequest.status(); - } - - // 가장 최근 트랜잭션의 상태 확인 (PG 원장 기준) - PaymentGatewayDto.TransactionResponse latestTransaction = - response.data().transactions().get(response.data().transactions().size() - 1); + // PaymentService를 통한 결제 상태 조회 (PG 원장 기준) + PaymentStatus paymentStatus = paymentService.getPaymentStatus(userIdString, orderId); - PaymentGatewayDto.TransactionStatus pgStatus = latestTransaction.status(); + // 도메인 모델을 인프라 DTO로 변환 (검증 로직에서 사용) + PaymentGatewayDto.TransactionStatus pgStatus = convertToInfraStatus(paymentStatus); PaymentGatewayDto.TransactionStatus callbackStatus = callbackRequest.status(); // 콜백 정보와 PG 조회 결과 비교 @@ -680,14 +637,14 @@ private PaymentGatewayDto.TransactionStatus verifyCallbackWithPgInquiry( @Transactional public void recoverOrderStatusByPaymentCheck(String userId, Long orderId) { try { - // PG에서 결제 상태 조회 - // 주문 ID를 6자리 이상 문자열로 변환 (pg-simulator 검증 요구사항) - String orderIdString = paymentRequestBuilder.formatOrderId(orderId); - PaymentGatewayDto.TransactionStatus status = - paymentGatewayAdapter.getPaymentStatus(userId, orderIdString); + // PaymentService를 통한 타임아웃 복구 + paymentService.recoverAfterTimeout(userId, orderId); - // OrderStatusUpdater를 사용하여 상태 업데이트 - boolean updated = orderStatusUpdater.updateByPaymentStatus(orderId, status, null, null); + // 결제 상태 조회 + PaymentStatus paymentStatus = paymentService.getPaymentStatus(userId, orderId); + + // OrderPaymentResultService를 사용하여 주문 상태 업데이트 + boolean updated = orderPaymentResultService.updateByPaymentStatus(orderId, paymentStatus, null, null); if (!updated) { log.warn("상태 복구 실패. 주문 상태 업데이트에 실패했습니다. (orderId: {})", orderId); @@ -699,5 +656,80 @@ public void recoverOrderStatusByPaymentCheck(String userId, Long orderId) { } } + /** + * 결제 실패 시 주문 취소 및 리소스 원복을 처리합니다. + *

    + * 결제 요청이 실패한 경우, 이미 생성된 주문을 취소하고 + * 차감된 포인트를 환불하며 재고를 원복합니다. + *

    + *

    + * 처리 내용: + *

      + *
    • 주문 상태를 CANCELED로 변경
      • + *
    • 차감된 포인트 환불
      • + *
    • 차감된 재고 원복
      • + *
    + *

    + *

    + * 트랜잭션 전략: + *

      + *
    • REQUIRES_NEW: 별도 트랜잭션으로 실행하여 외부 시스템 호출과 독립적으로 처리
      • + *
    • 결제 실패 처리 중 오류가 발생해도 기존 주문 생성 트랜잭션에 영향을 주지 않음
      • + *
    • Self-invocation 문제 해결: 별도 메서드로 분리하여 Spring AOP 프록시가 정상적으로 적용되도록 함
      • + *
    + *

    + *

    + * 주의사항: + *

      + *
    • 주문이 이미 취소되었거나 존재하지 않는 경우 로그만 기록합니다.
      • + *
    • 결제 실패 처리 중 오류 발생 시에도 로그만 기록합니다.
      • + *
    + *

    + * + * @param userId 사용자 ID (로그인 ID) + * @param orderId 주문 ID + * @param errorCode 오류 코드 + * @param errorMessage 오류 메시지 + */ + @Transactional(propagation = Propagation.REQUIRES_NEW) + private void handlePaymentFailure(String userId, Long orderId, String errorCode, String errorMessage) { + try { + // 사용자 조회 (Service를 통한 접근) + User user; + try { + user = userService.findByUserId(userId); + } catch (CoreException e) { + log.warn("결제 실패 처리 시 사용자를 찾을 수 없습니다. (userId: {}, orderId: {})", userId, orderId); + return; + } + + // 주문 조회 (Service를 통한 접근) + Order order; + try { + order = orderService.getById(orderId); + } catch (CoreException e) { + log.warn("결제 실패 처리 시 주문을 찾을 수 없습니다. (orderId: {})", orderId); + return; + } + + // 이미 취소된 주문인 경우 처리하지 않음 + if (order.getStatus() == OrderStatus.CANCELED) { + log.info("이미 취소된 주문입니다. 결제 실패 처리를 건너뜁니다. (orderId: {})", orderId); + return; + } + + // 주문 취소 및 리소스 원복 + orderCancellationService.cancel(order, user); + + log.info("결제 실패로 인한 주문 취소 완료. (orderId: {}, errorCode: {}, errorMessage: {})", + orderId, errorCode, errorMessage); + } catch (Exception e) { + // 결제 실패 처리 중 오류 발생 시에도 로그만 기록 + // 이미 주문은 생성되어 있으므로, 나중에 수동으로 처리할 수 있도록 로그 기록 + log.error("결제 실패 처리 중 오류 발생. (orderId: {}, errorCode: {})", + orderId, errorCode, e); + } + } + } From f6358e0d8ad3f7b7c65cf0ba7edb005e2a9cc211 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Sun, 7 Dec 2025 23:41:32 +0900 Subject: [PATCH 15/22] =?UTF-8?q?refactor:=20=EC=9E=AC=EA=B5=AC=EC=84=B1?= =?UTF-8?q?=ED=95=9C=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EB=A1=9C=EC=A7=81=EC=97=90=20=EB=A7=9E=EC=B6=B0=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=AC?= =?UTF-8?q?=EA=B5=AC=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/coupon/CouponServiceTest.java | 196 ++++++++ .../domain/payment/PaymentServiceTest.java | 427 ++++++++++++++++++ .../domain/payment/PaymentTestFixture.java | 2 +- .../domain/product/ProductServiceTest.java | 93 ++++ .../loopers/domain/user/UserServiceTest.java | 164 +++++++ 5 files changed, 881 insertions(+), 1 deletion(-) create mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/coupon/CouponServiceTest.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/product/ProductServiceTest.java create mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/user/UserServiceTest.java diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/coupon/CouponServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/coupon/CouponServiceTest.java new file mode 100644 index 000000000..c15742303 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/domain/coupon/CouponServiceTest.java @@ -0,0 +1,196 @@ +package com.loopers.domain.coupon; + +import com.loopers.domain.coupon.discount.CouponDiscountStrategy; +import com.loopers.domain.coupon.discount.CouponDiscountStrategyFactory; +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.orm.ObjectOptimisticLockingFailureException; + +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.*; + +/** + * CouponService 테스트. + */ +@ExtendWith(MockitoExtension.class) +@DisplayName("CouponService") +public class CouponServiceTest { + + @Mock + private CouponRepository couponRepository; + + @Mock + private UserCouponRepository userCouponRepository; + + @Mock + private CouponDiscountStrategyFactory couponDiscountStrategyFactory; + + @Mock + private CouponDiscountStrategy couponDiscountStrategy; + + @InjectMocks + private CouponService couponService; + + @DisplayName("쿠폰 적용") + @Nested + class ApplyCoupon { + @DisplayName("쿠폰을 적용하여 할인 금액을 계산하고 쿠폰을 사용 처리할 수 있다.") + @Test + void appliesCouponAndCalculatesDiscount() { + // arrange + Long userId = 1L; + String couponCode = "FIXED5000"; + Integer subtotal = 10_000; + Integer expectedDiscount = 5_000; + + Coupon coupon = Coupon.of(couponCode, CouponType.FIXED_AMOUNT, 5_000); + UserCoupon userCoupon = UserCoupon.of(userId, coupon); + + when(couponRepository.findByCode(couponCode)).thenReturn(Optional.of(coupon)); + when(userCouponRepository.findByUserIdAndCouponCodeForUpdate(userId, couponCode)) + .thenReturn(Optional.of(userCoupon)); + when(couponDiscountStrategyFactory.getStrategy(CouponType.FIXED_AMOUNT)) + .thenReturn(couponDiscountStrategy); + when(couponDiscountStrategy.calculateDiscountAmount(subtotal, 5_000)) + .thenReturn(expectedDiscount); + when(userCouponRepository.save(any(UserCoupon.class))).thenReturn(userCoupon); + + // act + Integer result = couponService.applyCoupon(userId, couponCode, subtotal); + + // assert + assertThat(result).isEqualTo(expectedDiscount); + assertThat(userCoupon.getIsUsed()).isTrue(); // 쿠폰이 사용되었는지 확인 + verify(couponRepository, times(1)).findByCode(couponCode); + verify(userCouponRepository, times(1)).findByUserIdAndCouponCodeForUpdate(userId, couponCode); + verify(userCouponRepository, times(1)).save(userCoupon); + } + + @DisplayName("쿠폰을 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenCouponNotFound() { + // arrange + Long userId = 1L; + String couponCode = "NON_EXISTENT"; + Integer subtotal = 10_000; + + when(couponRepository.findByCode(couponCode)).thenReturn(Optional.empty()); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + couponService.applyCoupon(userId, couponCode, subtotal); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + assertThat(result.getMessage()).contains("쿠폰을 찾을 수 없습니다"); + verify(couponRepository, times(1)).findByCode(couponCode); + verify(userCouponRepository, never()).findByUserIdAndCouponCodeForUpdate(any(), any()); + } + + @DisplayName("사용자가 소유한 쿠폰을 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenUserCouponNotFound() { + // arrange + Long userId = 1L; + String couponCode = "FIXED5000"; + Integer subtotal = 10_000; + + Coupon coupon = Coupon.of(couponCode, CouponType.FIXED_AMOUNT, 5_000); + + when(couponRepository.findByCode(couponCode)).thenReturn(Optional.of(coupon)); + when(userCouponRepository.findByUserIdAndCouponCodeForUpdate(userId, couponCode)) + .thenReturn(Optional.empty()); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + couponService.applyCoupon(userId, couponCode, subtotal); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + assertThat(result.getMessage()).contains("사용자가 소유한 쿠폰을 찾을 수 없습니다"); + verify(couponRepository, times(1)).findByCode(couponCode); + verify(userCouponRepository, times(1)).findByUserIdAndCouponCodeForUpdate(userId, couponCode); + } + + @DisplayName("이미 사용된 쿠폰이면 예외가 발생한다.") + @Test + void throwsException_whenCouponAlreadyUsed() { + // arrange + Long userId = 1L; + String couponCode = "USED_COUPON"; + Integer subtotal = 10_000; + + Coupon coupon = Coupon.of(couponCode, CouponType.FIXED_AMOUNT, 5_000); + UserCoupon userCoupon = UserCoupon.of(userId, coupon); + userCoupon.use(); // 이미 사용 처리 + + when(couponRepository.findByCode(couponCode)).thenReturn(Optional.of(coupon)); + when(userCouponRepository.findByUserIdAndCouponCodeForUpdate(userId, couponCode)) + .thenReturn(Optional.of(userCoupon)); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + couponService.applyCoupon(userId, couponCode, subtotal); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + assertThat(result.getMessage()).contains("이미 사용된 쿠폰입니다"); + verify(couponRepository, times(1)).findByCode(couponCode); + verify(userCouponRepository, times(1)).findByUserIdAndCouponCodeForUpdate(userId, couponCode); + verify(userCouponRepository, never()).save(any(UserCoupon.class)); + } + + @DisplayName("낙관적 락 충돌 시 예외가 발생한다.") + @Test + void throwsException_whenOptimisticLockConflict() { + // arrange + Long userId = 1L; + String couponCode = "FIXED5000"; + Integer subtotal = 10_000; + + Coupon coupon = Coupon.of(couponCode, CouponType.FIXED_AMOUNT, 5_000); + UserCoupon userCoupon = UserCoupon.of(userId, coupon); + + when(couponRepository.findByCode(couponCode)).thenReturn(Optional.of(coupon)); + when(userCouponRepository.findByUserIdAndCouponCodeForUpdate(userId, couponCode)) + .thenReturn(Optional.of(userCoupon)); + // Coupon.calculateDiscountAmount()가 호출될 때 getStrategy()가 호출되므로 stubbing 필요 + when(couponDiscountStrategyFactory.getStrategy(any(CouponType.class))) + .thenReturn(couponDiscountStrategy); + when(couponDiscountStrategy.calculateDiscountAmount(anyInt(), anyInt())) + .thenReturn(5_000); + when(userCouponRepository.save(any(UserCoupon.class))) + .thenThrow(new ObjectOptimisticLockingFailureException(UserCoupon.class, userCoupon)); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + couponService.applyCoupon(userId, couponCode, subtotal); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.CONFLICT); + assertThat(result.getMessage()).contains("쿠폰이 이미 사용되었습니다"); + verify(couponRepository, times(1)).findByCode(couponCode); + verify(userCouponRepository, times(1)).findByUserIdAndCouponCodeForUpdate(userId, couponCode); + verify(couponDiscountStrategyFactory, times(1)).getStrategy(CouponType.FIXED_AMOUNT); + verify(couponDiscountStrategy, times(1)).calculateDiscountAmount(subtotal, 5_000); + verify(userCouponRepository, times(1)).save(userCoupon); + } + } +} + diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java index 8a84c93e8..b05e6a0a8 100644 --- a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java @@ -2,6 +2,7 @@ import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -9,6 +10,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; import java.time.LocalDateTime; import java.util.Optional; @@ -27,9 +29,21 @@ public class PaymentServiceTest { @Mock private PaymentRepository paymentRepository; + + @Mock + private PaymentGateway paymentGateway; + + @Mock + private PaymentFailureClassifier paymentFailureClassifier; @InjectMocks private PaymentService paymentService; + + @BeforeEach + void setUp() { + // @Value 어노테이션 필드 설정 + ReflectionTestUtils.setField(paymentService, "callbackBaseUrl", "http://localhost:8080"); + } @DisplayName("결제 생성") @Nested @@ -223,5 +237,418 @@ void throwsException_whenPaymentNotFound() { verify(paymentRepository, times(1)).findById(paymentId); } } + + @DisplayName("PG 결제 요청") + @Nested + class RequestPayment { + @DisplayName("PG 결제 요청을 성공적으로 처리할 수 있다.") + @Test + void requestsPaymentSuccessfully() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + String userId = "user123"; // User.userId (String) + Long userEntityId = PaymentTestFixture.ValidPayment.USER_ID; // User.id (Long) + String cardType = "SAMSUNG"; + String cardNo = PaymentTestFixture.ValidPayment.CARD_NO; + Long amount = PaymentTestFixture.ValidPayment.AMOUNT; + + Payment payment = Payment.of( + orderId, + userEntityId, + CardType.SAMSUNG, + cardNo, + amount, + LocalDateTime.now() + ); + + PaymentRequestResult.Success successResult = new PaymentRequestResult.Success("TXN123456"); + + when(paymentRepository.save(any(Payment.class))).thenReturn(payment); + when(paymentGateway.requestPayment(any(PaymentRequestCommand.class))).thenReturn(successResult); + + // act + PaymentRequestResult result = paymentService.requestPayment(orderId, userId, userEntityId, cardType, cardNo, amount); + + // assert + assertThat(result).isInstanceOf(PaymentRequestResult.Success.class); + assertThat(((PaymentRequestResult.Success) result).transactionKey()).isEqualTo("TXN123456"); + verify(paymentRepository, times(1)).save(any(Payment.class)); + verify(paymentGateway, times(1)).requestPayment(any(PaymentRequestCommand.class)); + } + + @DisplayName("비즈니스 실패 시 결제 상태를 FAILED로 변경한다.") + @Test + void updatesPaymentToFailed_whenBusinessFailure() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + String userId = "user123"; // User.userId (String) + Long userEntityId = PaymentTestFixture.ValidPayment.USER_ID; // User.id (Long) + String cardType = "SAMSUNG"; + String cardNo = PaymentTestFixture.ValidPayment.CARD_NO; + Long amount = PaymentTestFixture.ValidPayment.AMOUNT; + + Payment payment = Payment.of( + orderId, + userEntityId, + CardType.SAMSUNG, + cardNo, + amount, + LocalDateTime.now() + ); + + PaymentRequestResult.Failure failureResult = new PaymentRequestResult.Failure( + "LIMIT_EXCEEDED", + "카드 한도 초과", + false, + false + ); + + when(paymentRepository.save(any(Payment.class))).thenReturn(payment); + when(paymentGateway.requestPayment(any(PaymentRequestCommand.class))).thenReturn(failureResult); + when(paymentFailureClassifier.classify("LIMIT_EXCEEDED")).thenReturn(PaymentFailureType.BUSINESS_FAILURE); + when(paymentRepository.findById(anyLong())).thenReturn(Optional.of(payment)); + + // act + PaymentRequestResult result = paymentService.requestPayment(orderId, userId, userEntityId, cardType, cardNo, amount); + + // assert + assertThat(result).isInstanceOf(PaymentRequestResult.Failure.class); + verify(paymentRepository, times(2)).save(any(Payment.class)); // 생성 + 실패 상태 변경 + verify(paymentFailureClassifier, times(1)).classify("LIMIT_EXCEEDED"); + } + + @DisplayName("외부 시스템 장애 시 결제 상태를 PENDING으로 유지한다.") + @Test + void maintainsPendingStatus_whenExternalSystemFailure() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + String userId = "user123"; // User.userId (String) + Long userEntityId = PaymentTestFixture.ValidPayment.USER_ID; // User.id (Long) + String cardType = "SAMSUNG"; + String cardNo = PaymentTestFixture.ValidPayment.CARD_NO; + Long amount = PaymentTestFixture.ValidPayment.AMOUNT; + + Payment payment = Payment.of( + orderId, + userEntityId, + CardType.SAMSUNG, + cardNo, + amount, + LocalDateTime.now() + ); + + PaymentRequestResult.Failure failureResult = new PaymentRequestResult.Failure( + "CIRCUIT_BREAKER_OPEN", + "결제 대기 상태", + false, + false + ); + + when(paymentRepository.save(any(Payment.class))).thenReturn(payment); + when(paymentGateway.requestPayment(any(PaymentRequestCommand.class))).thenReturn(failureResult); + when(paymentFailureClassifier.classify("CIRCUIT_BREAKER_OPEN")).thenReturn(PaymentFailureType.EXTERNAL_SYSTEM_FAILURE); + + // act + PaymentRequestResult result = paymentService.requestPayment(orderId, userId, userEntityId, cardType, cardNo, amount); + + // assert + assertThat(result).isInstanceOf(PaymentRequestResult.Failure.class); + verify(paymentRepository, times(1)).save(any(Payment.class)); // 생성만 + verify(paymentFailureClassifier, times(1)).classify("CIRCUIT_BREAKER_OPEN"); + verify(paymentRepository, never()).findById(anyLong()); // 상태 변경 없음 + } + + @DisplayName("잘못된 카드 번호로 인해 예외가 발생한다.") + @Test + void throwsException_whenInvalidCardNo() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + String userId = "user123"; // User.userId (String) + Long userEntityId = PaymentTestFixture.ValidPayment.USER_ID; // User.id (Long) + String cardType = "SAMSUNG"; + String invalidCardNo = "1234"; // 잘못된 카드 번호 + Long amount = PaymentTestFixture.ValidPayment.AMOUNT; + + // act & assert + CoreException result = assertThrows(CoreException.class, () -> { + paymentService.requestPayment(orderId, userId, userEntityId, cardType, invalidCardNo, amount); + }); + + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + verify(paymentRepository, never()).save(any(Payment.class)); + verify(paymentGateway, never()).requestPayment(any(PaymentRequestCommand.class)); + } + + @DisplayName("잘못된 카드 타입으로 인해 예외가 발생한다.") + @Test + void throwsException_whenInvalidCardType() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + String userId = "user123"; // User.userId (String) + Long userEntityId = PaymentTestFixture.ValidPayment.USER_ID; // User.id (Long) + String invalidCardType = "INVALID"; + String cardNo = PaymentTestFixture.ValidPayment.CARD_NO; + Long amount = PaymentTestFixture.ValidPayment.AMOUNT; + + // act & assert + CoreException result = assertThrows(CoreException.class, () -> { + paymentService.requestPayment(orderId, userId, userEntityId, invalidCardType, cardNo, amount); + }); + + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + verify(paymentRepository, never()).save(any(Payment.class)); + verify(paymentGateway, never()).requestPayment(any(PaymentRequestCommand.class)); + } + } + + @DisplayName("결제 상태 조회") + @Nested + class GetPaymentStatus { + @DisplayName("결제 상태를 조회할 수 있다.") + @Test + void getsPaymentStatus() { + // arrange + String userId = "user123"; + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + PaymentStatus expectedStatus = PaymentStatus.SUCCESS; + + when(paymentGateway.getPaymentStatus(userId, orderId)).thenReturn(expectedStatus); + + // act + PaymentStatus result = paymentService.getPaymentStatus(userId, orderId); + + // assert + assertThat(result).isEqualTo(expectedStatus); + verify(paymentGateway, times(1)).getPaymentStatus(userId, orderId); + } + } + + @DisplayName("콜백 처리") + @Nested + class HandleCallback { + @DisplayName("SUCCESS 콜백을 처리할 수 있다.") + @Test + void handlesSuccessCallback() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + String transactionKey = "TXN123456"; + PaymentStatus status = PaymentStatus.SUCCESS; + String reason = null; + + Payment payment = Payment.of( + orderId, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + LocalDateTime.now() + ); + + when(paymentRepository.findByOrderId(orderId)).thenReturn(Optional.of(payment)); + when(paymentRepository.findById(anyLong())).thenReturn(Optional.of(payment)); + when(paymentRepository.save(any(Payment.class))).thenReturn(payment); + + // act + paymentService.handleCallback(orderId, transactionKey, status, reason); + + // assert + verify(paymentRepository, times(1)).findByOrderId(orderId); + verify(paymentRepository, times(1)).findById(anyLong()); + verify(paymentRepository, times(1)).save(any(Payment.class)); + } + + @DisplayName("FAILED 콜백을 처리할 수 있다.") + @Test + void handlesFailedCallback() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + String transactionKey = "TXN123456"; + PaymentStatus status = PaymentStatus.FAILED; + String reason = "카드 한도 초과"; + + Payment payment = Payment.of( + orderId, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + LocalDateTime.now() + ); + + when(paymentRepository.findByOrderId(orderId)).thenReturn(Optional.of(payment)); + when(paymentRepository.findById(anyLong())).thenReturn(Optional.of(payment)); + when(paymentRepository.save(any(Payment.class))).thenReturn(payment); + + // act + paymentService.handleCallback(orderId, transactionKey, status, reason); + + // assert + verify(paymentRepository, times(1)).findByOrderId(orderId); + verify(paymentRepository, times(1)).findById(anyLong()); + verify(paymentRepository, times(1)).save(any(Payment.class)); + } + + @DisplayName("PENDING 콜백은 상태를 유지한다.") + @Test + void maintainsStatus_whenPendingCallback() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + String transactionKey = "TXN123456"; + PaymentStatus status = PaymentStatus.PENDING; + String reason = null; + + Payment payment = Payment.of( + orderId, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + LocalDateTime.now() + ); + + when(paymentRepository.findByOrderId(orderId)).thenReturn(Optional.of(payment)); + + // act + paymentService.handleCallback(orderId, transactionKey, status, reason); + + // assert + verify(paymentRepository, times(1)).findByOrderId(orderId); + verify(paymentRepository, never()).findById(anyLong()); + verify(paymentRepository, never()).save(any(Payment.class)); + } + + @DisplayName("결제를 찾을 수 없으면 로그만 기록한다.") + @Test + void logsWarning_whenPaymentNotFound() { + // arrange + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + String transactionKey = "TXN123456"; + PaymentStatus status = PaymentStatus.SUCCESS; + String reason = null; + + when(paymentRepository.findByOrderId(orderId)).thenReturn(Optional.empty()); + + // act + paymentService.handleCallback(orderId, transactionKey, status, reason); + + // assert + verify(paymentRepository, times(1)).findByOrderId(orderId); + verify(paymentRepository, never()).findById(anyLong()); + verify(paymentRepository, never()).save(any(Payment.class)); + } + } + + @DisplayName("타임아웃 복구") + @Nested + class RecoverAfterTimeout { + @DisplayName("SUCCESS 상태로 복구할 수 있다.") + @Test + void recoversToSuccess() { + // arrange + String userId = "user123"; + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + PaymentStatus status = PaymentStatus.SUCCESS; + + Payment payment = Payment.of( + orderId, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + LocalDateTime.now() + ); + + when(paymentGateway.getPaymentStatus(userId, orderId)).thenReturn(status); + when(paymentRepository.findByOrderId(orderId)).thenReturn(Optional.of(payment)); + when(paymentRepository.findById(anyLong())).thenReturn(Optional.of(payment)); + when(paymentRepository.save(any(Payment.class))).thenReturn(payment); + + // act + paymentService.recoverAfterTimeout(userId, orderId); + + // assert + verify(paymentGateway, times(1)).getPaymentStatus(userId, orderId); + verify(paymentRepository, times(1)).findByOrderId(orderId); + verify(paymentRepository, times(1)).findById(anyLong()); + verify(paymentRepository, times(1)).save(any(Payment.class)); + } + + @DisplayName("FAILED 상태로 복구할 수 있다.") + @Test + void recoversToFailed() { + // arrange + String userId = "user123"; + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + PaymentStatus status = PaymentStatus.FAILED; + + Payment payment = Payment.of( + orderId, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + LocalDateTime.now() + ); + + when(paymentGateway.getPaymentStatus(userId, orderId)).thenReturn(status); + when(paymentRepository.findByOrderId(orderId)).thenReturn(Optional.of(payment)); + when(paymentRepository.findById(anyLong())).thenReturn(Optional.of(payment)); + when(paymentRepository.save(any(Payment.class))).thenReturn(payment); + + // act + paymentService.recoverAfterTimeout(userId, orderId); + + // assert + verify(paymentGateway, times(1)).getPaymentStatus(userId, orderId); + verify(paymentRepository, times(1)).findByOrderId(orderId); + verify(paymentRepository, times(1)).findById(anyLong()); + verify(paymentRepository, times(1)).save(any(Payment.class)); + } + + @DisplayName("PENDING 상태는 유지한다.") + @Test + void maintainsPendingStatus() { + // arrange + String userId = "user123"; + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + PaymentStatus status = PaymentStatus.PENDING; + + Payment payment = Payment.of( + orderId, + PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.AMOUNT, + PaymentTestFixture.ValidPayment.ZERO_POINT, + LocalDateTime.now() + ); + + when(paymentGateway.getPaymentStatus(userId, orderId)).thenReturn(status); + when(paymentRepository.findByOrderId(orderId)).thenReturn(Optional.of(payment)); + + // act + paymentService.recoverAfterTimeout(userId, orderId); + + // assert + verify(paymentGateway, times(1)).getPaymentStatus(userId, orderId); + verify(paymentRepository, times(1)).findByOrderId(orderId); + verify(paymentRepository, never()).findById(anyLong()); + verify(paymentRepository, never()).save(any(Payment.class)); + } + + @DisplayName("결제를 찾을 수 없으면 로그만 기록한다.") + @Test + void logsWarning_whenPaymentNotFound() { + // arrange + String userId = "user123"; + Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; + PaymentStatus status = PaymentStatus.SUCCESS; + + when(paymentGateway.getPaymentStatus(userId, orderId)).thenReturn(status); + when(paymentRepository.findByOrderId(orderId)).thenReturn(Optional.empty()); + + // act + paymentService.recoverAfterTimeout(userId, orderId); + + // assert + verify(paymentGateway, times(1)).getPaymentStatus(userId, orderId); + verify(paymentRepository, times(1)).findByOrderId(orderId); + verify(paymentRepository, never()).findById(anyLong()); + verify(paymentRepository, never()).save(any(Payment.class)); + } + } } diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTestFixture.java b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTestFixture.java index ec8165a9c..5e781bceb 100644 --- a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTestFixture.java +++ b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTestFixture.java @@ -14,7 +14,7 @@ public static final class ValidPayment { public static final Long USER_ID = 100L; public static final Long AMOUNT = 50000L; public static final CardType CARD_TYPE = CardType.SAMSUNG; - public static final String CARD_NO = "1234-5678-9012-3456"; + public static final String CARD_NO = "4111-1111-1111-1111"; public static final LocalDateTime REQUESTED_AT = LocalDateTime.of(2025, 12, 1, 10, 0, 0); public static final String TRANSACTION_KEY = "tx-key-12345"; public static final Long ZERO_POINT = 0L; diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/product/ProductServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/product/ProductServiceTest.java new file mode 100644 index 000000000..2ae4afeb2 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/domain/product/ProductServiceTest.java @@ -0,0 +1,93 @@ +package com.loopers.domain.product; + +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.List; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +/** + * ProductService 테스트. + */ +@ExtendWith(MockitoExtension.class) +@DisplayName("ProductService") +public class ProductServiceTest { + + @Mock + private ProductRepository productRepository; + + @InjectMocks + private ProductService productService; + + @DisplayName("상품 조회 (비관적 락)") + @Nested + class FindProductForUpdate { + @DisplayName("상품 ID로 상품을 조회할 수 있다. (비관적 락)") + @Test + void findsProductByIdForUpdate() { + // arrange + Long productId = 1L; + Product expectedProduct = Product.of("상품", 10_000, 10, 1L); + when(productRepository.findByIdForUpdate(productId)).thenReturn(Optional.of(expectedProduct)); + + // act + Product result = productService.findByIdForUpdate(productId); + + // assert + assertThat(result).isEqualTo(expectedProduct); + verify(productRepository, times(1)).findByIdForUpdate(productId); + } + + @DisplayName("상품을 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenProductNotFound() { + // arrange + Long productId = 999L; + when(productRepository.findByIdForUpdate(productId)).thenReturn(Optional.empty()); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + productService.findByIdForUpdate(productId); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + assertThat(result.getMessage()).contains("상품을 찾을 수 없습니다"); + verify(productRepository, times(1)).findByIdForUpdate(productId); + } + } + + @DisplayName("상품 저장") + @Nested + class SaveProducts { + @DisplayName("상품 목록을 저장할 수 있다.") + @Test + void savesAllProducts() { + // arrange + Product product1 = Product.of("상품1", 10_000, 10, 1L); + Product product2 = Product.of("상품2", 20_000, 5, 1L); + List products = List.of(product1, product2); + when(productRepository.save(any(Product.class))).thenAnswer(invocation -> invocation.getArgument(0)); + + // act + productService.saveAll(products); + + // assert + verify(productRepository, times(1)).save(product1); + verify(productRepository, times(1)).save(product2); + } + } +} + diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/user/UserServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/user/UserServiceTest.java new file mode 100644 index 000000000..087413f54 --- /dev/null +++ b/apps/commerce-api/src/test/java/com/loopers/domain/user/UserServiceTest.java @@ -0,0 +1,164 @@ +package com.loopers.domain.user; + +import com.loopers.support.error.CoreException; +import com.loopers.support.error.ErrorType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +/** + * UserService 테스트. + */ +@ExtendWith(MockitoExtension.class) +@DisplayName("UserService") +public class UserServiceTest { + + @Mock + private UserRepository userRepository; + + @InjectMocks + private UserService userService; + + @DisplayName("사용자 조회") + @Nested + class FindUser { + @DisplayName("사용자 ID로 사용자를 조회할 수 있다.") + @Test + void findsUserByUserId() { + // arrange + String userId = "testuser"; + User expectedUser = User.of(userId, "test@example.com", "1990-01-01", Gender.MALE, Point.of(1000L)); + when(userRepository.findByUserId(userId)).thenReturn(expectedUser); + + // act + User result = userService.findByUserId(userId); + + // assert + assertThat(result).isEqualTo(expectedUser); + verify(userRepository, times(1)).findByUserId(userId); + } + + @DisplayName("사용자를 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenUserNotFound() { + // arrange + String userId = "unknown"; + when(userRepository.findByUserId(userId)).thenReturn(null); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + userService.findByUserId(userId); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + assertThat(result.getMessage()).contains("사용자를 찾을 수 없습니다"); + verify(userRepository, times(1)).findByUserId(userId); + } + } + + @DisplayName("사용자 조회 (비관적 락)") + @Nested + class FindUserForUpdate { + @DisplayName("사용자 ID로 사용자를 조회할 수 있다. (비관적 락)") + @Test + void findsUserByUserIdForUpdate() { + // arrange + String userId = "testuser"; + User expectedUser = User.of(userId, "test@example.com", "1990-01-01", Gender.MALE, Point.of(1000L)); + when(userRepository.findByUserIdForUpdate(userId)).thenReturn(expectedUser); + + // act + User result = userService.findByUserIdForUpdate(userId); + + // assert + assertThat(result).isEqualTo(expectedUser); + verify(userRepository, times(1)).findByUserIdForUpdate(userId); + } + + @DisplayName("사용자를 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenUserNotFound() { + // arrange + String userId = "unknown"; + when(userRepository.findByUserIdForUpdate(userId)).thenReturn(null); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + userService.findByUserIdForUpdate(userId); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + assertThat(result.getMessage()).contains("사용자를 찾을 수 없습니다"); + verify(userRepository, times(1)).findByUserIdForUpdate(userId); + } + } + + @DisplayName("사용자 조회 (ID)") + @Nested + class FindUserById { + @DisplayName("사용자 ID (PK)로 사용자를 조회할 수 있다.") + @Test + void findsUserById() { + // arrange + Long id = 1L; + User expectedUser = User.of("testuser", "test@example.com", "1990-01-01", Gender.MALE, Point.of(1000L)); + when(userRepository.findById(id)).thenReturn(expectedUser); + + // act + User result = userService.findById(id); + + // assert + assertThat(result).isEqualTo(expectedUser); + verify(userRepository, times(1)).findById(id); + } + + @DisplayName("사용자를 찾을 수 없으면 예외가 발생한다.") + @Test + void throwsException_whenUserNotFound() { + // arrange + Long id = 999L; + when(userRepository.findById(id)).thenReturn(null); + + // act + CoreException result = assertThrows(CoreException.class, () -> { + userService.findById(id); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); + assertThat(result.getMessage()).contains("사용자를 찾을 수 없습니다"); + verify(userRepository, times(1)).findById(id); + } + } + + @DisplayName("사용자 저장") + @Nested + class SaveUser { + @DisplayName("사용자를 저장할 수 있다.") + @Test + void savesUser() { + // arrange + User user = User.of("testuser", "test@example.com", "1990-01-01", Gender.MALE, Point.of(1000L)); + when(userRepository.save(any(User.class))).thenReturn(user); + + // act + User result = userService.save(user); + + // assert + assertThat(result).isEqualTo(user); + verify(userRepository, times(1)).save(user); + } + } +} + From d9ebd8e2ad5628caf087cfd52529ca9525e088b9 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Mon, 8 Dec 2025 00:08:11 +0900 Subject: [PATCH 16/22] =?UTF-8?q?refactor:=20=EC=A3=BC=EB=AC=B8=20?= =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EC=8B=9C=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?= =?UTF-8?q?=EB=98=90=EB=8A=94=20=EC=B9=B4=EB=93=9C=EB=A7=8C=EC=9D=84=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=97=AC=20=EA=B2=B0=EC=A0=9C=20?= =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasing/PurchasingFacade.java | 179 ++++++++++++------ .../order/OrderCancellationService.java | 13 +- .../com/loopers/domain/payment/Payment.java | 40 +++- .../domain/payment/PaymentService.java | 29 +++ .../purchasing/PurchasingV1Controller.java | 1 + .../api/purchasing/PurchasingV1Dto.java | 7 +- 6 files changed, 209 insertions(+), 60 deletions(-) diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java index e24f92f05..2d5e89b64 100644 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java @@ -15,6 +15,7 @@ import com.loopers.domain.order.OrderPaymentResultService; import com.loopers.domain.order.OrderCancellationService; import com.loopers.domain.payment.PaymentService; +import com.loopers.domain.payment.Payment; import com.loopers.domain.payment.PaymentStatus; import com.loopers.domain.payment.CardType; import com.loopers.support.error.CoreException; @@ -24,6 +25,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; +import org.springframework.transaction.support.TransactionTemplate; +import org.springframework.transaction.PlatformTransactionManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -52,15 +55,26 @@ public class PurchasingFacade { private final OrderCancellationService orderCancellationService; private final OrderPaymentResultService orderPaymentResultService; private final PaymentService paymentService; // Payment 관련: PaymentService만 의존 (DIP 준수) + private final PlatformTransactionManager transactionManager; /** * 주문을 생성한다. *

    * 1. 사용자 조회 및 존재 여부 검증
    * 2. 상품 재고 검증 및 차감
    - * 3. 사용자 포인트 검증 및 차감
    - * 4. 주문 저장
    - * 5. PG 결제 요청 (비동기) + * 3. 쿠폰 할인 적용
    + * 4. 사용자 포인트 차감 (지정된 금액만)
    + * 5. 주문 저장
    + * 6. Payment 생성 (포인트+쿠폰 혼합 지원)
    + * 7. PG 결제 금액이 0이면 바로 완료, 아니면 PG 결제 요청 (비동기) + *

    + *

    + * 결제 방식: + *

      + *
    • 포인트+쿠폰 전액 결제: paidAmount == 0이면 PG 요청 없이 바로 완료
      • + *
    • 혼합 결제: 포인트 일부 사용 + PG 결제 나머지 금액
      • + *
    • 카드만 결제: 포인트 사용 없이 카드로 전체 금액 결제
      • + *
    *

    *

    * 동시성 제어 전략: @@ -92,12 +106,13 @@ public class PurchasingFacade { * * @param userId 사용자 식별자 (로그인 ID) * @param commands 주문 상품 정보 - * @param cardType 카드 타입 (SAMSUNG, KB, HYUNDAI) - * @param cardNo 카드 번호 (xxxx-xxxx-xxxx-xxxx 형식) + * @param usedPoint 포인트 사용량 (선택, 기본값: 0) + * @param cardType 카드 타입 (paidAmount > 0일 때만 필수) + * @param cardNo 카드 번호 (paidAmount > 0일 때만 필수) * @return 생성된 주문 정보 */ @Transactional - public OrderInfo createOrder(String userId, List commands, String cardType, String cardNo) { + public OrderInfo createOrder(String userId, List commands, Long usedPoint, String cardType, String cardNo) { if (userId == null || userId.isBlank()) { throw new CoreException(ErrorType.BAD_REQUEST, "사용자 ID는 필수입니다."); } @@ -159,41 +174,84 @@ public OrderInfo createOrder(String userId, List commands, Str discountAmount = couponService.applyCoupon(user.getId(), couponCode, calculateSubtotal(orderItems)); } + // 주문 총액 계산 (쿠폰 할인 적용) + Integer orderTotalAmount = calculateSubtotal(orderItems) - discountAmount; + + // 포인트 차감 (지정된 금액만) + Long usedPointAmount = Objects.requireNonNullElse(usedPoint, 0L); + + // 포인트 잔액 검증: 포인트를 사용하는 경우에만 검증 + // 재고 차감 전에 검증하여 원자성 보장 (검증 실패 시 아무것도 변경되지 않음) + if (usedPointAmount > 0) { + Long userPointBalance = user.getPoint().getValue(); + if (userPointBalance < usedPointAmount) { + throw new CoreException(ErrorType.BAD_REQUEST, + String.format("포인트가 부족합니다. (현재 잔액: %d, 사용 요청 금액: %d)", userPointBalance, usedPointAmount)); + } + } + // OrderService를 사용하여 주문 생성 Order savedOrder = orderService.create(user.getId(), orderItems, couponCode, discountAmount); // 주문은 PENDING 상태로 생성됨 (Order 생성자에서 기본값으로 설정) // 결제 성공 후에만 COMPLETED로 변경됨 + // 재고 차감 decreaseStocksForOrderItems(savedOrder.getItems(), products); - deductUserPoint(user, savedOrder.getTotalAmount()); - // 주문은 PENDING 상태로 유지 (결제 요청 중 상태) - // 결제 성공 시 콜백이나 상태 확인 API를 통해 COMPLETED로 변경됨 - productService.saveAll(products); - userService.save(user); - // 주문은 PENDING 상태로 저장됨 + // 포인트 차감 (지정된 금액만) + if (usedPointAmount > 0) { + deductUserPoint(user, usedPointAmount.intValue()); + } - // Payment 생성 (PaymentService 사용) - paymentService.create( + // PG 결제 금액 계산 + // Order.getTotalAmount()는 이미 쿠폰 할인이 적용된 금액이므로 discountAmount를 다시 빼면 안 됨 + Long totalAmount = savedOrder.getTotalAmount().longValue(); + Long paidAmount = totalAmount - usedPointAmount; + + // Payment 생성 (포인트+쿠폰 혼합 지원) + CardType cardTypeEnum = (cardType != null && !cardType.isBlank()) ? convertCardType(cardType) : null; + Payment payment = paymentService.create( savedOrder.getId(), user.getId(), - convertCardType(cardType), + totalAmount, + usedPointAmount, + cardTypeEnum, cardNo, - savedOrder.getTotalAmount().longValue(), java.time.LocalDateTime.now() ); + // 포인트+쿠폰으로 전액 결제 완료된 경우 + if (paidAmount == 0) { + // PG 요청 없이 바로 완료 + orderService.completeOrder(savedOrder.getId()); + paymentService.toSuccess(payment.getId(), java.time.LocalDateTime.now()); + productService.saveAll(products); + userService.save(user); + log.info("포인트+쿠폰으로 전액 결제 완료. (orderId: {})", savedOrder.getId()); + return OrderInfo.from(savedOrder); + } + + // PG 결제가 필요한 경우 + if (cardType == null || cardType.isBlank() || cardNo == null || cardNo.isBlank()) { + throw new CoreException(ErrorType.BAD_REQUEST, + "포인트와 쿠폰만으로 결제할 수 없습니다. 카드 정보를 입력해주세요."); + } + + productService.saveAll(products); + userService.save(user); + // PG 결제 요청을 트랜잭션 커밋 후에 실행하여 DB 커넥션 풀 고갈 방지 // 트랜잭션 내에서 외부 HTTP 호출을 하면 PG 지연/타임아웃 시 DB 커넥션이 오래 유지되어 커넥션 풀 고갈 위험 Long orderId = savedOrder.getId(); - Integer totalAmount = savedOrder.getTotalAmount(); TransactionSynchronizationManager.registerSynchronization( new TransactionSynchronization() { @Override public void afterCommit() { // 트랜잭션 커밋 후 PG 호출 (DB 커넥션 해제 후 실행) try { - String transactionKey = requestPaymentToGateway(userId, user.getId(), orderId, cardType, cardNo, totalAmount); + String transactionKey = requestPaymentToGateway( + userId, user.getId(), orderId, cardType, cardNo, paidAmount.intValue() + ); if (transactionKey != null) { // 결제 성공: 별도 트랜잭션에서 주문 상태를 COMPLETED로 변경 updateOrderStatusToCompleted(orderId, transactionKey); @@ -437,6 +495,13 @@ private String requestPaymentToGateway(String userId, Long userEntityId, Long or // PaymentService 내부에서 이미 실패 분류가 완료되었으므로, 여기서는 처리만 수행 // 비즈니스 실패는 PaymentService에서 이미 처리되었으므로, 여기서는 타임아웃/외부 시스템 장애만 처리 + // Circuit Breaker OPEN은 외부 시스템 장애이므로 주문을 취소하지 않음 + if ("CIRCUIT_BREAKER_OPEN".equals(failure.errorCode())) { + // 외부 시스템 장애: 주문은 PENDING 상태로 유지 + log.info("Circuit Breaker OPEN 상태. 주문은 PENDING 상태로 유지됩니다. (orderId: {})", orderId); + return null; + } + if (failure.isTimeout()) { // 타임아웃: 상태 확인 후 복구 log.info("타임아웃 발생. PG 결제 상태 확인 API를 호출하여 실제 결제 상태를 확인합니다. (orderId: {})", orderId); @@ -673,9 +738,9 @@ public void recoverOrderStatusByPaymentCheck(String userId, Long orderId) { *

    * 트랜잭션 전략: *

      - *
    • REQUIRES_NEW: 별도 트랜잭션으로 실행하여 외부 시스템 호출과 독립적으로 처리
      • + *
    • TransactionTemplate 사용: afterCommit 콜백에서 호출되므로 명시적으로 새 트랜잭션 생성
      • *
    • 결제 실패 처리 중 오류가 발생해도 기존 주문 생성 트랜잭션에 영향을 주지 않음
      • - *
    • Self-invocation 문제 해결: 별도 메서드로 분리하여 Spring AOP 프록시가 정상적으로 적용되도록 함
      • + *
    • Self-invocation 문제 해결: TransactionTemplate을 사용하여 명시적으로 트랜잭션 관리
      • *
    *

    *

    @@ -691,44 +756,52 @@ public void recoverOrderStatusByPaymentCheck(String userId, Long orderId) { * @param errorCode 오류 코드 * @param errorMessage 오류 메시지 */ - @Transactional(propagation = Propagation.REQUIRES_NEW) private void handlePaymentFailure(String userId, Long orderId, String errorCode, String errorMessage) { - try { - // 사용자 조회 (Service를 통한 접근) - User user; - try { - user = userService.findByUserId(userId); - } catch (CoreException e) { - log.warn("결제 실패 처리 시 사용자를 찾을 수 없습니다. (userId: {}, orderId: {})", userId, orderId); - return; - } - - // 주문 조회 (Service를 통한 접근) - Order order; + // TransactionTemplate을 사용하여 명시적으로 새 트랜잭션 생성 + // afterCommit 콜백에서 호출되므로 @Transactional 어노테이션이 작동하지 않음 + TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager); + transactionTemplate.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW); + + transactionTemplate.executeWithoutResult(status -> { try { - order = orderService.getById(orderId); - } catch (CoreException e) { - log.warn("결제 실패 처리 시 주문을 찾을 수 없습니다. (orderId: {})", orderId); - return; - } + // 사용자 조회 (Service를 통한 접근) + User user; + try { + user = userService.findByUserId(userId); + } catch (CoreException e) { + log.warn("결제 실패 처리 시 사용자를 찾을 수 없습니다. (userId: {}, orderId: {})", userId, orderId); + return; + } - // 이미 취소된 주문인 경우 처리하지 않음 - if (order.getStatus() == OrderStatus.CANCELED) { - log.info("이미 취소된 주문입니다. 결제 실패 처리를 건너뜁니다. (orderId: {})", orderId); - return; - } + // 주문 조회 (Service를 통한 접근) + Order order; + try { + order = orderService.getById(orderId); + } catch (CoreException e) { + log.warn("결제 실패 처리 시 주문을 찾을 수 없습니다. (orderId: {})", orderId); + return; + } - // 주문 취소 및 리소스 원복 - orderCancellationService.cancel(order, user); + // 이미 취소된 주문인 경우 처리하지 않음 + if (order.getStatus() == OrderStatus.CANCELED) { + log.info("이미 취소된 주문입니다. 결제 실패 처리를 건너뜁니다. (orderId: {})", orderId); + return; + } - log.info("결제 실패로 인한 주문 취소 완료. (orderId: {}, errorCode: {}, errorMessage: {})", - orderId, errorCode, errorMessage); - } catch (Exception e) { - // 결제 실패 처리 중 오류 발생 시에도 로그만 기록 - // 이미 주문은 생성되어 있으므로, 나중에 수동으로 처리할 수 있도록 로그 기록 - log.error("결제 실패 처리 중 오류 발생. (orderId: {}, errorCode: {})", - orderId, errorCode, e); - } + // 주문 취소 및 리소스 원복 + orderCancellationService.cancel(order, user); + + log.info("결제 실패로 인한 주문 취소 완료. (orderId: {}, errorCode: {}, errorMessage: {})", + orderId, errorCode, errorMessage); + } catch (Exception e) { + // 결제 실패 처리 중 오류 발생 시에도 로그만 기록 + // 이미 주문은 생성되어 있으므로, 나중에 수동으로 처리할 수 있도록 로그 기록 + log.error("결제 실패 처리 중 오류 발생. (orderId: {}, errorCode: {})", + orderId, errorCode, e); + // 예외를 다시 던져서 트랜잭션이 롤백되도록 함 + throw new RuntimeException("결제 실패 처리 중 오류 발생", e); + } + }); } } diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java index 643644749..aeb549631 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java @@ -1,5 +1,7 @@ package com.loopers.domain.order; +import com.loopers.domain.payment.Payment; +import com.loopers.domain.payment.PaymentService; import com.loopers.domain.product.Product; import com.loopers.domain.product.ProductRepository; import com.loopers.domain.user.Point; @@ -33,6 +35,7 @@ public class OrderCancellationService { private final OrderRepository orderRepository; private final UserRepository userRepository; private final ProductRepository productRepository; + private final PaymentService paymentService; /** * 주문을 취소하고 포인트를 환불하며 재고를 원복합니다. @@ -82,7 +85,15 @@ public void cancel(Order order, User user) { order.cancel(); increaseStocksForOrderItems(order.getItems(), products); - lockedUser.receivePoint(Point.of((long) order.getTotalAmount())); + + // 실제로 사용된 포인트만 환불 (Payment에서 확인) + Long refundPointAmount = paymentService.findByOrderId(order.getId()) + .map(Payment::getUsedPoint) + .orElse(0L); + + if (refundPointAmount > 0) { + lockedUser.receivePoint(Point.of(refundPointAmount)); + } products.forEach(productRepository::save); userRepository.save(lockedUser); diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java index 45e7c7ac6..2a9178162 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java @@ -125,6 +125,34 @@ public static Payment of( Long totalAmount, Long usedPoint, LocalDateTime requestedAt + ) { + return of(orderId, userId, totalAmount, usedPoint, null, null, requestedAt); + } + + /** + * 포인트와 카드 혼합 결제용 Payment를 생성합니다. + *

    + * 포인트와 쿠폰 할인을 적용한 후 남은 금액을 카드로 결제하는 경우 사용합니다. + *

    + * + * @param orderId 주문 ID + * @param userId 사용자 ID + * @param totalAmount 총 결제 금액 + * @param usedPoint 사용 포인트 + * @param cardType 카드 타입 (paidAmount > 0일 때만 필수) + * @param cardNo 카드 번호 (paidAmount > 0일 때만 필수) + * @param requestedAt PG 요청 시각 + * @return 생성된 Payment 인스턴스 + * @throws CoreException 유효성 검증 실패 시 + */ + public static Payment of( + Long orderId, + Long userId, + Long totalAmount, + Long usedPoint, + CardType cardType, + String cardNo, + LocalDateTime requestedAt ) { validateOrderId(orderId); validateUserId(userId); @@ -135,6 +163,14 @@ public static Payment of( Long paidAmount = totalAmount - usedPoint; validatePaidAmount(paidAmount); + // paidAmount > 0이면 카드 정보 필수 + if (paidAmount > 0) { + if (cardType == null || cardNo == null || cardNo.isBlank()) { + throw new CoreException(ErrorType.BAD_REQUEST, + "포인트와 쿠폰만으로 결제할 수 없습니다. 카드 정보를 입력해주세요."); + } + } + Payment payment = new Payment(); payment.orderId = orderId; payment.userId = userId; @@ -142,8 +178,8 @@ public static Payment of( payment.usedPoint = usedPoint; payment.paidAmount = paidAmount; payment.status = (paidAmount == 0L) ? PaymentStatus.SUCCESS : PaymentStatus.PENDING; - payment.cardType = null; - payment.cardNo = null; + payment.cardType = cardType; // paidAmount > 0일 때만 설정 + payment.cardNo = cardNo; // paidAmount > 0일 때만 설정 payment.pgRequestedAt = requestedAt; return payment; diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java index 3cb2a562c..8414fed9a 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java @@ -81,6 +81,35 @@ public Payment create( return paymentRepository.save(payment); } + /** + * 포인트와 카드 혼합 결제를 생성합니다. + *

    + * 포인트와 쿠폰 할인을 적용한 후 남은 금액을 카드로 결제하는 경우 사용합니다. + *

    + * + * @param orderId 주문 ID + * @param userId 사용자 ID + * @param totalAmount 총 결제 금액 + * @param usedPoint 사용 포인트 + * @param cardType 카드 타입 (paidAmount > 0일 때만 필수) + * @param cardNo 카드 번호 (paidAmount > 0일 때만 필수) + * @param requestedAt PG 요청 시각 + * @return 생성된 Payment + */ + @Transactional + public Payment create( + Long orderId, + Long userId, + Long totalAmount, + Long usedPoint, + CardType cardType, + String cardNo, + LocalDateTime requestedAt + ) { + Payment payment = Payment.of(orderId, userId, totalAmount, usedPoint, cardType, cardNo, requestedAt); + return paymentRepository.save(payment); + } + /** * 결제를 SUCCESS 상태로 전이합니다. *

    diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java index fcea74ac2..e6fd5ee27 100644 --- a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java +++ b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java @@ -41,6 +41,7 @@ public ApiResponse createOrder( OrderInfo orderInfo = purchasingFacade.createOrder( userId, request.toCommands(), + request.payment().usedPoint(), request.payment().cardType(), request.payment().cardNo() ); diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Dto.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Dto.java index e1307ca42..f2e552d09 100644 --- a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Dto.java +++ b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Dto.java @@ -35,10 +35,9 @@ public List toCommands() { * 결제 정보 요청 DTO. */ public record PaymentRequest( - @NotNull(message = "카드 타입은 필수입니다.") - String cardType, - @NotNull(message = "카드 번호는 필수입니다.") - String cardNo + Long usedPoint, // 포인트 사용량 (선택, 기본값: 0) + String cardType, // 카드 타입 (paidAmount > 0일 때만 필수) + String cardNo // 카드 번호 (paidAmount > 0일 때만 필수) ) { } From 92fd4830dfb72e6cac887467ecaa6255df1881e8 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Mon, 8 Dec 2025 00:08:49 +0900 Subject: [PATCH 17/22] =?UTF-8?q?refactor:=20=ED=8F=AC=EC=9D=B8=ED=8A=B8?= =?UTF-8?q?=20=EB=98=90=EB=8A=94=20=EC=B9=B4=EB=93=9C=EB=A5=BC=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=97=AC=20=EA=B2=B0=EC=A0=9C=ED=95=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=AC=EA=B5=AC=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingFacadeCircuitBreakerTest.java | 23 ++++++-- .../PurchasingFacadeConcurrencyTest.java | 14 +++-- .../PurchasingFacadePaymentCallbackTest.java | 3 + .../PurchasingFacadePaymentGatewayTest.java | 9 ++- .../purchasing/PurchasingFacadeTest.java | 45 +++++++-------- .../order/OrderCancellationServiceTest.java | 6 ++ .../domain/payment/PaymentServiceTest.java | 32 +++++++---- .../loopers/domain/payment/PaymentTest.java | 55 +++++++++++++------ .../api/PurchasingV1ApiE2ETest.java | 8 +-- 9 files changed, 131 insertions(+), 64 deletions(-) diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java index 72b6052a8..f13e550e0 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java @@ -142,6 +142,7 @@ void createOrder_consecutiveFailures_circuitBreakerOpens() { purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); @@ -189,6 +190,7 @@ void createOrder_circuitBreakerOpen_fallbackExecuted() { purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); @@ -244,6 +246,7 @@ void createOrder_circuitBreakerHalfOpen_success_transitionsToClosed() { purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); @@ -299,6 +302,7 @@ void createOrder_circuitBreakerHalfOpen_failure_transitionsToOpen() { OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); @@ -337,9 +341,11 @@ void createOrder_circuitBreakerOpen_internalSystemRespondsNormally() { } // act + // 포인트를 사용하지 않고 카드로만 결제 (Circuit Breaker OPEN 상태에서도 주문은 PENDING 상태로 유지) OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); @@ -350,12 +356,13 @@ void createOrder_circuitBreakerOpen_internalSystemRespondsNormally() { assertThat(orderInfo.orderId()).isNotNull(); assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); - // 재고와 포인트는 정상적으로 차감되어야 함 + // 재고는 정상적으로 차감되어야 함 Product savedProduct = productRepository.findById(product.getId()).orElseThrow(); assertThat(savedProduct.getStock()).isEqualTo(9); + // 포인트는 사용하지 않았으므로 차감되지 않음 User savedUser = userRepository.findByUserId(user.getUserId()); - assertThat(savedUser.getPoint().getValue()).isEqualTo(40_000L); + assertThat(savedUser.getPoint().getValue()).isEqualTo(50_000L); } @Test @@ -396,6 +403,7 @@ void createOrder_fallbackResponseWithCircuitBreakerOpen_orderRemainsPending() { OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); @@ -452,6 +460,7 @@ void createOrder_retryFailure_circuitBreakerOpens_fallbackExecuted() { purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); @@ -519,9 +528,11 @@ void createOrder_retryFailure_fallbackCalled_circuitBreakerOpenHandled() { .thenReturn(fallbackResponse); // act + // 포인트를 사용하지 않고 카드로만 결제 (Circuit Breaker OPEN 상태에서도 주문은 PENDING 상태로 유지) OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); @@ -537,12 +548,13 @@ void createOrder_retryFailure_fallbackCalled_circuitBreakerOpenHandled() { // 3. CIRCUIT_BREAKER_OPEN은 외부 시스템 장애로 간주되므로 주문 취소가 발생하지 않아야 함 assertThat(savedOrder.getStatus()).isNotEqualTo(OrderStatus.CANCELED); - // 4. 재고와 포인트는 정상적으로 차감되어야 함 (주문은 생성되었지만 결제는 PENDING) + // 4. 재고는 정상적으로 차감되어야 함 (주문은 생성되었지만 결제는 PENDING) Product savedProduct = productRepository.findById(product.getId()).orElseThrow(); assertThat(savedProduct.getStock()).isEqualTo(9); + // 포인트는 사용하지 않았으므로 차감되지 않음 User savedUser = userRepository.findByUserId(user.getUserId()); - assertThat(savedUser.getPoint().getValue()).isEqualTo(40_000L); + assertThat(savedUser.getPoint().getValue()).isEqualTo(50_000L); } @Test @@ -582,6 +594,7 @@ void createOrder_fallbackResponse_circuitBreakerOpenErrorCode_orderRemainsPendin OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); @@ -645,6 +658,7 @@ void createOrder_retryExhausted_circuitBreakerOpens_fallbackCalled_orderPending( purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); @@ -692,6 +706,7 @@ void createOrder_retryExhausted_circuitBreakerOpens_fallbackCalled_orderPending( OrderInfo fallbackOrderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" ); diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeConcurrencyTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeConcurrencyTest.java index bdfda839d..f4fc9e213 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeConcurrencyTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeConcurrencyTest.java @@ -128,7 +128,8 @@ void concurrencyTest_pointShouldProperlyDecreaseWhenOrderCreated() throws Interr List commands = List.of( OrderItemCommand.of(products.get(index).getId(), 1) ); - purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); + // 포인트를 사용하여 주문 (각 주문마다 10,000 포인트 사용) + purchasingFacade.createOrder(userId, commands, 10_000L, "SAMSUNG", "4111-1111-1111-1111"); successCount.incrementAndGet(); } catch (Exception e) { synchronized (exceptions) { @@ -176,11 +177,13 @@ void concurrencyTest_stockShouldBeProperlyDecreasedWhenOrdersCreated() throws In List commands = List.of( OrderItemCommand.of(productId, quantityPerOrder) ); - purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); + purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111"); successCount.incrementAndGet(); } catch (Exception e) { synchronized (exceptions) { exceptions.add(e); + System.out.println("Exception in stock test: " + e.getClass().getSimpleName() + " - " + e.getMessage()); + e.printStackTrace(); } } finally { latch.countDown(); @@ -194,6 +197,7 @@ void concurrencyTest_stockShouldBeProperlyDecreasedWhenOrdersCreated() throws In Product savedProduct = productRepository.findById(productId).orElseThrow(); int expectedStock = 100 - (successCount.get() * quantityPerOrder); + System.out.println("Success count: " + successCount.get() + ", Exceptions: " + exceptions.size()); assertThat(savedProduct.getStock()).isEqualTo(expectedStock); assertThat(successCount.get() + exceptions.size()).isEqualTo(orderCount); } @@ -228,7 +232,7 @@ void concurrencyTest_couponShouldBeUsedOnlyOnceWhenOrdersCreated() throws Interr List commands = List.of( new OrderItemCommand(product.getId(), 1, couponCode) ); - purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); + purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111"); successCount.incrementAndGet(); } catch (Exception e) { synchronized (exceptions) { @@ -277,7 +281,7 @@ void concurrencyTest_cancelOrderShouldRestoreStockAccuratelyDuringConcurrentStoc List commands = List.of( OrderItemCommand.of(productId, orderQuantity) ); - OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); + OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111"); Long orderId = orderInfo.orderId(); // 주문 취소 전 재고 확인 (100 - 5 = 95) @@ -317,7 +321,7 @@ void concurrencyTest_cancelOrderShouldRestoreStockAccuratelyDuringConcurrentStoc List otherCommands = List.of( OrderItemCommand.of(productId, 3) ); - purchasingFacade.createOrder(userId, otherCommands, "SAMSUNG", "4111-1111-1111-1111"); + purchasingFacade.createOrder(userId, otherCommands, null, "SAMSUNG", "4111-1111-1111-1111"); orderSuccess.incrementAndGet(); } catch (Exception e) { synchronized (exceptions) { diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java index 24195fab4..331a41ed2 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java @@ -121,6 +121,7 @@ void handlePaymentCallback_successCallback_orderStatusUpdatedToCompleted() { OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 ); @@ -197,6 +198,7 @@ void handlePaymentCallback_failureCallback_orderStatusUpdatedToCanceled() { OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 ); @@ -268,6 +270,7 @@ void recoverOrderStatus_afterTimeout_statusRecoveredByStatusCheck() { OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 ); diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java index 6a3f9f837..f66ef1e2c 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java @@ -111,6 +111,7 @@ void createOrder_paymentGatewayTimeout_orderCreatedWithPendingStatus() { OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 ); @@ -122,9 +123,9 @@ void createOrder_paymentGatewayTimeout_orderCreatedWithPendingStatus() { Product savedProduct = productRepository.findById(product.getId()).orElseThrow(); assertThat(savedProduct.getStock()).isEqualTo(9); - // 포인트는 차감되었는지 확인 + // 포인트 차감 확인 (usedPoint가 null이므로 포인트 차감 없음) User savedUser = userRepository.findByUserId(user.getUserId()); - assertThat(savedUser.getPoint().getValue()).isEqualTo(40_000L); + assertThat(savedUser.getPoint().getValue()).isEqualTo(50_000L); // 포인트 차감 없음 // 주문이 저장되었는지 확인 Order savedOrder = orderRepository.findById(orderInfo.orderId()).orElseThrow(); @@ -160,6 +161,7 @@ void createOrder_paymentGatewayFailure_orderCreatedWithPendingStatus() { OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 ); @@ -197,6 +199,7 @@ void createOrder_paymentGatewayServerError_orderCreatedWithPendingStatus() { OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 ); @@ -234,6 +237,7 @@ void createOrder_paymentGatewayConnectionFailure_orderCreatedWithPendingStatus() OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 ); @@ -266,6 +270,7 @@ void createOrder_paymentGatewayTimeout_internalSystemRespondsNormally() { OrderInfo orderInfo = purchasingFacade.createOrder( user.getUserId(), commands, + null, "SAMSUNG", "4111-1111-1111-1111" // 유효한 Luhn 알고리즘 통과 카드 번호 ); diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java index e9b01e55e..cb66c913c 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java @@ -153,7 +153,7 @@ void createOrder_successFlow() { ); // act - OrderInfo orderInfo = purchasingFacade.createOrder(user.getUserId(), commands, "SAMSUNG", "4111-1111-1111-1111"); + OrderInfo orderInfo = purchasingFacade.createOrder(user.getUserId(), commands, null, "SAMSUNG", "4111-1111-1111-1111"); // assert // createOrder는 주문을 PENDING 상태로 생성하고, PG 결제 요청은 afterCommit 콜백에서 비동기로 실행됨 @@ -165,9 +165,9 @@ void createOrder_successFlow() { assertThat(savedProduct1.getStock()).isEqualTo(8); // 10 - 2 assertThat(savedProduct2.getStock()).isEqualTo(4); // 5 - 1 - // 포인트 차감 확인 + // 포인트 차감 확인 (usedPoint가 null이므로 포인트 차감 없음) User savedUser = userRepository.findByUserId(user.getUserId()); - assertThat(savedUser.getPoint().getValue()).isEqualTo(25_000L); // 50_000 - (10_000 * 2 + 5_000 * 1) + assertThat(savedUser.getPoint().getValue()).isEqualTo(50_000L); // 포인트 차감 없음 } @Test @@ -178,7 +178,7 @@ void createOrder_emptyItems_throwsException() { List emptyCommands = List.of(); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, emptyCommands, "SAMSUNG", "4111-1111-1111-1111")) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, emptyCommands, null, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); } @@ -193,7 +193,7 @@ void createOrder_userNotFound() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(unknownUserId, commands, "SAMSUNG", "4111-1111-1111-1111")) + assertThatThrownBy(() -> purchasingFacade.createOrder(unknownUserId, commands, null, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.NOT_FOUND); } @@ -215,7 +215,7 @@ void createOrder_stockNotEnough() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); @@ -245,7 +245,7 @@ void createOrder_stockZero() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); @@ -275,7 +275,8 @@ void createOrder_pointNotEnough() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) + // 포인트를 사용하려고 하지만 잔액이 부족한 경우 + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, 10_000L, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); @@ -305,7 +306,7 @@ void createOrder_duplicateProducts_throwsException() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); @@ -325,7 +326,7 @@ void getOrders_returnsUserOrders() { List commands = List.of( OrderItemCommand.of(product.getId(), 1) ); - purchasingFacade.createOrder(user.getUserId(), commands, "SAMSUNG", "4111-1111-1111-1111"); + purchasingFacade.createOrder(user.getUserId(), commands, null, "SAMSUNG", "4111-1111-1111-1111"); // act List orders = purchasingFacade.getOrders(user.getUserId()); @@ -347,7 +348,7 @@ void getOrder_returnsSingleOrder() { List commands = List.of( OrderItemCommand.of(product.getId(), 1) ); - OrderInfo createdOrder = purchasingFacade.createOrder(user.getUserId(), commands, "SAMSUNG", "4111-1111-1111-1111"); + OrderInfo createdOrder = purchasingFacade.createOrder(user.getUserId(), commands, null, "SAMSUNG", "4111-1111-1111-1111"); // act OrderInfo found = purchasingFacade.getOrder(user.getUserId(), createdOrder.orderId()); @@ -373,7 +374,7 @@ void getOrder_withDifferentUser_throwsException() { List commands = List.of( OrderItemCommand.of(product.getId(), 1) ); - OrderInfo user1Order = purchasingFacade.createOrder(user1Id, commands, "SAMSUNG", "4111-1111-1111-1111"); + OrderInfo user1Order = purchasingFacade.createOrder(user1Id, commands, null, "SAMSUNG", "4111-1111-1111-1111"); final Long orderId = user1Order.orderId(); // act & assert @@ -405,7 +406,7 @@ void createOrder_atomicityGuaranteed() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); @@ -447,7 +448,7 @@ void createOrder_success_allOperationsReflected() { final int totalAmount = (10_000 * 3) + (15_000 * 2); // act - OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); + OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111"); // assert // 주문이 정상적으로 생성되었는지 확인 @@ -461,9 +462,9 @@ void createOrder_success_allOperationsReflected() { assertThat(savedProduct1.getStock()).isEqualTo(initialStock1 - 3); assertThat(savedProduct2.getStock()).isEqualTo(initialStock2 - 2); - // 포인트가 정상적으로 차감되었는지 확인 + // 포인트 차감 확인 (usedPoint가 null이므로 포인트 차감 없음) User savedUser = userRepository.findByUserId(userId); - assertThat(savedUser.getPoint().getValue()).isEqualTo(initialPoint - totalAmount); + assertThat(savedUser.getPoint().getValue()).isEqualTo(initialPoint); // 포인트 차감 없음 // 주문이 저장되었는지 확인 List orders = purchasingFacade.getOrders(userId); @@ -488,10 +489,10 @@ void createOrder_withFixedAmountCoupon_success() { ); // act - OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); + OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111"); // assert - // createOrder는 주문을 PENDING 상태로 생성하고, PG 결제 요청은 afterCommit 콜백에서 비동기로 실행됨 + // 쿠폰 할인 후 남은 금액(5,000원)을 카드로 결제해야 하므로 주문은 PENDING 상태로 유지됨 assertThat(orderInfo.status()).isEqualTo(OrderStatus.PENDING); assertThat(orderInfo.totalAmount()).isEqualTo(5_000); // 10,000 - 5,000 = 5,000 @@ -518,7 +519,7 @@ void createOrder_withPercentageCoupon_success() { ); // act - OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111"); + OrderInfo orderInfo = purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111"); // assert // createOrder는 주문을 PENDING 상태로 생성하고, PG 결제 요청은 afterCommit 콜백에서 비동기로 실행됨 @@ -545,7 +546,7 @@ void createOrder_withNonExistentCoupon_shouldFail() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.NOT_FOUND); } @@ -568,7 +569,7 @@ void createOrder_withCouponNotOwnedByUser_shouldFail() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.NOT_FOUND); } @@ -592,7 +593,7 @@ void createOrder_withUsedCoupon_shouldFail() { ); // act & assert - assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, "SAMSUNG", "4111-1111-1111-1111")) + assertThatThrownBy(() -> purchasingFacade.createOrder(userId, commands, null, "SAMSUNG", "4111-1111-1111-1111")) .isInstanceOf(CoreException.class) .hasFieldOrPropertyWithValue("errorType", ErrorType.BAD_REQUEST); } diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java index 3f2deed68..5c39429b5 100644 --- a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java @@ -1,5 +1,6 @@ package com.loopers.domain.order; +import com.loopers.domain.payment.PaymentService; import com.loopers.domain.product.Product; import com.loopers.domain.product.ProductRepository; import com.loopers.domain.user.Gender; @@ -40,6 +41,9 @@ public class OrderCancellationServiceTest { @Mock private ProductRepository productRepository; + @Mock + private PaymentService paymentService; + @InjectMocks private OrderCancellationService orderCancellationService; @@ -66,6 +70,8 @@ void cancelsOrderAndRecoversResources() { when(orderRepository.save(any(Order.class))).thenReturn(order); when(userRepository.save(any(User.class))).thenReturn(user); when(productRepository.save(any(Product.class))).thenReturn(product1, product2); + // Payment가 없는 경우 (포인트를 사용하지 않은 주문) + when(paymentService.findByOrderId(any(Long.class))).thenReturn(Optional.empty()); // act orderCancellationService.cancel(order, user); diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java index b05e6a0a8..0c501395c 100644 --- a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java @@ -77,7 +77,7 @@ void createsPointPayment() { Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; Long userId = PaymentTestFixture.ValidPayment.USER_ID; Long totalAmount = PaymentTestFixture.ValidPayment.AMOUNT; - Long usedPoint = PaymentTestFixture.ValidPayment.ZERO_POINT; + Long usedPoint = PaymentTestFixture.ValidPayment.FULL_POINT; // 포인트로 전액 결제 LocalDateTime requestedAt = PaymentTestFixture.ValidPayment.REQUESTED_AT; Payment expectedPayment = Payment.of(orderId, userId, totalAmount, usedPoint, requestedAt); @@ -103,8 +103,9 @@ void transitionsToSuccess() { Payment payment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); LocalDateTime completedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); @@ -129,8 +130,9 @@ void transitionsToFailed() { Payment payment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); LocalDateTime completedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); @@ -180,8 +182,9 @@ void findsById() { Payment expectedPayment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); @@ -203,8 +206,9 @@ void findsByOrderId() { Payment expectedPayment = Payment.of( orderId, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); @@ -438,8 +442,9 @@ void handlesSuccessCallback() { Payment payment = Payment.of( orderId, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, LocalDateTime.now() ); @@ -468,8 +473,9 @@ void handlesFailedCallback() { Payment payment = Payment.of( orderId, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, LocalDateTime.now() ); @@ -498,8 +504,9 @@ void maintainsStatus_whenPendingCallback() { Payment payment = Payment.of( orderId, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, LocalDateTime.now() ); @@ -549,8 +556,9 @@ void recoversToSuccess() { Payment payment = Payment.of( orderId, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, LocalDateTime.now() ); @@ -580,8 +588,9 @@ void recoversToFailed() { Payment payment = Payment.of( orderId, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, LocalDateTime.now() ); @@ -611,8 +620,9 @@ void maintainsPendingStatus() { Payment payment = Payment.of( orderId, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, LocalDateTime.now() ); diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTest.java index c4c8787b7..cc49a6467 100644 --- a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentTest.java @@ -77,16 +77,22 @@ void hasPendingStatus_whenPointDoesNotCoverTotalAmount() { // arrange Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; Long userId = PaymentTestFixture.ValidPayment.USER_ID; - Long totalAmount = PaymentTestFixture.ValidPayment.AMOUNT; - Long usedPoint = 0L; // 포인트 미사용 + Long amount = PaymentTestFixture.ValidPayment.AMOUNT; // act - Payment payment = Payment.of(orderId, userId, totalAmount, usedPoint, PaymentTestFixture.ValidPayment.REQUESTED_AT); + Payment payment = Payment.of( + orderId, + userId, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, + amount, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); // assert assertThat(payment.getStatus()).isEqualTo(PaymentStatus.PENDING); - assertThat(payment.getUsedPoint()).isEqualTo(usedPoint); - assertThat(payment.getPaidAmount()).isEqualTo(totalAmount); + assertThat(payment.getUsedPoint()).isEqualTo(0L); + assertThat(payment.getPaidAmount()).isEqualTo(amount); } @DisplayName("포인트로 부분 결제하면 PENDING 상태로 생성된다.") @@ -96,10 +102,18 @@ void hasPendingStatus_whenPointPartiallyCoversTotalAmount() { Long orderId = PaymentTestFixture.ValidPayment.ORDER_ID; Long userId = PaymentTestFixture.ValidPayment.USER_ID; Long totalAmount = PaymentTestFixture.ValidPayment.AMOUNT; - Long usedPoint = totalAmount / 2; // 포인트로 절반 결제 + Long usedPoint = PaymentTestFixture.ValidPayment.PARTIAL_POINT; // 포인트로 절반 결제 // act - Payment payment = Payment.of(orderId, userId, totalAmount, usedPoint, PaymentTestFixture.ValidPayment.REQUESTED_AT); + Payment payment = Payment.of( + orderId, + userId, + totalAmount, + usedPoint, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, + PaymentTestFixture.ValidPayment.REQUESTED_AT + ); // assert assertThat(payment.getStatus()).isEqualTo(PaymentStatus.PENDING); @@ -114,8 +128,9 @@ void canTransitionToSuccess_whenPending() { Payment payment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); LocalDateTime completedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); @@ -135,8 +150,9 @@ void canTransitionToFailed_whenPending() { Payment payment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); LocalDateTime completedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); @@ -158,8 +174,9 @@ void throwsException_whenTransitioningToSuccessFromFailed() { Payment payment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); payment.toFailed("실패 사유", LocalDateTime.now()); @@ -180,8 +197,9 @@ void throwsException_whenTransitioningToFailedFromSuccess() { Payment payment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); payment.toSuccess(LocalDateTime.now()); @@ -202,8 +220,9 @@ void returnsTrue_whenPaymentIsCompleted() { Payment successPayment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); successPayment.toSuccess(LocalDateTime.now()); @@ -211,8 +230,9 @@ void returnsTrue_whenPaymentIsCompleted() { Payment failedPayment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); failedPayment.toFailed("ERROR", LocalDateTime.now()); @@ -220,8 +240,9 @@ void returnsTrue_whenPaymentIsCompleted() { Payment pendingPayment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); @@ -238,8 +259,9 @@ void doesNotThrowException_whenTransitioningToSuccessFromSuccess() { Payment payment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); LocalDateTime firstCompletedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); @@ -261,8 +283,9 @@ void doesNotThrowException_whenTransitioningToFailedFromFailed() { Payment payment = Payment.of( PaymentTestFixture.ValidPayment.ORDER_ID, PaymentTestFixture.ValidPayment.USER_ID, + PaymentTestFixture.ValidPayment.CARD_TYPE, + PaymentTestFixture.ValidPayment.CARD_NO, PaymentTestFixture.ValidPayment.AMOUNT, - PaymentTestFixture.ValidPayment.ZERO_POINT, PaymentTestFixture.ValidPayment.REQUESTED_AT ); LocalDateTime firstCompletedAt = LocalDateTime.of(2025, 12, 1, 10, 5, 0); diff --git a/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java b/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java index 46e6f964a..1b025fccc 100644 --- a/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java +++ b/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java @@ -119,7 +119,7 @@ private HttpEntity createOrderRequest(Long produc List.of( new PurchasingV1Dto.ItemRequest(savedProduct.getId(), 1) ), - new PurchasingV1Dto.PaymentRequest("SAMSUNG", "4111-1111-1111-1111") + new PurchasingV1Dto.PaymentRequest(null, "SAMSUNG", "4111-1111-1111-1111") ); HttpHeaders headers = new HttpHeaders(); @@ -252,7 +252,7 @@ void returns200_whenPaymentCallbackSuccess() { List.of( new PurchasingV1Dto.ItemRequest(savedProduct.getId(), 1) ), - new PurchasingV1Dto.PaymentRequest("SAMSUNG", "4111-1111-1111-1111") + new PurchasingV1Dto.PaymentRequest(null, "SAMSUNG", "4111-1111-1111-1111") ); HttpHeaders createHeaders = new HttpHeaders(); @@ -357,7 +357,7 @@ void returns200_whenPaymentCallbackFailure() { List.of( new PurchasingV1Dto.ItemRequest(savedProduct.getId(), 1) ), - new PurchasingV1Dto.PaymentRequest("SAMSUNG", "4111-1111-1111-1111") + new PurchasingV1Dto.PaymentRequest(null, "SAMSUNG", "4111-1111-1111-1111") ); HttpHeaders createHeaders = new HttpHeaders(); @@ -468,7 +468,7 @@ void returns200_whenOrderStatusRecovered() { List.of( new PurchasingV1Dto.ItemRequest(savedProduct.getId(), 1) ), - new PurchasingV1Dto.PaymentRequest("SAMSUNG", "4111-1111-1111-1111") + new PurchasingV1Dto.PaymentRequest(null, "SAMSUNG", "4111-1111-1111-1111") ); HttpHeaders createHeaders = new HttpHeaders(); From 6665994f8f546b6c06e4d6961867f8cc4eea781b Mon Sep 17 00:00:00 2001 From: minor7295 Date: Mon, 8 Dec 2025 23:25:26 +0900 Subject: [PATCH 18/22] =?UTF-8?q?refactor:=20=EB=8B=A4=EB=A5=B8=20applicat?= =?UTF-8?q?ion=EB=A0=88=EC=9D=B4=EC=96=B4=EC=99=80=20=EB=8F=99=EC=9D=BC?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20command=EC=9D=98=20=EC=9C=84=EC=B9=98?= =?UTF-8?q?=EB=A5=BC=20domain=EC=97=90=EC=84=9C=20application=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasing}/PaymentRequestCommand.java | 5 ++--- .../main/java/com/loopers/domain/payment/PaymentGateway.java | 2 ++ .../main/java/com/loopers/domain/payment/PaymentService.java | 1 + .../infrastructure/paymentgateway/PaymentGatewayImpl.java | 2 +- .../java/com/loopers/domain/payment/PaymentServiceTest.java | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) rename apps/commerce-api/src/main/java/com/loopers/{domain/payment => application/purchasing}/PaymentRequestCommand.java (91%) diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestCommand.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestCommand.java similarity index 91% rename from apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestCommand.java rename to apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestCommand.java index 9931d48c9..3834136a6 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentRequestCommand.java +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PaymentRequestCommand.java @@ -1,4 +1,4 @@ -package com.loopers.domain.payment; +package com.loopers.application.purchasing; import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; @@ -6,7 +6,7 @@ /** * 결제 요청 명령. *

    - * PG 결제 요청에 필요한 정보를 담는 도메인 모델입니다. + * PG 결제 요청에 필요한 정보를 담는 명령 모델입니다. *

    * * @author Loopers @@ -41,4 +41,3 @@ public record PaymentRequestCommand( } } } - diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentGateway.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentGateway.java index cc51f65ae..a8f2864d8 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentGateway.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentGateway.java @@ -1,5 +1,7 @@ package com.loopers.domain.payment; +import com.loopers.application.purchasing.PaymentRequestCommand; + /** * 결제 게이트웨이 인터페이스. *

    diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java index 8414fed9a..9a7ac16c6 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java @@ -1,5 +1,6 @@ package com.loopers.domain.payment; +import com.loopers.application.purchasing.PaymentRequestCommand; import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; import lombok.RequiredArgsConstructor; diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayImpl.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayImpl.java index 62530d59d..ac5e0bdbc 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayImpl.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayImpl.java @@ -1,7 +1,7 @@ package com.loopers.infrastructure.paymentgateway; import com.loopers.domain.payment.PaymentGateway; -import com.loopers.domain.payment.PaymentRequestCommand; +import com.loopers.application.purchasing.PaymentRequestCommand; import com.loopers.domain.payment.PaymentRequestResult; import com.loopers.domain.payment.PaymentStatus; import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker; diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java index 0c501395c..963eab173 100644 --- a/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/domain/payment/PaymentServiceTest.java @@ -1,5 +1,6 @@ package com.loopers.domain.payment; +import com.loopers.application.purchasing.PaymentRequestCommand; import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; import org.junit.jupiter.api.BeforeEach; From fd1155df4c26cd7b051792424992aba093e76a31 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Tue, 9 Dec 2025 00:47:22 +0900 Subject: [PATCH 19/22] =?UTF-8?q?refactor:=20Order=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=EC=97=90=20=EB=8C=80?= =?UTF-8?q?=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=A4=91=20application=20=EB=A0=88=EC=9D=B4=EC=96=B4=EC=97=90?= =?UTF-8?q?=20=EB=8D=94=20=EC=A0=81=ED=95=A9=ED=95=9C=20=EB=B6=80=EB=B6=84?= =?UTF-8?q?=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderCancellationServiceTest.java | 189 -------------- .../order/OrderPaymentResultServiceTest.java | 242 ------------------ .../domain/order/OrderServiceTest.java | 220 ++++++++++++++++ 3 files changed, 220 insertions(+), 431 deletions(-) delete mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java delete mode 100644 apps/commerce-api/src/test/java/com/loopers/domain/order/OrderPaymentResultServiceTest.java diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java deleted file mode 100644 index 5c39429b5..000000000 --- a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderCancellationServiceTest.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.loopers.domain.order; - -import com.loopers.domain.payment.PaymentService; -import com.loopers.domain.product.Product; -import com.loopers.domain.product.ProductRepository; -import com.loopers.domain.user.Gender; -import com.loopers.domain.user.Point; -import com.loopers.domain.user.User; -import com.loopers.domain.user.UserRepository; -import com.loopers.support.error.CoreException; -import com.loopers.support.error.ErrorType; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.util.List; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; - -/** - * OrderCancellationService 테스트. - */ -@ExtendWith(MockitoExtension.class) -@DisplayName("OrderCancellationService") -public class OrderCancellationServiceTest { - - @Mock - private OrderRepository orderRepository; - - @Mock - private UserRepository userRepository; - - @Mock - private ProductRepository productRepository; - - @Mock - private PaymentService paymentService; - - @InjectMocks - private OrderCancellationService orderCancellationService; - - @DisplayName("주문 취소") - @Nested - class CancelOrder { - @DisplayName("주문을 취소하고 리소스를 원복할 수 있다.") - @Test - void cancelsOrderAndRecoversResources() { - // arrange - Long userId = OrderTestFixture.ValidOrder.USER_ID; - User user = createUser(userId); - Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); - - List items = order.getItems(); - Product product1 = createProduct(items.get(0).getProductId()); - Product product2 = createProduct(items.get(1).getProductId()); - - when(userRepository.findByUserIdForUpdate(user.getUserId())).thenReturn(user); - when(productRepository.findByIdForUpdate(items.get(0).getProductId())) - .thenReturn(Optional.of(product1)); - when(productRepository.findByIdForUpdate(items.get(1).getProductId())) - .thenReturn(Optional.of(product2)); - when(orderRepository.save(any(Order.class))).thenReturn(order); - when(userRepository.save(any(User.class))).thenReturn(user); - when(productRepository.save(any(Product.class))).thenReturn(product1, product2); - // Payment가 없는 경우 (포인트를 사용하지 않은 주문) - when(paymentService.findByOrderId(any(Long.class))).thenReturn(Optional.empty()); - - // act - orderCancellationService.cancel(order, user); - - // assert - verify(userRepository, times(1)).findByUserIdForUpdate(user.getUserId()); - verify(productRepository, times(1)).findByIdForUpdate(items.get(0).getProductId()); - verify(productRepository, times(1)).findByIdForUpdate(items.get(1).getProductId()); - verify(orderRepository, times(1)).save(order); - verify(userRepository, times(1)).save(user); - verify(productRepository, times(2)).save(any(Product.class)); - // 상태 변경 검증은 OrderTest에서 이미 검증했으므로 제거 - } - - @DisplayName("주문이 null이면 예외가 발생한다.") - @Test - void throwsException_whenOrderIsNull() { - // arrange - User user = createUser(OrderTestFixture.ValidOrder.USER_ID); - - // act - CoreException result = assertThrows(CoreException.class, () -> { - orderCancellationService.cancel(null, user); - }); - - // assert - assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); - verify(orderRepository, never()).save(any(Order.class)); - } - - @DisplayName("사용자가 null이면 예외가 발생한다.") - @Test - void throwsException_whenUserIsNull() { - // arrange - Order order = Order.of( - OrderTestFixture.ValidOrder.USER_ID, - OrderTestFixture.ValidOrderItem.createMultipleItems() - ); - - // act - CoreException result = assertThrows(CoreException.class, () -> { - orderCancellationService.cancel(order, null); - }); - - // assert - assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); - verify(orderRepository, never()).save(any(Order.class)); - } - - @DisplayName("사용자를 찾을 수 없으면 예외가 발생한다.") - @Test - void throwsException_whenUserNotFound() { - // arrange - Long userId = OrderTestFixture.ValidOrder.USER_ID; - User user = createUser(userId); - Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); - - when(userRepository.findByUserIdForUpdate(user.getUserId())).thenReturn(null); - - // act - CoreException result = assertThrows(CoreException.class, () -> { - orderCancellationService.cancel(order, user); - }); - - // assert - assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); - verify(userRepository, times(1)).findByUserIdForUpdate(user.getUserId()); - verify(orderRepository, never()).save(any(Order.class)); - } - - @DisplayName("상품을 찾을 수 없으면 예외가 발생한다.") - @Test - void throwsException_whenProductNotFound() { - // arrange - Long userId = OrderTestFixture.ValidOrder.USER_ID; - User user = createUser(userId); - Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); - List items = order.getItems(); - - when(userRepository.findByUserIdForUpdate(user.getUserId())).thenReturn(user); - when(productRepository.findByIdForUpdate(items.get(0).getProductId())) - .thenReturn(Optional.empty()); - - // act - CoreException result = assertThrows(CoreException.class, () -> { - orderCancellationService.cancel(order, user); - }); - - // assert - assertThat(result.getErrorType()).isEqualTo(ErrorType.NOT_FOUND); - verify(userRepository, times(1)).findByUserIdForUpdate(user.getUserId()); - verify(productRepository, times(1)).findByIdForUpdate(items.get(0).getProductId()); - verify(orderRepository, never()).save(any(Order.class)); - } - } - - private User createUser(Long userId) { - return User.of( - String.valueOf(userId), - "test@example.com", - "1990-01-01", - Gender.MALE, - Point.of(0L) - ); - } - - private Product createProduct(Long productId) { - // Mock을 사용하여 ID 설정 - Product mockedProduct = mock(Product.class); - when(mockedProduct.getId()).thenReturn(productId); - doNothing().when(mockedProduct).increaseStock(any(Integer.class)); - return mockedProduct; - } -} - diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderPaymentResultServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderPaymentResultServiceTest.java deleted file mode 100644 index 0d70ee580..000000000 --- a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderPaymentResultServiceTest.java +++ /dev/null @@ -1,242 +0,0 @@ -package com.loopers.domain.order; - -import com.loopers.domain.payment.PaymentStatus; -import com.loopers.domain.user.Gender; -import com.loopers.domain.user.Point; -import com.loopers.domain.user.User; -import com.loopers.domain.user.UserRepository; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; - -/** - * OrderPaymentResultService 테스트. - */ -@ExtendWith(MockitoExtension.class) -@DisplayName("OrderPaymentResultService") -public class OrderPaymentResultServiceTest { - - @Mock - private OrderRepository orderRepository; - - @Mock - private UserRepository userRepository; - - @Mock - private OrderCancellationService orderCancellationService; - - @InjectMocks - private OrderPaymentResultService orderPaymentResultService; - - @DisplayName("결제 결과에 따른 주문 처리") - @Nested - class ProcessByPaymentResult { - @DisplayName("결제 성공 시 주문을 완료 상태로 변경할 수 있다.") - @Test - void completesOrder_whenPaymentSuccess() { - // arrange - Long orderId = 1L; - Order order = Order.of( - OrderTestFixture.ValidOrder.USER_ID, - OrderTestFixture.ValidOrderItem.createMultipleItems() - ); - String transactionKey = "TXN123456"; - - when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); - when(orderRepository.save(any(Order.class))).thenReturn(order); - - // act - boolean result = orderPaymentResultService.updateByPaymentStatus( - orderId, - PaymentStatus.SUCCESS, - transactionKey, - null - ); - - // assert - assertThat(result).isTrue(); - verify(orderRepository, times(1)).findById(orderId); - verify(orderRepository, times(1)).save(order); - verify(orderCancellationService, never()).cancel(any(), any()); - // 상태 변경 검증은 OrderTest에서 이미 검증했으므로 제거 - } - - @DisplayName("결제 실패 시 주문을 취소 상태로 변경할 수 있다.") - @Test - void cancelsOrder_whenPaymentFailed() { - // arrange - Long orderId = 1L; - Long userId = OrderTestFixture.ValidOrder.USER_ID; - Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); - User user = createUser(userId); - String transactionKey = "TXN123456"; - String reason = "카드 한도 초과"; - - when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); - when(userRepository.findById(userId)).thenReturn(user); - doNothing().when(orderCancellationService).cancel(any(Order.class), any(User.class)); - - // act - boolean result = orderPaymentResultService.updateByPaymentStatus( - orderId, - PaymentStatus.FAILED, - transactionKey, - reason - ); - - // assert - assertThat(result).isTrue(); - verify(orderRepository, times(1)).findById(orderId); - verify(userRepository, times(1)).findById(userId); - verify(orderCancellationService, times(1)).cancel(order, user); - } - - @DisplayName("결제 대기 상태면 주문 상태를 유지한다.") - @Test - void maintainsOrderStatus_whenPaymentPending() { - // arrange - Long orderId = 1L; - Order order = Order.of( - OrderTestFixture.ValidOrder.USER_ID, - OrderTestFixture.ValidOrderItem.createMultipleItems() - ); - String transactionKey = "TXN123456"; - - when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); - - // act - boolean result = orderPaymentResultService.updateByPaymentStatus( - orderId, - PaymentStatus.PENDING, - transactionKey, - null - ); - - // assert - assertThat(result).isTrue(); - verify(orderRepository, times(1)).findById(orderId); - verify(orderRepository, never()).save(any(Order.class)); - verify(orderCancellationService, never()).cancel(any(), any()); - } - - @DisplayName("이미 완료된 주문은 처리하지 않는다.") - @Test - void skipsProcessing_whenOrderAlreadyCompleted() { - // arrange - Long orderId = 1L; - Order order = Order.of( - OrderTestFixture.ValidOrder.USER_ID, - OrderTestFixture.ValidOrderItem.createMultipleItems() - ); - order.complete(); // 이미 완료 상태 - - when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); - - // act - boolean result = orderPaymentResultService.updateByPaymentStatus( - orderId, - PaymentStatus.SUCCESS, - "TXN123456", - null - ); - - // assert - assertThat(result).isTrue(); - verify(orderRepository, times(1)).findById(orderId); - verify(orderRepository, never()).save(any(Order.class)); - } - - @DisplayName("이미 취소된 주문은 처리하지 않는다.") - @Test - void skipsProcessing_whenOrderAlreadyCanceled() { - // arrange - Long orderId = 1L; - Long userId = OrderTestFixture.ValidOrder.USER_ID; - Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); - order.cancel(); // 이미 취소 상태 - - when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); - - // act - boolean result = orderPaymentResultService.updateByPaymentStatus( - orderId, - PaymentStatus.FAILED, - "TXN123456", - "실패 사유" - ); - - // assert - assertThat(result).isTrue(); - verify(orderRepository, times(1)).findById(orderId); - verify(orderCancellationService, never()).cancel(any(), any()); - } - - @DisplayName("주문을 찾을 수 없으면 false를 반환한다.") - @Test - void returnsFalse_whenOrderNotFound() { - // arrange - Long orderId = 999L; - when(orderRepository.findById(orderId)).thenReturn(Optional.empty()); - - // act - boolean result = orderPaymentResultService.updateByPaymentStatus( - orderId, - PaymentStatus.SUCCESS, - "TXN123456", - null - ); - - // assert - assertThat(result).isFalse(); - verify(orderRepository, times(1)).findById(orderId); - verify(orderRepository, never()).save(any(Order.class)); - } - - @DisplayName("결제 실패 시 사용자를 찾을 수 없으면 false를 반환한다.") - @Test - void returnsFalse_whenUserNotFound() { - // arrange - Long orderId = 1L; - Long userId = OrderTestFixture.ValidOrder.USER_ID; - Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); - - when(orderRepository.findById(orderId)).thenReturn(Optional.of(order)); - when(userRepository.findById(userId)).thenReturn(null); - - // act - boolean result = orderPaymentResultService.updateByPaymentStatus( - orderId, - PaymentStatus.FAILED, - "TXN123456", - "실패 사유" - ); - - // assert - assertThat(result).isFalse(); - verify(orderRepository, times(1)).findById(orderId); - verify(userRepository, times(1)).findById(userId); - verify(orderCancellationService, never()).cancel(any(Order.class), any(User.class)); - } - } - - private User createUser(Long userId) { - return User.of( - String.valueOf(userId), - "test@example.com", - "1990-01-01", - Gender.MALE, - Point.of(0L) - ); - } -} - diff --git a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderServiceTest.java b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderServiceTest.java index 11964d67d..1dab0a951 100644 --- a/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderServiceTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/domain/order/OrderServiceTest.java @@ -1,5 +1,10 @@ package com.loopers.domain.order; +import com.loopers.domain.payment.PaymentStatus; +import com.loopers.domain.product.Product; +import com.loopers.domain.user.Gender; +import com.loopers.domain.user.Point; +import com.loopers.domain.user.User; import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; import org.junit.jupiter.api.DisplayName; @@ -234,5 +239,220 @@ void throwsException_whenOrderNotFound() { verify(orderRepository, never()).save(any(Order.class)); } } + + @DisplayName("주문 취소") + @Nested + class CancelOrder { + @DisplayName("주문을 취소하고 재고를 원복하며 포인트를 환불할 수 있다.") + @Test + void cancelsOrderAndRecoversResources() { + // arrange + Long userId = OrderTestFixture.ValidOrder.USER_ID; + User user = createUser(userId); + Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); + + List items = order.getItems(); + Product product1 = createProduct(items.get(0).getProductId()); + Product product2 = createProduct(items.get(1).getProductId()); + List products = List.of(product1, product2); + Long refundPointAmount = 5000L; + + when(orderRepository.save(any(Order.class))).thenReturn(order); + + // act + orderService.cancelOrder(order, products, user, refundPointAmount); + + // assert + verify(orderRepository, times(1)).save(order); + verify(product1, times(1)).increaseStock(items.get(0).getQuantity()); + verify(product2, times(1)).increaseStock(items.get(1).getQuantity()); + // 상태 변경 검증은 OrderTest에서 이미 검증했으므로 제거 + } + + @DisplayName("주문이 null이면 예외가 발생한다.") + @Test + void throwsException_whenOrderIsNull() { + // arrange + User user = createUser(OrderTestFixture.ValidOrder.USER_ID); + List products = List.of(); + Long refundPointAmount = 0L; + + // act + CoreException result = assertThrows(CoreException.class, () -> { + orderService.cancelOrder(null, products, user, refundPointAmount); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + verify(orderRepository, never()).save(any(Order.class)); + } + + @DisplayName("사용자가 null이면 예외가 발생한다.") + @Test + void throwsException_whenUserIsNull() { + // arrange + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + List products = List.of(); + Long refundPointAmount = 0L; + + // act + CoreException result = assertThrows(CoreException.class, () -> { + orderService.cancelOrder(order, products, null, refundPointAmount); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + verify(orderRepository, never()).save(any(Order.class)); + } + + @DisplayName("포인트를 사용하지 않은 주문은 포인트 환불 없이 취소할 수 있다.") + @Test + void cancelsOrderWithoutPointRefund() { + // arrange + Long userId = OrderTestFixture.ValidOrder.USER_ID; + User user = createUser(userId); + Order order = Order.of(userId, OrderTestFixture.ValidOrderItem.createMultipleItems()); + + List items = order.getItems(); + Product product1 = createProduct(items.get(0).getProductId()); + Product product2 = createProduct(items.get(1).getProductId()); + List products = List.of(product1, product2); + Long refundPointAmount = 0L; + + when(orderRepository.save(any(Order.class))).thenReturn(order); + + // act + orderService.cancelOrder(order, products, user, refundPointAmount); + + // assert + verify(orderRepository, times(1)).save(order); + verify(product1, times(1)).increaseStock(items.get(0).getQuantity()); + verify(product2, times(1)).increaseStock(items.get(1).getQuantity()); + } + } + + @DisplayName("결제 결과에 따른 주문 상태 업데이트") + @Nested + class UpdateStatusByPaymentResult { + @DisplayName("결제 성공 시 주문을 완료 상태로 변경할 수 있다.") + @Test + void completesOrder_whenPaymentSuccess() { + // arrange + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + when(orderRepository.save(any(Order.class))).thenReturn(order); + + // act + orderService.updateStatusByPaymentResult(order, PaymentStatus.SUCCESS); + + // assert + verify(orderRepository, times(1)).save(order); + // 상태 변경 검증은 OrderTest에서 이미 검증했으므로 제거 + } + + @DisplayName("결제 실패 시 주문을 취소 상태로 변경할 수 있다.") + @Test + void cancelsOrder_whenPaymentFailed() { + // arrange + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + when(orderRepository.save(any(Order.class))).thenReturn(order); + + // act + orderService.updateStatusByPaymentResult(order, PaymentStatus.FAILED); + + // assert + verify(orderRepository, times(1)).save(order); + // 상태 변경 검증은 OrderTest에서 이미 검증했으므로 제거 + } + + @DisplayName("결제 대기 상태면 주문 상태를 유지한다.") + @Test + void maintainsOrderStatus_whenPaymentPending() { + // arrange + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + + // act + orderService.updateStatusByPaymentResult(order, PaymentStatus.PENDING); + + // assert + verify(orderRepository, never()).save(any(Order.class)); + } + + @DisplayName("이미 완료된 주문은 처리하지 않는다.") + @Test + void skipsProcessing_whenOrderAlreadyCompleted() { + // arrange + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + order.complete(); // 이미 완료 상태 + + // act + orderService.updateStatusByPaymentResult(order, PaymentStatus.SUCCESS); + + // assert + verify(orderRepository, never()).save(any(Order.class)); + } + + @DisplayName("이미 취소된 주문은 처리하지 않는다.") + @Test + void skipsProcessing_whenOrderAlreadyCanceled() { + // arrange + Order order = Order.of( + OrderTestFixture.ValidOrder.USER_ID, + OrderTestFixture.ValidOrderItem.createMultipleItems() + ); + order.cancel(); // 이미 취소 상태 + + // act + orderService.updateStatusByPaymentResult(order, PaymentStatus.FAILED); + + // assert + verify(orderRepository, never()).save(any(Order.class)); + } + + @DisplayName("주문이 null이면 예외가 발생한다.") + @Test + void throwsException_whenOrderIsNull() { + // act + CoreException result = assertThrows(CoreException.class, () -> { + orderService.updateStatusByPaymentResult(null, PaymentStatus.SUCCESS); + }); + + // assert + assertThat(result.getErrorType()).isEqualTo(ErrorType.BAD_REQUEST); + verify(orderRepository, never()).save(any(Order.class)); + } + } + + private User createUser(Long userId) { + return User.of( + String.valueOf(userId), + "test@example.com", + "1990-01-01", + Gender.MALE, + Point.of(0L) + ); + } + + private Product createProduct(Long productId) { + // Mock을 사용하여 ID 설정 + Product mockedProduct = mock(Product.class); + when(mockedProduct.getId()).thenReturn(productId); + doNothing().when(mockedProduct).increaseStock(any(Integer.class)); + return mockedProduct; + } } From c725d49a8e91c7529d55c23bccb5df1b0a567eb0 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Tue, 9 Dec 2025 00:48:53 +0900 Subject: [PATCH 20/22] =?UTF-8?q?refactor:=20Order=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=EC=97=90=20=EC=9E=88?= =?UTF-8?q?=EB=8D=98=20=EB=82=B4=EC=9A=A9=20=EC=A4=91=20=EC=96=B4=ED=94=8C?= =?UTF-8?q?=EB=A6=AC=EC=BC=80=EC=9D=B4=EC=85=98=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=EC=97=90=20=ED=95=B4=EB=8B=B9=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=EB=93=A4=EC=9D=80=20application=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EB=A1=9C=20=EC=9D=B4=EB=8F=99=EC=8B=9C?= =?UTF-8?q?=ED=82=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasing/PurchasingFacade.java | 135 +++++++++++++++--- .../order/OrderCancellationService.java | 117 --------------- .../order/OrderPaymentResultService.java | 100 ------------- .../loopers/domain/order/OrderService.java | 90 ++++++++++++ 4 files changed, 203 insertions(+), 239 deletions(-) delete mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java delete mode 100644 apps/commerce-api/src/main/java/com/loopers/domain/order/OrderPaymentResultService.java diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java index 2d5e89b64..19020de50 100644 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java @@ -12,8 +12,6 @@ import com.loopers.domain.coupon.CouponService; import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; import com.loopers.domain.payment.PaymentRequestResult; -import com.loopers.domain.order.OrderPaymentResultService; -import com.loopers.domain.order.OrderCancellationService; import com.loopers.domain.payment.PaymentService; import com.loopers.domain.payment.Payment; import com.loopers.domain.payment.PaymentStatus; @@ -52,8 +50,6 @@ public class PurchasingFacade { private final ProductService productService; private final CouponService couponService; private final OrderService orderService; - private final OrderCancellationService orderCancellationService; - private final OrderPaymentResultService orderPaymentResultService; private final PaymentService paymentService; // Payment 관련: PaymentService만 의존 (DIP 준수) private final PlatformTransactionManager transactionManager; @@ -174,9 +170,6 @@ public OrderInfo createOrder(String userId, List commands, Lon discountAmount = couponService.applyCoupon(user.getId(), couponCode, calculateSubtotal(orderItems)); } - // 주문 총액 계산 (쿠폰 할인 적용) - Integer orderTotalAmount = calculateSubtotal(orderItems) - discountAmount; - // 포인트 차감 (지정된 금액만) Long usedPointAmount = Objects.requireNonNullElse(usedPoint, 0L); @@ -287,18 +280,48 @@ public void afterCommit() { * @param order 주문 엔티티 * @param user 사용자 엔티티 */ - /** - * 주문을 취소하고 포인트를 환불하며 재고를 원복한다. - *

    - * OrderCancellationService를 사용하여 처리합니다. - *

    - * - * @param order 주문 엔티티 - * @param user 사용자 엔티티 - */ @Transactional public void cancelOrder(Order order, User user) { - orderCancellationService.cancel(order, user); + if (order == null || user == null) { + throw new CoreException(ErrorType.BAD_REQUEST, "취소할 주문과 사용자 정보는 필수입니다."); + } + + // ✅ Deadlock 방지: User 락을 먼저 획득하여 createOrder와 동일한 락 획득 순서 보장 + User lockedUser = userService.findByUserIdForUpdate(user.getUserId()); + if (lockedUser == null) { + throw new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."); + } + + // ✅ Deadlock 방지: 상품 ID를 정렬하여 일관된 락 획득 순서 보장 + List sortedProductIds = order.getItems().stream() + .map(OrderItem::getProductId) + .distinct() + .sorted() + .toList(); + + // 정렬된 순서대로 상품 락 획득 (Deadlock 방지) + Map productMap = new java.util.HashMap<>(); + for (Long productId : sortedProductIds) { + Product product = productService.findByIdForUpdate(productId); + productMap.put(productId, product); + } + + // OrderItem 순서대로 Product 리스트 생성 + List products = order.getItems().stream() + .map(item -> productMap.get(item.getProductId())) + .toList(); + + // 실제로 사용된 포인트만 환불 (Payment에서 확인) + Long refundPointAmount = paymentService.findByOrderId(order.getId()) + .map(Payment::getUsedPoint) + .orElse(0L); + + // 도메인 서비스를 통한 주문 취소 처리 + orderService.cancelOrder(order, products, lockedUser, refundPointAmount); + + // 저장 + productService.saveAll(products); + userService.save(lockedUser); } /** @@ -431,6 +454,74 @@ private PaymentGatewayDto.TransactionStatus convertToInfraStatus(PaymentStatus p }; } + /** + * 결제 상태에 따라 주문 상태를 업데이트합니다. + *

    + * 별도 트랜잭션으로 실행하여 외부 시스템 호출과 독립적으로 처리합니다. + *

    + * + * @param orderId 주문 ID + * @param paymentStatus 결제 상태 (도메인 모델) + * @param transactionKey 트랜잭션 키 + * @param reason 실패 사유 (실패 시) + * @return 업데이트 성공 여부 (true: 성공, false: 실패) + */ + @Transactional(propagation = Propagation.REQUIRES_NEW) + public boolean updateOrderStatusByPaymentResult( + Long orderId, + PaymentStatus paymentStatus, + String transactionKey, + String reason + ) { + try { + Order order = orderService.findById(orderId).orElse(null); + + if (order == null) { + log.warn("주문 상태 업데이트 시 주문을 찾을 수 없습니다. (orderId: {})", orderId); + return false; + } + + // 이미 완료되거나 취소된 주문인 경우 처리하지 않음 (정상적인 경우이므로 true 반환) + if (order.getStatus() == OrderStatus.COMPLETED) { + log.info("이미 완료된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); + return true; + } + + if (order.getStatus() == OrderStatus.CANCELED) { + log.info("이미 취소된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); + return true; + } + + if (paymentStatus == PaymentStatus.SUCCESS) { + // 결제 성공: 주문 완료 + orderService.updateStatusByPaymentResult(order, paymentStatus); + log.info("결제 상태 확인 결과, 주문 상태를 COMPLETED로 업데이트했습니다. (orderId: {}, transactionKey: {})", + orderId, transactionKey); + return true; + } else if (paymentStatus == PaymentStatus.FAILED) { + // 결제 실패: 주문 취소 및 리소스 원복 + User user = userService.findById(order.getUserId()); + if (user == null) { + log.warn("주문 상태 업데이트 시 사용자를 찾을 수 없습니다. (orderId: {}, userId: {})", + orderId, order.getUserId()); + return false; + } + cancelOrder(order, user); + log.info("결제 상태 확인 결과, 주문 상태를 CANCELED로 업데이트했습니다. (orderId: {}, transactionKey: {}, reason: {})", + orderId, transactionKey, reason); + return true; + } else { + // PENDING 상태: 아직 처리 중 (정상적인 경우이므로 true 반환) + log.info("결제 상태 확인 결과, 아직 처리 중입니다. 주문은 PENDING 상태로 유지됩니다. (orderId: {}, transactionKey: {})", + orderId, transactionKey); + return true; + } + } catch (Exception e) { + log.error("주문 상태 업데이트 중 오류 발생. (orderId: {})", orderId, e); + return false; + } + } + /** * 주문 상태를 COMPLETED로 업데이트합니다. *

    @@ -594,8 +685,8 @@ public void handlePaymentCallback(Long orderId, PaymentGatewayDto.CallbackReques callbackRequest.reason() ); - // OrderPaymentResultService를 사용하여 주문 상태 업데이트 - boolean updated = orderPaymentResultService.updateByPaymentStatus( + // 주문 상태 업데이트 처리 + boolean updated = updateOrderStatusByPaymentResult( orderId, paymentStatus, callbackRequest.transactionKey(), @@ -708,8 +799,8 @@ public void recoverOrderStatusByPaymentCheck(String userId, Long orderId) { // 결제 상태 조회 PaymentStatus paymentStatus = paymentService.getPaymentStatus(userId, orderId); - // OrderPaymentResultService를 사용하여 주문 상태 업데이트 - boolean updated = orderPaymentResultService.updateByPaymentStatus(orderId, paymentStatus, null, null); + // 주문 상태 업데이트 처리 + boolean updated = updateOrderStatusByPaymentResult(orderId, paymentStatus, null, null); if (!updated) { log.warn("상태 복구 실패. 주문 상태 업데이트에 실패했습니다. (orderId: {})", orderId); @@ -789,7 +880,7 @@ private void handlePaymentFailure(String userId, Long orderId, String errorCode, } // 주문 취소 및 리소스 원복 - orderCancellationService.cancel(order, user); + cancelOrder(order, user); log.info("결제 실패로 인한 주문 취소 완료. (orderId: {}, errorCode: {}, errorMessage: {})", orderId, errorCode, errorMessage); diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java deleted file mode 100644 index aeb549631..000000000 --- a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderCancellationService.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.loopers.domain.order; - -import com.loopers.domain.payment.Payment; -import com.loopers.domain.payment.PaymentService; -import com.loopers.domain.product.Product; -import com.loopers.domain.product.ProductRepository; -import com.loopers.domain.user.Point; -import com.loopers.domain.user.User; -import com.loopers.domain.user.UserRepository; -import com.loopers.support.error.CoreException; -import com.loopers.support.error.ErrorType; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 주문 취소 도메인 서비스. - *

    - * 주문 취소 및 리소스 원복을 처리합니다. - *

    - * - * @author Loopers - * @version 1.0 - */ -@Slf4j -@Component -@RequiredArgsConstructor -public class OrderCancellationService { - - private final OrderRepository orderRepository; - private final UserRepository userRepository; - private final ProductRepository productRepository; - private final PaymentService paymentService; - - /** - * 주문을 취소하고 포인트를 환불하며 재고를 원복합니다. - *

    - * 동시성 제어: - *

      - *
    • 비관적 락 사용: 재고 원복 시 동시성 제어를 위해 findByIdForUpdate 사용
      • - *
    • Deadlock 방지: 상품 ID를 정렬하여 일관된 락 획득 순서 보장
      • - *
    - *

    - * - * @param order 주문 엔티티 - * @param user 사용자 엔티티 - */ - @Transactional - public void cancel(Order order, User user) { - if (order == null || user == null) { - throw new CoreException(ErrorType.BAD_REQUEST, "취소할 주문과 사용자 정보는 필수입니다."); - } - - // ✅ Deadlock 방지: User 락을 먼저 획득하여 createOrder와 동일한 락 획득 순서 보장 - User lockedUser = userRepository.findByUserIdForUpdate(user.getUserId()); - if (lockedUser == null) { - throw new CoreException(ErrorType.NOT_FOUND, "사용자를 찾을 수 없습니다."); - } - - // ✅ Deadlock 방지: 상품 ID를 정렬하여 일관된 락 획득 순서 보장 - List sortedProductIds = order.getItems().stream() - .map(OrderItem::getProductId) - .distinct() - .sorted() - .toList(); - - // 정렬된 순서대로 상품 락 획득 (Deadlock 방지) - Map productMap = new HashMap<>(); - for (Long productId : sortedProductIds) { - Product product = productRepository.findByIdForUpdate(productId) - .orElseThrow(() -> new CoreException(ErrorType.NOT_FOUND, - String.format("상품을 찾을 수 없습니다. (상품 ID: %d)", productId))); - productMap.put(productId, product); - } - - // OrderItem 순서대로 Product 리스트 생성 - List products = order.getItems().stream() - .map(item -> productMap.get(item.getProductId())) - .toList(); - - order.cancel(); - increaseStocksForOrderItems(order.getItems(), products); - - // 실제로 사용된 포인트만 환불 (Payment에서 확인) - Long refundPointAmount = paymentService.findByOrderId(order.getId()) - .map(Payment::getUsedPoint) - .orElse(0L); - - if (refundPointAmount > 0) { - lockedUser.receivePoint(Point.of(refundPointAmount)); - } - - products.forEach(productRepository::save); - userRepository.save(lockedUser); - orderRepository.save(order); - } - - private void increaseStocksForOrderItems(List items, List products) { - Map productMap = products.stream() - .collect(java.util.stream.Collectors.toMap(Product::getId, product -> product)); - - for (OrderItem item : items) { - Product product = productMap.get(item.getProductId()); - if (product == null) { - throw new CoreException(ErrorType.NOT_FOUND, - String.format("상품을 찾을 수 없습니다. (상품 ID: %d)", item.getProductId())); - } - product.increaseStock(item.getQuantity()); - } - } -} - diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderPaymentResultService.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderPaymentResultService.java deleted file mode 100644 index 001336252..000000000 --- a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderPaymentResultService.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.loopers.domain.order; - -import com.loopers.domain.payment.PaymentStatus; -import com.loopers.domain.user.User; -import com.loopers.domain.user.UserRepository; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -/** - * 주문 결제 결과 처리 도메인 서비스. - *

    - * 결제 결과에 따라 주문 상태를 처리합니다. - *

    - * - * @author Loopers - * @version 1.0 - */ -@Slf4j -@Component -@RequiredArgsConstructor -public class OrderPaymentResultService { - - private final OrderRepository orderRepository; - private final UserRepository userRepository; - private final OrderCancellationService orderCancellationService; - - /** - * 결제 상태에 따라 주문 상태를 업데이트합니다. - *

    - * 별도 트랜잭션으로 실행하여 외부 시스템 호출과 독립적으로 처리합니다. - *

    - * - * @param orderId 주문 ID - * @param paymentStatus 결제 상태 (도메인 모델) - * @param transactionKey 트랜잭션 키 - * @param reason 실패 사유 (실패 시) - * @return 업데이트 성공 여부 (true: 성공, false: 실패) - */ - @Transactional(propagation = Propagation.REQUIRES_NEW) - public boolean updateByPaymentStatus( - Long orderId, - PaymentStatus paymentStatus, - String transactionKey, - String reason - ) { - try { - Order order = orderRepository.findById(orderId) - .orElse(null); - - if (order == null) { - log.warn("주문 상태 업데이트 시 주문을 찾을 수 없습니다. (orderId: {})", orderId); - return false; - } - - // 이미 완료되거나 취소된 주문인 경우 처리하지 않음 (정상적인 경우이므로 true 반환) - if (order.getStatus() == OrderStatus.COMPLETED) { - log.info("이미 완료된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); - return true; - } - - if (order.getStatus() == OrderStatus.CANCELED) { - log.info("이미 취소된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); - return true; - } - - if (paymentStatus == PaymentStatus.SUCCESS) { - // 결제 성공: 주문 완료 - order.complete(); - orderRepository.save(order); - log.info("결제 상태 확인 결과, 주문 상태를 COMPLETED로 업데이트했습니다. (orderId: {}, transactionKey: {})", - orderId, transactionKey); - return true; - } else if (paymentStatus == PaymentStatus.FAILED) { - // 결제 실패: 주문 취소 및 리소스 원복 - User user = userRepository.findById(order.getUserId()); - if (user == null) { - log.warn("주문 상태 업데이트 시 사용자를 찾을 수 없습니다. (orderId: {}, userId: {})", - orderId, order.getUserId()); - return false; - } - orderCancellationService.cancel(order, user); - log.info("결제 상태 확인 결과, 주문 상태를 CANCELED로 업데이트했습니다. (orderId: {}, transactionKey: {}, reason: {})", - orderId, transactionKey, reason); - return true; - } else { - // PENDING 상태: 아직 처리 중 (정상적인 경우이므로 true 반환) - log.info("결제 상태 확인 결과, 아직 처리 중입니다. 주문은 PENDING 상태로 유지됩니다. (orderId: {}, transactionKey: {})", - orderId, transactionKey); - return true; - } - } catch (Exception e) { - log.error("주문 상태 업데이트 중 오류 발생. (orderId: {})", orderId, e); - return false; - } - } -} - diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderService.java b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderService.java index 88207b645..e74c024d7 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderService.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/order/OrderService.java @@ -1,5 +1,9 @@ package com.loopers.domain.order; +import com.loopers.domain.payment.PaymentStatus; +import com.loopers.domain.product.Product; +import com.loopers.domain.user.Point; +import com.loopers.domain.user.User; import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; import lombok.RequiredArgsConstructor; @@ -7,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; import java.util.Optional; /** @@ -122,5 +127,90 @@ public Order completeOrder(Long orderId) { order.complete(); return orderRepository.save(order); } + + /** + * 주문을 취소 상태로 변경하고 재고를 원복하며 포인트를 환불합니다. + *

    + * 도메인 로직만 처리합니다. 사용자 조회, 상품 조회, Payment 조회는 애플리케이션 레이어에서 처리합니다. + *

    + * + * @param order 주문 엔티티 + * @param products 주문 아이템에 해당하는 상품 목록 (락이 이미 획득된 상태) + * @param user 사용자 엔티티 (락이 이미 획득된 상태) + * @param refundPointAmount 환불할 포인트 금액 + * @throws CoreException 주문 또는 사용자 정보가 null인 경우 + */ + @Transactional + public void cancelOrder(Order order, List products, User user, Long refundPointAmount) { + if (order == null || user == null) { + throw new CoreException(ErrorType.BAD_REQUEST, "취소할 주문과 사용자 정보는 필수입니다."); + } + + // 주문 취소 + order.cancel(); + + // 재고 원복 + increaseStocksForOrderItems(order.getItems(), products); + + // 포인트 환불 + if (refundPointAmount > 0) { + user.receivePoint(Point.of(refundPointAmount)); + } + + orderRepository.save(order); + } + + /** + * 결제 상태에 따라 주문 상태를 업데이트합니다. + *

    + * 도메인 로직만 처리합니다. 사용자 조회, 트랜잭션 관리, 로깅은 애플리케이션 레이어에서 처리합니다. + *

    + * + * @param order 주문 엔티티 + * @param paymentStatus 결제 상태 + * @throws CoreException 주문이 null이거나 이미 완료/취소된 경우 + */ + @Transactional + public void updateStatusByPaymentResult(Order order, PaymentStatus paymentStatus) { + if (order == null) { + throw new CoreException(ErrorType.BAD_REQUEST, "주문 정보는 필수입니다."); + } + + // 이미 완료되거나 취소된 주문인 경우 처리하지 않음 + if (order.getStatus() == OrderStatus.COMPLETED || order.getStatus() == OrderStatus.CANCELED) { + return; + } + + if (paymentStatus == PaymentStatus.SUCCESS) { + // 결제 성공: 주문 완료 + order.complete(); + orderRepository.save(order); + } else if (paymentStatus == PaymentStatus.FAILED) { + // 결제 실패: 주문 취소 (재고 원복 및 포인트 환불은 애플리케이션 레이어에서 처리) + order.cancel(); + orderRepository.save(order); + } + // PENDING 상태: 상태 유지 (아무 작업도 하지 않음) + } + + /** + * 주문 아이템에 대해 재고를 증가시킵니다. + * + * @param items 주문 아이템 목록 + * @param products 상품 목록 + */ + private void increaseStocksForOrderItems(List items, List products) { + Map productMap = products.stream() + .collect(java.util.stream.Collectors.toMap(Product::getId, product -> product)); + + for (OrderItem item : items) { + Product product = productMap.get(item.getProductId()); + if (product == null) { + throw new CoreException(ErrorType.NOT_FOUND, + String.format("상품을 찾을 수 없습니다. (상품 ID: %d)", item.getProductId())); + } + product.increaseStock(item.getQuantity()); + } + } } From a527a9140d27cdbe2bc7cb1c36820280ab09d379 Mon Sep 17 00:00:00 2001 From: minor7295 Date: Tue, 9 Dec 2025 01:00:05 +0900 Subject: [PATCH 21/22] =?UTF-8?q?refactor:=20infrastructure=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EC=97=90=20domain=EB=A0=88=EC=9D=B4=EC=96=B4?= =?UTF-8?q?=EC=99=80=20=EB=8B=AC=EB=A6=AC=20payment=EC=99=80=20paymentgate?= =?UTF-8?q?way=EA=B0=80=20=EA=B5=AC=EB=B6=84=EB=90=98=EC=96=B4=EC=9E=88?= =?UTF-8?q?=EC=96=B4=20=ED=86=B5=EC=9D=BC=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loopers/application/purchasing/PurchasingFacade.java | 2 +- .../{paymentgateway => payment}/DelayProvider.java | 3 +-- .../{paymentgateway => payment}/PaymentGatewayClient.java | 3 +-- .../{paymentgateway => payment}/PaymentGatewayDto.java | 3 +-- .../{paymentgateway => payment}/PaymentGatewayImpl.java | 3 +-- .../{paymentgateway => payment}/PaymentGatewayMetrics.java | 3 +-- .../PaymentGatewaySchedulerClient.java | 3 +-- .../{paymentgateway => payment}/ThreadDelayProvider.java | 3 +-- .../interfaces/api/purchasing/PurchasingV1Controller.java | 2 +- .../purchasing/PurchasingFacadeCircuitBreakerTest.java | 4 ++-- .../purchasing/PurchasingFacadePaymentCallbackTest.java | 6 +++--- .../purchasing/PurchasingFacadePaymentGatewayTest.java | 4 ++-- .../application/purchasing/PurchasingFacadeTest.java | 4 ++-- .../PaymentGatewayClientTest.java | 3 +-- .../com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java | 6 +++--- 15 files changed, 22 insertions(+), 30 deletions(-) rename apps/commerce-api/src/main/java/com/loopers/infrastructure/{paymentgateway => payment}/DelayProvider.java (89%) rename apps/commerce-api/src/main/java/com/loopers/infrastructure/{paymentgateway => payment}/PaymentGatewayClient.java (98%) rename apps/commerce-api/src/main/java/com/loopers/infrastructure/{paymentgateway => payment}/PaymentGatewayDto.java (98%) rename apps/commerce-api/src/main/java/com/loopers/infrastructure/{paymentgateway => payment}/PaymentGatewayImpl.java (99%) rename apps/commerce-api/src/main/java/com/loopers/infrastructure/{paymentgateway => payment}/PaymentGatewayMetrics.java (97%) rename apps/commerce-api/src/main/java/com/loopers/infrastructure/{paymentgateway => payment}/PaymentGatewaySchedulerClient.java (97%) rename apps/commerce-api/src/main/java/com/loopers/infrastructure/{paymentgateway => payment}/ThreadDelayProvider.java (88%) rename apps/commerce-api/src/test/java/com/loopers/infrastructure/{paymentgateway => payment}/PaymentGatewayClientTest.java (99%) diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java index 19020de50..eb7ceb035 100644 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java @@ -10,7 +10,7 @@ import com.loopers.domain.user.User; import com.loopers.domain.user.UserService; import com.loopers.domain.coupon.CouponService; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.infrastructure.payment.PaymentGatewayDto; import com.loopers.domain.payment.PaymentRequestResult; import com.loopers.domain.payment.PaymentService; import com.loopers.domain.payment.Payment; diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/DelayProvider.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/DelayProvider.java similarity index 89% rename from apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/DelayProvider.java rename to apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/DelayProvider.java index 11cc69f71..22fabd259 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/DelayProvider.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/DelayProvider.java @@ -1,4 +1,4 @@ -package com.loopers.infrastructure.paymentgateway; +package com.loopers.infrastructure.payment; import java.time.Duration; @@ -21,4 +21,3 @@ public interface DelayProvider { */ void delay(Duration duration) throws InterruptedException; } - diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClient.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayClient.java similarity index 98% rename from apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClient.java rename to apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayClient.java index 9357ec6d3..cf6e1b2d6 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClient.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayClient.java @@ -1,4 +1,4 @@ -package com.loopers.infrastructure.paymentgateway; +package com.loopers.infrastructure.payment; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -82,4 +82,3 @@ PaymentGatewayDto.ApiResponse getTransactionsBy @RequestParam("orderId") String orderId ); } - diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayDto.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayDto.java similarity index 98% rename from apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayDto.java rename to apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayDto.java index 812fbed96..4ca22424f 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayDto.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayDto.java @@ -1,4 +1,4 @@ -package com.loopers.infrastructure.paymentgateway; +package com.loopers.infrastructure.payment; import com.fasterxml.jackson.annotation.JsonProperty; @@ -103,4 +103,3 @@ public enum Result { } } } - diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayImpl.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayImpl.java similarity index 99% rename from apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayImpl.java rename to apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayImpl.java index ac5e0bdbc..6ef5d43fb 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayImpl.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayImpl.java @@ -1,4 +1,4 @@ -package com.loopers.infrastructure.paymentgateway; +package com.loopers.infrastructure.payment; import com.loopers.domain.payment.PaymentGateway; import com.loopers.application.purchasing.PaymentRequestCommand; @@ -147,4 +147,3 @@ private PaymentStatus convertToPaymentStatus(PaymentGatewayDto.TransactionStatus } } - diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayMetrics.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayMetrics.java similarity index 97% rename from apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayMetrics.java rename to apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayMetrics.java index 57c97df10..72bc0b96b 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayMetrics.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayMetrics.java @@ -1,4 +1,4 @@ -package com.loopers.infrastructure.paymentgateway; +package com.loopers.infrastructure.payment; import io.micrometer.core.instrument.MeterRegistry; import lombok.RequiredArgsConstructor; @@ -83,4 +83,3 @@ public void recordSuccess(String clientName) { ).increment(); } } - diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewaySchedulerClient.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewaySchedulerClient.java similarity index 97% rename from apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewaySchedulerClient.java rename to apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewaySchedulerClient.java index 44d693912..01451ab62 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/PaymentGatewaySchedulerClient.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewaySchedulerClient.java @@ -1,4 +1,4 @@ -package com.loopers.infrastructure.paymentgateway; +package com.loopers.infrastructure.payment; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -67,4 +67,3 @@ PaymentGatewayDto.ApiResponse getTransactionsBy @RequestParam("orderId") String orderId ); } - diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/ThreadDelayProvider.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/ThreadDelayProvider.java similarity index 88% rename from apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/ThreadDelayProvider.java rename to apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/ThreadDelayProvider.java index 803a6f304..d31ef49d9 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/paymentgateway/ThreadDelayProvider.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/ThreadDelayProvider.java @@ -1,4 +1,4 @@ -package com.loopers.infrastructure.paymentgateway; +package com.loopers.infrastructure.payment; import org.springframework.stereotype.Component; @@ -18,4 +18,3 @@ public void delay(Duration duration) throws InterruptedException { Thread.sleep(duration.toMillis()); } } - diff --git a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java index e6fd5ee27..937a9cf20 100644 --- a/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java +++ b/apps/commerce-api/src/main/java/com/loopers/interfaces/api/purchasing/PurchasingV1Controller.java @@ -2,7 +2,7 @@ import com.loopers.application.purchasing.OrderInfo; import com.loopers.application.purchasing.PurchasingFacade; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.infrastructure.payment.PaymentGatewayDto; import com.loopers.interfaces.api.ApiResponse; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java index f13e550e0..c8de02c57 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeCircuitBreakerTest.java @@ -12,8 +12,8 @@ import com.loopers.domain.user.Point; import com.loopers.domain.user.User; import com.loopers.domain.user.UserRepository; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayClient; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.infrastructure.payment.PaymentGatewayClient; +import com.loopers.infrastructure.payment.PaymentGatewayDto; import com.loopers.utils.DatabaseCleanUp; import io.github.resilience4j.circuitbreaker.CircuitBreaker; import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java index 331a41ed2..b2c9cc516 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentCallbackTest.java @@ -11,9 +11,9 @@ import com.loopers.domain.user.Point; import com.loopers.domain.user.User; import com.loopers.domain.user.UserRepository; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayClient; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; -import com.loopers.infrastructure.paymentgateway.PaymentGatewaySchedulerClient; +import com.loopers.infrastructure.payment.PaymentGatewayClient; +import com.loopers.infrastructure.payment.PaymentGatewayDto; +import com.loopers.infrastructure.payment.PaymentGatewaySchedulerClient; import com.loopers.utils.DatabaseCleanUp; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java index f66ef1e2c..366a0b91a 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadePaymentGatewayTest.java @@ -11,8 +11,8 @@ import com.loopers.domain.user.Point; import com.loopers.domain.user.User; import com.loopers.domain.user.UserRepository; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayClient; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.infrastructure.payment.PaymentGatewayClient; +import com.loopers.infrastructure.payment.PaymentGatewayDto; import com.loopers.utils.DatabaseCleanUp; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; diff --git a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java index cb66c913c..4fa80edfa 100644 --- a/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/application/purchasing/PurchasingFacadeTest.java @@ -15,8 +15,8 @@ import com.loopers.domain.user.Point; import com.loopers.domain.user.User; import com.loopers.domain.user.UserRepository; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayClient; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; +import com.loopers.infrastructure.payment.PaymentGatewayClient; +import com.loopers.infrastructure.payment.PaymentGatewayDto; import com.loopers.support.error.CoreException; import com.loopers.support.error.ErrorType; import com.loopers.utils.DatabaseCleanUp; diff --git a/apps/commerce-api/src/test/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClientTest.java b/apps/commerce-api/src/test/java/com/loopers/infrastructure/payment/PaymentGatewayClientTest.java similarity index 99% rename from apps/commerce-api/src/test/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClientTest.java rename to apps/commerce-api/src/test/java/com/loopers/infrastructure/payment/PaymentGatewayClientTest.java index 89b3eef61..dbfac8411 100644 --- a/apps/commerce-api/src/test/java/com/loopers/infrastructure/paymentgateway/PaymentGatewayClientTest.java +++ b/apps/commerce-api/src/test/java/com/loopers/infrastructure/payment/PaymentGatewayClientTest.java @@ -1,4 +1,4 @@ -package com.loopers.infrastructure.paymentgateway; +package com.loopers.infrastructure.payment; import com.loopers.utils.DatabaseCleanUp; import org.junit.jupiter.api.AfterEach; @@ -274,4 +274,3 @@ void getTransaction_success_returnsResponse() { assertThat(response.data().transactionKey()).isEqualTo(transactionKey); } } - diff --git a/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java b/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java index 1b025fccc..a09516c93 100644 --- a/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java +++ b/apps/commerce-api/src/test/java/com/loopers/interfaces/api/PurchasingV1ApiE2ETest.java @@ -9,9 +9,9 @@ import com.loopers.domain.product.ProductRepository; import com.loopers.domain.user.Gender; import com.loopers.domain.user.UserTestFixture; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayClient; -import com.loopers.infrastructure.paymentgateway.PaymentGatewayDto; -import com.loopers.infrastructure.paymentgateway.PaymentGatewaySchedulerClient; +import com.loopers.infrastructure.payment.PaymentGatewayClient; +import com.loopers.infrastructure.payment.PaymentGatewayDto; +import com.loopers.infrastructure.payment.PaymentGatewaySchedulerClient; import com.loopers.interfaces.api.ApiResponse; import com.loopers.interfaces.api.purchasing.PurchasingV1Dto; import com.loopers.utils.DatabaseCleanUp; From 73678c867acc06b8190724e70746c12a65abca6d Mon Sep 17 00:00:00 2001 From: minor7295 Date: Tue, 9 Dec 2025 01:05:52 +0900 Subject: [PATCH 22/22] =?UTF-8?q?chore:=20=EC=A4=91=EB=B3=B5=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EB=A1=9C=EA=B7=B8=20=EC=A0=95=EB=A6=AC,=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=98=EA=B2=8C=20=EB=86=92?= =?UTF-8?q?=EC=9D=80=20level=EC=9D=B8=20=EB=A1=9C=EA=B7=B8=EB=8A=94=20debu?= =?UTF-8?q?g=20=EB=A1=9C=EA=B7=B8=EB=A1=9C=20=EC=A0=84=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasing/PurchasingFacade.java | 26 ++++++++----------- .../config/Resilience4jRetryConfig.java | 6 ++--- .../domain/payment/PaymentService.java | 4 +-- .../payment/PaymentGatewayImpl.java | 1 - 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java index eb7ceb035..650870153 100644 --- a/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java +++ b/apps/commerce-api/src/main/java/com/loopers/application/purchasing/PurchasingFacade.java @@ -220,7 +220,7 @@ public OrderInfo createOrder(String userId, List commands, Lon paymentService.toSuccess(payment.getId(), java.time.LocalDateTime.now()); productService.saveAll(products); userService.save(user); - log.info("포인트+쿠폰으로 전액 결제 완료. (orderId: {})", savedOrder.getId()); + log.debug("포인트+쿠폰으로 전액 결제 완료. (orderId: {})", savedOrder.getId()); return OrderInfo.from(savedOrder); } @@ -248,11 +248,10 @@ public void afterCommit() { if (transactionKey != null) { // 결제 성공: 별도 트랜잭션에서 주문 상태를 COMPLETED로 변경 updateOrderStatusToCompleted(orderId, transactionKey); - log.info("PG 결제 요청 완료. (orderId: {}, transactionKey: {})", orderId, transactionKey); } else { // PG 요청 실패: 외부 시스템 장애로 간주 // 주문은 PENDING 상태로 유지되어 나중에 상태 확인 API나 콜백으로 복구 가능 - log.info("PG 결제 요청 실패. 주문은 PENDING 상태로 유지됩니다. (orderId: {})", orderId); + log.debug("PG 결제 요청 실패. 주문은 PENDING 상태로 유지됩니다. (orderId: {})", orderId); } } catch (Exception e) { // PG 요청 중 예외 발생 시에도 주문은 이미 저장되어 있으므로 유지 @@ -483,12 +482,12 @@ public boolean updateOrderStatusByPaymentResult( // 이미 완료되거나 취소된 주문인 경우 처리하지 않음 (정상적인 경우이므로 true 반환) if (order.getStatus() == OrderStatus.COMPLETED) { - log.info("이미 완료된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); + log.debug("이미 완료된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); return true; } if (order.getStatus() == OrderStatus.CANCELED) { - log.info("이미 취소된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); + log.debug("이미 취소된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); return true; } @@ -512,7 +511,7 @@ public boolean updateOrderStatusByPaymentResult( return true; } else { // PENDING 상태: 아직 처리 중 (정상적인 경우이므로 true 반환) - log.info("결제 상태 확인 결과, 아직 처리 중입니다. 주문은 PENDING 상태로 유지됩니다. (orderId: {}, transactionKey: {})", + log.debug("결제 상태 확인 결과, 아직 처리 중입니다. 주문은 PENDING 상태로 유지됩니다. (orderId: {}, transactionKey: {})", orderId, transactionKey); return true; } @@ -537,7 +536,7 @@ public void updateOrderStatusToCompleted(Long orderId, String transactionKey) { Order order = orderService.getById(orderId); if (order.getStatus() == OrderStatus.COMPLETED) { - log.info("이미 완료된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); + log.debug("이미 완료된 주문입니다. 상태 업데이트를 건너뜁니다. (orderId: {})", orderId); return; } @@ -579,8 +578,6 @@ private String requestPaymentToGateway(String userId, Long userEntityId, Long or // 결과 처리 if (result instanceof PaymentRequestResult.Success success) { - log.info("PG 결제 요청 성공. (orderId: {}, transactionKey: {})", - orderId, success.transactionKey()); return success.transactionKey(); } else if (result instanceof PaymentRequestResult.Failure failure) { // PaymentService 내부에서 이미 실패 분류가 완료되었으므로, 여기서는 처리만 수행 @@ -589,13 +586,13 @@ private String requestPaymentToGateway(String userId, Long userEntityId, Long or // Circuit Breaker OPEN은 외부 시스템 장애이므로 주문을 취소하지 않음 if ("CIRCUIT_BREAKER_OPEN".equals(failure.errorCode())) { // 외부 시스템 장애: 주문은 PENDING 상태로 유지 - log.info("Circuit Breaker OPEN 상태. 주문은 PENDING 상태로 유지됩니다. (orderId: {})", orderId); + log.warn("Circuit Breaker OPEN 상태. 주문은 PENDING 상태로 유지됩니다. (orderId: {})", orderId); return null; } if (failure.isTimeout()) { // 타임아웃: 상태 확인 후 복구 - log.info("타임아웃 발생. PG 결제 상태 확인 API를 호출하여 실제 결제 상태를 확인합니다. (orderId: {})", orderId); + log.debug("타임아웃 발생. PG 결제 상태 확인 API를 호출하여 실제 결제 상태를 확인합니다. (orderId: {})", orderId); paymentService.recoverAfterTimeout(userId, orderId); } else if (!failure.isRetryable()) { // 비즈니스 실패: 주문 취소 (별도 트랜잭션으로 처리) @@ -613,7 +610,6 @@ private String requestPaymentToGateway(String userId, Long userEntityId, Long or } catch (Exception e) { // 기타 예외 처리 log.error("PG 결제 요청 중 예상치 못한 오류 발생. (orderId: {})", orderId, e); - log.info("예상치 못한 오류 발생. 주문은 PENDING 상태로 유지됩니다. (orderId: {})", orderId); return null; } } @@ -660,13 +656,13 @@ public void handlePaymentCallback(Long orderId, PaymentGatewayDto.CallbackReques // 이미 완료되거나 취소된 주문인 경우 처리하지 않음 if (order.getStatus() == OrderStatus.COMPLETED) { - log.info("이미 완료된 주문입니다. 콜백 처리를 건너뜁니다. (orderId: {}, transactionKey: {})", + log.debug("이미 완료된 주문입니다. 콜백 처리를 건너뜁니다. (orderId: {}, transactionKey: {})", orderId, callbackRequest.transactionKey()); return; } if (order.getStatus() == OrderStatus.CANCELED) { - log.info("이미 취소된 주문입니다. 콜백 처리를 건너뜁니다. (orderId: {}, transactionKey: {})", + log.debug("이미 취소된 주문입니다. 콜백 처리를 건너뜁니다. (orderId: {}, transactionKey: {})", orderId, callbackRequest.transactionKey()); return; } @@ -875,7 +871,7 @@ private void handlePaymentFailure(String userId, Long orderId, String errorCode, // 이미 취소된 주문인 경우 처리하지 않음 if (order.getStatus() == OrderStatus.CANCELED) { - log.info("이미 취소된 주문입니다. 결제 실패 처리를 건너뜁니다. (orderId: {})", orderId); + log.debug("이미 취소된 주문입니다. 결제 실패 처리를 건너뜁니다. (orderId: {})", orderId); return; } diff --git a/apps/commerce-api/src/main/java/com/loopers/config/Resilience4jRetryConfig.java b/apps/commerce-api/src/main/java/com/loopers/config/Resilience4jRetryConfig.java index 90923e2f3..ee554579f 100644 --- a/apps/commerce-api/src/main/java/com/loopers/config/Resilience4jRetryConfig.java +++ b/apps/commerce-api/src/main/java/com/loopers/config/Resilience4jRetryConfig.java @@ -119,9 +119,9 @@ public RetryRegistry retryRegistry() { // Exponential Backoff 적용하여 일시적 오류 자동 복구 retryRegistry.addConfiguration("paymentGatewaySchedulerClient", retryConfig); - log.info("Resilience4j Retry 설정 완료:"); - log.info(" - 결제 요청 API (paymentGatewayClient): Retry 없음 (유저 요청 경로 - 빠른 실패)"); - log.info(" - 조회 API (paymentGatewaySchedulerClient): Exponential Backoff 적용 (스케줄러 - 비동기/배치 기반 Retry)"); + log.debug("Resilience4j Retry 설정 완료:"); + log.debug(" - 결제 요청 API (paymentGatewayClient): Retry 없음 (유저 요청 경로 - 빠른 실패)"); + log.debug(" - 조회 API (paymentGatewaySchedulerClient): Exponential Backoff 적용 (스케줄러 - 비동기/배치 기반 Retry)"); return retryRegistry; } diff --git a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java index 9a7ac16c6..b7308675c 100644 --- a/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java +++ b/apps/commerce-api/src/main/java/com/loopers/domain/payment/PaymentService.java @@ -303,7 +303,7 @@ public void handleCallback(Long orderId, String transactionKey, PaymentStatus st orderId, transactionKey, reason); } else { // PENDING 상태: 상태 유지 - log.info("결제 콜백 처리: PENDING 상태 유지. (orderId: {}, transactionKey: {})", orderId, transactionKey); + log.debug("결제 콜백 처리: PENDING 상태 유지. (orderId: {}, transactionKey: {})", orderId, transactionKey); } } @@ -343,7 +343,7 @@ public void recoverAfterTimeout(String userId, Long orderId, Duration delayDurat log.warn("타임아웃 후 상태 확인 완료: FAILED. (orderId: {})", orderId); } else { // PENDING 상태: 상태 유지 - log.info("타임아웃 후 상태 확인: PENDING 상태 유지. (orderId: {})", orderId); + log.debug("타임아웃 후 상태 확인: PENDING 상태 유지. (orderId: {})", orderId); } } catch (InterruptedException e) { Thread.currentThread().interrupt(); diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayImpl.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayImpl.java index 6ef5d43fb..5d4b994fa 100644 --- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayImpl.java +++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/payment/PaymentGatewayImpl.java @@ -124,7 +124,6 @@ private PaymentRequestResult toDomainResult( && response.meta().result() == PaymentGatewayDto.ApiResponse.Metadata.Result.SUCCESS && response.data() != null) { String transactionKey = response.data().transactionKey(); - log.info("PG 결제 요청 성공. (orderId: {}, transactionKey: {})", orderId, transactionKey); metrics.recordSuccess("paymentGatewayClient"); return new PaymentRequestResult.Success(transactionKey); } else {