Merge pull request #1041 from ds-lcapellino/feature/639-handle-policy…

…-expiration

Feature/639 handle policy expiration

CHANGELOG.md

@@ -17,6 +17,10 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - #1037 extended autocomplete api by contractAgreementId
 - #985 Added function to save Contracts based on notification contractAgreementIds into the database
 - #985 Added function to filter notifications for contractAgreementIds
+- XXX updated JsonSchemaTest now the test pulls the latest version of the json file
+- XXX deactivated a test class in tx-backend which behaved undesirably
+- #1017 updated contributing, notice, and readme files for TRG 7
+- #639 handle expired or incorrect policies when sending notifications
 - #786 Added authorization as admin for submodel api & registry api
 - #884 Upgraded tractionBatteryCode from 1.0.0 to 2.0.0
 - #786 Added alternative port (only accessible within same cluster) for application which is used for unsecured API endpoints.
@@ -28,6 +32,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - XXX Added interceptor to EdcRestTemplates to log requests
 - #915 Added section to documentation: EDC-BPN configuration
 - #1037 Added link from contracts view to the corresponding filtered part table view
+- #1017 added file for CC BY 4.0 license for TRG 7
 - #985 Added reference to part/notification under contract
 - #786 Added icons on part table to let admin reload registry / sync assets via IRS
 
@@ -41,19 +46,6 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - XXX Removed EdcNotifiactionMockServiceImpl class and replaced with mocks
 - #1033 removed action jira-publish-release workflow
 
-### Changed
-
-- XXX updated JsonSchemaTest now the test pulls the latest version of the json file
-- XXX deactivated a test class in tx-backend which behaved undesirably
-
-### Added
-
-- #1017 added file for CC BY 4.0 license for TRG 7
-
-### Changed
-
-- #1017 updated contributing, notice, and readme files for TRG 7
-
 ## [11.0.2 - 29.05.2024]
 ### Added
 - #1010 Made submodel path configurable

pom.xml

@@ -90,7 +90,7 @@ SPDX-License-Identifier: Apache-2.0
         <junit-bom.version>5.10.2</junit-bom.version>
         <awaitility.version>4.2.1</awaitility.version>
         <!-- TODO https://github.com/eclipse-tractusx/traceability-foss/issues/978 update to the cx release version of irs lib IMPORTANT NO SNAPSHOT-->
-        <irs-client-lib.version>2.0.5</irs-client-lib.version>
+        <irs-client-lib.version>2.1.1</irs-client-lib.version>
         <json-schema-validator.version>5.4.0</json-schema-validator.version>
         <!-- Sonar related properties -->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/PartSiteInformationAsPlannedMapper.java

@@ -55,7 +55,7 @@ private static List<DetailAspectModel> extractDetailAspectModelsPartSiteInformat
         List<DetailAspectModel> detailAspectModels = new ArrayList<>();
         emptyIfNull(sites).forEach(site -> {
             DetailAspectDataPartSiteInformationAsPlanned detailAspectDataPartSiteInformationAsPlanned = DetailAspectDataPartSiteInformationAsPlanned.builder()
-                    .catenaXSiteId(site.catenaXSiteId())
+                    .catenaXSiteId(site.catenaXsiteId())
                     .functionValidFrom(site.functionValidFrom().toOffsetDateTime())
                     .function(site.function())
                     .functionValidUntil(site.functionValidUntil().toOffsetDateTime())

tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationService.java

@@ -156,7 +156,7 @@ public void approve(Long notificationId) {
             approvedInvestigation = notificationPublisherService.approveNotification(notification);
         } catch (SendNotificationException exception) {
             log.info("Notification status rollback", exception);
-            throw new SendNotificationException(exception.getMessage());
+            throw new SendNotificationException(exception.getMessage(), exception);
         }
         getNotificationRepository().updateNotification(approvedInvestigation);
     }

tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/EdcNotificationServiceImpl.java

@@ -86,7 +86,7 @@ public CompletableFuture<NotificationMessage> asyncNotificationMessageExecutor(N
             return CompletableFuture.completedFuture(null);
 
         } catch (DiscoveryFinderException discoveryFinderException) {
-            enrichNotificationByError(discoveryFinderException, notification);
+            enrichNotificationByError(discoveryFinderException, notification, message);
             return CompletableFuture.completedFuture(null);
         }
     }
