Dt 620

booking/src/main/java/org/dcsa/conformance/standards/booking/BookingScenarioListBuilder.java

@@ -54,11 +54,20 @@ public static BookingScenarioListBuilder buildTree(
                                                                   .then(
                                                                       shipper_GetBooking(
                                                                           PENDING_AMENDMENT,
-                                                                          AMENDMENT_RECEIVED)))),
+                                                                          AMENDMENT_RECEIVED)
+                                                                        .then (uc9_shipper_cancelBookingAmendment()
+                                                                          .then(shipper_GetBooking(
+                                                                            PENDING_AMENDMENT,
+                                                                            CANCELLED)))))),
                                               uc7_shipper_submitBookingAmendment()
                                                   .then(
                                                       shipper_GetBooking(
-                                                          CONFIRMED, AMENDMENT_RECEIVED)),
+                                                        CONFIRMED,
+                                                        AMENDMENT_RECEIVED)
+                                                        .then (uc9_shipper_cancelBookingAmendment()
+                                                          .then(shipper_GetBooking(
+                                                            CONFIRMED,
+                                                            CANCELLED)))),
                                               uc10_carrier_declineBooking()
                                                   .then(shipper_GetBooking(DECLINED)),
                                               uc12_shipper_cancelBooking()
@@ -305,7 +314,18 @@ private static BookingScenarioListBuilder uc8b_carrier_declineBookingAmendment()
   }
 
   private static BookingScenarioListBuilder uc9_shipper_cancelBookingAmendment() {
-    return tbdShipperAction();
+    BookingComponentFactory componentFactory = threadLocalComponentFactory.get();
+    String carrierPartyName = threadLocalCarrierPartyName.get();
+    String shipperPartyName = threadLocalShipperPartyName.get();
+    return new BookingScenarioListBuilder(
+      previousAction ->
+        new UC9_Shipper_CancelBookingAmendment(
+          carrierPartyName,
+          shipperPartyName,
+          (BookingAction) previousAction,
+          componentFactory.getMessageSchemaValidator(BOOKING_API, CANCEL_SCHEMA_NAME),
+          componentFactory.getMessageSchemaValidator(
+            BOOKING_API, BOOKING_REF_STATUS_SCHEMA)));
   }
 
   private static BookingScenarioListBuilder uc10_carrier_declineBooking() {

booking/src/main/java/org/dcsa/conformance/standards/booking/action/UC12_Shipper_CancelEntireBookingAction.java

@@ -61,6 +61,12 @@ protected Stream<? extends ConformanceCheck> createSubChecks() {
               getMatchedExchangeUuid(),
               BookingState.CANCELLED
             ),
+            new QueryParamCheck(
+              BookingRole::isShipper,
+              getMatchedExchangeUuid(),
+              "operation",
+              "cancelBooking"
+            ),
             new ApiHeaderCheck(
                 BookingRole::isShipper,
                 getMatchedExchangeUuid(),

booking/src/main/java/org/dcsa/conformance/standards/booking/action/UC9_Shipper_CancelBookingAmendment.java

@@ -0,0 +1,86 @@
+package org.dcsa.conformance.standards.booking.action;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.dcsa.conformance.core.check.*;
+import org.dcsa.conformance.core.traffic.ConformanceExchange;
+import org.dcsa.conformance.core.traffic.HttpMessageType;
+import org.dcsa.conformance.standards.booking.checks.CarrierBookingRefStatusPayloadResponseConformanceCheck;
+import org.dcsa.conformance.standards.booking.party.BookingRole;
+import org.dcsa.conformance.standards.booking.party.BookingState;
+
+import java.util.stream.Stream;
+
+@Getter
+@Slf4j
+public class UC9_Shipper_CancelBookingAmendment extends StateChangingBookingAction {
+  private final JsonSchemaValidator requestSchemaValidator;
+  private final JsonSchemaValidator responseSchemaValidator;
+
+  public UC9_Shipper_CancelBookingAmendment(
+    String carrierPartyName,
+    String shipperPartyName,
+    BookingAction previousAction,
+    JsonSchemaValidator requestSchemaValidator,
+    JsonSchemaValidator responseSchemaValidator) {
+    super(shipperPartyName, carrierPartyName, previousAction, "UC9", 200);
+    this.requestSchemaValidator = requestSchemaValidator;
+    this.responseSchemaValidator = responseSchemaValidator;
+  }
+
+  @Override
+  public String getHumanReadablePrompt() {
+    return ("UC9: Cancel Amendment to confirmed booking");
+  }
+
+  @Override
+  public ObjectNode asJsonNode() {
+    ObjectNode jsonNode = super.asJsonNode();
+    jsonNode.put("cbrr", getDspSupplier().get().carrierBookingRequestReference());
+    return jsonNode;
+  }
+
+  @Override
+  public ConformanceCheck createCheck(String expectedApiVersion) {
+    return new ConformanceCheck(getActionTitle()) {
+      @Override
+      protected Stream<? extends ConformanceCheck> createSubChecks() {
+        var cbrr = getDspSupplier().get().carrierBookingRequestReference();
+        return Stream.of(
+          new HttpMethodCheck(BookingRole::isShipper, getMatchedExchangeUuid(), "PATCH"),
+          new UrlPathCheck(BookingRole::isShipper, getMatchedExchangeUuid(), "/v2/bookings/%s".formatted(cbrr)),
+          new ResponseStatusCheck(
+            BookingRole::isCarrier, getMatchedExchangeUuid(), expectedStatus),
+          new QueryParamCheck(
+            BookingRole::isShipper,
+            getMatchedExchangeUuid(),
+            "operation",
+            "cancelAmendment"
+          ),
+          new ApiHeaderCheck(
+            BookingRole::isShipper,
+            getMatchedExchangeUuid(),
+            HttpMessageType.REQUEST,
+            expectedApiVersion),
+          new ApiHeaderCheck(
+            BookingRole::isCarrier,
+            getMatchedExchangeUuid(),
+            HttpMessageType.RESPONSE,
+            expectedApiVersion),
+          new JsonSchemaCheck(
+            BookingRole::isShipper,
+            getMatchedExchangeUuid(),
+            HttpMessageType.REQUEST,
+            requestSchemaValidator),
+          new JsonSchemaCheck(
+            BookingRole::isCarrier,
+            getMatchedExchangeUuid(),
+            HttpMessageType.RESPONSE,
+            responseSchemaValidator))
+          // .filter(Objects::nonNull)
+          ;
+      }
+    };
+  }
+}

booking/src/main/java/org/dcsa/conformance/standards/booking/model/PersistableCarrierBooking.java

@@ -126,8 +126,10 @@ public void cancelBookingAmendment(String bookingReference, String reason) {
     if (reason == null || reason.isBlank()) {
       reason = "Amendment cancelled by shipper (no reason given)";
     }
+    final var cancelReason = reason;
+    getBooking().put("reason", cancelReason);
     var amendedBooking = getAmendedBooking().orElseThrow(AssertionError::new);
-    amendedBooking.put("reason", reason);
+    amendedBooking.put("reason", cancelReason);
   }
 
   private void changeState(String attributeName, BookingState newState) {

booking/src/main/java/org/dcsa/conformance/standards/booking/party/Shipper.java

@@ -62,6 +62,7 @@ protected Map<Class<? extends ConformanceAction>, Consumer<JsonNode>> getActionP
         Map.entry(Shipper_GetAmendedBooking404Action.class, this::getBookingRequest),
         Map.entry(UC3_Shipper_SubmitUpdatedBookingRequestAction.class, this::sendUpdatedBooking),
         Map.entry(UC7_Shipper_SubmitBookingAmendment.class, this::sendUpdatedConfirmedBooking),
+        Map.entry(UC9_Shipper_CancelBookingAmendment.class, this::sendCancelBookingAmendment),
         Map.entry(UC12_Shipper_CancelEntireBookingAction.class, this::sendCancelEntireBooking));
   }
 
@@ -116,16 +117,31 @@ private void sendBookingRequest(JsonNode actionPrompt) {
   private void sendCancelEntireBooking(JsonNode actionPrompt) {
     log.info("Shipper.sendCancelEntireBooking(%s)".formatted(actionPrompt.toPrettyString()));
     String cbrr = actionPrompt.get("cbrr").asText();
-
+    Map<String, List<String>> queryParams =  Map.of("operation", List.of("cancelBooking"));
     asyncCounterpartPatch(
-        "/v2/bookings/%s?operation=cancelBooking".formatted(cbrr),
+        "/v2/bookings/%s".formatted(cbrr),
+        queryParams,
         new ObjectMapper()
             .createObjectNode()
             .put("bookingStatus", BookingState.CANCELLED.wireName()));
 
     addOperatorLogEntry("Sent a cancel booking request of '%s'".formatted(cbrr));
   }
 
+  private void sendCancelBookingAmendment(JsonNode actionPrompt) {
+    log.info("Shipper.sendCancelBookingAmendment(%s)".formatted(actionPrompt.toPrettyString()));
+    String cbrr = actionPrompt.get("cbrr").asText();
+    Map<String, List<String>> queryParams =  Map.of("operation", List.of("cancelAmendment"));
+    asyncCounterpartPatch(
+      "/v2/bookings/%s".formatted(cbrr),
+      queryParams,
+      new ObjectMapper()
+        .createObjectNode()
+        .put("bookingStatus", BookingState.CANCELLED.wireName()));
+
+    addOperatorLogEntry("Sent a cancel amendment request of '%s'".formatted(cbrr));
+  }
+
   private void sendUpdatedBooking(JsonNode actionPrompt) {
     log.info("Shipper.sendUpdatedBooking(%s)".formatted(actionPrompt.toPrettyString()));
     String cbrr = actionPrompt.get("cbrr").asText();

core/src/main/java/org/dcsa/conformance/core/party/ConformanceParty.java

@@ -183,6 +183,10 @@ protected void asyncCounterpartPatch(String path, JsonNode jsonBody) {
     asyncCounterpartPatch(path, jsonBody, conformanceResponse -> {});
   }
 
+  protected void asyncCounterpartPatch(String path, Map<String, ? extends Collection<String>> queryParams, JsonNode jsonBody) {
+    asyncCounterpartPatch(path, queryParams, jsonBody, conformanceResponse -> {});
+  }
+
   protected void asyncCounterpartPost(String path, JsonNode jsonBody) {
     asyncCounterpartPost(path, jsonBody, conformanceResponse -> {});
   }
@@ -195,6 +199,11 @@ protected void asyncCounterpartPatch(String path, JsonNode jsonBody, Consumer<Co
     _asyncCounterpartPatchPostOrPut("PATCH", path, Collections.emptyMap(), jsonBody, responseCallback);
   }
 
+  protected void asyncCounterpartPatch(String path,Map<String, ? extends Collection<String>> queryParams,
+                                       JsonNode jsonBody, Consumer<ConformanceResponse> responseCallback) {
+    _asyncCounterpartPatchPostOrPut("PATCH", path, queryParams, jsonBody, responseCallback);
+  }
+
   protected void asyncCounterpartPost(String path, JsonNode jsonBody, Consumer<ConformanceResponse> responseCallback) {
     _asyncCounterpartPatchPostOrPut("POST", path, Collections.emptyMap(), jsonBody, responseCallback);
   }