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

Jump to bottom

Dt-796 changes #48

Merged
merged 2 commits into from
Dec 22, 2023
Merged

Dt-796 changes #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dc826e
Dt-796 changes
preetamnpr Dec 21, 2023
2b37833
Dt-796 changes
preetamnpr Dec 21, 2023
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
10 changes: 5 additions & 5 deletions booking/src/main/java/org/dcsa/conformance/standards/booking/BookingScenarioListBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private BookingScenarioListBuilder thenAllPathsFrom(
shipper_GetBooking(bookingState)
.thenEither(
uc5_carrier_confirmBookingRequest().thenHappyPathFrom(CONFIRMED),
uc6_carrier_requestUpdateToConfirmedBooking().thenAllPathsFrom(PENDING_AMENDMENT),
uc6_carrier_requestToAmendConfirmedBooking().thenAllPathsFrom(PENDING_AMENDMENT),
uc7_shipper_submitBookingAmendment()
.thenAllPathsFrom(AMENDMENT_RECEIVED, CONFIRMED),
uc10_carrier_declineBooking().thenAllPathsFrom(DECLINED),
Expand Down Expand Up @@ -90,15 +90,15 @@ private BookingScenarioListBuilder thenAllPathsFrom(
case PENDING_AMENDMENT -> then(
shipper_GetBooking(bookingState)
.thenEither(
uc6_carrier_requestUpdateToConfirmedBooking().thenHappyPathFrom(PENDING_AMENDMENT),
uc6_carrier_requestToAmendConfirmedBooking().thenHappyPathFrom(PENDING_AMENDMENT),
uc7_shipper_submitBookingAmendment()
.thenAllPathsFrom(AMENDMENT_RECEIVED, PENDING_AMENDMENT),
uc10_carrier_declineBooking().thenHappyPathFrom(DECLINED),
uc11_shipper_cancelBooking().thenHappyPathFrom(CANCELLED)));
case AMENDMENT_RECEIVED -> then(
shipper_GetBooking(originalBookingState,AMENDMENT_RECEIVED)
.thenEither(
uc6_carrier_requestUpdateToConfirmedBooking().thenHappyPathFrom(PENDING_AMENDMENT),
uc6_carrier_requestToAmendConfirmedBooking().thenHappyPathFrom(PENDING_AMENDMENT),
uc8a_carrier_approveBookingAmendment().thenAllPathsFrom(AMENDMENT_CONFIRMED,originalBookingState),
uc8b_carrier_declineBookingAmendment().thenAllPathsFrom(AMENDMENT_DECLINED,originalBookingState),
uc9_shipper_cancelBookingAmendment().thenAllPathsFrom(AMENDMENT_CANCELLED,originalBookingState),
Expand Down Expand Up @@ -248,8 +248,8 @@ private static BookingScenarioListBuilder uc5_carrier_confirmBookingRequest() {
return carrierStateChange(UC5_Carrier_ConfirmBookingRequestAction::new);
}

private static BookingScenarioListBuilder uc6_carrier_requestUpdateToConfirmedBooking() {
return carrierStateChange(UC6_Carrier_RequestUpdateToConfirmedBookingAction::new);
private static BookingScenarioListBuilder uc6_carrier_requestToAmendConfirmedBooking() {
return carrierStateChange(UC6_Carrier_RequestToAmendConfirmedBookingAction::new);
}

private static BookingScenarioListBuilder uc7_shipper_submitBookingAmendment() {
Expand Down
7 changes: 3 additions & 4 deletions ...equestUpdateToConfirmedBookingAction.java → ...RequestToAmendConfirmedBookingAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
import org.dcsa.conformance.core.check.*;
import org.dcsa.conformance.core.traffic.HttpMessageType;
import org.dcsa.conformance.standards.booking.checks.CarrierBookingNotificationDataPayloadRequestConformanceCheck;
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
public class UC6_Carrier_RequestUpdateToConfirmedBookingAction extends StateChangingBookingAction {
public class UC6_Carrier_RequestToAmendConfirmedBookingAction extends StateChangingBookingAction {
private final JsonSchemaValidator requestSchemaValidator;

public UC6_Carrier_RequestUpdateToConfirmedBookingAction(
public UC6_Carrier_RequestToAmendConfirmedBookingAction(
String carrierPartyName,
String shipperPartyName,
BookingAction previousAction,
Expand All @@ -26,7 +25,7 @@ public UC6_Carrier_RequestUpdateToConfirmedBookingAction(

@Override
public String getHumanReadablePrompt() {
return ("UC6: Request update to the confirmed booking with CBR %s"
return ("UC6: Request to amend the confirmed booking with CBR %s"
.formatted(getDspSupplier().get().carrierBookingReference()));
}

Expand Down
10 changes: 5 additions & 5 deletions booking/src/main/java/org/dcsa/conformance/standards/booking/party/Carrier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ protected Map<Class<? extends ConformanceAction>, Consumer<JsonNode>> getActionP
Map.entry(UC4_Carrier_RejectBookingRequestAction.class, this::rejectBookingRequest),
Map.entry(UC5_Carrier_ConfirmBookingRequestAction.class, this::confirmBookingRequest),
Map.entry(
UC6_Carrier_RequestUpdateToConfirmedBookingAction.class,
this::requestUpdateToConfirmedBooking),
UC6_Carrier_RequestToAmendConfirmedBookingAction.class,
this::requestToAmendConfirmedBooking),
Map.entry(UC8_Carrier_ProcessAmendmentAction.class, this::processBookingAmendment),
Map.entry(UC10_Carrier_DeclineBookingAction.class, this::declineBooking),
Map.entry(UC12_Carrier_ConfirmBookingCompletedAction.class, this::confirmBookingCompleted));
Expand Down Expand Up @@ -249,9 +249,9 @@ private void confirmBookingCompleted(JsonNode actionPrompt) {
addOperatorLogEntry("Completed the booking request with CBR '%s'".formatted(cbr));
}

private void requestUpdateToConfirmedBooking(JsonNode actionPrompt) {
private void requestToAmendConfirmedBooking(JsonNode actionPrompt) {
log.info(
"Carrier.requestUpdateToConfirmedBooking(%s)".formatted(actionPrompt.toPrettyString()));
"Carrier.requestToAmendConfirmedBooking(%s)".formatted(actionPrompt.toPrettyString()));

String cbrr = actionPrompt.required("cbrr").asText();
String cbr = actionPrompt.required("cbr").asText();
Expand All @@ -267,7 +267,7 @@ private void requestUpdateToConfirmedBooking(JsonNode actionPrompt) {
persistableCarrierBooking.save(persistentMap);
generateAndEmitNotificationFromBooking(actionPrompt, persistableCarrierBooking, true);

addOperatorLogEntry("Requested update to the booking with CBR '%s'".formatted(cbr));
addOperatorLogEntry("Requested to amend the booking with CBR '%s'".formatted(cbr));
}

private String generateAndAssociateCBR(String cbrr) {
Expand Down
Loading