优化

lastleg-service/src/test/java/com/baiyue/lastleg/controller/InternalCustomerOrderProgressControllerTest.java

@@ -0,0 +1,20 @@
+package com.baiyue.lastleg.controller;
+
+import com.baiyue.lastleg.dto.CustomerOrderProgress;
+import com.baiyue.lastleg.security.InternalServiceTokenGuard;
+import com.baiyue.lastleg.service.CustomerOrderProgressService;
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+class InternalCustomerOrderProgressControllerTest {
+    @Test void validatesInternalIdentityBeforeReadingCustomerFacts() {
+        var service=mock(CustomerOrderProgressService.class);
+        var controller=new InternalCustomerOrderProgressController(new InternalServiceTokenGuard("test-token"),service);
+        var request=new CustomerOrderProgress.Request(11L);
+        assertThatThrownBy(()->controller.read(null,request)).isInstanceOf(org.springframework.web.server.ResponseStatusException.class);
+        assertThatThrownBy(()->controller.read("wrong",request)).isInstanceOf(org.springframework.web.server.ResponseStatusException.class);
+        verifyNoInteractions(service);
+        controller.read("test-token",request);verify(service).read(11);
+    }
+}

lastleg-service/src/test/java/com/baiyue/lastleg/mapper/CustomerOrderProgressMapperTest.java

