Merge pull request #1061 from eclipse-tractusx/feature/962-notificati…

…on-model-update feature(refactoring):962 refactored e2e-test.
eclipse-tractusx · Jun 19, 2024 · 7c5a7fc · 7c5a7fc
2 parents b59952c + 5a83f89
commit 7c5a7fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...src/test/java/org/eclipse/tractusx/traceability/test/validator/NotificationValidator.java b/...src/test/java/org/eclipse/tractusx/traceability/test/validator/NotificationValidator.java
@@ -65,18 +65,16 @@ public static void assertHasFields(NotificationResponse notification, Map<String
         }
 
         if (fieldsToCheck.containsKey(CLOSE_REASON.getFieldName())) {
-            assertThat(notification.getReason().close())
-                    .isEqualTo(fieldsToCheck.get(CLOSE_REASON.getFieldName()));
+            assertThat(notification.latestMessage().get().getMessage()).isEqualTo(fieldsToCheck.get(CLOSE_REASON.getFieldName()));
         }
 
         if (fieldsToCheck.containsKey(ACCEPT_REASON.getFieldName())) {
-            assertThat(notification.getReason().accept())
-                    .isEqualTo(fieldsToCheck.get(ACCEPT_REASON.getFieldName()));
+            assertThat(notification.latestMessage().get().getMessage()).isEqualTo(fieldsToCheck.get(ACCEPT_REASON.getFieldName()));
+
         }
 
         if (fieldsToCheck.containsKey(DECLINE_REASON.getFieldName())) {
-            assertThat(notification.getReason().decline())
-                    .isEqualTo(fieldsToCheck.get(DECLINE_REASON.getFieldName()));
+            assertThat(notification.latestMessage().get().getMessage()).isEqualTo(fieldsToCheck.get(DECLINE_REASON.getFieldName()));
         }
 
         if (fieldsToCheck.containsKey(SEVERITY.getFieldName())) {

diff --git a/tx-models/src/main/java/notification/response/NotificationResponse.java b/tx-models/src/main/java/notification/response/NotificationResponse.java
@@ -100,7 +100,7 @@ public class NotificationResponse {
     private List<NotificationMessageResponse> messages;
 
 
-    public Optional<NotificationMessageResponse> latestNotification() {
+    public Optional<NotificationMessageResponse> latestMessage() {
         return messages.stream().max(Comparator.comparing(NotificationMessageResponse::getMessageDate)).stream().findFirst();
     }