Skip to content

jsonformat på datoer #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2024
Merged

jsonformat på datoer #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions innsyn/src/main/java/no/nav/k9/innsyn/InnsynHendelse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
import java.time.ZonedDateTime;
import java.util.Objects;

import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;

import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import no.nav.k9.søknad.felles.DtoKonstanter;

/**
* En hendelse fra k9-sak med nye data som kan brukes i innsyn.
*
Expand All @@ -27,8 +28,7 @@ public class InnsynHendelse<T extends InnsynHendelseData> {
*/
@Valid
@NotNull
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "UTC")
@JsonProperty(value = "oppdateringstidspunkt", required = true)
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DtoKonstanter.DATO_TID_FORMAT, timezone = DtoKonstanter.TIDSSONE) @JsonProperty(value = "oppdateringstidspunkt", required = true)
private ZonedDateTime oppdateringstidspunkt;

@Valid
Expand Down
12 changes: 10 additions & 2 deletions innsyn/src/main/java/no/nav/k9/innsyn/sak/Aksjonspunkt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@

import java.time.ZonedDateTime;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;

import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import no.nav.k9.søknad.felles.DtoKonstanter;

public record Aksjonspunkt(
@JsonProperty("venteårsak") @Valid @NotNull Venteårsak venteårsak,
@JsonProperty("tidsfrist") ZonedDateTime tidsfrist
@JsonProperty("venteårsak")
@Valid
@NotNull
Venteårsak venteårsak,

@JsonProperty("tidsfrist")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DtoKonstanter.DATO_TID_FORMAT, timezone = DtoKonstanter.TIDSSONE)
ZonedDateTime tidsfrist
) {

public enum Venteårsak {
Expand Down
4 changes: 4 additions & 0 deletions innsyn/src/main/java/no/nav/k9/innsyn/sak/Behandling.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.UUID;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand All @@ -17,6 +18,7 @@
import jakarta.validation.constraints.NotNull;
import no.nav.k9.innsyn.InnsynHendelseData;
import no.nav.k9.konstant.Konstant;
import no.nav.k9.søknad.felles.DtoKonstanter;

@JsonIgnoreProperties(ignoreUnknown = true)
@JsonAutoDetect(getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, fieldVisibility = JsonAutoDetect.Visibility.ANY)
Expand All @@ -29,10 +31,12 @@ public record Behandling(

@JsonProperty(value = "opprettetTidspunkt", required = true)
@NotNull
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DtoKonstanter.DATO_TID_FORMAT, timezone = DtoKonstanter.TIDSSONE)
ZonedDateTime opprettetTidspunkt,

@JsonInclude(value = JsonInclude.Include.NON_NULL)
@JsonProperty(value = "avsluttetTidspunkt")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DtoKonstanter.DATO_TID_FORMAT, timezone = DtoKonstanter.TIDSSONE)
ZonedDateTime avsluttetTidspunkt,

@JsonInclude(value = JsonInclude.Include.NON_NULL)
Expand Down
3 changes: 2 additions & 1 deletion innsyn/src/main/java/no/nav/k9/innsyn/sak/SøknadInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import no.nav.k9.søknad.felles.DtoKonstanter;
import no.nav.k9.søknad.felles.Kildesystem;

public record SøknadInfo(
Expand All @@ -28,7 +29,7 @@ public record SøknadInfo(
@JsonProperty(value = "mottattTidspunkt", required = true)
@Valid
@NotNull
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "UTC")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DtoKonstanter.DATO_TID_FORMAT, timezone = DtoKonstanter.TIDSSONE)
ZonedDateTime mottattTidspunkt,

@Valid
Expand Down
12 changes: 5 additions & 7 deletions soknad/src/main/java/no/nav/k9/søknad/Søknad.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@
import java.util.Objects;
import java.util.Optional;

import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.databind.node.ObjectNode;

import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import no.nav.k9.søknad.felles.DtoKonstanter;
import no.nav.k9.søknad.felles.Kildesystem;
import no.nav.k9.søknad.felles.Versjon;
import no.nav.k9.søknad.felles.personopplysninger.Søker;
Expand All @@ -47,8 +46,7 @@ public class Søknad implements Innsending {

@Valid
@NotNull
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "UTC")
@JsonProperty(value = "mottattDato", required = true)
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DtoKonstanter.DATO_TID_FORMAT, timezone = DtoKonstanter.TIDSSONE) @JsonProperty(value = "mottattDato", required = true)
private ZonedDateTime mottattDato;

@Valid
Expand Down
6 changes: 6 additions & 0 deletions soknad/src/main/java/no/nav/k9/søknad/felles/DtoKonstanter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package no.nav.k9.søknad.felles;

public class DtoKonstanter {
public static final String DATO_TID_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSX";
public static final String TIDSSONE = "UTC";
}