diff --git a/core/src/main/java/org/lfenergy/shapeshifter/core/model/UftpMessageReference.java b/core/src/main/java/org/lfenergy/shapeshifter/core/model/UftpMessageReference.java index 73f9aaa..938d322 100644 --- a/core/src/main/java/org/lfenergy/shapeshifter/core/model/UftpMessageReference.java +++ b/core/src/main/java/org/lfenergy/shapeshifter/core/model/UftpMessageReference.java @@ -4,25 +4,32 @@ package org.lfenergy.shapeshifter.core.model; +import lombok.NonNull; import org.lfenergy.shapeshifter.api.PayloadMessageType; /** * Reference to a previously sent or received UFTP message. * - * @param messageID The MessageID of the UFTP message. - * @param conversationID The Conversation ID of the UFTP message. - * @param direction The direction of the UFTP message, whether it's incoming or outgoing. - * @param senderDomain The SenderDomain of the UFTP message. + * @param messageID The MessageID of the UFTP message. + * @param conversationID The Conversation ID of the UFTP message. + * @param direction The direction of the UFTP message, whether it's incoming or outgoing. + * @param senderDomain The SenderDomain of the UFTP message. * @param recipientDomain The RecipientDomain of the UFTP message. - * @param type The class of the payload message. - * @param The type of the payload message. + * @param type The class of the payload message. + * @param The type of the payload message. */ public record UftpMessageReference( - String messageID, - String conversationID, - UftpMessageDirection direction, - String senderDomain, - String recipientDomain, - Class type + @NonNull + String messageID, + @NonNull + String conversationID, + @NonNull + UftpMessageDirection direction, + @NonNull + String senderDomain, + @NonNull + String recipientDomain, + @NonNull + Class type ) { } diff --git a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/PeriodReferenceValidator.java b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/PeriodReferenceValidator.java index 912bcbe..79a23f2 100644 --- a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/PeriodReferenceValidator.java +++ b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/PeriodReferenceValidator.java @@ -102,7 +102,12 @@ private boolean validatePeriod(UftpMessage uftpMessage, Flex private boolean validatePeriod(UftpMessage uftpMessage, FlexOrder msg) { var period = msg.getPeriod(); - var offer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(msg.getFlexOfferMessageID(), + var flexOfferMessageID = msg.getFlexOfferMessageID(); + if (flexOfferMessageID == null) { + return true; // Unsolicited FlexOrder, thus no matching with FlexOffer period. + } + + var offer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOfferMessageID, msg.getConversationID(), FlexOffer.class)); if (offer.isEmpty()) { return true; // validated in ReferencedFlexOfferMessageIdValidation diff --git a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderOptionReferenceValidator.java b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderOptionReferenceValidator.java index b316920..8ae1459 100644 --- a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderOptionReferenceValidator.java +++ b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderOptionReferenceValidator.java @@ -33,12 +33,17 @@ public int order() { public boolean isValid(UftpMessage uftpMessage) { var flexOrder = uftpMessage.payloadMessage(); + var flexOfferMessageID = flexOrder.getFlexOfferMessageID(); + if (flexOfferMessageID == null) { + return true; // Unsolicited FlexOrder, thus no matching with FlexOffer period. + } + var optionReference = flexOrder.getOptionReference(); if (optionReference == null || optionReference.isEmpty()) { return true; } - return messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOrder.getFlexOfferMessageID(), + return messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOfferMessageID, uftpMessage.payloadMessage().getConversationID(), FlexOffer.class)) .map(flexOffer -> flexOffer.getOfferOptions() .stream() diff --git a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderFlexibilityMatchValidator.java b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderFlexibilityMatchValidator.java index 87d1893..ae777cd 100644 --- a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderFlexibilityMatchValidator.java +++ b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderFlexibilityMatchValidator.java @@ -39,7 +39,12 @@ public int order() { public boolean isValid(UftpMessage uftpMessage) { var flexOrder = uftpMessage.payloadMessage(); - var flexOffer = uftpMessageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOrder.getFlexOfferMessageID(), + var flexOfferMessageID = flexOrder.getFlexOfferMessageID(); + if (flexOfferMessageID == null) { + return true; // Unsolicited FlexOrder, thus no matching with FlexOffer period. + } + + var flexOffer = uftpMessageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOfferMessageID, flexOrder.getConversationID(), FlexOffer.class)); if (flexOffer.isEmpty()) { return false; diff --git a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderIspMatchValidator.java b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderIspMatchValidator.java index 8106d44..a84723e 100644 --- a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderIspMatchValidator.java +++ b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderIspMatchValidator.java @@ -40,7 +40,12 @@ public int order() { public boolean isValid(UftpMessage uftpMessage) { var flexOrder = uftpMessage.payloadMessage(); - var flexOffer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOrder.getFlexOfferMessageID(), + var flexOfferMessageID = flexOrder.getFlexOfferMessageID(); + if (flexOfferMessageID == null) { + return true; // Unsolicited FlexOrder, thus no matching with FlexOffer period. + } + + var flexOffer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOfferMessageID, flexOrder.getConversationID(), FlexOffer.class)); // if there is no flex offer => return false if (flexOffer.isEmpty()) { diff --git a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderPriceMatchValidator.java b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderPriceMatchValidator.java index 20c1c76..73afd99 100644 --- a/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderPriceMatchValidator.java +++ b/core/src/main/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderPriceMatchValidator.java @@ -37,7 +37,13 @@ public int order() { @Override public boolean isValid(UftpMessage uftpMessage) { var flexOrder = uftpMessage.payloadMessage(); - var flexOffer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOrder.getFlexOfferMessageID(), + + var flexOfferMessageID = flexOrder.getFlexOfferMessageID(); + if (flexOfferMessageID == null) { + return true; // Unsolicited FlexOrder, thus no matching with FlexOffer period. + } + + var flexOffer = messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(flexOfferMessageID, flexOrder.getConversationID(), FlexOffer.class)); return flexOffer.map(offer -> offer.getOfferOptions().stream().allMatch(it -> priceMatches(it, flexOrder.getPrice()))).orElse(false); } diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/sending/UftpSendMessageServiceTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/sending/UftpSendMessageServiceTest.java index 986a1ed..1b2cc79 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/sending/UftpSendMessageServiceTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/sending/UftpSendMessageServiceTest.java @@ -391,8 +391,9 @@ void attemptToSendMessage_connectFailed() { verifyNoValidations(); assertThat(actual) - .isInstanceOf(UftpSendException.class) - .hasMessage("Unexpected I/O exception while sending UFTP message to " + endpoint + ": ConnectException: null"); + .isInstanceOf(UftpSendException.class); + assertThat(actual.getMessage()) + .startsWith("Unexpected I/O exception while sending UFTP message to " + endpoint + ": ConnectException:"); assertThat(actual.getHttpStatusCode()).isEqualTo(httpStatusCode); } diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/NotExpiredValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/NotExpiredValidatorTest.java index e4dab7f..88de7b4 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/NotExpiredValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/NotExpiredValidatorTest.java @@ -75,18 +75,24 @@ void notAppliesTo() { public static Stream withParameter() { FlexRequest flexRequest = new FlexRequest(); flexRequest.setTimeZone(TIME_ZONE_AMSTERDAM); + flexRequest.setSenderDomain("agr.tld"); + flexRequest.setRecipientDomain("dso.tld"); FlexOffer flexOffer = new FlexOffer(); flexOffer.setTimeZone(TIME_ZONE_AMSTERDAM); flexOffer.setFlexRequestMessageID(MATCHING_MESSAGE_ID); flexOffer.setPeriod(PERIOD); flexOffer.setConversationID(CONVERSATION_ID); + flexOffer.setSenderDomain("agr.tld"); + flexOffer.setRecipientDomain("dso.tld"); FlexOrder flexOrder = new FlexOrder(); flexOrder.setTimeZone(TIME_ZONE_AMSTERDAM); flexOrder.setFlexOfferMessageID(MATCHING_MESSAGE_ID); flexOrder.setPeriod(PERIOD); flexOrder.setConversationID(CONVERSATION_ID); + flexOrder.setSenderDomain("dso.tld"); + flexOrder.setRecipientDomain("agr.tld"); return Stream.of( Arguments.of(flexOffer, FlexRequest.class, flexRequest), @@ -104,6 +110,16 @@ void valid_true_whenFlexOfferTypeWhenThereIsNoFlexRequestMessageID() { assertThat(testSubject.isValid(UftpMessageFixture.createOutgoing(sender, flexOffer))).isTrue(); } + @Test + void valid_true_whenFlexOrderTypeWhenThereIsNoFlexOfferMessageID() { + // Unsolicited FlexOrder has no FlexOfferMessageID + FlexOrder flexOrder = new FlexOrder(); + flexOrder.setFlexOfferMessageID(null); + flexOrder.setPeriod(PERIOD); + + assertThat(testSubject.isValid(UftpMessageFixture.createOutgoing(sender, flexOrder))).isTrue(); + } + @Test void valid_flexOffer_true_whenFlexRequestIsSentFromMexicoCity() { TimeZone.setDefault(TimeZone.getTimeZone(TIME_ZONE_AMSTERDAM)); @@ -113,6 +129,8 @@ void valid_flexOffer_true_whenFlexRequestIsSentFromMexicoCity() { flexRequest.setTimeZone(TIME_ZONE_MEXICO_CITY); var flexOffer = new FlexOffer(); + flexOffer.setSenderDomain("agr.tld"); + flexOffer.setRecipientDomain("dso.tld"); flexOffer.setFlexRequestMessageID(MATCHING_MESSAGE_ID); flexOffer.setConversationID(CONVERSATION_ID); var uftpMessage = UftpMessageFixture.createOutgoing(sender, flexOffer); @@ -133,6 +151,8 @@ void valid_flexOrder_true_whenFlexOfferIsSentFromMexicoCity() { flexOffer.setConversationID(CONVERSATION_ID); var flexOrder = new FlexOrder(); + flexOrder.setSenderDomain("dso.tld"); + flexOrder.setRecipientDomain("agr.tld"); flexOrder.setFlexOfferMessageID(MATCHING_MESSAGE_ID); flexOrder.setConversationID(CONVERSATION_ID); diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/PeriodReferenceValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/PeriodReferenceValidatorTest.java index 1dca695..e69904f 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/PeriodReferenceValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/PeriodReferenceValidatorTest.java @@ -8,10 +8,13 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.lfenergy.shapeshifter.core.service.validation.base.TestDataHelper.conversationId; + import java.lang.reflect.Method; import java.time.LocalDate; import java.util.Optional; +import java.util.UUID; import java.util.stream.Stream; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -37,136 +40,162 @@ @ExtendWith(MockitoExtension.class) class PeriodReferenceValidatorTest { - private static final String MATCHING_MESSAGE_ID = "MATCHING_MESSAGE_ID"; - private static final String CONVERSATION_ID = conversationId(); - private static final LocalDate PERIOD = LocalDate.of(2022, 11, 22); - private static final LocalDate OTHER = LocalDate.of(2023, 12, 28); - - @Mock - private UftpMessageSupport messageSupport; - - @InjectMocks - private PeriodReferenceValidator testSubject; - - @Mock - private UftpParticipant sender; - - @AfterEach - void noMore() { - verifyNoMoreInteractions( - messageSupport, - sender - ); - } - - @Test - void appliesTo() { - assertThat(testSubject.appliesTo(AGRPortfolioQueryResponse.class)).isTrue(); - assertThat(testSubject.appliesTo(DSOPortfolioQueryResponse.class)).isTrue(); - assertThat(testSubject.appliesTo(FlexOffer.class)).isTrue(); - assertThat(testSubject.appliesTo(FlexOrder.class)).isTrue(); - } - - @Test - void notAppliesTo() { - assertThat(testSubject.appliesTo(TestMessage.class)).isFalse(); - } - - public static Stream withParameter() { - - AGRPortfolioQueryResponse agrQueryResp = new AGRPortfolioQueryResponse(); - agrQueryResp.setAGRPortfolioQueryMessageID(MATCHING_MESSAGE_ID); - agrQueryResp.setConversationID(CONVERSATION_ID); - agrQueryResp.setPeriod(PERIOD); - - DSOPortfolioQueryResponse dsoQueryResp = new DSOPortfolioQueryResponse(); - dsoQueryResp.setDSOPortfolioQueryMessageID(MATCHING_MESSAGE_ID); - dsoQueryResp.setConversationID(CONVERSATION_ID); - dsoQueryResp.setPeriod(PERIOD); - - FlexOffer flexOffer = new FlexOffer(); - flexOffer.setFlexRequestMessageID(MATCHING_MESSAGE_ID); - flexOffer.setConversationID(CONVERSATION_ID); - flexOffer.setPeriod(PERIOD); - - FlexOrder flexOrder = new FlexOrder(); - flexOrder.setFlexOfferMessageID(MATCHING_MESSAGE_ID); - flexOrder.setConversationID(CONVERSATION_ID); - flexOrder.setPeriod(PERIOD); - - return Stream.of( - Arguments.of(agrQueryResp, AGRPortfolioQuery.class, new AGRPortfolioQuery()), - Arguments.of(dsoQueryResp, DSOPortfolioQuery.class, new DSOPortfolioQuery()), - Arguments.of(flexOffer, FlexRequest.class, new FlexRequest()), - Arguments.of(flexOrder, FlexOffer.class, new FlexOffer()) - ); - } - - @Test - void valid_true_whenFlexOfferTypeWhenThereIsNoFlexRequestMessageID() { - // Matching Message ID is mandatory except for FlexOffer's FlexRequestMessageID - FlexOffer flexOffer = new FlexOffer(); - flexOffer.setFlexRequestMessageID(null); - flexOffer.setPeriod(PERIOD); - - assertThat(testSubject.isValid(UftpMessageFixture.createOutgoing(sender, flexOffer))).isTrue(); - } - - @ParameterizedTest - @MethodSource("withParameter") - void valid_true_matchingMessageNotFound( - PayloadMessageType payloadMessage, Class matchingMessageType, T matchingMessage - ) { - var uftpMessage = UftpMessageFixture.createOutgoing(sender, payloadMessage); - - given(messageSupport.findReferencedMessage( uftpMessage.referenceToPreviousMessage(MATCHING_MESSAGE_ID, CONVERSATION_ID, - matchingMessageType))).willReturn(Optional.empty()); - - // Matching message may not be found, although it should be there. This returns valid() == true - // because that is not the purpose of this validation. It is checked in Referenced******MessageIdValidation classes. - assertThat(testSubject.isValid(uftpMessage)).isTrue(); - } - - @ParameterizedTest - @MethodSource("withParameter") - void valid_true_matchingMessageFoundPeriodMatches( - PayloadMessageType payloadMessage, Class matchingMessageType, T matchingMessage - ) throws Exception { - var uftpMessage = UftpMessageFixture.createOutgoing(sender, payloadMessage); - - setPeriod(matchingMessageType, matchingMessage, PERIOD); - given(messageSupport.findReferencedMessage( uftpMessage.referenceToPreviousMessage(MATCHING_MESSAGE_ID, CONVERSATION_ID, - matchingMessageType))).willReturn(Optional.of(matchingMessage)); - - assertThat(testSubject.isValid(uftpMessage)).isTrue(); - } - - @ParameterizedTest - @MethodSource("withParameter") - void valid_false_matchingMessageFoundPeriodDoesNotMatch( - PayloadMessageType payloadMessage, Class matchingMessageType, T matchingMessage - ) throws Exception { - var uftpMessage = UftpMessageFixture.createOutgoing(sender, payloadMessage); - - setPeriod(matchingMessageType, matchingMessage, OTHER); - given(messageSupport.findReferencedMessage( uftpMessage.referenceToPreviousMessage(MATCHING_MESSAGE_ID, CONVERSATION_ID, - matchingMessageType))).willReturn(Optional.of(matchingMessage)); - - assertThat(testSubject.isValid(uftpMessage)).isFalse(); - } - - private void setPeriod(Class matchingMessageType, T matchingMessage, LocalDate value) throws Exception { - Method setter; - try { - setter = matchingMessageType.getDeclaredMethod("setPeriod", LocalDate.class); - } catch (NoSuchMethodException e) { - setter = matchingMessageType.getSuperclass().getDeclaredMethod("setPeriod", LocalDate.class); + private static final String MATCHING_MESSAGE_ID = "MATCHING_MESSAGE_ID"; + private static final String CONVERSATION_ID = conversationId(); + private static final LocalDate PERIOD = LocalDate.of(2022, 11, 22); + private static final LocalDate OTHER = LocalDate.of(2023, 12, 28); + + @Mock + private UftpMessageSupport messageSupport; + + @InjectMocks + private PeriodReferenceValidator testSubject; + + @Mock + private UftpParticipant sender; + + @AfterEach + void noMore() { + verifyNoMoreInteractions( + messageSupport, + sender + ); + } + + @Test + void appliesTo() { + assertThat(testSubject.appliesTo(AGRPortfolioQueryResponse.class)).isTrue(); + assertThat(testSubject.appliesTo(DSOPortfolioQueryResponse.class)).isTrue(); + assertThat(testSubject.appliesTo(FlexOffer.class)).isTrue(); + assertThat(testSubject.appliesTo(FlexOrder.class)).isTrue(); } - setter.invoke(matchingMessage, value); - } - @Test - void getReason() { - assertThat(testSubject.getReason()).isEqualTo("Reference Period mismatch"); - } + @Test + void notAppliesTo() { + assertThat(testSubject.appliesTo(TestMessage.class)).isFalse(); + } + + public static Stream withParameter() { + + AGRPortfolioQueryResponse agrQueryResp = new AGRPortfolioQueryResponse(); + agrQueryResp.setConversationID(UUID.randomUUID().toString()); + agrQueryResp.setMessageID(UUID.randomUUID().toString()); + agrQueryResp.setSenderDomain("agr.tld"); + agrQueryResp.setRecipientDomain("dso.tld"); + agrQueryResp.setAGRPortfolioQueryMessageID(MATCHING_MESSAGE_ID); + agrQueryResp.setConversationID(CONVERSATION_ID); + agrQueryResp.setPeriod(PERIOD); + + DSOPortfolioQueryResponse dsoQueryResp = new DSOPortfolioQueryResponse(); + dsoQueryResp.setConversationID(UUID.randomUUID().toString()); + dsoQueryResp.setMessageID(UUID.randomUUID().toString()); + dsoQueryResp.setSenderDomain("dso.tld"); + dsoQueryResp.setRecipientDomain("agr.tld"); + dsoQueryResp.setDSOPortfolioQueryMessageID(MATCHING_MESSAGE_ID); + dsoQueryResp.setConversationID(CONVERSATION_ID); + dsoQueryResp.setPeriod(PERIOD); + + FlexOffer flexOffer = new FlexOffer(); + flexOffer.setConversationID(UUID.randomUUID().toString()); + flexOffer.setMessageID(UUID.randomUUID().toString()); + flexOffer.setSenderDomain("agr.tld"); + flexOffer.setRecipientDomain("dso.tld"); + flexOffer.setFlexRequestMessageID(MATCHING_MESSAGE_ID); + flexOffer.setConversationID(CONVERSATION_ID); + flexOffer.setPeriod(PERIOD); + + FlexOrder flexOrder = new FlexOrder(); + flexOrder.setConversationID(UUID.randomUUID().toString()); + flexOrder.setMessageID(UUID.randomUUID().toString()); + flexOrder.setSenderDomain("dso.tld"); + flexOrder.setRecipientDomain("agr.tld"); + flexOrder.setFlexOfferMessageID(MATCHING_MESSAGE_ID); + flexOrder.setConversationID(CONVERSATION_ID); + flexOrder.setPeriod(PERIOD); + + return Stream.of( + Arguments.of(agrQueryResp, AGRPortfolioQuery.class, new AGRPortfolioQuery()), + Arguments.of(dsoQueryResp, DSOPortfolioQuery.class, new DSOPortfolioQuery()), + Arguments.of(flexOffer, FlexRequest.class, new FlexRequest()), + Arguments.of(flexOrder, FlexOffer.class, new FlexOffer()) + ); + } + + @Test + void valid_true_whenFlexOfferTypeWhenThereIsNoFlexRequestMessageID() { + // Matching Message ID is mandatory except for FlexOffer's FlexRequestMessageID + FlexOffer flexOffer = new FlexOffer(); + flexOffer.setFlexRequestMessageID(null); + flexOffer.setPeriod(PERIOD); + + assertThat(testSubject.isValid(UftpMessageFixture.createOutgoing(sender, flexOffer))).isTrue(); + } + + @Test + void valid_true_whenFlexOrderTypeWhenThereIsNoFlexOfferMessageID() { + // Unsolicited FlexOrder has no FlexOfferMessageID + FlexOrder flexOrder = new FlexOrder(); + flexOrder.setFlexOfferMessageID(null); + flexOrder.setPeriod(PERIOD); + + assertThat(testSubject.isValid(UftpMessageFixture.createOutgoing(sender, flexOrder))).isTrue(); + } + + @ParameterizedTest + @MethodSource("withParameter") + void valid_true_matchingMessageNotFound( + PayloadMessageType payloadMessage, Class matchingMessageType, T matchingMessage + ) { + var uftpMessage = UftpMessageFixture.createOutgoing(sender, payloadMessage); + + given(messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(MATCHING_MESSAGE_ID, CONVERSATION_ID, + matchingMessageType))).willReturn(Optional.empty()); + + // Matching message may not be found, although it should be there. This returns valid() == true + // because that is not the purpose of this validation. It is checked in Referenced******MessageIdValidation classes. + assertThat(testSubject.isValid(uftpMessage)).isTrue(); + } + + @ParameterizedTest + @MethodSource("withParameter") + void valid_true_matchingMessageFoundPeriodMatches( + PayloadMessageType payloadMessage, Class matchingMessageType, T matchingMessage + ) throws Exception { + var uftpMessage = UftpMessageFixture.createOutgoing(sender, payloadMessage); + + setPeriod(matchingMessageType, matchingMessage, PERIOD); + given(messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(MATCHING_MESSAGE_ID, CONVERSATION_ID, + matchingMessageType))).willReturn(Optional.of(matchingMessage)); + + assertThat(testSubject.isValid(uftpMessage)).isTrue(); + } + + @ParameterizedTest + @MethodSource("withParameter") + void valid_false_matchingMessageFoundPeriodDoesNotMatch( + PayloadMessageType payloadMessage, Class matchingMessageType, T matchingMessage + ) throws Exception { + var uftpMessage = UftpMessageFixture.createOutgoing(sender, payloadMessage); + + setPeriod(matchingMessageType, matchingMessage, OTHER); + given(messageSupport.findReferencedMessage(uftpMessage.referenceToPreviousMessage(MATCHING_MESSAGE_ID, CONVERSATION_ID, + matchingMessageType))).willReturn(Optional.of(matchingMessage)); + + assertThat(testSubject.isValid(uftpMessage)).isFalse(); + } + + private void setPeriod(Class matchingMessageType, T matchingMessage, LocalDate value) throws Exception { + Method setter; + try { + setter = matchingMessageType.getDeclaredMethod("setPeriod", LocalDate.class); + } catch (NoSuchMethodException e) { + setter = matchingMessageType.getSuperclass().getDeclaredMethod("setPeriod", LocalDate.class); + } + setter.invoke(matchingMessage, value); + } + + @Test + void getReason() { + assertThat(testSubject.getReason()).isEqualTo("Reference Period mismatch"); + } } \ No newline at end of file diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedDPrognosisMessageIdValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedDPrognosisMessageIdValidatorTest.java index 86142ed..be7118d 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedDPrognosisMessageIdValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedDPrognosisMessageIdValidatorTest.java @@ -91,12 +91,17 @@ public static Stream withoutParameter() { public static Stream withParameter() { FlexOffer flexOffer = new FlexOffer(); + flexOffer.setSenderDomain("agr.tld"); + flexOffer.setRecipientDomain("dso.tld"); flexOffer.setDPrognosisMessageID(DPROGNOSIS_MESSAGE_ID1); flexOffer.setConversationID(CONVERSATION_ID); + FlexOrder flexOrder = new FlexOrder(); + flexOrder.setSenderDomain("dso.tld"); + flexOrder.setRecipientDomain("agr.tld"); flexOrder.setDPrognosisMessageID(DPROGNOSIS_MESSAGE_ID1); - flexOffer.setConversationID(CONVERSATION_ID); flexOrder.setConversationID(CONVERSATION_ID); + FlexOrderSettlementType os1 = new FlexOrderSettlementType(); os1.setDPrognosisMessageID(DPROGNOSIS_MESSAGE_ID1); FlexOrderSettlementType os2 = new FlexOrderSettlementType(); @@ -104,6 +109,8 @@ public static Stream withParameter() { FlexOrderSettlementType os3WithoutDPorgMsgId = new FlexOrderSettlementType(); FlexSettlement flexSettlement = new FlexSettlement(); + flexSettlement.setSenderDomain("agr.tld"); + flexSettlement.setRecipientDomain("dso.tld"); flexSettlement.getFlexOrderSettlements().addAll(List.of(os1, os2, os3WithoutDPorgMsgId)); flexSettlement.setConversationID(CONVERSATION_ID); diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOfferMessageIdValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOfferMessageIdValidatorTest.java index f6eaba0..7a25852 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOfferMessageIdValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOfferMessageIdValidatorTest.java @@ -77,10 +77,14 @@ public static Stream withoutParameter() { public static Stream withParameter() { FlexOfferRevocation revocation = new FlexOfferRevocation(); + revocation.setSenderDomain("agr.tld"); + revocation.setRecipientDomain("dso.tld"); revocation.setFlexOfferMessageID(FLEX_OFFER_MESSAGE_ID); revocation.setConversationID(CONVERSATION_ID); FlexOrder flexOrder = new FlexOrder(); + flexOrder.setSenderDomain("dso.tld"); + flexOrder.setRecipientDomain("agr.tld"); flexOrder.setFlexOfferMessageID(FLEX_OFFER_MESSAGE_ID); flexOrder.setConversationID(CONVERSATION_ID); diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderMessageIdValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderMessageIdValidatorTest.java index 02eaf9e..2cf5ff0 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderMessageIdValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderMessageIdValidatorTest.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Optional; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.lfenergy.shapeshifter.api.DPrognosisResponse; @@ -46,6 +47,12 @@ class ReferencedFlexOrderMessageIdValidatorTest { private final FlexOrder flexOrder1 = new FlexOrder(); private final FlexOrder flexOrder2 = new FlexOrder(); + @BeforeEach + void setUp() { + prognosisResponse.setSenderDomain("example.com"); + prognosisResponse.setRecipientDomain("recipient.com"); + } + @AfterEach void noMore() { verifyNoMoreInteractions(messageSupport); diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderOptionReferenceValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderOptionReferenceValidatorTest.java index 7f1f1de..eeede73 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderOptionReferenceValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexOrderOptionReferenceValidatorTest.java @@ -60,9 +60,18 @@ void notAppliesTo() { assertThat(testSubject.appliesTo(FlexOffer.class)).isFalse(); } + @Test + void valid_true_whenFlexOfferMessageIDIsNull() { + flexOrder.setFlexOfferMessageID(null); + flexOrder.setOptionReference(OPTION_REFERENCE); + + assertThat(testSubject.isValid(UftpMessageFixture.createOutgoing(sender, flexOrder))).isTrue(); + } + @Test void valid_true_whenNoValueIsPresent() { - flexOrder.setOrderReference(null); + flexOrder.setFlexOfferMessageID(FLEX_OFFER_ID); + flexOrder.setOptionReference(null); assertThat(testSubject.isValid(UftpMessageFixture.createOutgoing(sender, flexOrder))).isTrue(); } diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdValidatorTest.java index 7df5407..34c3d81 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexRequestMessageIdValidatorTest.java @@ -8,6 +8,7 @@ import static org.mockito.BDDMockito.given; import java.util.Optional; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.lfenergy.shapeshifter.api.FlexOffer; @@ -36,6 +37,12 @@ class ReferencedFlexRequestMessageIdValidatorTest { private final FlexOffer flexOffer = new FlexOffer(); private final FlexRequest flexRequest = new FlexRequest(); + @BeforeEach + void setUp() { + flexOffer.setSenderDomain("example.com"); + flexOffer.setRecipientDomain("recipient.com"); + } + @Test void appliesTo() { assertThat(testSubject.appliesTo(FlexOffer.class)).isTrue(); @@ -48,7 +55,7 @@ void notAppliesTo() { @Test void valid_whenNoReferenceInRequest() { - given(flexOffer.getFlexRequestMessageID()).willReturn(null); + flexOffer.setFlexRequestMessageID(null); assertThat(testSubject.isValid(UftpMessageFixture.createOutgoing(sender, flexOffer))).isTrue(); } diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexSettlementResponseOrderReferenceValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexSettlementResponseOrderReferenceValidatorTest.java index 54b5d48..63a2a13 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexSettlementResponseOrderReferenceValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedFlexSettlementResponseOrderReferenceValidatorTest.java @@ -30,6 +30,7 @@ class ReferencedFlexSettlementResponseOrderReferenceValidatorTest { private static final String ORDER_REFERENCE1 = "ORDER_REFERENCE1"; private static final String ORDER_REFERENCE2 = "ORDER_REFERENCE2"; + private static final String SENDER_DOMAIN = "SENDER_DOMAIN"; private static final String RECIPIENT_DOMAIN = "RECIPIENT_DOMAIN"; private static final String CONVERSATION_ID = conversationId(); @Mock @@ -78,6 +79,7 @@ void valid_whenNoReferencesInResponse() { @Test void valid_whenAllReferencesInListAreKnown() { + given(settlementResponse.getSenderDomain()).willReturn(SENDER_DOMAIN); given(settlementResponse.getRecipientDomain()).willReturn(RECIPIENT_DOMAIN); given(settlementResponse.getFlexOrderSettlementStatuses()).willReturn(List.of( status1, status2 @@ -96,6 +98,7 @@ void valid_whenAllReferencesInListAreKnown() { @Test void invalid_whenSingleReferenceInListIsUnknown() { + given(settlementResponse.getSenderDomain()).willReturn(SENDER_DOMAIN); given(settlementResponse.getRecipientDomain()).willReturn(RECIPIENT_DOMAIN); given(settlementResponse.getFlexOrderSettlementStatuses()).willReturn(List.of( status1, status2 diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidatorTest.java index 5c11ce5..a9ea53b 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/ReferencedRequestMessageIdInResponseValidatorTest.java @@ -1,5 +1,6 @@ package org.lfenergy.shapeshifter.core.service.validation.base; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.lfenergy.shapeshifter.api.FlexOffer; @@ -39,6 +40,14 @@ class ReferencedRequestMessageIdInResponseValidatorTest { private final FlexRequest flexRequest = new FlexRequest(); private final FlexOffer flexOffer = new FlexOffer(); + @BeforeEach + void setUp() { + flexRequestResponse.setSenderDomain("example.com"); + flexRequestResponse.setRecipientDomain("recipient.com"); + flexOfferResponse.setSenderDomain("example.com"); + flexOfferResponse.setRecipientDomain("recipient.com"); + } + @Test void appliesTo() { assertThat(testSubject.appliesTo(FlexRequestResponse.class)).isTrue(); diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/TestDataHelper.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/TestDataHelper.java index 9a34a6e..a8c808c 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/TestDataHelper.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/base/TestDataHelper.java @@ -30,6 +30,8 @@ public class TestDataHelper { public static final String DEFAULT_CONTRACT_ID = "CONTRACT-ID"; public static final String DEFAULT_BASE_LINE_REFERENCE = "BASELINE_REFERENCE"; public static final String DEFAULT_CURRENCY = "EUR"; + public static final String DEFAULT_SENDER_DOMAIN = "sender.domain.eu"; + public static final String DEFAULT_RECIPIENT_DOMAIN = "recipient.domain.eu"; /********************************************************* * FLEX REQUEST @@ -40,6 +42,8 @@ public static FlexRequest flexRequest() { public static FlexRequest flexRequest(String messageId, OffsetDateTime expirationDateTime) { var flexRequest = new FlexRequest(); + flexRequest.setSenderDomain(DEFAULT_SENDER_DOMAIN); + flexRequest.setRecipientDomain(DEFAULT_RECIPIENT_DOMAIN); flexRequest.setMessageID(messageId); flexRequest.setContractID(DEFAULT_CONTRACT_ID); flexRequest.setRevision(1); @@ -77,6 +81,8 @@ public static FlexOffer flexOffer(String flexRequestMessageId, String conversati public static FlexOffer flexOffer(String flexRequestMessageId, String conversationId, List flexOfferOptions, OffsetDateTime expirationDate) { var flexOffer = new FlexOffer(); + flexOffer.setSenderDomain(DEFAULT_SENDER_DOMAIN); + flexOffer.setRecipientDomain(DEFAULT_RECIPIENT_DOMAIN); flexOffer.setConversationID(conversationId); flexOffer.setContractID(DEFAULT_CONTRACT_ID); flexOffer.setBaselineReference(DEFAULT_BASE_LINE_REFERENCE); @@ -162,6 +168,8 @@ public static FlexOrder flexOrder(String flexOfferMessageId, String conversation public static FlexOrder flexOrder(String flexOfferMessageId, String conversationId, BigDecimal price, String optionReference) { var flexOrder = new FlexOrder(); + flexOrder.setSenderDomain(DEFAULT_SENDER_DOMAIN); + flexOrder.setRecipientDomain(DEFAULT_RECIPIENT_DOMAIN); flexOrder.setContractID(DEFAULT_CONTRACT_ID); flexOrder.setBaselineReference(DEFAULT_BASE_LINE_REFERENCE); flexOrder.setCurrency(DEFAULT_CURRENCY); diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderFlexibilityMatchValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderFlexibilityMatchValidatorTest.java index 0a59f4d..65e8914 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderFlexibilityMatchValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderFlexibilityMatchValidatorTest.java @@ -29,6 +29,7 @@ import static org.lfenergy.shapeshifter.core.service.validation.base.TestDataHelper.flexOrderIsps; import static org.lfenergy.shapeshifter.core.service.validation.base.TestDataHelper.messageId; import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.verifyNoInteractions; @ExtendWith(MockitoExtension.class) class FlexOrderFlexibilityMatchValidatorTest { @@ -56,6 +57,17 @@ void notAppliesTo() { assertThat(testSubject.appliesTo(FlexRequest.class)).isFalse(); } + @Test + void test_unsolicited_flex_order_is_valid() { + var flexOrder = flexOrder(null, conversationId()); + flexOrder.setFlexOfferMessageID(null); + + var uftpMessage = UftpMessageFixture.createOutgoing(sender, flexOrder); + + assertThat(testSubject.isValid(uftpMessage)).isTrue(); + verifyNoInteractions(messageSupport); + } + @Test void test_happy_flow_1_order_has_same_flexibility_as_offer() { var flexMessageId = messageId(); diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderIspMatchValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderIspMatchValidatorTest.java index e0da47f..65b3f7d 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderIspMatchValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderIspMatchValidatorTest.java @@ -17,6 +17,7 @@ import static org.lfenergy.shapeshifter.core.service.validation.base.TestDataHelper.flexOrderIsps; import static org.lfenergy.shapeshifter.core.service.validation.base.TestDataHelper.messageId; import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.verifyNoInteractions; import java.util.List; import java.util.Optional; @@ -60,6 +61,17 @@ void notAppliesTo() { assertThat(testSubject.appliesTo(FlexRequest.class)).isFalse(); } + @Test + void test_unsolicited_flex_order_is_valid() { + var flexOrder = flexOrder(null, conversationId()); + flexOrder.setFlexOfferMessageID(null); + + var uftpMessage = UftpMessageFixture.createOutgoing(sender, flexOrder); + + assertThat(testSubject.isValid(uftpMessage)).isTrue(); + verifyNoInteractions(messageSupport); + } + @Test void test_happy_flow_1_order_isps_all_occur_in_flex_offer() { var flexMessageId = messageId(); diff --git a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderPriceMatchValidatorTest.java b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderPriceMatchValidatorTest.java index 51c2efa..1ae13b8 100644 --- a/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderPriceMatchValidatorTest.java +++ b/core/src/test/java/org/lfenergy/shapeshifter/core/service/validation/message/FlexOrderPriceMatchValidatorTest.java @@ -13,6 +13,7 @@ import static org.lfenergy.shapeshifter.core.service.validation.base.TestDataHelper.messageId; import static org.lfenergy.shapeshifter.core.service.validation.base.TestDataHelper.DEFAULT_OPTION_REFERENCE; import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.verifyNoInteractions; import java.math.BigDecimal; import java.util.List; @@ -56,6 +57,17 @@ void notAppliesTo() { assertThat(testSubject.appliesTo(FlexRequest.class)).isFalse(); } + @Test + void test_unsolicited_flex_order_is_valid() { + var flexOrder = flexOrder(null, conversationId()); + flexOrder.setFlexOfferMessageID(null); + + var uftpMessage = UftpMessageFixture.createOutgoing(sender, flexOrder); + + assertThat(testSubject.isValid(uftpMessage)).isTrue(); + verifyNoInteractions(messageSupport); + } + @Test void test_happy_flow_1_order_has_same_price_as_offer() { var flexMessageId = messageId();