fix: return A0404 for missing PDA pallets

2026-09-04 14:07:18 +08:00
parent f6247ce232
commit 3399ae7488
13 changed files with 205 additions and 7 deletions
@@ -6,8 +6,10 @@ import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatusCode;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestClient;
+import org.springframework.web.server.ResponseStatusException;

 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -31,12 +33,24 @@ public class HttpPalletPhysicalGateway implements PalletPhysicalGateway {
        ResolveEnvelope response = client.get().uri("/internal/v1/warehouse-pallets/resolve/{code}", palletCode)
            .header("X-Internal-Service-Token", internalToken).retrieve()
            .onStatus(HttpStatusCode::isError, (request, result) -> {
-                throw new IllegalArgumentException("Warehouse rejected pallet scan: HTTP " + result.getStatusCode());
+                throw palletLookupFailure(result.getStatusCode());
            }).body(ResolveEnvelope.class);
-        if (response == null || response.data() == null) throw new IllegalStateException("Warehouse returned no pallet");
+        if (response != null && "A0404".equals(response.code())) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Warehouse pallet was not found");
+        }
+        if (response == null || response.data() == null) {
+            throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,
+                "Warehouse pallet service returned no usable response");
+        }
        return response.data();
    }

+    private ResponseStatusException palletLookupFailure(HttpStatusCode status) {
+        return new ResponseStatusException(status.value() == 404 ? HttpStatus.NOT_FOUND
+            : (status.is4xxClientError() ? HttpStatus.BAD_REQUEST : HttpStatus.SERVICE_UNAVAILABLE),
+            status.value() == 404 ? "Warehouse pallet was not found" : "Warehouse pallet lookup failed");
+    }
+
    @Override
    public LocationReference resolveLocation(long warehouseId, long locationId) {
        LocationEnvelope response = client.get().uri(uri -> uri
@@ -76,7 +90,7 @@ public class HttpPalletPhysicalGateway implements PalletPhysicalGateway {
            }).toBodilessEntity();
    }

-    private record ResolveEnvelope(PalletReference data) { }
+    private record ResolveEnvelope(String code, String message, PalletReference data) { }
    private record LocationEnvelope(LocationReference data) { }
    private record TransitionEnvelope(Transition data) { }
 }