Mindre endringer sykemelding-api validering

#deploy-test-sykemelding-api

apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/util/SykemeldingRequestValidator.java

@@ -28,9 +28,6 @@ public static void validate(SykemeldingDTO dto) {
         if (isNull(dto.getHelsepersonell())) {
             missingFields.add("helsepersonell");
         }
-        if (isNull(dto.getSender())) {
-            missingFields.add("sender");
-        }
 
         if (!missingFields.isEmpty()) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, String.join(", ", missingFields));

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/AdresseDTO.java

@@ -2,15 +2,11 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.Value;
+import lombok.Data;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
 public class AdresseDTO {
     private String gate;
     private String postnummer;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/AktivitetDTO.java

@@ -3,13 +3,11 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.NoArgsConstructor;
-import lombok.Value;
+import lombok.Data;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
 public class AktivitetDTO {
     private final Integer grad;
     private final Boolean reisetilskudd;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/ArbeidsgiverDTO.java

@@ -2,15 +2,11 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.Value;
+import lombok.Data;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
 public class ArbeidsgiverDTO {
     private String navn;
     private String yrkesbetegnelse;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/DetaljerDTO.java

@@ -2,15 +2,11 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.Data;
 
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 @Builder
+@AllArgsConstructor
 public class DetaljerDTO {
 
     private String tiltakArbeidsplass;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/DiagnoseDTO.java

@@ -3,13 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.NoArgsConstructor;
-import lombok.Value;
+import lombok.Data;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
 public class DiagnoseDTO {
     @JsonProperty
     private String diagnose;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/HelsepersonellDTO.java

@@ -3,15 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.Value;
+import lombok.Data;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
 public class HelsepersonellDTO {
     @JsonProperty
     private String ident;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/OrganisasjonDTO.java

@@ -2,17 +2,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.Value;
+import lombok.Data;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
 public class OrganisasjonDTO {
-    private final String navn;
-    private final String orgNr;
-    private final AdresseDTO adresse;
+    private String navn;
+    private String orgNr;
+    private AdresseDTO adresse;
 }

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/PasientDTO.java

@@ -2,17 +2,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.Value;
+import lombok.Data;
 
 import java.time.LocalDate;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
 public class PasientDTO {
     private String ident;
     private String fornavn;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/PeriodeDTO.java

@@ -2,17 +2,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.Value;
+import lombok.Data;
 
 import java.time.LocalDate;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
 public class PeriodeDTO {
     private LocalDate fom;
     private LocalDate tom;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/UtdypendeOpplysningerDTO.java

@@ -12,7 +12,6 @@
 
 @Data
 @Builder
-@NoArgsConstructor
 @AllArgsConstructor
 public class UtdypendeOpplysningerDTO {
 
@@ -28,6 +27,12 @@ public List<SvarType> getSpmSvar() {
         return spmSvar;
     }
 
+    public enum Restriksjon {
+        SKJERMET_FOR_ARBEIDSGIVER,
+        SKJERMET_FOR_PASIENT,
+        SKJERMET_FOR_NAV
+    }
+
     @Data
     @Builder
     @NoArgsConstructor
@@ -39,10 +44,4 @@ public static class SvarType {
         private Restriksjon restriksjon;
         private String svarTekst;
     }
-
-    public enum Restriksjon {
-        SKJERMET_FOR_ARBEIDSGIVER,
-        SKJERMET_FOR_PASIENT,
-        SKJERMET_FOR_NAV
-    }
 }