Merge pull request eclipse-tractusx#1163 from eclipse-tractusx/featur…

…e/xxx-fix-notification-description

feature(chore):xxx - fixed notification description.

CHANGELOG.md

@@ -29,6 +29,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - #786 Introduced internal url for notification contracts.
 - #994 improved bpn edc configuration view uux
 - #1082 fix update of parts when synchronizing with IRS
+- #xxx fixed notification description on receiver side
 - #875 owasp dependency check tool is now used from github action image instead of maven plugin
 - XXX fixed display of semantic data model in parts as planned table
 

tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/model/EDCNotificationFactory.java

@@ -23,6 +23,7 @@
 import org.eclipse.tractusx.traceability.notification.domain.base.model.Notification;
 import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationAffectedPart;
 import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage;
+import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus;
 
 import java.util.List;
 
@@ -48,8 +49,14 @@ public static EDCNotification createEdcNotification(String senderEDC, Notificati
                 notificationMessage.getMessageId()
         );
 
+        String message = null;
+        if (notification.getNotificationStatus() != null && notification.getNotificationStatus().equals(NotificationStatus.SENT)){
+            message = notification.getDescription();
+        } else{
+            message = notificationMessage.getMessage();
+        }
         EDCNotificationContent content = new EDCNotificationContent(
-                notificationMessage.getMessage(),
+                message,
                 extractAssetIds(notificationMessage)
         );