Skip to content

Commit a4ce024

Browse files
committed
Refactor NySykemeldingResponseDTO to include aktivitet list and update response mapping in NySykemeldingPostCommand
1 parent 4e59245 commit a4ce024

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ public Mono<NySykemeldingResponseDTO> call() {
3030
.bodyValue(request)
3131
.retrieve()
3232
.bodyToMono(NySykemeldingResponseDTO.class)
33+
.map(response -> NySykemeldingResponseDTO.builder()
34+
.status(response.getStatus())
35+
.ident(request.getIdent())
36+
.build())
3337
.doOnError(WebClientError.logTo(log))
3438
.onErrorResume(error -> NySykemeldingResponseDTO.of(WebClientError.describe(error), request.getIdent()));
35-
3639
}
3740
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
import org.springframework.http.HttpStatus;
1010
import reactor.core.publisher.Mono;
1111

12+
import java.time.LocalDate;
13+
import java.util.List;
14+
1215
@Data
1316
@Builder
1417
@NoArgsConstructor
@@ -17,8 +20,7 @@ public class NySykemeldingResponseDTO {
1720

1821
private HttpStatus status;
1922
private String avvik;
20-
private NySykemeldingRequest nySykemeldingRequest;
21-
private String msgId;
23+
private List<Aktivitet> aktivitet;
2224
private String ident;
2325

2426
public static Mono<NySykemeldingResponseDTO> of(WebClientError.Description description, String ident) {
@@ -35,9 +37,9 @@ public static Mono<NySykemeldingResponseDTO> of(WebClientError.Description descr
3537
@NoArgsConstructor
3638
@AllArgsConstructor
3739
@JsonInclude(JsonInclude.Include.NON_EMPTY)
38-
public static class NySykemeldingRequest {
40+
public static class Aktivitet {
3941

40-
private String sykemeldingId;
41-
private NySykemeldingRequestDTO nySykemeldingRequestDTO;
42+
private LocalDate fom;
43+
private LocalDate tom;
4244
}
4345
}

0 commit comments

Comments
 (0)