Skip to content
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

Legg til tidspunkt for mottagelse i ny kvittering #823

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Legg til tidspunkt for mottagelse i ny kvittering #823

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
8 changes: 8 additions & 0 deletions ...rc/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/api/kvittering/KvitteringRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:UseSerializers(OffsetDateTimeSerializer::class)

package no.nav.helsearbeidsgiver.inntektsmelding.api.kvittering

import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
Expand All @@ -6,6 +8,7 @@ import io.ktor.server.routing.Route
import io.ktor.server.routing.get
import kotlinx.serialization.Serializable
import kotlinx.serialization.SerializationException
import kotlinx.serialization.UseSerializers
import kotlinx.serialization.builtins.serializer
import no.nav.helsearbeidsgiver.domene.inntektsmelding.deprecated.Inntekt
import no.nav.helsearbeidsgiver.domene.inntektsmelding.deprecated.Inntektsmelding
Expand Down Expand Up @@ -38,8 +41,10 @@ import no.nav.helsearbeidsgiver.inntektsmelding.api.utils.respondInternalServerE
import no.nav.helsearbeidsgiver.inntektsmelding.api.utils.respondNotFound
import no.nav.helsearbeidsgiver.inntektsmelding.api.utils.respondOk
import no.nav.helsearbeidsgiver.utils.json.fromJson
import no.nav.helsearbeidsgiver.utils.json.serializer.OffsetDateTimeSerializer
import no.nav.helsearbeidsgiver.utils.json.toPretty
import no.nav.helsearbeidsgiver.utils.pipe.orDefault
import java.time.OffsetDateTime
import java.time.ZoneId
import java.util.UUID

Expand Down Expand Up @@ -116,6 +121,7 @@ private data class KvitteringNavNo(
val avsender: Avsender,
val sykmeldingsperioder: List<Periode>,
val skjema: SkjemaInntektsmelding,
val mottatt: OffsetDateTime,
)

private fun KvitteringResultat.tilResponse(): KvitteringResponse =
Expand Down Expand Up @@ -143,6 +149,8 @@ private fun KvitteringResultat.tilKvitteringNavNo(): KvitteringNavNo? {
),
sykmeldingsperioder = forespoersel.sykmeldingsperioder,
skjema = skjemaKvittering,
// midlertidig, erstattes med non-null alternativ
mottatt = inntektsmelding?.tidspunkt ?: OffsetDateTime.now(),
)
} else {
null
Expand Down
Loading