booking: Support getting a booking via CBR in addition to CBRR

Signed-off-by: Niels Thykier <[email protected]>
dcsaorg · Nov 20, 2023 · 2fbede8 · 2fbede8
1 parent b705080
commit 2fbede8
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/booking/src/main/java/org/dcsa/conformance/standards/booking/party/Carrier.java b/booking/src/main/java/org/dcsa/conformance/standards/booking/party/Carrier.java
@@ -32,6 +32,7 @@ public class Carrier extends ConformanceParty {
   private final ObjectMapper objectMapper = new ObjectMapper();
   private final Map<String, BookingState> bookingStatesByCbrr = new HashMap<>();
   private final Map<String, String> cbrrToCbr = new HashMap<>();
+  private final Map<String, String> cbrToCbrr = new HashMap<>();
   protected boolean isShipperNotificationEnabled = false;
 
   public Carrier(
@@ -56,18 +57,22 @@ protected void exportPartyJsonState(ObjectNode targetObjectNode) {
         "bookingStatesByCbrr",
         StateManagementUtil.storeMap(objectMapper, bookingStatesByCbrr, BookingState::name));
     targetObjectNode.set("cbrrToCbr", StateManagementUtil.storeMap(objectMapper, cbrrToCbr));
+    targetObjectNode.set("cbrToCbrr", StateManagementUtil.storeMap(objectMapper, cbrToCbrr));
   }
 
   @Override
   protected void importPartyJsonState(ObjectNode sourceObjectNode) {
     StateManagementUtil.restoreIntoMap(
         bookingStatesByCbrr, sourceObjectNode.get("bookingStatesByCbrr"), BookingState::valueOf);
     StateManagementUtil.restoreIntoMap(cbrrToCbr, sourceObjectNode.get("cbrrToCbr"));
+    StateManagementUtil.restoreIntoMap(cbrToCbrr, sourceObjectNode.get("cbrToCbrr"));
   }
 
   @Override
   protected void doReset() {
     bookingStatesByCbrr.clear();
+    cbrrToCbr.clear();
+    cbrToCbrr.clear();
   }
 
   @Override
@@ -397,6 +402,7 @@ private void processAndEmitNotificationForStateTransition(
           if (cbr == null) {
             cbr = UUID.randomUUID().toString().replace("-", "").toUpperCase();
             cbrrToCbr.put(cbrr, cbr);
+            cbrToCbrr.put(cbr, cbrr);
             generatedCBR = true;
           }
         }
@@ -467,16 +473,24 @@ public ConformanceResponse handleRequest(ConformanceRequest request) {
     }
   }
 
+  private String lastUrlSegment(String url) {
+    // ".../foo" and ".../foo/" should be the same
+    return url.substring(1 + url.replaceAll("/++$", "").lastIndexOf("/"));
+  }
+
   private ConformanceResponse _handleGetBookingRequest(ConformanceRequest request) {
-    String cbrr = request.url().substring(1 + request.url().lastIndexOf("/"));
+    var bookingReference = lastUrlSegment(request.url());
+    // bookingReference can either be a CBR or CBRR.
+    var cbrr = cbrToCbrr.getOrDefault(bookingReference, bookingReference);
+    var booking = persistentMap.load(cbrr);
     ConformanceResponse response =
         request.createResponse(
             200,
             Map.of("Api-Version", List.of(apiVersion)),
-            new ConformanceMessageBody(persistentMap.load(cbrr)));
+            new ConformanceMessageBody(booking));
     addOperatorLogEntry(
         "Responded to GET booking request '%s' (in state '%s')"
-            .formatted(cbrr, BookingState.RECEIVED.wireName()));
+            .formatted(bookingReference, booking.get("bookingStatus")));
     return response;
   }