Bugfix/nom trivia (#3959)

krharum · web-flow · commit bb21e23af2aa · 2025-09-24T07:11:40.000+02:00
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/medl/command/MedlPutCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/medl/command/MedlPutCommand.java
@@ -37,7 +37,7 @@ public Mono<MedlPostResponse> call() {
                 .retrieve()
                 .toBodilessEntity()
                 .map(response -> MedlPostResponse.builder()
-                        .status(HttpStatus.valueOf(response.getStatusCode().value()))
+                        .status(HttpStatus.resolve(response.getStatusCode().value()))
                         .build())
                 .doOnError(WebClientError.logTo(log))
                 .onErrorResume(throwable -> MedlPostResponse.of(WebClientError.describe(throwable)));
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/NomClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/NomClient.java
@@ -7,6 +7,7 @@
 import no.nav.dolly.bestilling.nom.domain.NomRessursRequest;
 import no.nav.dolly.bestilling.nom.domain.NomRessursResponse;
 import no.nav.dolly.bestilling.personservice.PersonServiceConsumer;
+import no.nav.dolly.config.ApplicationConfig;
 import no.nav.dolly.domain.PdlPerson;
 import no.nav.dolly.domain.PdlPersonBolk;
 import no.nav.dolly.domain.jpa.BestillingProgress;
@@ -15,11 +16,13 @@
 import no.nav.dolly.domain.resultset.dolly.DollyPerson;
 import no.nav.dolly.mapper.MappingContextUtils;
 import no.nav.dolly.service.TransactionHelperService;
+import no.nav.testnav.libs.reactivecore.web.WebClientError;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.time.Duration;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -35,6 +38,7 @@
 @RequiredArgsConstructor
 public class NomClient implements ClientRegister {
 
+    private final ApplicationConfig applicationConfig;
     private final NomConsumer nomConsumer;
     private final PersonServiceConsumer personServiceConsumer;
     private final MapperFacade mapperFacade;
@@ -63,6 +67,10 @@ public Mono<BestillingProgress> gjenopprett(RsDollyUtvidetBestilling bestilling,
                         return Mono.just(ressurs);
                     }
                 })
+                .timeout(Duration.ofSeconds(applicationConfig.getClientTimeout()))
+                .onErrorResume(error -> Mono.just(NomRessursResponse.builder()
+                                .melding(WebClientError.describe(error).getMessage())
+                                .build()))
                 .map(NomClient::getStatus)
                 .flatMap(status -> oppdaterStatus(progress, status));
     }
