Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SD-1823 Revisit the OVS checks with unit test cases #235

Merged
merged 11 commits into from
Dec 15, 2024
Merged

SD-1823 Revisit the OVS checks with unit test cases #235

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f1aa58c
SD-1823 revisit of the Ovs checks with unit test cases.
preetamnpr Nov 28, 2024
abd955f
SD-1823 fixed failed tests and added @Getter.
preetamnpr Nov 28, 2024
cc4a931
SD-1823 added additional tests, additionalProperties flag is set to f…
preetamnpr Nov 28, 2024
d806693
SD-1823 enhanced the validation check failure with jsonpath and relev…
preetamnpr Nov 29, 2024
0d1568d
Merge branch 'dev' into SD-1823
preetamnpr Nov 29, 2024
69e6f07
Merge branch 'dev' into SD-1823
preetamnpr Nov 29, 2024
f9367aa
SD-1823 added suggestions from the codiumAI review agent, partyinput …
preetamnpr Nov 29, 2024
136725c
Merge branch 'SD-1823' of https://github.com/dcsaorg/Conformance-Gate…
preetamnpr Nov 29, 2024
d0ebefe
SD-1823 moved the different publisher responses to test folder and ad…
preetamnpr Dec 3, 2024
a75e892
SD-1823 reverted core changes by implementing the wrapper method.
preetamnpr Dec 4, 2024
738fd35
SD-1823 handled null sspSupplier and removed validationErrors conditi…
preetamnpr Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/main/java/org/dcsa/conformance/core/check/JsonAttributeBasedCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.dcsa.conformance.core.traffic.ConformanceExchange;
import org.dcsa.conformance.core.traffic.HttpMessageType;


