Skip to content

Legg til timestamp som valgfritt i InntektDTO #362

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
Aug 4, 2025
Merged

Legg til timestamp som valgfritt i InntektDTO #362

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
1 change: 1 addition & 0 deletions dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/api/v1/UklassifisertInntektRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ fun Route.uklassifisertInntekt(
storedInntektPeriode = storedInntektMedMetadata.storedInntektPeriode,
begrunnelse = "",
),
oppdaterTimestamp = true,
)
}.let {
call.respond(HttpStatusCode.OK, it)
Expand Down
2 changes: 2 additions & 0 deletions dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/api/v1/models/InntekterDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import no.nav.dagpenger.inntekt.inntektskomponenten.v1.InntektkomponentResponse
import no.nav.dagpenger.inntekt.mapping.Inntektsmottaker
import no.nav.dagpenger.inntekt.mapping.Virksomhet
import no.nav.dagpenger.inntekt.mapping.utledInntektType
import java.time.LocalDateTime
import java.time.LocalDateTime.now
import java.time.YearMonth

Expand All @@ -20,6 +21,7 @@ data class InntekterDto(
val mottaker: Inntektsmottaker,
val periode: PeriodeDto,
val begrunnelse: String? = null,
val timestamp: LocalDateTime? = null,
)

data class PeriodeDto(
Expand Down
13 changes: 13 additions & 0 deletions dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/mapping/MapToInntektFrontend.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ import no.nav.dagpenger.inntekt.inntektskomponenten.v1.Periode
import no.nav.dagpenger.inntekt.inntektskomponenten.v1.TilleggInformasjon
import no.nav.dagpenger.inntekt.opptjeningsperiode.Opptjeningsperiode
import java.math.BigDecimal
import java.time.LocalDateTime
import java.time.YearMonth

fun InntektkomponentResponse.mapToFrontend(
person: Inntektsmottaker,
organisasjoner: List<Organisasjon>,
storedInntektMedMetadata: StoredInntektMedMetadata,
oppdaterTimestamp: Boolean = false,
): InntekterDto {
val inntekt = arbeidsInntektMaaned
val virksomheter: MutableList<Virksomhet> = mutableListOf()
Expand Down Expand Up @@ -103,9 +105,20 @@ fun InntektkomponentResponse.mapToFrontend(
mottaker = person,
periode = getPeriode(storedInntektMedMetadata),
begrunnelse = storedInntektMedMetadata.begrunnelse,
timestamp = hentTid(oppdaterTimestamp, storedInntektMedMetadata),
)
}

private fun hentTid(
oppdaterTimestamp: Boolean,
storedInntektMedMetadata: StoredInntektMedMetadata,
): LocalDateTime? =
if (oppdaterTimestamp) {
LocalDateTime.now()
} else {
storedInntektMedMetadata.timestamp
}

private fun getPeriode(storedInntektMedMetadata: StoredInntektMedMetadata): PeriodeDto {
val opptjeningsperiode = Opptjeningsperiode(beregningsdato = storedInntektMedMetadata.beregningsdato)
return PeriodeDto(
Expand Down
Loading