Refactor NySykemeldingResponseDTO to include sykemeldingRequest and update response mapping in NySykemeldingPostCommand #deploy-test-dolly-backend

Author: stigus

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/command/NySykemeldingPostCommand.java

@@ -6,6 +6,7 @@
 import no.nav.dolly.bestilling.sykemelding.domain.dto.NySykemeldingResponseDTO;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
 import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
@@ -29,12 +30,14 @@ public Mono<NySykemeldingResponseDTO> call() {
                 .headers(WebClientHeader.bearer(token))
                 .bodyValue(request)
                 .retrieve()
-                .bodyToMono(NySykemeldingResponseDTO.class)
+                .toEntity(NySykemeldingResponseDTO.class)
                 .map(response -> NySykemeldingResponseDTO.builder()
-                        .status(response.getStatus())
+                        .status(HttpStatus.resolve(response.getStatusCode().value()))
+                        .sykemeldingRequest(request)
                         .ident(request.getIdent())
                         .build())
                 .doOnError(WebClientError.logTo(log))
                 .onErrorResume(error -> NySykemeldingResponseDTO.of(WebClientError.describe(error), request.getIdent()));
+
     }
 }

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/domain/dto/NySykemeldingResponseDTO.java

@@ -21,6 +21,7 @@ public class NySykemeldingResponseDTO {
     private HttpStatus status;
     private String avvik;
     private List<Aktivitet> aktivitet;
+    private NySykemeldingRequestDTO sykemeldingRequest;
     private String ident;
 
     public static Mono<NySykemeldingResponseDTO> of(WebClientError.Description description, String ident) {