[FEATURE] Shipment 배송 이벤트 발행/구독 기능 구현 및 배송담당자 삭제 내부 API 구현

common/src/main/java/com/shipflow/config/message/JacksonConfig.java

@@ -1,5 +1,7 @@
 package com.shipflow.config.message;
 
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -17,6 +19,7 @@ public ObjectMapper objectMapper() {
 		mapper.registerModule(new JavaTimeModule());
 		mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
 		mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+		mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
 		return mapper;
 	}
 }

hub-service/src/main/java/com/shipflow/hubservice/infrastructure/client/DeliveryClient.java

@@ -10,7 +10,7 @@
 @FeignClient(name = "deliveryservice")
 public interface DeliveryClient {
 
-	@DeleteMapping("/internal/delivery-managers/{hubId}")
+	@DeleteMapping("/internal/delivery-managers/hubs/{hubId}")
 	void deleteCompanyDeliveryManagers(
 		@RequestHeader("X-Internal-Request") String internalRequest,
 		@RequestHeader("X-User-Id") String requestUserId,

order-service/src/main/java/com/shipflow/orderservice/infrastructure/messaging/event/consume/ShipmentCompletedEvent.java

@@ -1,21 +1,22 @@
 package com.shipflow.orderservice.infrastructure.messaging.event.consume;
 
+import java.util.UUID;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.shipflow.common.messaging.event.SagaEvent;
+
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.UUID;
-
 @Getter
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ShipmentCompletedEvent extends SagaEvent {
 
-    private UUID orderId;
+	private UUID orderId;
 
-    public ShipmentCompletedEvent(UUID orderId) {
-        super("shipment.completed");
-        this.orderId = orderId;
-    }
+	public ShipmentCompletedEvent(UUID orderId) {
+		super("shipment.completed");
+		this.orderId = orderId;
+	}
 }

order-service/src/main/java/com/shipflow/orderservice/infrastructure/messaging/event/consume/ShipmentCreatedEvent.java

@@ -1,36 +1,37 @@
 package com.shipflow.orderservice.infrastructure.messaging.event.consume;
 
+import java.util.UUID;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.shipflow.common.messaging.event.SagaEvent;
 import com.shipflow.orderservice.domain.model.ShipmentStatus;
+
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.UUID;
-
 @Getter
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ShipmentCreatedEvent extends SagaEvent {
 
-    private UUID orderId;
-    private UUID shipmentId;
-    private ShipmentStatus shipmentStatus;
-    private UUID departureHubId;
-    private String departureHubName;
-    private UUID arrivalHubId;
-    private String arrivalHubName;
+	private UUID orderId;
+	private UUID shipmentId;
+	private ShipmentStatus shipmentStatus;
+	private UUID departureHubId;
+	private String departureHubName;
+	private UUID arrivalHubId;
+	private String arrivalHubName;
 
-    public ShipmentCreatedEvent(UUID orderId, UUID shipmentId, ShipmentStatus shipmentStatus,
-                                UUID departureHubId, String departureHubName,
-                                UUID arrivalHubId, String arrivalHubName) {
-        super("shipment.created");
-        this.orderId = orderId;
-        this.shipmentId = shipmentId;
-        this.shipmentStatus = shipmentStatus;
-        this.departureHubId = departureHubId;
-        this.departureHubName = departureHubName;
-        this.arrivalHubId = arrivalHubId;
-        this.arrivalHubName = arrivalHubName;
-    }
+	public ShipmentCreatedEvent(UUID orderId, UUID shipmentId, ShipmentStatus shipmentStatus,
+		UUID departureHubId, String departureHubName,
+		UUID arrivalHubId, String arrivalHubName) {
+		super("shipment.created");
+		this.orderId = orderId;
+		this.shipmentId = shipmentId;
+		this.shipmentStatus = shipmentStatus;
+		this.departureHubId = departureHubId;
+		this.departureHubName = departureHubName;
+		this.arrivalHubId = arrivalHubId;
+		this.arrivalHubName = arrivalHubName;
+	}
 }

order-service/src/main/java/com/shipflow/orderservice/infrastructure/messaging/event/publish/OrderCanceledEvent.java

@@ -1,25 +1,26 @@
 package com.shipflow.orderservice.infrastructure.messaging.event.publish;
 
+import java.util.UUID;
+
 import com.shipflow.common.messaging.event.SagaEvent;
+
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.UUID;
-
 @Getter
 @NoArgsConstructor
 public class OrderCanceledEvent extends SagaEvent {
 
-    private static final String EVENT_TYPE = "order.canceled";
+	private static final String EVENT_TYPE = "order.canceled";
 
-    private UUID orderId;
-    private UUID productId;
-    private int quantity;
+	private UUID orderId;
+	private UUID productId;
+	private int quantity;
 
-    public OrderCanceledEvent(UUID orderId, UUID productId, int quantity) {
-        super(EVENT_TYPE);
-        this.orderId = orderId;
-        this.productId = productId;
-        this.quantity = quantity;
-    }
+	public OrderCanceledEvent(UUID orderId, UUID productId, int quantity) {
+		super(EVENT_TYPE);
+		this.orderId = orderId;
+		this.productId = productId;
+		this.quantity = quantity;
+	}
 }

shipment-service/build.gradle

@@ -29,6 +29,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
+    // Service Discovery
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
+
     // Feign
     implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
 
@@ -45,6 +49,9 @@ dependencies {
     // RabbitMQ
     implementation 'org.springframework.boot:spring-boot-starter-amqp'
 
+    // Redis
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

shipment-service/src/main/java/com/shipflow/shipmentservice/ShipmentserviceApplication.java

@@ -3,8 +3,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableFeignClients
+@EnableScheduling
 @SpringBootApplication
 public class ShipmentserviceApplication {
 

shipment-service/src/main/java/com/shipflow/shipmentservice/application/ShipmentEventPublisher.java

@@ -0,0 +1,14 @@
+package com.shipflow.shipmentservice.application;
+
+import com.shipflow.shipmentservice.domain.event.ShipmentCompletedEvent;
+import com.shipflow.shipmentservice.domain.event.ShipmentCreatedEvent;
+import com.shipflow.shipmentservice.domain.event.ShipmentCreationFailedEvent;
+
+public interface ShipmentEventPublisher {
+
+	void publishCreated(ShipmentCreatedEvent event);
+
+	void publishCreationFailed(ShipmentCreationFailedEvent event);
+
+	void publishCompleted(ShipmentCompletedEvent event);
+}

shipment-service/src/main/java/com/shipflow/shipmentservice/application/ShipmentManagerService.java

@@ -27,6 +27,8 @@
 @Transactional(readOnly = true)
 public class ShipmentManagerService {
 
+	private static final UUID SYSTEM_ID = UUID.fromString("00000000-0000-0000-0000-000000000000");
+
 	private final ShipmentManagerRepository shipmentManagerRepository;
 	private final UserClient userClient;
 
@@ -107,4 +109,22 @@ public void deleteShipmentManager(UUID managerId, UUID userId) {
 
 		shipmentManager.delete(userId);
 	}
+
+	@Transactional
+	public void markPendingDeletionByHubId(UUID hubId) {
+		List<ShipmentManager> managers = shipmentManagerRepository.findAllByHubId(hubId);
+		managers.forEach(ShipmentManager::markPendingDeletion);
+	}
+
+	@Transactional
+	public void markPendingDeletionByUserId(UUID userId) {
+		shipmentManagerRepository.findByUserId(userId)
+			.ifPresent(ShipmentManager::markPendingDeletion);
+	}
+
+	@Transactional
+	public void deleteAllPending() {
+		List<ShipmentManager> pending = shipmentManagerRepository.findAllPendingDeletion();
+		pending.forEach(m -> m.delete(SYSTEM_ID));
+	}
 }