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

fix: link terminal drayage carrier events

Browse Source
This commit is contained in:
ouyangxq
2026-09-11 02:20:50 +08:00
parent fe278f2ba6
commit 81f4f9163c
10 changed files with 99 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/test/java/com/baiyue/firstleg/portschedule/service/CarrierScheduleQueryServiceTest.java
+40
View File
@@ -474,6 +474,38 @@ class CarrierScheduleQueryServiceTest {
verify(repository).updateState(before, 3, 7L, "admin");
}
@Test
void containerManualNodeJoinsAndAdvancesExistingCarrierTask() {
CarrierScheduleQueryEntity task = task(0, 8);
task.setTrackingType("CONTAINER_NO"); task.setTrackingNo("ZCSU7881970");
task.setStatus("READY"); task.setLatestStandardNode("PICKUP_READY");
task.setLatestNodeObservedAt(NOW.minusHours(1));
CarrierScheduleQueryEntity stored = copyTask(task);
stored.setVersion(9); stored.setLatestStandardNode("PICKED_UP");
stored.setLatestNodeObservedAt(NOW);
when(repository.findByContainerBookingId(20L)).thenReturn(task);
when(repository.lock(1L)).thenReturn(task);
when(repository.find(1L)).thenReturn(stored);
when(repository.insertIfAbsent(any(CarrierScheduleNodeFactEntity.class))).thenReturn(true);
when(repository.updateState(any(), eq(8), eq(7L), eq("admin"))).thenReturn(1);
when(repository.nodesByContainer(20L)).thenReturn(List.of());
service.addContainerManualNode(20L, 7L, "admin", "terminal-pickup",
new com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ContainerManualNodeRequest(
"PICKED_UP", NOW, null, NOW, "USLAX", "Los Angeles", "terminal pickup"));
verify(repository).insertIfAbsent(argThat((CarrierScheduleNodeFactEntity fact) -> Long.valueOf(1L).equals(fact.getQueryId())
&& fact.getContainerBookingId() == 20L && "PICKED_UP".equals(fact.getStandardNode())));
verify(repository).updateState(task, 8, 7L, "admin");
verify(repository).insert(argThat((CarrierScheduleQueryHistoryEntity history) ->
"MANUAL_NODE".equals(history.getAction()) && Long.valueOf(1L).equals(history.getQueryId())
&& Integer.valueOf(8).equals(history.getFromVersion())
&& Integer.valueOf(9).equals(history.getToVersion())));
verify(nodeOutbox).publish(eq(stored), argThat(fact -> Long.valueOf(1L).equals(fact.getQueryId())),
eq("ZCSU7881970"));
verify(nodeOutbox, never()).publishContainerNode(any(), anyLong(), any(), anyString());
}
@Test
void manualActualFactRejectsCurrentOrEarlierBusinessNodeBeforeWritingFact() {
CarrierScheduleQueryEntity task = task(0, 3);
@@ -771,6 +803,14 @@ class CarrierScheduleQueryServiceTest {
return value;
}
private static CarrierScheduleQueryEntity copyTask(CarrierScheduleQueryEntity source) {
CarrierScheduleQueryEntity value = task(source.getAttemptCount(), source.getVersion());
value.setTrackingType(source.getTrackingType()); value.setTrackingNo(source.getTrackingNo());
value.setStatus(source.getStatus()); value.setLatestStandardNode(source.getLatestStandardNode());
value.setLatestNodeObservedAt(source.getLatestNodeObservedAt());
return value;
}
private void set(String fieldName, Object value) throws Exception {
var field = CarrierScheduleQueryService.class.getDeclaredField(fieldName);
field.setAccessible(true); field.set(service, value);