Refactor sykemelding classes and fix DTO typo #deploy-test-dolly-backend

#deploy-test-sykemelding-api #deploy-test-synt-sykemelding-api Refactored the Sykemelding classes to use a new response DTO and improved logging for better traceability. Also corrected the typo in SykemeldingResponseDTO across the codebase, ensuring consistent naming conventions. Updated application URLs in the configuration files.
navikt · Nov 28, 2024 · 4f5d27b · 4f5d27b
1 parent b518705
commit 4f5d27b
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 44 deletions.
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingClient.java
@@ -188,6 +188,7 @@ private void saveTransaksjonId(SykemeldingResponse sykemelding, Long bestillingI
 
             log.info("Lagrer transaksjon for {} i q1 ", sykemelding.getIdent());
 
+            sykemelding.getSykemeldingRequest().setSykemeldingId(sykemelding.getMsgId());
             transaksjonMappingService.save(TransaksjonMapping.builder()
                     .ident(sykemelding.getIdent())
                     .bestillingId(bestillingId)

diff --git a/.../dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingConsumer.java b/.../dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingConsumer.java
@@ -45,7 +45,8 @@ public Mono<SykemeldingResponse> postDetaljertSykemelding(DetaljertSykemeldingRe
 
         return tokenService.exchange(serverProperties)
                 .flatMap(token -> new SykemeldingPostCommand(webClient, detaljertSykemeldingRequest,
-                        token.getTokenValue()).call());
+                        token.getTokenValue()).call())
+                .doOnNext(response -> log.info("Status fra sykemelding innsending: {}", response.getStatus()));
     }
 
     @Override

diff --git a/...end/src/main/java/no/nav/dolly/bestilling/sykemelding/command/SykemeldingPostCommand.java b/...end/src/main/java/no/nav/dolly/bestilling/sykemelding/command/SykemeldingPostCommand.java
@@ -1,12 +1,13 @@
 package no.nav.dolly.bestilling.sykemelding.command;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.sykemelding.domain.DetaljertSykemeldingRequest;
 import no.nav.dolly.bestilling.sykemelding.dto.SykemeldingResponse;
+import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;
@@ -16,6 +17,7 @@
 
 import static no.nav.dolly.util.TokenXUtil.getUserJwt;
 