@@ -0,0 +1,74 @@
+package com.baiyue.lastleg.mapper;
+
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.h2.jdbcx.JdbcDataSource;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import java.util.UUID;
+import static org.assertj.core.api.Assertions.*;
+
+class CustomerOrderProgressMapperTest {
+    private JdbcTemplate jdbc;
+    private CustomerOrderProgressMapper mapper;
+    @BeforeEach void setup() throws Exception {
+        var ds=new JdbcDataSource();ds.setURL("jdbc:h2:mem:tail-progress-"+UUID.randomUUID()+";MODE=MySQL;DB_CLOSE_DELAY=-1");
+        jdbc=new JdbcTemplate(ds);
+        jdbc.execute("CREATE TABLE ll_order(id BIGINT,customer_id VARCHAR,source_order_id VARCHAR,source_inbound_id VARCHAR,source_region VARCHAR,order_type VARCHAR,package_count INT)");
+        jdbc.execute("CREATE TABLE ll_dispatch_order(id BIGINT,customer_id VARCHAR,status VARCHAR,depart_at TIMESTAMP)");
+        jdbc.execute("CREATE TABLE ll_dispatch_item(id BIGINT,dispatch_order_id BIGINT,customer_id VARCHAR,plan_pallet_id BIGINT,warehouse_pallet_id BIGINT,overseas_warehouse_id VARCHAR,destination_type VARCHAR,delivery_address VARCHAR,postal_code VARCHAR,destination_warehouse_code VARCHAR,fba_warehouse_code VARCHAR,destination_warehouse_id VARCHAR)");
+        jdbc.execute("CREATE TABLE ll_inbound_plan_pallet_allocation(pallet_id BIGINT,line_id BIGINT,planned_package_count INT)");
+        jdbc.execute("CREATE TABLE ll_inbound_plan_line(id BIGINT,customer_id VARCHAR,order_id BIGINT)");
+        jdbc.execute("CREATE TABLE ll_inventory_position(id BIGINT,customer_id VARCHAR,pallet_id BIGINT,overseas_warehouse_id VARCHAR,balance_id BIGINT,available_packages INT)");
+        jdbc.execute("CREATE TABLE ll_inventory_balance(id BIGINT,customer_id VARCHAR,inbound_order_id BIGINT)");
+        jdbc.execute("CREATE TABLE ll_dispatch_pda_pick(id BIGINT,customer_id VARCHAR,dispatch_item_id BIGINT,inventory_position_id BIGINT,packages INT,task_id BIGINT)");
+        jdbc.execute("CREATE TABLE ll_dispatch_pda_pick_order(id BIGINT,pick_id BIGINT,customer_id VARCHAR,order_id BIGINT,packages INT)");
+        jdbc.execute("CREATE TABLE ll_dispatch_pda_task(id BIGINT,customer_id VARCHAR,dispatch_order_id BIGINT)");
+        jdbc.execute("CREATE TABLE ll_delivery_order(id BIGINT,customer_id VARCHAR,dispatch_order_id BIGINT,outbound_order_id BIGINT,status VARCHAR,delivery_group_key VARCHAR)");
+        jdbc.execute("CREATE TABLE ll_outbound_order(id BIGINT,customer_id VARCHAR,status VARCHAR)");
+        jdbc.update("INSERT INTO ll_order VALUES(1,'11','101','201','FIRSTLEG','FBA',10),(2,'11','102','202','FIRSTLEG','FBA',20),(3,'22','103','203','FIRSTLEG','FBA',30)");
+        jdbc.update("INSERT INTO ll_dispatch_order VALUES(10,'11','PENDING_DEPARTURE',NULL)");
+        jdbc.update("INSERT INTO ll_dispatch_item(id,dispatch_order_id,customer_id,plan_pallet_id,overseas_warehouse_id,destination_warehouse_code) VALUES(100,10,'11',500,'W1','FBA1')");
+        jdbc.update("INSERT INTO ll_inbound_plan_line VALUES(1000,'11',1),(1001,'11',2),(1002,'22',3)");
+        jdbc.update("INSERT INTO ll_inbound_plan_pallet_allocation VALUES(500,1000,10),(500,1001,20),(500,1002,30)");
+        var config=new MybatisConfiguration();config.setMapUnderscoreToCamelCase(true);config.addMapper(CustomerOrderProgressMapper.class);
+        var factory=new MybatisSqlSessionFactoryBean();factory.setDataSource(ds);factory.setConfiguration(config);
+        mapper=new SqlSessionTemplate(factory.getObject()).getMapper(CustomerOrderProgressMapper.class);
+    }
+    @Test void plannedSharedPalletIncludesEveryOwnSourceAndExcludesCancellation() {
+        var sources=mapper.sources("11");assertThat(sources).hasSize(2);
+        assertThat(sources.get(0).scheduledPackages()).isEqualTo(10);
+        assertThat(sources.get(1).scheduledPackages()).isEqualTo(20);
+        assertThat(sources).allMatch(s->s.deliveringPackages()==0);
+        jdbc.update("UPDATE ll_dispatch_order SET status='CANCELLED'");
+        assertThat(mapper.sources("11")).allMatch(s->s.scheduledPackages()==0);
+        assertThat(mapper.sources("22")).hasSize(1).allMatch(s->s.scheduledPackages()==0);
+    }
+    @Test void receivedPalletUsesInventoryAndActualPicksWithoutCountingBothPlanAndStock() {
+        jdbc.update("UPDATE ll_dispatch_item SET warehouse_pallet_id=800");
+        jdbc.update("INSERT INTO ll_inventory_balance VALUES(300,'11',1),(301,'11',2)");
+        jdbc.update("INSERT INTO ll_inventory_position VALUES(400,'11',800,'W1',300,6),(401,'11',800,'W1',301,20)");
+        jdbc.update("INSERT INTO ll_dispatch_pda_pick VALUES(600,'11',100,400,4,700)");
+        var sources=mapper.sources("11");assertThat(sources.get(0).scheduledPackages()).isEqualTo(10);
+        assertThat(sources.get(1).scheduledPackages()).isEqualTo(20);
+    }
+    @Test void deliveryRequiresActualDepartureOutboundAndMatchingDestinationAttribution() {
+        jdbc.update("INSERT INTO ll_dispatch_pda_task VALUES(700,'11',10)");
+        jdbc.update("INSERT INTO ll_dispatch_pda_pick VALUES(600,'11',100,400,4,700)");
+        jdbc.update("INSERT INTO ll_dispatch_pda_pick_order VALUES(900,600,'11',1,4)");
+        jdbc.update("INSERT INTO ll_outbound_order VALUES(10000,'11','WAIT_OUTBOUND')");
+        jdbc.update("INSERT INTO ll_delivery_order VALUES(10001,'11',10,10000,'DELIVERING','CODE:FBA1')");
+        assertThat(mapper.sources("11")).allMatch(s->s.deliveringPackages()==0);
+        jdbc.update("UPDATE ll_dispatch_order SET status='DEPARTED',depart_at=CURRENT_TIMESTAMP");
+        assertThat(mapper.sources("11")).allMatch(s->s.deliveringPackages()==0);
+        jdbc.update("UPDATE ll_outbound_order SET status='OUTBOUNDED'");
+        assertThat(mapper.sources("11").get(0).deliveringPackages()).isEqualTo(4);
+        assertThat(mapper.sources("11").get(1).deliveringPackages()).isZero();
+        jdbc.update("UPDATE ll_delivery_order SET delivery_group_key='CODE:FBA2'");
+        assertThat(mapper.sources("11")).allMatch(s->s.deliveringPackages()==0);
+        jdbc.update("UPDATE ll_delivery_order SET delivery_group_key='CODE:FBA1',status='RETURN_PENDING'");
+        assertThat(mapper.sources("11")).allMatch(s->s.deliveringPackages()==0);
+    }
+}

lastleg-service/src/test/java/com/baiyue/lastleg/service/CustomerOrderProgressServiceTest.java

@@ -0,0 +1,18 @@
+package com.baiyue.lastleg.service;
+
+import com.baiyue.lastleg.dto.CustomerOrderProgress.Source;
+import org.junit.jupiter.api.Test;
+import java.util.List;
+import static org.assertj.core.api.Assertions.*;
+
+class CustomerOrderProgressServiceTest {
+    @Test void aggregatesAllInboundFragmentsAndNeverTreatsDuplicateOrUnknownCoverageAsComplete() {
+        var result=CustomerOrderProgressService.project(List.of(
+            new Source("1",10,10,0),new Source("1",10,0,0),
+            new Source("2",10,0,10),new Source("3",10,0,20),new Source("4",0,5,0),new Source("5",10,0,0)));
+        assertThat(result).hasSize(4);
+        assertThat(result.get(0).stage()).isEqualTo("scheduled");assertThat(result.get(0).partial()).isTrue();
+        assertThat(result.get(1).stage()).isEqualTo("delivering");assertThat(result.get(1).partial()).isFalse();
+        assertThat(result.get(2).partial()).isTrue();assertThat(result.get(3).partial()).isTrue();
+    }
+}