Lagt til converter for LocalDate + LocalDateTime

navikt · Oct 24, 2023 · f62fa7f · f62fa7f
1 parent 194dddb
commit f62fa7f
Show file tree

Hide file tree

Showing 47 changed files with 252 additions and 1 deletion.
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAareg.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAareg.java
@@ -6,6 +6,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.YearMonth;
 import java.util.ArrayList;
@@ -43,7 +46,8 @@ public class RsAareg {
 
     private RsAktoer arbeidsgiver;
 
-    @Schema(description = "Angir periode oppdateringen gjelder fra")
+    @Schema(description = "Angir periode oppdateringen gjelder fra", type = "string", pattern="^\\d{4}-\\d{2}$")
+    @Field(type = FieldType.Date, format = DateFormat.year_month, pattern = "uuuu-MM")
     private YearMonth navArbeidsforholdPeriode;
 
     @Schema(description = "Angir om posten er oppdatering")

diff --git a/...dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAnsettelsesPeriode.java b/...dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsAnsettelsesPeriode.java
@@ -6,6 +6,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDateTime;
 
@@ -19,10 +22,12 @@ public class RsAnsettelsesPeriode {
     @Schema(description = "Dato fra-og-med",
             type = "LocalDateTime",
             requiredMode = Schema.RequiredMode.REQUIRED)
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime fom;
 
     @Schema(description = "Dato til-og-med",
             type = "LocalDateTime")
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime tom;
 
     @Schema(description = "Årsak for avsluttet ansettelsesperiode (kodeverk: SluttÅrsakAareg)",

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsArbeidsavtale.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsArbeidsavtale.java
@@ -6,6 +6,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDateTime;
 
@@ -28,8 +31,10 @@ public class RsArbeidsavtale {
     private String avloenningstype;
 
     @Schema(type = "LocalDateTime")
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime endringsdatoStillingsprosent;
 
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime sisteLoennsendringsdato;
 
     private Double stillingsprosent;
@@ -44,5 +49,6 @@ public class RsArbeidsavtale {
     private String ansettelsesform;
 
     @Schema(type = "LocalDateTime")
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime endringsdatoLoenn;
 }
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAareg.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAareg.java
@@ -6,6 +6,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDateTime;
 
@@ -19,9 +22,11 @@ public class RsPeriodeAareg {
     @Schema(description = "Dato fra-og-med",
             type = "LocalDateTime",
             requiredMode = Schema.RequiredMode.REQUIRED)
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime fom;
 
     @Schema(description = "Dato til-og-med",
             type = "LocalDateTime")
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime tom;
 }
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAmelding.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/aareg/RsPeriodeAmelding.java
@@ -6,6 +6,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -23,10 +26,12 @@ public class RsPeriodeAmelding {
     @Schema(description = "Dato fra-og-med",
             type = "LocalDateTime",
             requiredMode = Schema.RequiredMode.REQUIRED)
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime fom;
 
     @Schema(description = "Dato til-og-med",
             type = "LocalDateTime")
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime tom;
 
     @Schema(description = "Samlet liste over periode",

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/Arenadata.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/Arenadata.java
@@ -5,6 +5,9 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -19,6 +22,7 @@
 public class Arenadata {
 
     @Schema
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime aktiveringDato;
 
     @Schema
@@ -31,6 +35,7 @@ public class Arenadata {
     private Boolean automatiskInnsendingAvMeldekort;
 
     @Schema(type = "LocalDateTime")
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime inaktiveringDato;
 
     @Schema(description = "Om rettigheten aap115 skal aktiveres på personen")

diff --git a/.../dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap.java b/.../dolly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap.java
@@ -7,6 +7,9 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -25,13 +28,15 @@ public class RsArenaAap extends ArenaPeriode{
     public enum VedtakType {O, E, G, S}
 
     private String aktivitetsfase;
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime datoMottatt;
     @Schema(description = "O = ny rettighet, S = sletting")
     private VedtakType vedtaktype;
     private List<Saksopplysning> genSaksopplysninger;
     private MedlemFolketrygden medlemFolketrygden;
     private List<AndreOkonomYtelser> andreOkonomYtelserListe;
     private List<Saksopplysning> institusjonsopphold;
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime justertFra;
     private List<Vilkaar> vilkaar;
     private String utfall;

diff --git a/...lly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap115.java b/...lly-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaAap115.java
@@ -5,6 +5,9 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -21,8 +24,11 @@ public class RsArenaAap115 {
 
     public enum VedtaksType {O, S}
 
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime fraDato;
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime tilDato;
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime datoMottatt;
 
     @Schema(description = "Gyldige verdier: O (ny), S (stans)")
@@ -56,6 +62,7 @@ public static class MedisinskOpplysning {
         private String klassifisering;
         private String diagnose;
         private String kilde;
+        @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
         private LocalDateTime kildeDato;
     }
 

diff --git a/...-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaDagpenger.java b/...-backend/src/main/java/no/nav/dolly/domain/resultset/arenaforvalter/RsArenaDagpenger.java
@@ -6,6 +6,9 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDateTime;
 
@@ -22,5 +25,6 @@ public class RsArenaDagpenger extends ArenaPeriode {
     private String rettighetKode;
 
     @Schema(type = "LocalDateTime")
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime mottattDato;
 }
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/breg/RsBregdata.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/breg/RsBregdata.java
@@ -6,6 +6,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -55,6 +58,7 @@ public static class RolleTo {
         private AdresseTo postAdresse;
 
         @Schema(defaultValue = "dagens dato")
+        @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
         private LocalDateTime registreringsdato;
 
         @Schema

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/histark/RsHistark.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/histark/RsHistark.java
@@ -8,6 +8,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -49,6 +52,7 @@ public static class RsHistarkDokument {
         private String skannested;
 
         @Schema(description = "Når saksmappen ble skannet")
+        @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
         private LocalDateTime skanningsTidspunkt;
         @Schema(description = "Temakoder som forsendelsen tilhører, for eksempel “DAG” (Dagpenger)")
         private List<String> temakoder;
@@ -60,9 +64,11 @@ public static class RsHistarkDokument {
         private String enhetsnummer;
 
         @Schema(description = "Startåret for saksmappen")
+        @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate startAar;
 
         @Schema(description = "Sluttåret for saksmappen")
+        @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate sluttAar;
 
         @Schema(description = "Selve PDF dokumentet. Ved fysisk dokument brukes bytearray.")

diff --git a/...nd/src/main/java/no/nav/dolly/domain/resultset/inntektsmeldingstub/RsInntektsmelding.java b/...nd/src/main/java/no/nav/dolly/domain/resultset/inntektsmeldingstub/RsInntektsmelding.java
@@ -5,6 +5,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -60,6 +63,7 @@ public static class Inntektsmelding {
         private List<RsNaturalYtelseDetaljer> opphoerAvNaturalytelseListe;
         private List<RsPeriode> pleiepengerPerioder;
         private RsRefusjon refusjon;
+        @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate startdatoForeldrepengeperiode;
         private RsSykepengerIArbeidsgiverperioden sykepengerIArbeidsgiverperioden;
         private YtelseType ytelse;
@@ -86,6 +90,7 @@ public static class RsRefusjon {
 
         private List<RsEndringIRefusjon> endringIRefusjonListe;
         private Double refusjonsbeloepPrMnd;
+        @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate refusjonsopphoersdato;
     }
 
@@ -96,6 +101,7 @@ public static class RsRefusjon {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class RsEndringIRefusjon {
 
+        @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate endringsdato;
         private Double refusjonsbeloepPrMnd;
     }
@@ -108,6 +114,7 @@ public static class RsEndringIRefusjon {
     public static class RsNaturalYtelseDetaljer {
 
         private Double beloepPrMnd;
+        @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate fom;
         private NaturalytelseType naturalytelseType;
     }
@@ -131,6 +138,7 @@ public static class RsOmsorgspenger {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class RsDelvisFravaer {
 
+        @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate dato;
         private Double timer;
     }
@@ -142,6 +150,7 @@ public static class RsDelvisFravaer {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class RsAvsendersystem {
 
+        @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
         private LocalDateTime innsendingstidspunkt;
         private String systemnavn;
         private String systemversjon;
@@ -190,6 +199,7 @@ public static class RsArbeidsforhold {
         private String arbeidsforholdId;
         private List<RsPeriode> avtaltFerieListe;
         private RsAltinnInntekt beregnetInntekt;
+        @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate foersteFravaersdag;
         private List<RsGraderingIForeldrepenger> graderingIForeldrepengerListe;
         private List<RsUtsettelseAvForeldrepenger> utsettelseAvForeldrepengerListe;
@@ -234,7 +244,9 @@ public static class RsAltinnInntekt {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class RsPeriode {
 
+        @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate fom;
+        @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate tom;
     }
 }
diff --git a/...ackend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/RsInntektsinformasjon.java b/...ackend/src/main/java/no/nav/dolly/domain/resultset/inntektstub/RsInntektsinformasjon.java
@@ -7,6 +7,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -51,6 +54,7 @@ public class RsInntektsinformasjon {
 
     private List<Historikk> historikk;
 
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDateTime rapporteringsdato;
 
     private Integer versjon;
@@ -125,10 +129,12 @@ public static class Arbeidsforhold {
 
         @Schema(type = "LocalDateTime",
                 example = "yyyy-MM-dd")
+        @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
         private LocalDateTime startdato;
 
         @Schema(type = "LocalDateTime",
                 example = "yyyy-MM-dd")
+        @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
         private LocalDateTime sluttdato;
 
         private Double antallTimerPerUkeSomEnFullStillingTilsvarer;
@@ -146,10 +152,12 @@ public static class Arbeidsforhold {
 
         @Schema(type = "LocalDateTime",
                 example = "yyyy-MM-dd")
+        @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
         private LocalDateTime sisteLoennsendringsdato;
 
         @Schema(type = "LocalDateTime",
                 example = "yyyy-MM-dd")
+        @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
         private LocalDateTime sisteDatoForStillingsprosentendring;
     }