Refactor AaregClient and ArbeidsforholdRespons: enhance error handling and add missing imports #deploy-test-dolly-backend

krharum · krharum · commit 87422eb7ea82 · 2025-05-07T10:37:01.000+02:00
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/AaregClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/AaregClient.java
@@ -81,8 +81,10 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
 
     private Mono<String> getErrors(Throwable error, Set<String> miljoer) {
 
+        var decoded = WebClientError.describe(error);
         return Mono.just(miljoer.stream()
-                .map(miljoe -> "%s:Feil= %s".formatted(miljoe, ErrorStatusDecoder.encodeStatus(WebClientError.describe(error).getMessage())))
+                .map(miljoe -> "%s:Feil= %s".formatted(miljoe, ErrorStatusDecoder.encodeStatus(decoded.getStatus() +
+                                (isBlank(decoded.getMessage()) ? "" : "= %s".formatted(decoded.getMessage())))))
                 .collect(Collectors.joining(",")));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,10 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly`
`81`	`81`
`82`	`82`	`private Mono<String> getErrors(Throwable error, Set<String> miljoer) {`
`83`	`83`
	`84`	`+ var decoded = WebClientError.describe(error);`
`84`	`85`	`return Mono.just(miljoer.stream()`
`85`		`- .map(miljoe -> "%s:Feil= %s".formatted(miljoe, ErrorStatusDecoder.encodeStatus(WebClientError.describe(error).getMessage())))`
	`86`	`+ .map(miljoe -> "%s:Feil= %s".formatted(miljoe, ErrorStatusDecoder.encodeStatus(decoded.getStatus() +`
	`87`	`+ (isBlank(decoded.getMessage()) ? "" : "= %s".formatted(decoded.getMessage())))))`
`86`	`88`	`.collect(Collectors.joining(",")));`
`87`	`89`	`}`
`88`	`90`