Merge pull request #10 from EarlyExpress/7-feature-결제-관련-서비스-구현

refactor(message): event 일관성 리팩토링

Author: junhyeong9812

src/main/java/com/early_express/payment_service/domain/payment/application/service/PaymentService.java

@@ -5,7 +5,7 @@
 import com.early_express.payment_service.domain.payment.domain.model.Payment;
 import com.early_express.payment_service.domain.payment.domain.model.vo.*;
 import com.early_express.payment_service.domain.payment.domain.repository.PaymentRepository;
-import com.early_express.payment_service.domain.payment.domain.client.TossPaymentsClient;
+import com.early_express.payment_service.domain.payment.infrastructure.client.toss.TossPaymentsClient;
 import com.early_express.payment_service.domain.payment.infrastructure.client.toss.dto.TossCancelRequest;
 import com.early_express.payment_service.domain.payment.infrastructure.client.toss.dto.TossCancelResponse;
 import com.early_express.payment_service.domain.payment.infrastructure.client.toss.dto.TossPaymentVerifyResponse;

…nt/domain/client/TossPaymentsClient.java …ture/client/toss/TossPaymentsClient.javasrc/main/java/com/early_express/payment_service/domain/payment/domain/client/TossPaymentsClient.java renamed to src/main/java/com/early_express/payment_service/domain/payment/infrastructure/client/toss/TossPaymentsClient.java src/main/java/com/early_express/payment_service/domain/payment/domain/client/TossPaymentsClient.java renamed to src/main/java/com/early_express/payment_service/domain/payment/infrastructure/client/toss/TossPaymentsClient.java

@@ -1,6 +1,5 @@
-package com.early_express.payment_service.domain.payment.domain.client;
+package com.early_express.payment_service.domain.payment.infrastructure.client.toss;
 
-import com.early_express.payment_service.domain.payment.infrastructure.client.toss.TossPaymentsClientConfig;
 import com.early_express.payment_service.domain.payment.infrastructure.client.toss.dto.TossCancelRequest;
 import com.early_express.payment_service.domain.payment.infrastructure.client.toss.dto.TossCancelResponse;
 import com.early_express.payment_service.domain.payment.infrastructure.client.toss.dto.TossPaymentVerifyResponse;

src/main/java/com/early_express/payment_service/domain/payment/infrastructure/messaging/consumer/RefundRequestedEventConsumer.java

@@ -0,0 +1,66 @@
+package com.early_express.payment_service.domain.payment.infrastructure.messaging.order.consumer;
+
+import com.early_express.payment_service.domain.payment.application.service.PaymentService;
+import com.early_express.payment_service.domain.payment.infrastructure.messaging.order.event.RefundRequestedEvent;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.support.Acknowledgment;
+import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.stereotype.Component;
+
+/**
+ * 환불 요청 이벤트 Consumer
+ * Order Service에서 발행한 환불 요청을 수신하여 처리
+ * Topic: refund-requested (토픽 분리 패턴)
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class RefundRequestedEventConsumer {
+
+    private final PaymentService paymentService;
+
+    /**
+     * 환불 요청 이벤트 수신
+     * Topic: refund-requested
+     */
+    @KafkaListener(
+            topics = "${spring.kafka.topic.refund-requested:refund-requested}",
+            groupId = "${spring.kafka.consumer.group-id:payment-service-group}",
+            containerFactory = "kafkaListenerContainerFactory"
+    )
+    public void handleRefundRequested(
+            @Payload RefundRequestedEvent event,
+            @Header(KafkaHeaders.RECEIVED_PARTITION) int partition,
+            @Header(KafkaHeaders.OFFSET) long offset,
+            Acknowledgment acknowledgment) {
+
+        log.info("환불 요청 이벤트 수신 - paymentId: {}, orderId: {}, partition: {}, offset: {}",
+                event.getPaymentId(), event.getOrderId(), partition, offset);
+
+        try {
+            // PaymentService의 cancelPayment 메서드 호출
+            paymentService.cancelPayment(
+                    event.getPaymentId(),
+                    event.getOrderId(),
+                    event.getRefundReason()
+            );
+
+            // 수동 커밋
+            acknowledgment.acknowledge();
+
+            log.info("환불 요청 처리 완료 - paymentId: {}, orderId: {}",
+                    event.getPaymentId(), event.getOrderId());
+
+        } catch (Exception e) {
+            log.error("환불 요청 처리 실패 - paymentId: {}, orderId: {}, error: {}",
+                    event.getPaymentId(), event.getOrderId(), e.getMessage(), e);
+
+            // 재시도를 위해 ACK 하지 않음
+            throw e;
+        }
+    }
+}

src/main/java/com/early_express/payment_service/domain/payment/infrastructure/messaging/event/RefundRequestedEvent.java

