diff --git a/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/graphql/schema/Arbeidsgiver.kt b/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/graphql/schema/Arbeidsgiver.kt index cc38091fe..d9217e1b0 100644 --- a/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/graphql/schema/Arbeidsgiver.kt +++ b/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/graphql/schema/Arbeidsgiver.kt @@ -151,6 +151,8 @@ data class NyttInntektsforholdPeriode( val vilkarsgrunnlagId: UUID?, val organisasjonsnummer: String, val skjaeringstidspunkt: LocalDate, + val dagligBelop: Double, + val manedligBelop: Double, ) data class Arbeidsgiver( diff --git a/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/graphql/schema/Person.kt b/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/graphql/schema/Person.kt index d7ad66deb..595deee48 100644 --- a/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/graphql/schema/Person.kt +++ b/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/graphql/schema/Person.kt @@ -215,6 +215,8 @@ data class Person( vilkarsgrunnlagId = it.vilkarsgrunnlagId, organisasjonsnummer = it.organisasjonsnummer, skjaeringstidspunkt = it.skjaeringstidspunkt, + dagligBelop = it.dagligBelop, + manedligBelop = it.manedligBelop, ) } } diff --git a/spesialist-api/src/main/resources/graphql/hentSnapshot.graphql b/spesialist-api/src/main/resources/graphql/hentSnapshot.graphql index da628baf2..ca8462624 100644 --- a/spesialist-api/src/main/resources/graphql/hentSnapshot.graphql +++ b/spesialist-api/src/main/resources/graphql/hentSnapshot.graphql @@ -91,6 +91,8 @@ query HentSnapshot($fnr: String!) { organisasjonsnummer vilkarsgrunnlagId skjaeringstidspunkt + dagligBelop + manedligBelop } generasjoner { id diff --git a/spesialist-api/src/main/resources/graphql/schema.graphql b/spesialist-api/src/main/resources/graphql/schema.graphql index 95bdef5ec..56f3a887a 100644 --- a/spesialist-api/src/main/resources/graphql/schema.graphql +++ b/spesialist-api/src/main/resources/graphql/schema.graphql @@ -160,8 +160,10 @@ type GraphQLInntektsmelding implements GraphQLHendelse { } type GraphQLNyttInntektsforholdPeriode { + dagligBelop: Float! fom: LocalDate! id: UUID! + manedligBelop: Float! organisasjonsnummer: String! skjaeringstidspunkt: LocalDate! tom: LocalDate! diff --git a/spesialist-api/src/test/schema_til_bruk_fra_tester.graphql b/spesialist-api/src/test/schema_til_bruk_fra_tester.graphql index 97875ce4a..6e101f41a 100644 --- a/spesialist-api/src/test/schema_til_bruk_fra_tester.graphql +++ b/spesialist-api/src/test/schema_til_bruk_fra_tester.graphql @@ -419,8 +419,10 @@ type Notater { } type NyttInntektsforholdPeriode { + dagligBelop: Float! fom: LocalDate! id: UUID! + manedligBelop: Float! organisasjonsnummer: String! skjaeringstidspunkt: LocalDate! tom: LocalDate!