Merge remote-tracking branch 'origin/dev' into dev

dcsaorg · Nov 20, 2024 · 69df1ea · 69df1ea
2 parents 4a1d469 + 40c3383
commit 69df1ea
Show file tree

Hide file tree

Showing 27 changed files with 875 additions and 143 deletions.
diff --git a/booking/src/main/java/org/dcsa/conformance/standards/booking/checks/BookingChecks.java b/booking/src/main/java/org/dcsa/conformance/standards/booking/checks/BookingChecks.java
@@ -524,11 +524,19 @@ private static void generateScenarioRelatedChecks(List<JsonContentCheck> checks,
       "carrierServiceName",
       delayedValue(cspSupplier, CarrierScenarioParameters::carrierServiceName)
     ));
-    checks.add(JsonAttribute.mustEqual(
-      "[Scenario] Verify that the correct 'contractQuotationReference' is used",
-      "contractQuotationReference",
-      delayedValue(cspSupplier, CarrierScenarioParameters::contractQuotationReference)
-    ));
+
+    checks.add(JsonAttribute.customValidator(
+      "[Scenario] Verify that the correct 'contractQuotationReference'/'serviceContractReference' is used",
+      body -> {
+        var contractQuotationReference = body.path("contractQuotationReference").asText("");
+        var serviceContractReference = body.path("serviceContractReference").asText("");
+        if (!contractQuotationReference.isEmpty() && !serviceContractReference.isEmpty()) {
+          return Set.of("The scenario requires either of 'contractQuotationReference'/'serviceContractReference'" +
+            " to be present, but not both");
+        }
+        return Set.of();
+      }
+     ));
 
     checks.add(JsonAttribute.mustEqual(
       "[Scenario] Verify that the correct 'carrierExportVoyageNumber' is used",
@@ -609,7 +617,7 @@ private static void generateScenarioRelatedChecks(List<JsonContentCheck> checks,
       JsonPointer.compile("/expectedArrivalAtPlaceOfDeliveryEndDate"),
       JsonPointer.compile("/carrierExportVoyageNumber")
     ),
-    JsonAttribute.atLeastOneOf(
+    JsonAttribute.xOrFields(
       JsonPointer.compile("/contractQuotationReference"),
       JsonPointer.compile("/serviceContractReference")
     ),

diff --git a/booking/src/main/resources/standards/booking/messages/booking-api-2.0.0-dg.json b/booking/src/main/resources/standards/booking/messages/booking-api-2.0.0-dg.json
@@ -4,7 +4,6 @@
   "cargoMovementTypeAtOrigin": "FCL",
   "cargoMovementTypeAtDestination": "FCL",
   "serviceContractReference": "SERVICE_CONTRACT_REFERENCE_PLACEHOLDER",
-  "contractQuotationReference": "CONTRACT_QUOTATION_REFERENCE_PLACEHOLDER",
   "carrierExportVoyageNumber": "CARRIER_EXPORT_VOYAGE_NUMBER_PLACEHOLDER",
   "carrierServiceName": "CARRIER_SERVICE_NAME_PLACEHOLDER",
   "isPartialLoadAllowed": false,

diff --git a/...g/src/main/resources/standards/booking/messages/booking-api-2.0.0-reefer-temp-change.json b/...g/src/main/resources/standards/booking/messages/booking-api-2.0.0-reefer-temp-change.json
@@ -4,7 +4,6 @@
   "cargoMovementTypeAtOrigin": "FCL",
   "cargoMovementTypeAtDestination": "FCL",
   "serviceContractReference": "SERVICE_CONTRACT_REFERENCE_PLACEHOLDER",
-  "contractQuotationReference": "CONTRACT_QUOTATION_REFERENCE_PLACEHOLDER",
   "carrierExportVoyageNumber": "CARRIER_EXPORT_VOYAGE_NUMBER_PLACEHOLDER",
   "carrierServiceName": "CARRIER_SERVICE_NAME_PLACEHOLDER",
   "isPartialLoadAllowed": false,

diff --git a/booking/src/main/resources/standards/booking/messages/booking-api-2.0.0-reefer.json b/booking/src/main/resources/standards/booking/messages/booking-api-2.0.0-reefer.json
@@ -4,7 +4,6 @@
   "cargoMovementTypeAtOrigin": "FCL",
   "cargoMovementTypeAtDestination": "FCL",
   "serviceContractReference": "SERVICE_CONTRACT_REFERENCE_PLACEHOLDER",
-  "contractQuotationReference": "CONTRACT_QUOTATION_REFERENCE_PLACEHOLDER",
   "carrierExportVoyageNumber": "CARRIER_EXPORT_VOYAGE_NUMBER_PLACEHOLDER",
   "carrierServiceName": "CARRIER_SERVICE_NAME_PLACEHOLDER",
   "isPartialLoadAllowed": false,

diff --git a/booking/src/main/resources/standards/booking/messages/booking-api-2.0.0-regular-2re1c.json b/booking/src/main/resources/standards/booking/messages/booking-api-2.0.0-regular-2re1c.json
@@ -4,7 +4,6 @@
   "cargoMovementTypeAtOrigin": "FCL",
   "cargoMovementTypeAtDestination": "FCL",
   "serviceContractReference": "SERVICE_CONTRACT_REFERENCE_PLACEHOLDER",
-  "contractQuotationReference": "CONTRACT_QUOTATION_REFERENCE_PLACEHOLDER",
   "carrierExportVoyageNumber": "CARRIER_EXPORT_VOYAGE_NUMBER_PLACEHOLDER",
   "carrierServiceName": "CARRIER_SERVICE_NAME_PLACEHOLDER",
   "isPartialLoadAllowed": false,

diff --git a/booking/src/main/resources/standards/booking/messages/booking-api-2.0.0-regular-2re2c.json b/booking/src/main/resources/standards/booking/messages/booking-api-2.0.0-regular-2re2c.json
@@ -4,7 +4,6 @@
   "cargoMovementTypeAtOrigin": "FCL",
   "cargoMovementTypeAtDestination": "FCL",
   "serviceContractReference": "SERVICE_CONTRACT_REFERENCE_PLACEHOLDER",
-  "contractQuotationReference": "CONTRACT_QUOTATION_REFERENCE_PLACEHOLDER",
   "carrierExportVoyageNumber": "CARRIER_EXPORT_VOYAGE_NUMBER_PLACEHOLDER",
   "carrierServiceName": "CARRIER_SERVICE_NAME_PLACEHOLDER",
   "isPartialLoadAllowed": false,

diff --git a/...ing/src/main/resources/standards/booking/messages/booking-api-2.0.0-regular-cho-dest.json b/...ing/src/main/resources/standards/booking/messages/booking-api-2.0.0-regular-cho-dest.json
@@ -4,7 +4,6 @@
   "cargoMovementTypeAtOrigin": "FCL",
   "cargoMovementTypeAtDestination": "FCL",
   "serviceContractReference": "SERVICE_CONTRACT_REFERENCE_PLACEHOLDER",
-  "contractQuotationReference": "CONTRACT_QUOTATION_REFERENCE_PLACEHOLDER",
   "carrierExportVoyageNumber": "CARRIER_EXPORT_VOYAGE_NUMBER_PLACEHOLDER",
   "carrierServiceName": "CARRIER_SERVICE_NAME_PLACEHOLDER",
   "isPartialLoadAllowed": false,

diff --git a/...ing/src/main/resources/standards/booking/messages/booking-api-2.0.0-regular-cho-orig.json b/...ing/src/main/resources/standards/booking/messages/booking-api-2.0.0-regular-cho-orig.json
@@ -4,7 +4,6 @@
   "cargoMovementTypeAtOrigin": "FCL",
   "cargoMovementTypeAtDestination": "FCL",
   "serviceContractReference": "SERVICE_CONTRACT_REFERENCE_PLACEHOLDER",
-  "contractQuotationReference": "CONTRACT_QUOTATION_REFERENCE_PLACEHOLDER",
   "carrierExportVoyageNumber": "CARRIER_EXPORT_VOYAGE_NUMBER_PLACEHOLDER",
   "carrierServiceName": "CARRIER_SERVICE_NAME_PLACEHOLDER",
   "isPartialLoadAllowed": false,

diff --git a/.../resources/standards/booking/messages/booking-api-2.0.0-regular-non-operating-reefer.json b/.../resources/standards/booking/messages/booking-api-2.0.0-regular-non-operating-reefer.json
@@ -4,7 +4,6 @@
   "cargoMovementTypeAtOrigin": "FCL",
   "cargoMovementTypeAtDestination": "FCL",
   "serviceContractReference": "SERVICE_CONTRACT_REFERENCE_PLACEHOLDER",
-  "contractQuotationReference": "CONTRACT_QUOTATION_REFERENCE_PLACEHOLDER",
   "carrierExportVoyageNumber": "CARRIER_EXPORT_VOYAGE_NUMBER_PLACEHOLDER",
   "carrierServiceName": "CARRIER_SERVICE_NAME_PLACEHOLDER",
   "isPartialLoadAllowed": false,

diff --git a/...rc/main/resources/standards/booking/messages/booking-api-2.0.0-regular-shipper-owned.json b/...rc/main/resources/standards/booking/messages/booking-api-2.0.0-regular-shipper-owned.json
@@ -4,7 +4,6 @@
   "cargoMovementTypeAtOrigin": "FCL",
   "cargoMovementTypeAtDestination": "FCL",
   "serviceContractReference": "SERVICE_CONTRACT_REFERENCE_PLACEHOLDER",
-  "contractQuotationReference": "CONTRACT_QUOTATION_REFERENCE_PLACEHOLDER",
   "carrierExportVoyageNumber": "CARRIER_EXPORT_VOYAGE_NUMBER_PLACEHOLDER",
   "carrierServiceName": "CARRIER_SERVICE_NAME_PLACEHOLDER",
   "isPartialLoadAllowed": false,

diff --git a/booking/src/main/resources/standards/booking/messages/booking-api-2.0.0-regular.json b/booking/src/main/resources/standards/booking/messages/booking-api-2.0.0-regular.json
@@ -15,7 +15,6 @@
     "portChargesPaymentTermCode": "PRE",
     "otherChargesPaymentTermCode": "PRE"
   },
-  "contractQuotationReference": "CONTRACT_QUOTATION_REFERENCE_PLACEHOLDER",
   "vessel": {
     "name": "King of the Seas",
     "vesselIMONumber": "9298686"