@@ -0,0 +1,27 @@
+package com.early_express.payment_service.domain.payment.infrastructure.messaging.order.event;
+
+import com.early_express.payment_service.global.infrastructure.event.base.BaseEvent;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.time.LocalDateTime;
+
+/**
+ * 환불 요청 이벤트 (Order Service → Payment Service)
+ * 수신 전용 이벤트
+ * Topic: refund-requested
+ */
+@Getter
+@SuperBuilder
+@NoArgsConstructor
+public class RefundRequestedEvent extends BaseEvent {
+
+    private String paymentId;
+    private String orderId;
+    private String refundReason;
+
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private LocalDateTime requestedAt;
+}

src/main/java/com/early_express/payment_service/domain/payment/infrastructure/messaging/order/consumer/RefundRequestedEventConsumer.java

@@ -1,20 +1,21 @@
-package com.early_express.payment_service.domain.payment.infrastructure.messaging.event;
+package com.early_express.payment_service.domain.payment.infrastructure.messaging.payment.event;
 
 import com.early_express.payment_service.domain.payment.domain.messaging.PaymentRefundFailedEventData;
 import com.early_express.payment_service.global.infrastructure.event.base.BaseEvent;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
  * 결제 환불 실패 이벤트 (Kafka 전송용)
- * Topic: payment-events
+ * Topic: payment-refund-failed
  */
 @Getter
+@SuperBuilder
 @NoArgsConstructor
 public class PaymentRefundFailedEvent extends BaseEvent {
 
@@ -26,33 +27,19 @@ public class PaymentRefundFailedEvent extends BaseEvent {
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private LocalDateTime failedAt;
 
-    @Builder
-    private PaymentRefundFailedEvent(
-            String paymentId,
-            String orderId,
-            BigDecimal requestedRefundAmount,
-            String errorMessage,
-            LocalDateTime failedAt) {
-
-        super.initBaseEvent("PaymentRefundFailedEvent", "payment-service");
-
-        this.paymentId = paymentId;
-        this.orderId = orderId;
-        this.requestedRefundAmount = requestedRefundAmount;
-        this.errorMessage = errorMessage;
-        this.failedAt = failedAt;
-    }
-
     /**
      * 도메인 이벤트 데이터로부터 Kafka 이벤트 생성
      */
     public static PaymentRefundFailedEvent from(PaymentRefundFailedEventData data) {
-        return PaymentRefundFailedEvent.builder()
+        PaymentRefundFailedEvent event = PaymentRefundFailedEvent.builder()
                 .paymentId(data.getPaymentId())
                 .orderId(data.getOrderId())
                 .requestedRefundAmount(data.getRequestedRefundAmount())
                 .errorMessage(data.getErrorMessage())
                 .failedAt(data.getFailedAt())
                 .build();
+
+        event.initBaseEvent("PAYMENT_REFUND_FAILED", "payment-service");
+        return event;
     }
-}
+}

src/main/java/com/early_express/payment_service/domain/payment/infrastructure/messaging/order/event/RefundRequestedEvent.java

@@ -1,20 +1,21 @@
-package com.early_express.payment_service.domain.payment.infrastructure.messaging.event;
+package com.early_express.payment_service.domain.payment.infrastructure.messaging.payment.event;
 
 import com.early_express.payment_service.domain.payment.domain.messaging.PaymentRefundedEventData;
 import com.early_express.payment_service.global.infrastructure.event.base.BaseEvent;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
  * 결제 환불 완료 이벤트 (Kafka 전송용)
- * Topic: payment-events
+ * Topic: payment-refunded
  */
 @Getter
+@SuperBuilder
 @NoArgsConstructor
 public class PaymentRefundedEvent extends BaseEvent {
 
@@ -29,34 +30,11 @@ public class PaymentRefundedEvent extends BaseEvent {
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private LocalDateTime refundedAt;
 
-    @Builder
-    private PaymentRefundedEvent(
-            String paymentId,
-            String orderId,
-            BigDecimal refundAmount,
-            BigDecimal totalRefundedAmount,
-            String refundReason,
-            String pgRefundId,
-            boolean fullRefund,
-            LocalDateTime refundedAt) {
-
-        super.initBaseEvent("PaymentRefundedEvent", "payment-service");
-
-        this.paymentId = paymentId;
-        this.orderId = orderId;
-        this.refundAmount = refundAmount;
-        this.totalRefundedAmount = totalRefundedAmount;
-        this.refundReason = refundReason;
-        this.pgRefundId = pgRefundId;
-        this.fullRefund = fullRefund;
-        this.refundedAt = refundedAt;
-    }
-
     /**
      * 도메인 이벤트 데이터로부터 Kafka 이벤트 생성
      */
     public static PaymentRefundedEvent from(PaymentRefundedEventData data) {
-        return PaymentRefundedEvent.builder()
+        PaymentRefundedEvent event = PaymentRefundedEvent.builder()
                 .paymentId(data.getPaymentId())
                 .orderId(data.getOrderId())
                 .refundAmount(data.getRefundAmount())
@@ -66,5 +44,8 @@ public static PaymentRefundedEvent from(PaymentRefundedEventData data) {
                 .fullRefund(data.isFullRefund())
                 .refundedAt(data.getRefundedAt())
                 .build();
+
+        event.initBaseEvent("PAYMENT_REFUNDED", "payment-service");
+        return event;
     }
-}
+}