Merge pull request #1084 from eclipse-tractusx/feature/965-policy-man…

…agement-error-handling

feature(chore):965 added error handling for irs response

tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ErrorHandlingConfig.java

@@ -78,6 +78,7 @@
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
@@ -114,19 +115,17 @@ ResponseEntity<ErrorResponse> handleHttpClientErrorException(HttpClientErrorExce
             try {
                 ResponseEntity<ErrorResponse> errorResponse = mapIRSBadRequestToErrorResponse(exception);
                 if (errorResponse != null) return errorResponse;
+            } catch (Exception e) {
+                ResponseEntity<ErrorResponse> body = ResponseEntity.status(BAD_REQUEST)
+                        .body(new ErrorResponse(exception.getMessage()));
+                return body; // Handle the case where the message cannot be mapped to IRSErrorResponse
             }
-            catch (Exception e) {
-            ResponseEntity<ErrorResponse> body = ResponseEntity.status(BAD_REQUEST)
-                    .body(new ErrorResponse(exception.getMessage()));
-            return body; // Handle the case where the message cannot be mapped to IRSErrorResponse
-        }
 
         } else if (status.equals(NOT_FOUND)) {
             try {
                 ResponseEntity<ErrorResponse> errorResponse = mapIRSNotFoundToErrorResponse(exception);
                 if (errorResponse != null) return errorResponse;
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 ResponseEntity<ErrorResponse> body = ResponseEntity.status(NOT_FOUND)
                         .body(new ErrorResponse(exception.getMessage()));
                 return body; // Handle the case where the message cannot be mapped to IRSErrorResponse
@@ -147,10 +146,9 @@ ResponseEntity<ErrorResponse> handleHttpClientErrorException(HttpClientErrorExce
         if (jsonStart != -1 && jsonEnd != -1) {
             String jsonString = rawMessage.substring(jsonStart, jsonEnd + 1);
             IRSErrorResponse badRequestResponse = objectMapper.readValue(jsonString, IRSErrorResponse.class);
-            if (badRequestResponse != null && badRequestResponse.getMessage() != null) {
-                ErrorResponse errorResponse = new ErrorResponse(badRequestResponse.getMessage());
-                return ResponseEntity.status(400).body(errorResponse);
-            }
+            List<String> messages = badRequestResponse.getMessages();
+            String concatenatedMessages = String.join(", ", messages);
+            return ResponseEntity.status(400).body(new ErrorResponse(concatenatedMessages));
         }
         return null;
     }
@@ -162,11 +160,10 @@ ResponseEntity<ErrorResponse> handleHttpClientErrorException(HttpClientErrorExce
         int jsonEnd = rawMessage.lastIndexOf("}");
         if (jsonStart != -1 && jsonEnd != -1) {
             String jsonString = rawMessage.substring(jsonStart, jsonEnd + 1);
-            IRSErrorResponse irsError = objectMapper.readValue(jsonString, IRSErrorResponse.class);
-            if (irsError != null && irsError.getMessage() != null) {
-                ErrorResponse errorResponse = new ErrorResponse(irsError.getMessage());
-                return ResponseEntity.status(404).body(errorResponse);
-            }
+            IRSErrorResponse badRequestResponse = objectMapper.readValue(jsonString, IRSErrorResponse.class);
+            List<String> messages = badRequestResponse.getMessages();
+            String concatenatedMessages = String.join(", ", messages);
+            return ResponseEntity.status(404).body(new ErrorResponse(concatenatedMessages));
         }
         return null;
     }

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

@@ -133,7 +133,7 @@ void shouldThorwBadRequestCreatePolicy() throws JoseException {
                 .post("/api/policies")
                 .then()
                 .statusCode(400)
-                .body(containsString("Request does not contain all required fields. Missing: odrl:permission"))
+                .body(containsString("Policy with id 'default-policy3342' already exists!"))
                 .log().all();
     }
 

tx-backend/src/test/resources/stubs/irs/policies/response_400_createPolicy.json

@@ -1,4 +1,7 @@
 {
-  "message" : "Request does not contain all required fields. Missing: odrl:permission"
+  "statusCode": "BAD_REQUEST",
+  "error": "Bad Request",
+  "messages": [
+    "Policy with id 'default-policy3342' already exists!"
+  ]
 }
-

tx-backend/src/test/resources/stubs/irs/policies/response_404_get_policyById.json

@@ -1,3 +1,7 @@
 {
-  "message": "404 : \"{\"statusCode\":\"NOT_FOUND\",\"error\":\"Not Found\",\"messages\":[\"Policy with id 'default-paafdsasfdolicy' not found\"]}\""
+  "statusCode": "NOT_FOUND",
+  "error": "Not Found",
+  "messages": [
+    "Policy with id 'd94e46a0-2aa2-4f62-a854-a5bc7013c78b' not found"
+  ]
 }

tx-models/src/main/java/assets/importpoc/IRSErrorResponse.java

@@ -22,9 +22,11 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 public class IRSErrorResponse {
-    private String message;
+    private List<String> messages;
 }
 

tx-models/src/main/java/policies/response/CreatePolicyResponse.java

@@ -18,5 +18,5 @@
  ********************************************************************************/
 package policies.response;
 
-public record CreatePolicyResponse() {
+public record CreatePolicyResponse(String policyId) {
 }