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

…on-model-update feature(chore):962 fixed sentToBpn.
eclipse-tractusx · Jun 24, 2024 · cac9e41 · cac9e41
2 parents e5e0669 + 5a7e971
commit cac9e41
Show file tree

Hide file tree

Showing 9 changed files with 1,904 additions and 1,919 deletions.
diff --git a/docs/api/traceability-foss-backend.json b/docs/api/traceability-foss-backend.json
diff --git a/tx-backend/openapi/traceability-foss-backend.json b/tx-backend/openapi/traceability-foss-backend.json
diff --git a/...n/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepository.java b/...n/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepository.java
@@ -46,6 +46,4 @@ public interface BpnRepository {
 
     BpnEntity save(BusinessPartnerResponse businessPartner);
 
-    List<BpnEdcMapping> findAllByIdIn(List<String> bpns);
-
 }
diff --git a/...va/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepositoryImpl.java b/...va/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepositoryImpl.java
@@ -98,11 +98,6 @@ public BpnEntity save(BusinessPartnerResponse businessPartner) {
         return repository.save(entity);
     }
 
-    @Override
-    public List<BpnEdcMapping> findAllByIdIn(List<String> bpns) {
-        return this.toDTOList(repository.findAllById(bpns));
-    }
-
     @Override
     public List<BpnEdcMapping> saveAll(List<BpnMappingRequest> bpnEdcMappings) {
         List<BpnEntity> bpnEdcMappingEntities = bpnEdcMappings.stream().map(this::toEntity).toList();

diff --git a/...traceability/notification/application/notification/mapper/NotificationResponseMapper.java b/...traceability/notification/application/notification/mapper/NotificationResponseMapper.java
@@ -25,6 +25,7 @@
 import org.eclipse.tractusx.traceability.common.model.PageResult;
 import org.eclipse.tractusx.traceability.notification.domain.base.model.Notification;
 import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage;
+import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
@@ -46,7 +47,7 @@ public static NotificationResponse from(Notification notification) {
                 .id(notification.getNotificationId().value())
                 .status(NotificationMessageMapper.from(notification.getNotificationStatus()))
                 .description(notification.getDescription())
-                .createdBy(getSenderBPN(notification.getNotifications()))
+                .createdBy(getSenderBPN(notification))
                 .createdByName(getSenderName(notification.getNotifications()))
                 .createdDate(notification.getCreatedAt().toString())
                 .assetIds(Collections.unmodifiableList(notification.getAffectedPartIds()))
@@ -73,11 +74,8 @@ public static PageResult<NotificationResponse> fromAsPageResult(PageResult<Notif
         return new PageResult<>(investigationDataPage);
     }
 
-    private static String getSenderBPN(Collection<NotificationMessage> notifications) {
-        return notifications.stream()
-                .findFirst()
-                .map(NotificationMessage::getSentBy)
-                .orElse(null);
+    private static String getSenderBPN(Notification notification) {
+       return notification.getNotificationSide().equals(NotificationSide.SENDER) ? notification.getBpn() : notification.getSendTo();
     }
 
     private static String getSenderName(Collection<NotificationMessage> notifications) {

diff --git a/...org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationMessage.java b/...org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationMessage.java
@@ -75,7 +75,6 @@ public static NotificationMessage create(BPN applicationBpn, String receiverBpn,
                 .sentByName(creator)
                 .sentTo(StringUtils.isBlank(receiverBpn) ? asset.getKey() : receiverBpn)
                 .sendToName(sendToName)
-                .message(description)
                 .notificationStatus(NotificationStatus.SENT)
                 .affectedParts(asset.getValue().stream().map(AssetBase::getId).map(NotificationAffectedPart::new).toList())
                 .edcNotificationId(notificationId)

diff --git a/.../tractusx/traceability/notification/domain/base/service/NotificationPublisherService.java b/.../tractusx/traceability/notification/domain/base/service/NotificationPublisherService.java
@@ -74,11 +74,12 @@ private void createMessages(Notification notification, BPN applicationBPN, Asset
                 .entrySet()
                 .stream()
                 .map(it -> {
-                    String creator = getManufacturerNameByBpn(applicationBPN.value());
+
                     String firstReceiverBpn = notification.getInitialReceiverBpns().stream()
                             .findFirst()
                             .orElseThrow(() -> new NotificationNotFoundException("Initial receiver BPNs not found"));
                     String sendToName = getManufacturerNameByBpn(firstReceiverBpn);
+                    String creator = getManufacturerNameByBpn(applicationBPN.value());
                     return NotificationMessage.create(
                             applicationBPN,
                             firstReceiverBpn,

diff --git a/...ipse/tractusx/traceability/notification/application/alert/response/AlertResponseTest.java b/...ipse/tractusx/traceability/notification/application/alert/response/AlertResponseTest.java
@@ -50,10 +50,7 @@ void givenNotification_whenFrom_thenConstructProperAlertResponse() {
                 .hasFieldOrPropertyWithValue("id", notification.getNotificationId().value())
                 .hasFieldOrPropertyWithValue("status", NotificationStatusResponse.ACCEPTED)
                 .hasFieldOrPropertyWithValue("description", notification.getDescription())
-                .hasFieldOrPropertyWithValue("createdBy", notification.getNotifications().stream()
-                        .findFirst()
-                        .map(NotificationMessage::getSentBy)
-                        .orElse(null))
+                .hasFieldOrPropertyWithValue("createdBy", notification.getBpn())
                 .hasFieldOrPropertyWithValue("createdByName", notification.getNotifications().stream()
                         .findFirst()
                         .map(NotificationMessage::getSentByName)

diff --git a/...tractusx/traceability/notification/application/alert/rest/NotificationControllerTest.java b/...tractusx/traceability/notification/application/alert/rest/NotificationControllerTest.java
@@ -105,10 +105,7 @@ void givenRequest_whenGetAlert_thenProperResponse() {
                 .hasFieldOrPropertyWithValue("id", notification.getNotificationId().value())
                 .hasFieldOrPropertyWithValue("status", NotificationStatusResponse.ACCEPTED)
                 .hasFieldOrPropertyWithValue("description", notification.getDescription())
-                .hasFieldOrPropertyWithValue("createdBy", notification.getNotifications().stream()
-                        .findFirst()
-                        .map(NotificationMessage::getSentBy)
-                        .orElse(null))
+                .hasFieldOrPropertyWithValue("createdBy", notification.getBpn())
                 .hasFieldOrPropertyWithValue("createdByName", notification.getNotifications().stream()
                         .findFirst()
                         .map(NotificationMessage::getSentByName)