Merge pull request #71 from dcsaorg/DT-786

Dt 786
dcsaorg · Mar 22, 2024 · 24b8eb9 · 24b8eb9
2 parents 526d532 + f9be44b
commit 24b8eb9
Show file tree

Hide file tree

Showing 40 changed files with 119,194 additions and 197 deletions.
diff --git a/...org/dcsa/conformance/standards/booking/action/Carrier_SupplyScenarioParametersAction.java b/...org/dcsa/conformance/standards/booking/action/Carrier_SupplyScenarioParametersAction.java
@@ -60,7 +60,8 @@ public String getHumanReadablePrompt() {
   @Override
   public JsonNode getJsonForHumanReadablePrompt() {
     var csp = switch (scenarioType) {
-      case REGULAR, REGULAR_SHIPPER_OWNED -> new CarrierScenarioParameters("Example Carrier Service",
+      case REGULAR, REGULAR_SHIPPER_OWNED -> new CarrierScenarioParameters( "SCR-1234-REGULAR",
+        "Example Carrier Service",
         "402E",
         "service Name",
         "640510",
@@ -69,7 +70,8 @@ public JsonNode getJsonForHumanReadablePrompt() {
         null,
         "DKAAR",
         "DEBRV");
-      case REGULAR_2RE1C, REGULAR_2RE2C -> new CarrierScenarioParameters("Example Carrier Service",
+      case REGULAR_2RE1C, REGULAR_2RE2C -> new CarrierScenarioParameters( "SCR-1234-REGULAR-2REC",
+        "Example Carrier Service",
         "402E",
         "service Name",
         "630260",
@@ -78,7 +80,8 @@ public JsonNode getJsonForHumanReadablePrompt() {
         "Kitchen pots and pans",
         "DKAAR",
         "DEBRV");
-      case REGULAR_CHO_DEST -> new CarrierScenarioParameters("Example Carrier Service",
+      case REGULAR_CHO_DEST -> new CarrierScenarioParameters("SCR-1234-REGULAR-CHO-DEST",
+        "Example Carrier Service",
         "402E",
         "service Name",
         "640510",
@@ -87,7 +90,8 @@ public JsonNode getJsonForHumanReadablePrompt() {
         null,
         "DKAAR",
         "USGBO");
-      case REGULAR_CHO_ORIG -> new CarrierScenarioParameters("Example Carrier Service",
+      case REGULAR_CHO_ORIG -> new CarrierScenarioParameters("SCR-1234-REGULAR-CHO-ORIG",
+        "Example Carrier Service",
         "402E",
         "service Name",
         "640510",
@@ -96,7 +100,8 @@ public JsonNode getJsonForHumanReadablePrompt() {
         null,
         "DKAAR",
         "DKAAR");
-      case REGULAR_NON_OPERATING_REEFER -> new CarrierScenarioParameters("Example Carrier Service",
+      case REGULAR_NON_OPERATING_REEFER -> new CarrierScenarioParameters("SCR-1234-NON-OPERATING-REEFER",
+        "Example Carrier Service",
         "402E",
         "service Name",
         "220291",
@@ -105,7 +110,8 @@ public JsonNode getJsonForHumanReadablePrompt() {
         null,
         "DKAAR",
         "DEBRV");
-      case REEFER, REEFER_TEMP_CHANGE -> new CarrierScenarioParameters("Example Carrier Service",
+      case REEFER, REEFER_TEMP_CHANGE -> new CarrierScenarioParameters( "SCR-1234-REEFER",
+        "Example Carrier Service",
         "402E",
         "service Name",
         "04052090",
@@ -114,7 +120,8 @@ public JsonNode getJsonForHumanReadablePrompt() {
         null,
         "DKAAR",
         "DEBRV");
-      case DG -> new CarrierScenarioParameters("Example Carrier Service",
+      case DG -> new CarrierScenarioParameters("SCR-1234-DG",
+        "Example Carrier Service",
         "403W",
         "TA1",
         "293499",

diff --git a/...src/main/java/org/dcsa/conformance/standards/booking/action/Shipper_GetBookingAction.java b/...src/main/java/org/dcsa/conformance/standards/booking/action/Shipper_GetBookingAction.java
@@ -1,15 +1,12 @@
 package org.dcsa.conformance.standards.booking.action;
 
-import java.util.*;
-import java.util.function.Function;
+
 import java.util.stream.Stream;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.dcsa.conformance.core.check.*;
-import org.dcsa.conformance.core.toolkit.JsonToolkit;
-import org.dcsa.conformance.core.traffic.ConformanceExchange;
 import org.dcsa.conformance.core.traffic.HttpMessageType;
-import org.dcsa.conformance.standards.booking.checks.CarrierGetBookingPayloadResponseConformanceCheck;
+import org.dcsa.conformance.standards.booking.checks.BookingChecks;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;
 
@@ -82,46 +79,7 @@ protected Stream<? extends ConformanceCheck> createSubChecks() {
                 getMatchedExchangeUuid(),
                 HttpMessageType.RESPONSE,
                 responseSchemaValidator),
-            new CarrierGetBookingPayloadResponseConformanceCheck(
-                getMatchedExchangeUuid(),
-                expectedBookingStatus,
-                expectedAmendedBookingStatus,
-                requestAmendedContent),
-            new ActionCheck(
-                "GET returns the expected Booking data",
-                BookingRole::isCarrier,
-                getMatchedExchangeUuid(),
-                HttpMessageType.RESPONSE) {
-              @Override
-              protected Set<String> checkConformance(
-                  Function<UUID, ConformanceExchange> getExchangeByUuid) {
-                ConformanceExchange getExchange = getExchangeByUuid.apply(getMatchedExchangeUuid());
-                if (getExchange == null) return Set.of();
-                Set<String> conformanceErrors = new HashSet<>();
-                if (previousAction
-                    instanceof UC1_Shipper_SubmitBookingRequestAction submitBookingRequestAction) {
-                  ConformanceExchange submitBookingRequestExchange =
-                      getExchangeByUuid.apply(submitBookingRequestAction.getMatchedExchangeUuid());
-                  if (submitBookingRequestExchange == null) return Set.of();
-                  // this is just an example
-                  String uc1CarrierServiceName =
-                      JsonToolkit.getTextAttributeOrNull(
-                          submitBookingRequestExchange.getRequest().message().body().getJsonBody(),
-                          "carrierServiceName");
-                  String getCarrierServiceName =
-                      JsonToolkit.getTextAttributeOrNull(
-                          getExchange.getResponse().message().body().getJsonBody(),
-                          "carrierServiceName");
-                  if (!Objects.equals(uc1CarrierServiceName, getCarrierServiceName)) {
-                    conformanceErrors.add(
-                        "Expected carrierServiceName '%s' but found '%s'"
-                            .formatted(uc1CarrierServiceName, getCarrierServiceName));
-                  }
-                }
-                return conformanceErrors;
-              }
-            })
-        // .filter(Objects::nonNull)
+            BookingChecks.responseContentChecks(getMatchedExchangeUuid(), getCspSupplier(), getDspSupplier(), expectedBookingStatus, expectedAmendedBookingStatus))
         ;
       }
     };

diff --git a/...org/dcsa/conformance/standards/booking/action/UC11_Shipper_CancelEntireBookingAction.java b/...org/dcsa/conformance/standards/booking/action/UC11_Shipper_CancelEntireBookingAction.java
@@ -6,6 +6,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.dcsa.conformance.core.check.*;
 import org.dcsa.conformance.core.traffic.HttpMessageType;
+import org.dcsa.conformance.standards.booking.checks.BookingChecks;
 import org.dcsa.conformance.standards.booking.checks.CarrierBookingRefStatusPayloadResponseConformanceCheck;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;

diff --git a/...org/dcsa/conformance/standards/booking/action/UC1_Shipper_SubmitBookingRequestAction.java b/...org/dcsa/conformance/standards/booking/action/UC1_Shipper_SubmitBookingRequestAction.java
@@ -7,9 +7,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.dcsa.conformance.core.check.*;
 import org.dcsa.conformance.core.traffic.HttpMessageType;
+import org.dcsa.conformance.standards.booking.checks.BookingChecks;
 import org.dcsa.conformance.standards.booking.checks.CarrierBookingRefStatusPayloadResponseConformanceCheck;
-import org.dcsa.conformance.standards.booking.checks.ScenarioType;
-import org.dcsa.conformance.standards.booking.checks.ShipperBookingContentConformanceCheck;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;
 
@@ -56,7 +55,6 @@ public ConformanceCheck createCheck(String expectedApiVersion) {
     return new ConformanceCheck(getActionTitle()) {
       @Override
       protected Stream<? extends ConformanceCheck> createSubChecks() {
-        var scenarioType = getDspSupplier().get().scenarioType();
         Stream<ActionCheck> primaryExchangeChecks =
           Stream.of(
             new HttpMethodCheck(BookingRole::isShipper, getMatchedExchangeUuid(), "POST"),
@@ -77,7 +75,7 @@ protected Stream<? extends ConformanceCheck> createSubChecks() {
               getMatchedExchangeUuid(),
               BookingState.RECEIVED
             ),
-            new ShipperBookingContentConformanceCheck(getMatchedExchangeUuid(),scenarioType),
+            BookingChecks.requestContentChecks(getMatchedExchangeUuid(), getCspSupplier(), getDspSupplier()),
             new JsonSchemaCheck(
                 BookingRole::isShipper,
                 getMatchedExchangeUuid(),

diff --git a/...a/conformance/standards/booking/action/UC3_Shipper_SubmitUpdatedBookingRequestAction.java b/...a/conformance/standards/booking/action/UC3_Shipper_SubmitUpdatedBookingRequestAction.java
@@ -7,6 +7,7 @@
 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.BookingChecks;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;
 
@@ -81,7 +82,8 @@ protected Stream<? extends ConformanceCheck> createSubChecks() {
                     BookingRole::isCarrier,
                     getMatchedExchangeUuid(),
                     HttpMessageType.RESPONSE,
-                    responseSchemaValidator));
+                    responseSchemaValidator),
+                BookingChecks.requestContentChecks(getMatchedExchangeUuid(), getCspSupplier(), getDspSupplier()));
         return Stream.concat(
             primaryExchangeChecks,
             getNotificationChecks(

diff --git a/...ava/org/dcsa/conformance/standards/booking/action/UC7_Shipper_SubmitBookingAmendment.java b/...ava/org/dcsa/conformance/standards/booking/action/UC7_Shipper_SubmitBookingAmendment.java
@@ -5,6 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.dcsa.conformance.core.check.*;
 import org.dcsa.conformance.core.traffic.HttpMessageType;
+import org.dcsa.conformance.standards.booking.checks.BookingChecks;
 import org.dcsa.conformance.standards.booking.checks.CarrierBookingRefStatusPayloadResponseConformanceCheck;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;
@@ -84,7 +85,8 @@ protected Stream<? extends ConformanceCheck> createSubChecks() {
                     BookingRole::isCarrier,
                     getMatchedExchangeUuid(),
                     HttpMessageType.RESPONSE,
-                    responseSchemaValidator));
+                    responseSchemaValidator),
+                BookingChecks.requestContentChecks(getMatchedExchangeUuid(), getCspSupplier(), getDspSupplier()));
         return Stream.concat(
             Stream.concat(primaryExchangeChecks,
             Stream.of(new CarrierBookingRefStatusPayloadResponseConformanceCheck(

diff --git a/...ava/org/dcsa/conformance/standards/booking/action/UC9_Shipper_CancelBookingAmendment.java b/...ava/org/dcsa/conformance/standards/booking/action/UC9_Shipper_CancelBookingAmendment.java
@@ -6,6 +6,7 @@
 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.BookingChecks;
 import org.dcsa.conformance.standards.booking.checks.CarrierBookingRefStatusPayloadResponseConformanceCheck;
 import org.dcsa.conformance.standards.booking.party.BookingRole;
 import org.dcsa.conformance.standards.booking.party.BookingState;

diff --git a/...org/dcsa/conformance/standards/booking/checks/AbstractCarrierPayloadConformanceCheck.java b/...org/dcsa/conformance/standards/booking/checks/AbstractCarrierPayloadConformanceCheck.java
@@ -18,19 +18,14 @@ abstract class AbstractCarrierPayloadConformanceCheck extends PayloadContentConf
     BookingState.PENDING_AMENDMENT
   );
 
-  protected static final Set<BookingState> CONFIRMED_BOOKING_STATES = Set.of(
-    BookingState.CONFIRMED,
-    BookingState.PENDING_AMENDMENT,
-    BookingState.COMPLETED,
-    BookingState.DECLINED
-  );
-
   protected static final Set<BookingState> REASON_STATES = Set.of(
+    BookingState.PENDING_UPDATE,
+    BookingState.PENDING_AMENDMENT,
     BookingState.DECLINED,
     BookingState.REJECTED,
     BookingState.CANCELLED,
-    BookingState.AMENDMENT_CANCELLED,
-    BookingState.AMENDMENT_DECLINED
+    BookingState.AMENDMENT_DECLINED,
+    BookingState.AMENDMENT_CANCELLED
   );
 
   protected static final Set<BookingState> BOOKING_STATES_WHERE_CBR_IS_OPTIONAL = Set.of(