objectMapper on error message from webclient & deploy to beta for tes…

…ting
FINTLabs · Sep 20, 2024 · 375c338 · 375c338
1 parent fd30fee
commit 375c338
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml
@@ -54,13 +54,13 @@ jobs:
     strategy:
       matrix:
         org:
-#          - fintlabs-no
-          - ofk-no
-          - bfk-no
-          - afk-no
+          - fintlabs-no
+#          - ofk-no
+#          - bfk-no
+#          - afk-no
         cluster:
-          - aks-api-fint-2022-02-08
-#          - aks-beta-fint-2021-11-23
+#         - aks-api-fint-2022-02-08
+          - aks-beta-fint-2021-11-23
         include:
           - org: fintlabs-no
             cluster: aks-beta-fint-2021-11-23

diff --git a/src/main/java/no/fint/betaling/claim/ClaimRestStatusService.java b/src/main/java/no/fint/betaling/claim/ClaimRestStatusService.java
@@ -1,5 +1,7 @@
 package no.fint.betaling.claim;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import no.fint.betaling.common.exception.ClientErrorException;
 import no.fint.betaling.common.exception.ServerErrorException;
@@ -105,7 +107,8 @@ private void updateClaimOnFailure(Claim claim, Throwable error) {
 
         String message = (error instanceof WebClientResponseException webClientError
                 && StringUtils.hasText(webClientError.getResponseBodyAsString()))
-                ? webClientError.getResponseBodyAsString() : error.getMessage();
+                ? extractErrorMessageFromJson(webClientError.getResponseBodyAsString())
+                : error.getMessage();
 
         log.error("Error updating claim {} {} with invoiceUri {}", claim.getOrderNumber(), claim.getClaimStatus(), claim.getInvoiceUri());
         log.error("Claim status: {}", message);
@@ -115,6 +118,16 @@ private void updateClaimOnFailure(Claim claim, Throwable error) {
         claimRepository.save(claim);
     }
 
+    private String extractErrorMessageFromJson(String json) {
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            JsonNode jsonNode = mapper.readTree(json);
+            return jsonNode.has("message") ? jsonNode.get("message").asText() : "null";
+        }catch (Exception e){
+            return "Error in JSON-Parsing";
+        }
+    }
+
     private Mono<ResponseEntity<Void>> evaluateResponse(ResponseEntity<Void> response, Claim claim) {
         HttpStatusCode statusCode = response.getStatusCode();