diff --git a/on-premise/core-payment-service/build.gradle b/on-premise/core-payment-service/build.gradle index 08b3c0d..3d020a4 100644 --- a/on-premise/core-payment-service/build.gradle +++ b/on-premise/core-payment-service/build.gradle @@ -26,7 +26,6 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' @@ -40,6 +39,13 @@ dependencies { // kafka implementation 'org.springframework.kafka:spring-kafka' + + // validation + implementation 'org.springframework.boot:spring-boot-starter-validation' + + // zipkin + implementation 'io.micrometer:micrometer-tracing-bridge-brave' + implementation 'io.zipkin.reporter2:zipkin-reporter-brave' } tasks.named('test') { diff --git a/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/dto/CashRequestDTO.java b/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/dto/CashRequestDTO.java index 5d56249..30a265d 100644 --- a/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/dto/CashRequestDTO.java +++ b/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/dto/CashRequestDTO.java @@ -10,6 +10,7 @@ @AllArgsConstructor @ToString public class CashRequestDTO { + private String orderId; private String loginId; // 사용자 식별자 private Long amount; // 출금액 } \ No newline at end of file diff --git a/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/dto/CashResponseDTO.java b/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/dto/CashResponseDTO.java index a0645c3..deaa8e5 100644 --- a/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/dto/CashResponseDTO.java +++ b/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/dto/CashResponseDTO.java @@ -10,6 +10,7 @@ @AllArgsConstructor @ToString public class CashResponseDTO { + private String orderId; // 주문 식별자 private String loginId; // 사용자 식별자 private String status; // "SUCCESS" or "FAIL" private String message; diff --git a/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/service/KafkaConsumerService.java b/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/service/KafkaConsumerService.java index 8de929a..7fe4b35 100644 --- a/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/service/KafkaConsumerService.java +++ b/on-premise/core-payment-service/src/main/java/com/fisa/core_payment_service/service/KafkaConsumerService.java @@ -71,6 +71,7 @@ public void consumeWithdraw(String message) { // (4) 성공 이벤트 발행 -> PointService의 토픽 이름인 "core-result"로 변경 CashResponseDTO successResponse = new CashResponseDTO( + requestDto.getOrderId(), requestDto.getLoginId(), "SUCCESS", "정상 출금 완료" @@ -88,6 +89,7 @@ public void consumeWithdraw(String message) { if (requestDto != null) { // (5) 실패 이벤트 발행 CashResponseDTO failResponse = new CashResponseDTO( + requestDto.getOrderId(), requestDto.getLoginId(), "FAIL", e.getMessage()