@@ -98,7 +106,7 @@ public void release(List<String> identer) {
 
     private static String getStatus(NomRessursResponse response) {
 
-        return isNotBlank(response.getMelding()) ? response.getMelding() : "OK";
+        return isNotBlank(response.getMelding()) ? "FEIL= " + response.getMelding() : "OK";
     }
 
     private Mono<BestillingProgress> oppdaterStatus(BestillingProgress progress, String status) {
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/NomConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/NomConsumer.java
@@ -1,5 +1,6 @@
 package no.nav.dolly.bestilling.nom;
 
+import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.nom.command.NomAvsluttRessurs;
 import no.nav.dolly.bestilling.nom.command.NomHentRessurs;
 import no.nav.dolly.bestilling.nom.command.NomOpprettRessurs;
@@ -14,6 +15,7 @@
 
 import java.time.LocalDate;
 
+@Slf4j
 @Service
 public class NomConsumer {
 
@@ -43,7 +45,8 @@ public Mono<NomRessursResponse> hentRessurs(String ident) {
     public Mono<NomRessursResponse> opprettRessurs(NomRessursRequest nomRessursRequest) {
 
         return tokenService.exchange(serverProperties)
-                .flatMap(token -> new NomOpprettRessurs(webClient, nomRessursRequest, token.getTokenValue()).call());
+                .flatMap(token -> new NomOpprettRessurs(webClient, nomRessursRequest, token.getTokenValue()).call())
+                .doOnNext(ressursResponse -> log.info("Opprettet ressurs i NOM med respons {}", ressursResponse));
     }
 
     public Mono<NomRessursResponse> avsluttRessurs(String ident, LocalDate sluttdato) {
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/command/NomAvsluttRessurs.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/command/NomAvsluttRessurs.java
@@ -26,6 +26,7 @@ public class NomAvsluttRessurs implements Callable<Mono<NomRessursResponse>> {
 
     @Override
     public Mono<NomRessursResponse> call() {
+
         return webClient
                 .post()
                 .uri(uriBuilder -> uriBuilder
@@ -45,4 +46,4 @@ public Mono<NomRessursResponse> call() {
                 .onErrorResume(throwable ->
                         Mono.just(NomRessursResponse.of(WebClientError.describe(throwable))));
     }
-}
+}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/command/NomOpprettRessurs.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/command/NomOpprettRessurs.java
@@ -6,6 +6,7 @@
 import no.nav.dolly.bestilling.nom.domain.NomRessursResponse;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
 import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
@@ -25,6 +26,8 @@ public class NomOpprettRessurs implements Callable<Mono<NomRessursResponse>> {
     @Override
     public Mono<NomRessursResponse> call() {
 
+        log.info("Sender opprett ressurs til NOM for ident {}", request.getPersonident());
+
         return webClient
                 .post()
                 .uri(uriBuilder -> uriBuilder
@@ -34,7 +37,11 @@ public Mono<NomRessursResponse> call() {
                 .headers(WebClientHeader.bearer(token))
                 .bodyValue(request)
                 .retrieve()
-                .bodyToMono(NomRessursResponse.class)
+                .toBodilessEntity()
+                .map(response -> NomRessursResponse
+                        .builder()
+                        .status(HttpStatus.resolve(response.getStatusCode().value()))
+                        .build())
                 .doOnError(WebClientError.logTo(log))
                 .onErrorResume(throwable ->
                         Mono.just(NomRessursResponse.of(WebClientError.describe(throwable))));
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/domain/NomRessursResponse.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/domain/NomRessursResponse.java
@@ -38,8 +38,8 @@ public static class Navn {
     }
 
     public static NomRessursResponse of(WebClientError.Description description) {
-        return NomRessursResponse
-                .builder()
+
+        return NomRessursResponse.builder()
                 .status(description.getStatus())
                 .melding(description.getMessage())
                 .build();
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/mapper/NomRessursMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/mapper/NomRessursMappingStrategy.java
@@ -10,6 +10,8 @@
 import org.springframework.stereotype.Component;
 
 import static java.util.Objects.nonNull;
+import static no.nav.dolly.util.TitleCaseUtil.toTitleCase;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 @Component
 public class NomRessursMappingStrategy implements MappingStrategy {
@@ -26,9 +28,9 @@ public void mapAtoB(RsNomData nomdata, NomRessursRequest nomRessursRequest, Mapp
 
                         var navn = (PdlPerson.Navn) context.getProperty("navn");
                         if (nonNull(navn)) {
-                            nomRessursRequest.setFornavn(navn.getFornavn());
-                            nomRessursRequest.setMellomnavn(navn.getMellomnavn());
-                            nomRessursRequest.setEtternavn(navn.getEtternavn());
+                            nomRessursRequest.setFornavn(isNotBlank(navn.getFornavn()) ? toTitleCase(navn.getFornavn()) : null);
+                            nomRessursRequest.setMellomnavn(isNotBlank(navn.getMellomnavn()) ? toTitleCase(navn.getMellomnavn()) : null);
+                            nomRessursRequest.setEtternavn(isNotBlank(navn.getEtternavn()) ? toTitleCase(navn.getEtternavn()) : null);
                         }
                     }
                 })
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/util/TitleCaseUtil.java b/apps/dolly-backend/src/main/java/no/nav/dolly/util/TitleCaseUtil.java
@@ -0,0 +1,32 @@
+package no.nav.dolly.util;
+
+import lombok.experimental.UtilityClass;
+
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+@UtilityClass
+public class TitleCaseUtil {
+
+    public static String toTitleCase(String input) {
+
+        if (isBlank(input)) {
+            return input;
+        }
+
+        var titleCaseBuilder = new StringBuilder();
+        var capitalizeNext = true; // Flag to indicate if the next character should be capitalized
+
+        for (char ch : input.toCharArray()) {
+            if (Character.isWhitespace(ch)) {
+                titleCaseBuilder.append(ch);
+                capitalizeNext = true; // Capitalize the first letter of the next word
+            } else if (capitalizeNext) {
+                titleCaseBuilder.append(Character.toUpperCase(ch));
+                capitalizeNext = false;
+            } else {
+                titleCaseBuilder.append(Character.toLowerCase(ch));
+            }
+        }
+        return titleCaseBuilder.toString();
+    }
+}
