Mer DTO endringer og logging

#deploy-test-sykemelding-api
navikt · Dec 6, 2024 · 510dcee · 510dcee
1 parent 1fc27ec
commit 510dcee
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/...transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/SykemeldingDTO.java b/...transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/SykemeldingDTO.java
@@ -1,20 +1,20 @@
 package no.nav.testnav.libs.dto.sykemelding.v1;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import static java.util.Objects.isNull;
 
 @Data
 @Builder
 @AllArgsConstructor
+@NoArgsConstructor(force = true)
 public class SykemeldingDTO {
 
     private LocalDate startDato;
@@ -28,16 +28,8 @@ public class SykemeldingDTO {
     private DiagnoseDTO hovedDiagnose;
     private List<DiagnoseDTO> biDiagnoser;
     private DetaljerDTO detaljer;
-    private Boolean umiddelbarBistand;
     private List<UtdypendeOpplysningerDTO> utdypendeOpplysninger;
-
-    @JsonIgnore
-    public List<DiagnoseDTO> getBiDiagnoser() {
-        if (biDiagnoser == null) {
-            return Collections.emptyList();
-        }
-        return biDiagnoser;
-    }
+    private Boolean umiddelbarBistand;
 
     public List<PeriodeDTO> getPerioder() {
 
@@ -47,6 +39,13 @@ public List<PeriodeDTO> getPerioder() {
         return perioder;
     }
 
+    public List<DiagnoseDTO> getBiDiagnoser() {
+
+        if (isNull(biDiagnoser)) {
+            biDiagnoser = new ArrayList<>();
+        }
+        return biDiagnoser;
+    }
 
     public List<UtdypendeOpplysningerDTO> getUtdypendeOpplysninger() {
 
@@ -56,9 +55,8 @@ public List<UtdypendeOpplysningerDTO> getUtdypendeOpplysninger() {
         return utdypendeOpplysninger;
     }
 
-
-    @JsonIgnore
     public Boolean getManglendeTilretteleggingPaaArbeidsplassen() {
         return manglendeTilretteleggingPaaArbeidsplassen != null && manglendeTilretteleggingPaaArbeidsplassen;
     }
 }
+