Feature/639 handle policy expiration

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.0-SNAPSHOT</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/notification/domain/base/exception/ContractNegotiationException.java

@@ -20,6 +20,7 @@
 package org.eclipse.tractusx.traceability.notification.domain.base.exception;
 
 public class ContractNegotiationException extends RuntimeException {
+
     public ContractNegotiationException(final String message, final Throwable exception) {
         super(message, exception);
     }

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

@@ -120,7 +120,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);
         }
     }
 
@@ -155,14 +155,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/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/blackbox/NotificationsEDCFacadeTest.java

@@ -93,7 +93,6 @@ void givenCorrectInvestigationMessageButSendRequestThrowsException_whenStartEdcT
         when(notificationRepository.findByEdcNotificationId(any())).thenReturn(Optional.of(notification));
         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");
@@ -122,7 +121,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());
     }

tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/investigation/InvestigationPolicyExpirationIT.java

@@ -0,0 +1,152 @@
+/********************************************************************************
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+package org.eclipse.tractusx.traceability.integration.notification.investigation;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.restassured.http.ContentType;
+import lombok.val;
+import notification.request.NotificationSeverityRequest;
+import notification.request.NotificationTypeRequest;
+import notification.request.StartNotificationRequest;
+import org.eclipse.tractusx.traceability.assets.domain.asbuilt.repository.AssetAsBuiltRepository;
+import org.eclipse.tractusx.traceability.common.request.OwnPageable;
+import org.eclipse.tractusx.traceability.common.request.PageableFilterRequest;
+import org.eclipse.tractusx.traceability.common.request.SearchCriteriaRequestParam;
+import org.eclipse.tractusx.traceability.integration.IntegrationTestSpecification;
+import org.eclipse.tractusx.traceability.integration.common.support.AssetsSupport;
+import org.eclipse.tractusx.traceability.integration.common.support.DiscoveryFinderSupport;
+import org.eclipse.tractusx.traceability.integration.common.support.EdcSupport;
+import org.eclipse.tractusx.traceability.integration.common.support.IrsApiSupport;
+import org.eclipse.tractusx.traceability.integration.common.support.NotificationApiSupport;
+import org.eclipse.tractusx.traceability.integration.common.support.NotificationMessageSupport;
+import org.eclipse.tractusx.traceability.integration.common.support.NotificationSupport;
+import org.eclipse.tractusx.traceability.integration.common.support.OAuth2ApiSupport;
+import org.eclipse.tractusx.traceability.notification.domain.notification.service.NotificationReceiverService;
+import org.hamcrest.Matchers;
+import org.jose4j.lang.JoseException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+
+import java.util.Collections;
+import java.util.List;
+
+import static io.restassured.RestAssured.given;
+import static org.eclipse.tractusx.traceability.common.security.JwtRole.SUPERVISOR;
+
+public class InvestigationPolicyExpirationIT extends IntegrationTestSpecification {
+    @Autowired
+    NotificationReceiverService notificationReceiverService;
+    @Autowired
+    AssetsSupport assetsSupport;
+    @Autowired
+    NotificationMessageSupport notificationMessageSupport;
+    @Autowired
+    NotificationSupport notificationSupport;
+    @Autowired
+    AssetAsBuiltRepository assetAsBuiltRepository;
+    @Autowired
+    NotificationApiSupport notificationApiSupport;
+    @Autowired
+    EdcSupport edcSupport;
+
+    @Autowired
+    DiscoveryFinderSupport discoveryFinderSupport;
+
+    @Autowired
+    OAuth2ApiSupport oauth2ApiSupport;
+
+    @Autowired
+    IrsApiSupport irsApiSupport;
+
+    ObjectMapper objectMapper;
+
+
+    @DynamicPropertySource
+    static void dynamicProperties(DynamicPropertyRegistry registry) {
+        registry.add("traceability.validUntil", () -> "2020-07-04T16:01:05.309Z");
+        registry.add("server.port", () -> "9997");
+        registry.add("management.server.port", () -> "8083");
+    }
+
+    @BeforeEach
+    void setUp() {
+        objectMapper = new ObjectMapper();
+    }
+
+    @Test
+    void shouldNotApproveInvestigationStatus_whenPolicyIsExpired() throws JoseException, com.fasterxml.jackson.core.JsonProcessingException {
+        // given
+        irsApiSupport.irsApiReturnsPolicies();
+        discoveryFinderSupport.discoveryFinderWillReturnEndpointAddress();
+        discoveryFinderSupport.discoveryFinderWillReturnConnectorEndpoints();
+        oauth2ApiSupport.oauth2ApiReturnsDtrToken();
+        edcSupport.performSupportActionsForAsyncNotificationMessageExecutor();
+        List<String> partIds = List.of(
+                "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE
+                "urn:uuid:0ce83951-bc18-4e8f-892d-48bad4eb67ef"  // BPN: BPNL00000003AXS3
+        );
+        String description = "at least 15 characters long investigation description";
+
+        assetsSupport.defaultAssetsStored();
+        val startInvestigationRequest = StartNotificationRequest.builder()
+                .affectedPartIds(partIds)
+                .description(description)
+                .severity(NotificationSeverityRequest.MINOR)
+                .type(NotificationTypeRequest.INVESTIGATION)
+                .receiverBpn("BPNL00000003CNKC")
+                .build();
+
+        // when
+        val investigationId = notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startInvestigationRequest, 201);
+
+
+        notificationSupport.assertInvestigationsSize(1);
+
+        given()
+                .contentType(ContentType.JSON)
+                .header(oAuth2Support.jwtAuthorization(SUPERVISOR))
+                .when()
+                .post("/api/notifications/{investigationId}/approve", investigationId)
+                .then()
+                .log().all()
+                .statusCode(503);
+
+        // then
+        given()
+                .header(oAuth2Support.jwtAuthorization(SUPERVISOR))
+                .body(new PageableFilterRequest(new OwnPageable(0, 10, Collections.emptyList()), new SearchCriteriaRequestParam(List.of("channel,EQUAL,SENDER,AND"))))
+                .contentType(ContentType.JSON)
+                .when()
+                .post("/api/notifications/filter")
+                .then()
+                .log().all()
+                .statusCode(200)
+                .body("page", Matchers.is(0))
+                .body("pageSize", Matchers.is(10))
+                .body("content", Matchers.hasSize(1))
+                .body("content[0].sendTo", Matchers.is(Matchers.not(Matchers.blankOrNullString())))
+                .body("content[0].messages[0].errorMessage", Matchers.is("Failed to negotiate contract agreement: Consumption of asset '40276218-e31b-4c35-a7c8-017e8edb702e' is not permitted as the required catalog offer policies are expired."))
+                .body("content[0].messages[1].errorMessage", Matchers.is("Failed to negotiate contract agreement: Consumption of asset '40276218-e31b-4c35-a7c8-017e8edb702e' is not permitted as the required catalog offer policies are expired."));
+
+        notificationMessageSupport.assertMessageSize(2);
+    }
+}

tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/investigation/PublisherInvestigationsControllerIT.java

@@ -577,5 +577,4 @@ void shouldBeCreatedBySender() throws JoseException, JsonProcessingException {
                 .body("pageSize", Matchers.is(10))
                 .body("content", Matchers.hasSize(1));
     }
-
 }