[250608] 배송기능 - enum 상태값별 이벤트 처리, 프로토콜버퍼 적용, 업데이트 로직 추가개발

Author: jamiewell

src/main/java/com/ecommerce/delivery/dto/request/DeliveryRequest.java

@@ -1,10 +1,71 @@
 package com.ecommerce.shipment.domain;
 
+
+import com.ecommerce.shipment.event.producer.ShipmentEventPublisher;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.function.BiConsumer;
+
+@Slf4j
 public enum ExternalShippingStatus {
-    READY,
-    READY_FOR_PICKUP,
-    SHIPPING,
-    DELIVERED,
-    FAILED,
-    CANCELLED;
+
+
+    READY((shipment, publisher) -> publisher.publishShipStatusChanged(shipment)),
+
+    READY_FOR_PICKUP((shipment, publisher) -> publisher.publishShipStatusChanged(shipment)),
+
+    SHIPPING((shipment, publisher) -> publisher.publishShipStatusChanged(shipment)),
+
+    DELIVERED((shipment, publisher) -> publisher.publishShipCompleted(shipment)),
+
+    FAILED((shipment, publisher) -> publisher.publishShipFailed(shipment)),
+
+    CANCELLED((shipment, publisher) -> publisher.publishShipCompleted(shipment));
+
+    // 함수형 인터페이스 - 각 배송 상태별 처리 로직
+    private final BiConsumer<Shipment, ShipmentEventPublisher> processor;
+
+    ExternalShippingStatus(BiConsumer<Shipment, ShipmentEventPublisher> processor) {
+        this.processor = processor;
+    }
+
+    // 상태별 비즈니스 로직 실행
+    public void process(Shipment shipment, ShipmentEventPublisher publisher) {
+        this.processor.accept(shipment, publisher);
+    }
+
+
+    // 카프카 발행용 String 변환 - DELIVERED, FAILED 등 문자열 그대로 사용
+    public String toKafkaString() {
+        return this.name();
+    }
+
+    // 카프카에서 받은 String을 Enum으로 변환
+    public static ExternalShippingStatus fromKafkaString(String status) {
+        try {
+            return ExternalShippingStatus.valueOf(status.trim().toUpperCase());
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("Unknown shipping status: " + status, e);
+        }
+    }
+
+    /**
+     * 상태 전환 가능 여부 (비즈니스 규칙)
+     */
+    public boolean canTransitionTo(ExternalShippingStatus newStatus) {
+        return switch (this) {
+            case READY -> newStatus == READY_FOR_PICKUP || newStatus == CANCELLED;
+            case READY_FOR_PICKUP -> newStatus == SHIPPING || newStatus == CANCELLED;
+            case SHIPPING -> newStatus == DELIVERED || newStatus == FAILED;
+            case DELIVERED, FAILED, CANCELLED -> false; // 최종 상태
+        };
+    }
+
+    /**
+     * 최종 상태 여부
+     */
+    public boolean isFinalStatus() {
+        return this == DELIVERED || this == FAILED || this == CANCELLED;
+    }
+
 }

src/main/java/com/ecommerce/delivery/dto/response/DeliveryResponse.java

@@ -1,5 +1,6 @@
 package com.ecommerce.shipment.domain;
 
+import com.ecommerce.shipment.event.producer.ShipmentEventPublisher;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -57,54 +58,32 @@ protected void onUpdate() {
         updtDt = LocalDateTime.now();
     }
 
-    // 택배사 정보 업데이트
+    // 택배사 정보 업데이트 - JPA Dirty Checking 활용
     public void updateCarrierDetailInfo(String carrierName, String trackingNumber) {
-        Shipment.builder()
-                .id(id)
-                .orderUUID(orderUUID)
-                .shipUUID(shipUUID)
-                .carrierName(carrierName)
-                .trackingNumber(trackingNumber)
-                .status(status)
-                .estmtDeliverDt(estmtDeliverDt)
-                .creaDt(creaDt)
-                .build();
+        this.carrierName = carrierName;
+        this.trackingNumber = trackingNumber;
+        // @PreUpdate에 의해 updtDt 자동 갱신
     }
 