@@ -97,30 +97,25 @@ private boolean handleSendingNotification(NotificationMessage message, String se
             return true;
         } catch (NoCatalogItemException e) {
             log.warn("Could not send message to {} no catalog item found. ", receiverUrl, e);
-            enrichNotificationByError(e, notification);
+            enrichNotificationByError(e, notification, message);
         } catch (SendNotificationException e) {
             log.warn("Could not send message to {} ", receiverUrl, e);
-            enrichNotificationByError(e, notification);
+            enrichNotificationByError(e, notification, message);
         } catch (NoEndpointDataReferenceException e) {
             log.warn("Could not send message to {} no endpoint data reference found", receiverUrl, e);
-            enrichNotificationByError(e, notification);
+            enrichNotificationByError(e, notification, message);
         } catch (ContractNegotiationException e) {
             log.warn("Could not send message to {} could not negotiate contract agreement", receiverUrl, e);
-            enrichNotificationByError(e, notification);
+            enrichNotificationByError(e, notification, message);
         }
         return false;
     }
 
-    private void enrichNotificationByError(Exception e, Notification notification) {
+    private void enrichNotificationByError(Exception e, Notification notification, NotificationMessage message) {
 
-        log.info("Notification for error message enrichment {}", notification);
-        notification.getNotifications().forEach(message1 -> log.info("Message found {}", message1));
-        notification.secondLatestNotifications().forEach(qmMessage -> {
-            log.info("Message from second latest notification {}", qmMessage);
-            qmMessage.setErrorMessage(e.getMessage());
-        });
-
-        notificationRepository.updateErrorMessage(notification);
+        log.info("Notification for error message enrichment {}", message);
+        message.setErrorMessage(e.getMessage());
+        notificationRepository.updateErrorMessage(notification, message);
 
     }
 }

tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationsEDCFacade.java

@@ -129,7 +129,7 @@ private String negotiateContractAgreement(final String receiverEdcUrl, final Cat
                     .orElseThrow()
                     .getContractAgreementId();
         } catch (Exception e) {
-            throw new ContractNegotiationException("Failed to negotiate contract agreement. ", e);
+            throw new ContractNegotiationException("Failed to negotiate contract agreement: " + e.getMessage(), e);
         }
     }
 
@@ -164,14 +164,6 @@ private CatalogItem getCatalogItem(final NotificationMessage notification, final
                                             .build())
                                     .build()
                     ).stream()