class JsonAttributeBasedCheck extends ActionCheck {

private final String standardsVersion;
Expand Down
6 changes: 6 additions & 0 deletions ovs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,11 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<!-- Test scoped dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
24 changes: 12 additions & 12 deletions ovs/src/main/java/org/dcsa/conformance/standards/ovs/OvsScenarioListBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,38 +35,38 @@ public static LinkedHashMap<String, OvsScenarioListBuilder> createModuleScenario
.thenEither(
scenarioWithParameters(Map.of(CARRIER_SERVICE_NAME, "Great Lion Service")),
scenarioWithParameters(
Map.of(CARRIER_SERVICE_NAME, "Blue Whale Service", LIMIT, "1")),
Map.of(CARRIER_SERVICE_NAME, "Blue Whale Service", LIMIT, "5")),
scenarioWithParameters(
Map.of(
CARRIER_SERVICE_NAME,
"Red Falcon Service",
START_DATE,
"2026-01-01")),
"2024-01-01")),
scenarioWithParameters(
Map.of(
CARRIER_SERVICE_NAME,
"Great Lion Service",
END_DATE,
"2021-01-01")),
"2025-01-01")),
scenarioWithParameters(Map.of(CARRIER_SERVICE_CODE, "BW1")),
scenarioWithParameters(Map.of(CARRIER_SERVICE_CODE, "BW1", LIMIT, "1")),
scenarioWithParameters(Map.of(CARRIER_SERVICE_CODE, "BW1", LIMIT, "5")),
scenarioWithParameters(Map.of(UNIVERSAL_SERVICE_REFERENCE, "SR12345A")),
scenarioWithParameters(
Map.of(UNIVERSAL_SERVICE_REFERENCE, "SR67890B", LIMIT, "1")))),
Map.of(UNIVERSAL_SERVICE_REFERENCE, "SR67890B", LIMIT, "5")))),
Map.entry(
"Vessel schedules",
noAction()
.thenEither(
scenarioWithParameters(Map.of(VESSEL_IMO_NUMBER, "9456789")),
scenarioWithParameters(Map.of(VESSEL_IMO_NUMBER, "9876543", LIMIT, "1")))),
scenarioWithParameters(Map.of(VESSEL_IMO_NUMBER, "9876543", LIMIT, "5")))),
Map.entry(
"Location schedules",
noAction()
.thenEither(
scenarioWithParameters(Map.of(UN_LOCATION_CODE, "NLAMS")),
scenarioWithParameters(Map.of(UN_LOCATION_CODE, "USNYC", LIMIT, "1")),
scenarioWithParameters(Map.of(UN_LOCATION_CODE, "USNYC", LIMIT, "5")),
scenarioWithParameters(Map.of(FACILITY_SMDG_CODE, "APM")),
scenarioWithParameters(Map.of(FACILITY_SMDG_CODE, "APM", LIMIT, "1")))),
scenarioWithParameters(Map.of(FACILITY_SMDG_CODE, "APM", LIMIT, "5")))),
Map.entry(
"Voyage schedules",
noAction()
Expand All @@ -79,7 +79,7 @@ public static LinkedHashMap<String, OvsScenarioListBuilder> createModuleScenario
Map.of(
CARRIER_VOYAGE_NUMBER, "2104S",
CARRIER_SERVICE_CODE, "BW1",
LIMIT, "1")),
LIMIT, "5")),
scenarioWithParameters(
Map.of(
CARRIER_VOYAGE_NUMBER, "2103N",
Expand All @@ -88,7 +88,7 @@ public static LinkedHashMap<String, OvsScenarioListBuilder> createModuleScenario
Map.of(
CARRIER_VOYAGE_NUMBER, "2103S",
UNIVERSAL_SERVICE_REFERENCE, "SR12345A",
LIMIT, "1")),
LIMIT, "5")),
scenarioWithParameters(
Map.of(
UNIVERSAL_VOYAGE_REFERENCE, "2103N",
Expand All @@ -97,7 +97,7 @@ public static LinkedHashMap<String, OvsScenarioListBuilder> createModuleScenario
Map.of(
UNIVERSAL_VOYAGE_REFERENCE, "2103S",
CARRIER_SERVICE_CODE, "FE1",
LIMIT, "1")),
LIMIT, "5")),
scenarioWithParameters(
Map.of(
UNIVERSAL_VOYAGE_REFERENCE, "2105N",
Expand All @@ -106,7 +106,7 @@ public static LinkedHashMap<String, OvsScenarioListBuilder> createModuleScenario
Map.of(
UNIVERSAL_VOYAGE_REFERENCE, "2105S",
UNIVERSAL_SERVICE_REFERENCE, "SR54321C",
LIMIT, "1")))))
LIMIT, "5")))))
.collect(
Collectors.toMap(
Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
Expand Down
51 changes: 50 additions & 1 deletion ...c/main/java/org/dcsa/conformance/standards/ovs/action/SupplyScenarioParametersAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;

import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.Arrays;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;

import lombok.Getter;
import org.dcsa.conformance.core.UserFacingException;
import org.dcsa.conformance.standards.ovs.party.OvsFilterParameter;
import org.dcsa.conformance.standards.ovs.party.SuppliedScenarioParameters;

Expand Down Expand Up @@ -90,6 +97,48 @@ public boolean isInputRequired() {
@Override
public void handlePartyInput(JsonNode partyInput) {
super.handlePartyInput(partyInput);
suppliedScenarioParameters = SuppliedScenarioParameters.fromJson(partyInput.get("input"));
JsonNode inputNode = partyInput.get("input");
Set<String> inputKeys =
StreamSupport.stream(
((Iterable<String>) inputNode::fieldNames)
.spliterator(),
false)
.collect(Collectors.toSet());

Set<String> missingKeys =
StreamSupport.stream(
((Iterable<String>) () -> getJsonForHumanReadablePrompt().fieldNames())
.spliterator(),
false)
.collect(Collectors.toSet());
missingKeys.removeAll(inputKeys);
if (!missingKeys.isEmpty()) {
throw new UserFacingException(
"The input must contain: %s".formatted(String.join(", ", missingKeys)));
}

Arrays.stream(OvsFilterParameter.values())
.map(OvsFilterParameter::getQueryParamName)
.filter(
queryParamName ->
queryParamName.startsWith(
OvsFilterParameter.START_DATE.getQueryParamName())
|| queryParamName.startsWith(OvsFilterParameter.END_DATE.getQueryParamName()))
.filter(inputNode::hasNonNull)
.forEach(
queryParamName -> {
String dateValue = inputNode.path(queryParamName).asText();
try {
LocalDate.parse(dateValue, DateTimeFormatter.ISO_DATE);
} catch (DateTimeParseException e) {
throw new UserFacingException(
"Invalid date-time format '%s' for input parameter '%s'"
.formatted(dateValue, queryParamName),
e);
}
});

suppliedScenarioParameters = SuppliedScenarioParameters.fromJson(inputNode);

}
}
Loading
Loading