Skip to content

Commit

Permalink
Ny versjon av Inntektsjustering
Browse files Browse the repository at this point in the history
  • Loading branch information
Bjodn committed Dec 3, 2024
1 parent f698a77 commit f82e67c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import no.nav.helse.rapids_rivers.JsonMessage
import no.nav.helse.rapids_rivers.MessageContext
import no.nav.helse.rapids_rivers.RapidsConnection
import org.slf4j.LoggerFactory
import java.time.LocalDateTime
import java.time.YearMonth

internal class InntektsjusteringRiver(
Expand Down Expand Up @@ -72,7 +71,7 @@ internal class InntektsjusteringRiver(
sak = sak.id,
inntektsjusteringId = inntektsjustering.id,
journalpostId = journalpostResponse.journalpostId,
mottatt = LocalDateTime.now(), // TODO Legg ti i Inntektsjustering i felles lib
mottatt = inntektsjustering.mottattDato,
inntektsaar = inntektsjustering.inntektsaar,
arbeidsinntekt = inntektsjustering.arbeidsinntekt,
naeringsinntekt = inntektsjustering.naeringsinntekt,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance
import java.time.Instant
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.YearMonth
import java.util.UUID

Expand All @@ -53,6 +54,7 @@ internal class InntektsjusteringRiverTest {
Inntektsjustering(
id = UUID.randomUUID(),
fnr = "123",
mottattDato = LocalDateTime.now(),
inntektsaar = 2025,
arbeidsinntekt = 100,
naeringsinntekt = 200,
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ktor2-serverresources = { module = "io.ktor:ktor-server-resources", version.ref
ktor2-servertests = { module = "io.ktor:ktor-server-tests", version.ref = "ktor2-version" }
ktor2-webjars = { module = "io.ktor:ktor-server-webjars", version.ref = "ktor2-version" }

etterlatte-common = { module = "pensjon-etterlatte-felles:common", version = "2024.10.22-08.13.edb8898fdac5" }
etterlatte-common = { module = "pensjon-etterlatte-felles:common", version = "2024.12.03-11.34.1ecc719218e3" }
teamdokumenthandtering-avroschemas = { module = "no.nav.teamdokumenthandtering:teamdokumenthandtering-avro-schemas", version = "08c0b2d2" }

logging-slf4japi = { module = "org.slf4j:slf4j-api", version = "2.0.16" }
Expand Down

0 comments on commit f82e67c

Please sign in to comment.