-                    .filter(catalogItem -> {
-                        log.info("-- catalog item check --");
-                        log.info("Item {}: {}", catalogItem.getItemId(), catalogItem);
-                        boolean isValid = policyCheckerService.isValid(catalogItem.getPolicy(), notification.getSentTo()
-                        );
-                        log.info("IsValid : {}", isValid);
-                        return isValid;
-                    })
                     .findFirst()
                     .orElseThrow();
         } catch (Exception e) {

tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/repository/NotificationRepository.java

@@ -26,6 +26,7 @@
 import org.eclipse.tractusx.traceability.common.model.SearchCriteria;
 import org.eclipse.tractusx.traceability.notification.domain.base.model.Notification;
 import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationId;
+import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage;
 import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide;
 import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType;
 import org.springframework.data.domain.Pageable;
@@ -53,7 +54,7 @@ public interface NotificationRepository {
 
     List<String> getDistinctFieldValues(String fieldName, String startWith, Integer resultLimit, NotificationSide owner);
 
-    void updateErrorMessage(Notification investigation);
+    void updateErrorMessage(Notification notification, NotificationMessage message);
 
     void deleteByIdIn(List<String> messageIds);
 

tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/repository/JpaNotificationMessageRepository.java

@@ -22,7 +22,12 @@
 import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationMessageEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 @Repository
 public interface JpaNotificationMessageRepository extends JpaRepository<NotificationMessageEntity, String> {
+    @Transactional
+    default NotificationMessageEntity updateOrInsert(NotificationMessageEntity notificationMessageEntity) {
+        return save(notificationMessageEntity);
+    }
 }

tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/repository/NotificationRepositoryImpl.java

@@ -21,7 +21,6 @@
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner;
@@ -48,6 +47,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Clock;
 import java.time.LocalDateTime;
@@ -163,19 +163,16 @@ public List<String> getDistinctFieldValues(String fieldName, String startWith, I
     }
 
     @Override
-    public void updateErrorMessage(Notification notification) {
+    public void updateErrorMessage(Notification notification, NotificationMessage message) {
         log.info("Starting update of error message with notification {}", notification);
         NotificationEntity notificationEntity = jpaNotificationRepository.findById(notification.getNotificationId().value())
                 .orElseThrow(() -> new IllegalArgumentException(String.format("Notification with id %s not found!", notification.getNotificationId().value())));
 
-        for (NotificationMessage notificationMessage : notification.getNotifications()) {
-            List<AssetAsBuiltEntity> assetEntitiesByNotification = getAssetEntitiesByNotification(notification);
-            NotificationMessageEntity notificationMessageEntity = toNotificationMessageEntity(notificationEntity, notificationMessage, assetEntitiesByNotification);
-            notificationMessageEntity.setErrorMessage(notificationMessage.getErrorMessage());
-            notificationMessageEntity.setUpdated(LocalDateTime.ofInstant(clock.instant(), clock.getZone()));
-            jpaNotificationMessageRepository.save(notificationMessageEntity);
-        }
-        jpaNotificationRepository.save(notificationEntity);
+        List<AssetAsBuiltEntity> assetEntitiesByNotification = getAssetEntitiesByNotification(notification);
+        NotificationMessageEntity notificationMessageEntity = toNotificationMessageEntity(notificationEntity, message, assetEntitiesByNotification);
+        notificationMessageEntity.setErrorMessage(message.getErrorMessage());
+        notificationMessageEntity.setUpdated(LocalDateTime.ofInstant(clock.instant(), clock.getZone()));
+        jpaNotificationMessageRepository.updateOrInsert(notificationMessageEntity);
     }
 
     @Override

tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/blackbox/NotificationsEDCFacadeTest.java

@@ -63,12 +63,8 @@ class NotificationsEDCFacadeTest {
     @Mock
     EndpointDataReferenceStorage endpointDataReferenceStorage;
     @Mock
-    PolicyCheckerService policyCheckerService;
-    @Mock
     EndpointDataReference endpointDataReference;
     @Mock
-    NotificationRepository notificationRepository;
-    @Mock
     Notification notification;
     @InjectMocks
     NotificationsEDCFacade notificationsEDCFacade;
@@ -92,7 +88,6 @@ void givenCorrectInvestigationMessageButSendRequestThrowsException_whenStartEdcT
         when(notification.getSeverity()).thenReturn(NotificationSeverity.MAJOR);
         when(edcProperties.getIdsPath()).thenReturn(idsPath);
         when(edcCatalogFacade.fetchCatalogItems(any())).thenReturn(List.of(catalogItem));
-        when(policyCheckerService.isValid(null, null)).thenReturn(true);
         when(contractNegotiationService.negotiate(receiverEdcUrl + idsPath, catalogItem, null, null))
                 .thenReturn(NegotiationResponse.builder().contractAgreementId(agreementId).build());
         when(endpointDataReference.getEndpoint()).thenReturn("endpoint");
@@ -121,7 +116,6 @@ void givenCorrectInvestigationMessageButNegotiateContractAgreementHasNoCatalogIt
         final String idsPath = "/api/v1/dsp";
         when(edcProperties.getIdsPath()).thenReturn(idsPath);
         when(edcCatalogFacade.fetchCatalogItems(any())).thenReturn(List.of(catalogItem));
-        when(policyCheckerService.isValid(null, null)).thenReturn(true);
         when(contractNegotiationService.negotiate(receiverEdcUrl + idsPath, catalogItem, null, null))
                 .thenReturn(null);
 

tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/IntegrationTestSpecification.java

@@ -19,6 +19,7 @@
 package org.eclipse.tractusx.traceability.integration;
 
 import groovy.json.JsonBuilder;
+import io.restassured.RestAssured;
 import org.awaitility.Awaitility;
 import org.eclipse.tractusx.traceability.integration.common.config.PostgreSQLConfig;
 import org.eclipse.tractusx.traceability.integration.common.config.RestAssuredConfig;
@@ -33,6 +34,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 
@@ -56,8 +58,12 @@ public class IntegrationTestSpecification {
     @Autowired
     DatabaseSupport databaseSupport;
 
+    @LocalServerPort
+    private Integer port;
+
     @BeforeEach
     void beforeEach() throws JoseException {
+        RestAssured.port = port;
         oAuth2ApiSupport.oauth2ApiReturnsTechnicalUserToken();
         oAuth2ApiSupport.oauth2ApiReturnsJwkCerts(oAuth2Support.jwk());
     }