+@Slf4j
 @RequiredArgsConstructor
 public class SykemeldingPostCommand implements Callable<Mono<SykemeldingResponse>> {
 
@@ -35,10 +37,10 @@ public Mono<SykemeldingResponse> call() {
                 .header(UserConstant.USER_HEADER_JWT, getUserJwt())
                 .bodyValue(request)
                 .retrieve()
-                .toBodilessEntity()
-                .timeout(Duration.ofMinutes(4))
+                .bodyToMono(SykemeldingResponseDTO.class)
                 .map(response -> SykemeldingResponse.builder()
-                        .status(HttpStatus.valueOf(response.getStatusCode().value()))
+                        .status(response.getStatus())
+                        .msgId(response.getSykemeldingId())
                         .ident(request.getPasient().getIdent())
                         .sykemeldingRequest(SykemeldingResponse.SykemeldingRequest.builder()
                                 .detaljertSykemeldingRequest(request)

diff --git a/...src/main/java/no/nav/dolly/bestilling/sykemelding/command/SyntSykemeldingPostCommand.java b/...src/main/java/no/nav/dolly/bestilling/sykemelding/command/SyntSykemeldingPostCommand.java
@@ -3,10 +3,10 @@
 import lombok.RequiredArgsConstructor;
 import no.nav.dolly.bestilling.sykemelding.domain.SyntSykemeldingRequest;
 import no.nav.dolly.bestilling.sykemelding.dto.SykemeldingResponse;
+import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;
@@ -34,10 +34,10 @@ public Mono<SykemeldingResponse> call() {
                 .header(UserConstant.USER_HEADER_JWT, getUserJwt())
                 .bodyValue(sykemeldingRequest)
                 .retrieve()
-                .toBodilessEntity()
-                .timeout(Duration.ofMinutes(4))
+                .bodyToMono(SykemeldingResponseDTO.class)
                 .map(response -> SykemeldingResponse.builder()
-                        .status(HttpStatus.valueOf(response.getStatusCode().value()))
+                        .status(response.getStatus())
+                        .msgId(response.getSykemeldingId())
                         .ident(sykemeldingRequest.getIdent())
                         .sykemeldingRequest(SykemeldingResponse.SykemeldingRequest.builder()
                                 .syntSykemeldingRequest(sykemeldingRequest)

diff --git a/...ly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/dto/SykemeldingResponse.java b/...ly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/dto/SykemeldingResponse.java
@@ -18,6 +18,7 @@ public class SykemeldingResponse {
     private HttpStatus status;
     private String avvik;
     private SykemeldingRequest sykemeldingRequest;
+    private String msgId;
     private String ident;
 
     @Data
@@ -27,6 +28,7 @@ public class SykemeldingResponse {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public static class SykemeldingRequest {
 
+        private String sykemeldingId;
         private SyntSykemeldingRequest syntSykemeldingRequest;
         private DetaljertSykemeldingRequest detaljertSykemeldingRequest;
     }

diff --git a/...olly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/command/KodeverkGetCommand.java b/...olly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/command/KodeverkGetCommand.java
@@ -4,6 +4,7 @@
 import no.nav.testnav.libs.dto.kodeverkservice.v1.KodeverkDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;
@@ -31,6 +32,10 @@ public Mono<KodeverkDTO> call() {
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .retrieve()
                 .bodyToMono(KodeverkDTO.class)
+                .map(kodeverk -> {
+                    kodeverk.setStatus(HttpStatus.OK);
+                    return kodeverk;
+                })
                 .doOnError(WebClientFilter::logErrorMessage)
                 .onErrorResume(error -> Mono.just(KodeverkDTO.builder()
                                 .kodeverknavn(kodeverk)

diff --git a/apps/dolly-backend/src/main/resources/application-local.yaml b/apps/dolly-backend/src/main/resources/application-local.yaml
@@ -57,7 +57,8 @@ consumers:
     name: testnav-pdl-forvalter-dev
     url: https://testnav-synt-sykemelding-api.intern.dev.nav.no
   testnav-sykemelding-api:
-    url: http://testnav-sykemelding-api.intern.dev.nav.no
+    name: testnav-sykemelding-api-dev
+    url: https://testnav-sykemelding-api-dev.intern.dev.nav.no
   testnav-miljoer-service:
     url: https://testnav-miljoer-service.intern.dev.nav.no
   testnav-arbeidsplassencv-proxy:

diff --git a/...elding-api/src/main/java/no/nav/registre/testnorge/sykemelding/consumer/SyfoConsumer.java b/...elding-api/src/main/java/no/nav/registre/testnorge/sykemelding/consumer/SyfoConsumer.java
@@ -2,7 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import no.nav.registre.testnorge.sykemelding.domain.Sykemelding;
-import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldningResponseDTO;
+import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.jms.core.JmsTemplate;
@@ -19,14 +19,14 @@ public SyfoConsumer(JmsTemplate jmsTemplate, @Value("${syfo.queue.name}") String
         this.queueName = queueName;
     }
 
-    public SykemeldningResponseDTO send(Sykemelding sykemelding) {
+    public SykemeldingResponseDTO send(Sykemelding sykemelding) {
 
         var xml = sykemelding.toXml();
         log.info("Legger sykemelding på kø med MsgId {}\n{}", sykemelding.getMsgId(), sykemelding);
         jmsTemplate.send(queueName, session -> session.createTextMessage(xml));
         log.trace(xml);
 
-        return SykemeldningResponseDTO.builder()
+        return SykemeldingResponseDTO.builder()
                 .sykemeldingId(sykemelding.getMsgId())
                 .status(HttpStatus.OK)
                 .build();

diff --git a/...i/src/main/java/no/nav/registre/testnorge/sykemelding/provider/SykemeldingController.java b/...i/src/main/java/no/nav/registre/testnorge/sykemelding/provider/SykemeldingController.java
@@ -1,19 +1,16 @@
 package no.nav.registre.testnorge.sykemelding.provider;
 
 import lombok.RequiredArgsConstructor;
-import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldningResponseDTO;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import no.nav.registre.testnorge.sykemelding.domain.ApplicationInfo;
+import no.nav.registre.testnorge.sykemelding.domain.Sykemelding;
+import no.nav.registre.testnorge.sykemelding.service.SykemeldingService;
+import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingDTO;
+import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingDTO;
-import no.nav.registre.testnorge.sykemelding.domain.ApplicationInfo;
-import no.nav.registre.testnorge.sykemelding.domain.Sykemelding;
-import no.nav.registre.testnorge.sykemelding.service.SykemeldingService;
-
 @RestController
 @RequestMapping("/api/v1/sykemeldinger")
 @RequiredArgsConstructor
@@ -23,7 +20,7 @@ public class SykemeldingController {
     private final ApplicationInfo applicationInfo;
 
     @PostMapping
-    public SykemeldningResponseDTO create(@RequestBody SykemeldingDTO dto) {
+    public SykemeldingResponseDTO create(@RequestBody SykemeldingDTO dto) {
 
         return service.send(new Sykemelding(dto, applicationInfo));
     }

diff --git a/...g-api/src/main/java/no/nav/registre/testnorge/sykemelding/service/SykemeldingService.java b/...g-api/src/main/java/no/nav/registre/testnorge/sykemelding/service/SykemeldingService.java
@@ -3,15 +3,15 @@
 import lombok.RequiredArgsConstructor;
 import no.nav.registre.testnorge.sykemelding.consumer.SyfoConsumer;
 import no.nav.registre.testnorge.sykemelding.domain.Sykemelding;
-import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldningResponseDTO;
+import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class SykemeldingService {
     private final SyfoConsumer syfoConsumer;
 
-    public SykemeldningResponseDTO send(Sykemelding sykemelding) {
+    public SykemeldingResponseDTO send(Sykemelding sykemelding) {
 
         return syfoConsumer.send(sykemelding);
     }

diff --git a/...pi/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SykemeldingConsumer.java b/...pi/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SykemeldingConsumer.java
@@ -4,7 +4,7 @@
 import no.nav.testnav.apps.syntsykemeldingapi.config.Consumers;
 import no.nav.testnav.apps.syntsykemeldingapi.consumer.command.PostSykemeldingCommand;
 import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingDTO;
-import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldningResponseDTO;
+import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange;
 import org.springframework.stereotype.Component;
@@ -30,7 +30,7 @@ public SykemeldingConsumer(
                 .build();
     }
 
-    public SykemeldningResponseDTO opprettSykemelding(SykemeldingDTO sykemelding) {
+    public SykemeldingResponseDTO opprettSykemelding(SykemeldingDTO sykemelding) {
 
         return tokenExchange.exchange(serverProperties)
                 .flatMap(accessToken ->

diff --git a/.../java/no/nav/testnav/apps/syntsykemeldingapi/consumer/command/PostSykemeldingCommand.java b/.../java/no/nav/testnav/apps/syntsykemeldingapi/consumer/command/PostSykemeldingCommand.java
@@ -4,7 +4,7 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingDTO;
-import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldningResponseDTO;
+import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -17,23 +17,23 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class PostSykemeldingCommand implements Callable<Mono<SykemeldningResponseDTO>> {
+public class PostSykemeldingCommand implements Callable<Mono<SykemeldingResponseDTO>> {
 
     private final WebClient webClient;
     private final String token;
     private final SykemeldingDTO sykemelding;
 
     @SneakyThrows
     @Override
-    public Mono<SykemeldningResponseDTO> call() {
+    public Mono<SykemeldingResponseDTO> call() {
         return webClient.post()
                 .uri(builder ->
                         builder.path("/api/v1/sykemeldinger").build()
                 )
                 .header(AUTHORIZATION, "Bearer " + token)
                 .bodyValue(sykemelding)
                 .retrieve()
-                .bodyToMono(SykemeldningResponseDTO.class)
+                .bodyToMono(SykemeldingResponseDTO.class)
                 .doOnError(WebClientFilter::logErrorMessage)
                 .onErrorResume(throwable ->
                         Mono.error(new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Feil oppsto i innsending av sykemelding")));

diff --git a/.../main/java/no/nav/testnav/apps/syntsykemeldingapi/provider/SyntSykemeldingController.java b/.../main/java/no/nav/testnav/apps/syntsykemeldingapi/provider/SyntSykemeldingController.java
@@ -2,20 +2,13 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
 import no.nav.testnav.apps.syntsykemeldingapi.service.SykemeldingService;
-import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldningResponseDTO;
+import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
 import no.nav.testnav.libs.dto.synt.sykemelding.v1.SyntSykemeldingDTO;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.HttpClientErrorException;
 
 @RestController
 @Slf4j
@@ -25,7 +18,7 @@ public class SyntSykemeldingController {
     private final SykemeldingService sykemeldingService;
 
     @PostMapping
-    public SykemeldningResponseDTO opprett(@RequestBody SyntSykemeldingDTO sykemelding) {
+    public SykemeldingResponseDTO opprett(@RequestBody SyntSykemeldingDTO sykemelding) {
 
         return sykemeldingService.opprettSykemelding(sykemelding);
     }

diff --git a/...-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/service/SykemeldingService.java b/...-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/service/SykemeldingService.java
@@ -9,12 +9,10 @@
 import no.nav.testnav.apps.syntsykemeldingapi.consumer.SyntElsamConsumer;
 import no.nav.testnav.apps.syntsykemeldingapi.domain.Person;
 import no.nav.testnav.apps.syntsykemeldingapi.domain.Sykemelding;
-import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldningResponseDTO;
+import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
 import no.nav.testnav.libs.dto.synt.sykemelding.v1.SyntSykemeldingDTO;
 import org.springframework.stereotype.Service;
 
-import java.util.Objects;
-
 import static java.util.Objects.nonNull;
 
 @Slf4j
@@ -27,7 +25,7 @@ public class SykemeldingService {
     private final ArbeidsforholdAdapter arbeidsforholdAdapter;
     private final PdlProxyConsumer pdlProxyConsumer;
 
-    public SykemeldningResponseDTO opprettSykemelding(SyntSykemeldingDTO syntSykemelding) {
+    public SykemeldingResponseDTO opprettSykemelding(SyntSykemeldingDTO syntSykemelding) {
 
         var pdlData = pdlProxyConsumer.getPdlPerson(syntSykemelding.getIdent());
         var pasient = new Person(pdlData);

diff --git a/...kemelding/v1/SykemeldningResponseDTO.java → ...ykemelding/v1/SykemeldingResponseDTO.java b/...kemelding/v1/SykemeldningResponseDTO.java → ...ykemelding/v1/SykemeldingResponseDTO.java
@@ -10,7 +10,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SykemeldningResponseDTO {
+public class SykemeldingResponseDTO {
 
     private HttpStatus status;
     private String sykemeldingId;