-    // 상태 업데이트 메서드 (불변성 유지)
-    public Shipment updateShippingStatus(ExternalShippingStatus newStatus) {
-        return Shipment.builder()
-                .id(id)
-                .orderUUID(orderUUID)
-                .shipUUID(shipUUID)
-                .carrierName(carrierName)
-                .trackingNumber(trackingNumber)
-                .status(newStatus)
-                .estmtDeliverDt(estmtDeliverDt)
-                .creaDt(creaDt)
-                .build();
+    // 상태 업데이트 메서드 - JPA Dirty Checking 활용
+    public void updateShippingStatus(ExternalShippingStatus newStatus) {
+        // 1. 비즈니스 규칙 검증
+        if (!status.canTransitionTo(newStatus)) {
+            throw new IllegalStateException(String.format("Cannot transition from %s to %s", status, newStatus));
+        }
+
+        // 2. 상태 변경 (Dirty Checking 으로 자동 UPDATE)
+        this.status = newStatus;
+        // 3. @PreUpdate에 의해 updtDt 자동 갱신
     }
 
     public boolean hasStatusDelivered() {
         return status.equals(ExternalShippingStatus.DELIVERED);
     }
 
-    public boolean hasStatusFailed() {
-        return status.equals(ExternalShippingStatus.FAILED);
-    }
-
-
-    public boolean hasDeliveryDetailInfo() {
-        return hasCarrierName() && hasTrackingNumber();
-    }
-
-    public boolean hasCarrierName() {
-        return carrierName != null;
-    }
-
-
-    public boolean hasTrackingNumber() {
-        return trackingNumber != null;
+    // 비즈니스 로직 처리 (함수형 enum 활용)
+    public void processStatusChange(ShipmentEventPublisher publisher) {
+        status.process(this, publisher);
     }
 
 }

src/main/java/com/ecommerce/delivery/repository/DeliveryRepository.java

@@ -0,0 +1,23 @@
+package com.ecommerce.shipment.dto.request;
+
+import com.ecommerce.shipment.domain.ExternalShippingStatus;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class CarrierUpdateRequest {
+
+    private final String carrierName;
+    private final String trackingNumber;
+    private final ExternalShippingStatus newStatus;
+
+    public static CarrierUpdateRequest of(String carrierName, String trackingNumber, ExternalShippingStatus status) {
+        return CarrierUpdateRequest.builder()
+                .carrierName(carrierName)
+                .trackingNumber(trackingNumber)
+                .newStatus(status)
+                .build();
+    }
+
+}

src/main/java/com/ecommerce/shipment/domain/ExternalShippingStatus.java

@@ -1,6 +1,7 @@
 package com.ecommerce.shipment.event.consumer;
 
-import com.ecommerce.proto.EdaMessage;
+import com.ecommerce.shipment.domain.OrderLifecycleMessage;
+import com.ecommerce.shipment.domain.Shipment;
 import com.ecommerce.shipment.service.ShipmentService;
 import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.RequiredArgsConstructor;
@@ -9,7 +10,6 @@
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.UUID;
 
 @Slf4j
@@ -19,7 +19,6 @@ public class ShipmentEventConsumer {
 
     private final ShipmentService shipmentService;
 
-
     @KafkaListener(topics = "shipment-events", groupId = "shipment-service")
     public void consumeShipmentEvents(ConsumerRecord<String, byte[]> record) {
         try {
@@ -39,30 +38,32 @@ public void consumeShipmentEvents(ConsumerRecord<String, byte[]> record) {
 
     private void operateOrderSucceed(byte[] eventBytes) {
         try {
-            EdaMessage.OrderCreatedEvent event = EdaMessage.OrderCreatedEvent.parseFrom(eventBytes);
-            UUID orderUUID = UUID.fromString(event.getOrderUUID());
-            shipmentService.getShipListByOrderUUID(List.of(orderUUID));
-        } catch (InvalidProtocolBufferException e) {
-            log.error("[shipment-operate] : ProtoBuf parse error : {}", e.getMessage());
+            UUID orderUUID = parseOrderUUID(eventBytes);
+            Shipment succeedOrder = shipmentService.getShipmentByOrderUUID(orderUUID);
+            shipmentService.createExecuteShipment(succeedOrder);
         } catch (Exception e) {
             log.error("[shipment-operate] : created Order error : {}", e.getMessage());
         }
-
-
     }
 
     private void operateOrderCancelled(byte[] eventBytes) {
         try {
-            EdaMessage.OrderCreatedEvent event = EdaMessage.OrderCreatedEvent.parseFrom(eventBytes);
-            UUID orderUUID = UUID.fromString(event.getOrderUUID());
-//            shipmentService
-        } catch (InvalidProtocolBufferException e) {
-            log.error("ProtoBuf parse error : {}", e.getMessage());
+            UUID orderUUID = parseOrderUUID(eventBytes);
+            Shipment updatedShip = shipmentService.getShipmentByOrderUUID(orderUUID);
+            shipmentService.cancelShipment(updatedShip);
         } catch (Exception e) {
             log.error("Canceled Order  error : {}", e.getMessage());
         }
+    }
 
-
+    private UUID parseOrderUUID(byte[] eventBytes) {
+        try {
+            OrderLifecycleMessage.OrderLifecycleEvent orderEvent = OrderLifecycleMessage.OrderLifecycleEvent.parseFrom(eventBytes);
+            return UUID.fromString(orderEvent.getOrderUuid());
+        } catch (InvalidProtocolBufferException e) {
+            log.error("ProtoBuf parse error : {}", e.getMessage());
+            throw new RuntimeException("Failed to parse order UUID", e);
+        }
     }
 
 }