java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into dev

Browse Source 
# Conflicts:
#	firstleg/src/main/java/com/baiyue/firstleg/loading/service/CabinetLoadingEvidenceService.java
#	firstleg/src/test/java/com/baiyue/firstleg/loading/service/CabinetLoadingEvidenceServiceTest.java
#	scripts/admin-test-env-modules/ocean-bookings.mjs
#	scripts/admin-test-env-modules/phase3-container-customs-fixture.mjs
#	scripts/admin-test-env-modules/phase3-container-documents-contract.test.mjs
#	scripts/admin-test-env-modules/phase3-container-loading.mjs
#	scripts/admin-test-env-modules/phase3-customs.mjs
#	scripts/admin-test-env-modules/phase3-loading-finalize.mjs
#	scripts/admin-test-env-modules/phase3-loading.mjs
#	scripts/admin-test-env-modules/phase3-port-schedules.mjs
#	scripts/admin-test-env-modules/service-center-flow.mjs
This commit is contained in:
ouyangxq
2026-09-02 14:00:44 +08:00
parent 1574263836 5d098c9762
commit 25ffd62e14
36 changed files with 1383 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/test/java/com/baiyue/firstleg/loading/service/CabinetLoadingEvidenceServiceTest.java
+26 -27
View File
@@ -13,15 +13,17 @@ import jakarta.annotation.Resource;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.mock.web.MockMultipartFile;
import org.mockito.ArgumentCaptor;
import java.util.List;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.HexFormat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -104,35 +106,32 @@ class CabinetLoadingEvidenceServiceTest {
}
@Test
void multipartReplayUsesRequestAndContentHashBeforeUploadingAgain() throws Exception {
when(objectMapper.writeValueAsString(org.mockito.ArgumentMatchers.any())).thenReturn("request");
CabinetLoadingEvidenceEntity persisted = evidence("PHOTO_STEP_1");
persisted.setId(401L); persisted.setSourceTaskId(20L); persisted.setFileId(301L);
persisted.setOperationKey("photo-replay");
persisted.setRequestHash(HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256")
.digest("request".getBytes(StandardCharsets.UTF_8))));
persisted.setVersion(0);
when(mapper.byOperation(20L, "photo-replay")).thenReturn(null, null, persisted);
when(mapper.byContainer(99L)).thenReturn(List.of(persisted));
void multipartReplayUsesContentHashBeforeUploadingAnotherFile() {
var multipart = new MockMultipartFile("file", "photo.png", "image/png", new byte[] {1, 2, 3});
var upload = new LoadingEvidenceFileClient.UploadResult(301L, "PLATFORM", 0L,
"LOADING_PHOTO_STEP_1", "99", "photo.png", "image/png", 5L);
when(files.upload(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.eq(9L),
org.mockito.ArgumentMatchers.eq(99L), org.mockito.ArgumentMatchers.eq("PHOTO_STEP_1"),
org.mockito.ArgumentMatchers.any())).thenReturn(com.baiyue.common.core.api.ApiResponse.success(upload));
"LOADING_PHOTO_STEP_1", "99", "photo.png", "image/png", 3L);
var metadata = new LoadingEvidenceFileClient.FileMetadata(301L, "PLATFORM", 0L,
"LOADING_PHOTO_STEP_1", "99", "photo.png", "image/png");
when(files.validate(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.eq(99L),
org.mockito.ArgumentMatchers.eq("PHOTO_STEP_1"), org.mockito.ArgumentMatchers.eq(301L)))
when(files.upload(anyString(), anyLong(), anyLong(), anyString(), any()))
.thenReturn(com.baiyue.common.core.api.ApiResponse.success(upload));
when(files.validate(anyString(), anyLong(), anyString(), anyLong()))
.thenReturn(com.baiyue.common.core.api.ApiResponse.success(metadata));
var file = new MockMultipartFile("file", "photo.png", "image/png", "photo".getBytes(StandardCharsets.UTF_8));
when(mapper.byContainer(99L)).thenReturn(List.of());
service.upload(20L, 8L, "photo-replay", 0, "PHOTO_STEP_1", null, "remark", file, 9L, "operator");
service.upload(20L, 8L, "photo-replay", 0, "PHOTO_STEP_1", null, "remark", file, 9L, "operator");
service.upload(20L, 8L, "same-key", 0, "PHOTO_STEP_1", null, "remark",
multipart, 9L, "operator");
verify(files, times(1)).upload(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.eq(9L),
org.mockito.ArgumentMatchers.eq(99L), org.mockito.ArgumentMatchers.eq("PHOTO_STEP_1"),
org.mockito.ArgumentMatchers.any());
verify(mapper, times(1)).insert(org.mockito.ArgumentMatchers.any(CabinetLoadingEvidenceEntity.class));
ArgumentCaptor<CabinetLoadingEvidenceEntity> inserted =
ArgumentCaptor.forClass(CabinetLoadingEvidenceEntity.class);
verify(mapper).insert(inserted.capture());
when(mapper.byOperation(20L, "same-key")).thenReturn(inserted.getValue());
when(mapper.byContainer(99L)).thenReturn(List.of(inserted.getValue()));
var replay = service.upload(20L, 8L, "same-key", 0, "PHOTO_STEP_1", null, "remark",
multipart, 9L, "operator");
assertThat(replay.evidences()).hasSize(1);
verify(files, times(1)).upload(anyString(), anyLong(), anyLong(), anyString(), any());
}
private static CabinetLoadingEvidenceEntity evidence(String type) {
firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingCandidateMapperContractTest.java
+8
View File
@@ -58,6 +58,10 @@ class SmartLoadingCandidateMapperContractTest {
.contains("SELECT SUM(li.package_count)")
.contains("li.deleted=0")
.contains("ORDER BY o.inbounded_at ASC, o.id ASC, i.inbound_detail_id ASC");
assertThat(sql.indexOf("NULL blockReason"))
.as("record constructor projection must keep status fields in their trailing positions")
.isLessThan(sql.indexOf("o.order_status_snapshot orderStatusSnapshot"));
}
@Test
@@ -90,6 +94,10 @@ class SmartLoadingCandidateMapperContractTest {
.contains("source.fulfillment_type='ONE_CLICK_DROPSHIP'")
.contains("i.inbound_id=o.id")
.contains("FOR UPDATE");
assertThat(sql.indexOf("NULL blockReason"))
.as("record constructor projection must keep status fields in their trailing positions")
.isLessThan(sql.indexOf("o.order_status_snapshot orderStatusSnapshot"));
}
@Test