Omregning lib (#6484)

* Opprettet lib modul - etterlatte-omregning-model * Tar i bruk etterlatte-omregning-model i behandling * Tar i bruk etterlatte-omregning-model i beregning-kafka * Tar i bruk etteratte-omregning-model i oppdater-behandling * Tar i bruk etterlatte-omregning-model i trygdetid-kafka * Tar i bruk etterlatte-omregning-model i vedtaksvurdering-kafka * Tar i bruk etterlatte-omregning-model i vilkaarsvurdering-kafka * Tar i bruk etterlatte-omregning-model i testdata * Fikser test i rapids extras * Lagd til omregning-model i workflo yaml for alle apper som bruker lib
navikt · Nov 28, 2024 · 8a6669b · 8a6669b
1 parent 6350758
commit 8a6669b
Show file tree

Hide file tree

Showing 43 changed files with 129 additions and 67 deletions.
diff --git a/.github/workflows/app-etterlatte-behandling.yaml b/.github/workflows/app-etterlatte-behandling.yaml
@@ -27,6 +27,7 @@ on:
       - libs/etterlatte-pdl-model/**
       - libs/etterlatte-sporingslogg/**
       - libs/etterlatte-vedtaksvurdering-model/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-vilkaarsvurdering-model/**
       - libs/etterlatte-funksjonsbrytere/**
       - libs/rapidsandrivers-extras/**
@@ -45,6 +46,7 @@ on:
       - libs/etterlatte-ktor/**
       - libs/etterlatte-migrering-model/**
       - libs/etterlatte-pdl-model/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-database/**
       - libs/etterlatte-sporingslogg/**
       - libs/etterlatte-vedtaksvurdering-model/**

diff --git a/.github/workflows/app-etterlatte-beregning-kafka.yaml b/.github/workflows/app-etterlatte-beregning-kafka.yaml
@@ -19,6 +19,7 @@ on:
       - libs/saksbehandling-common/**
       - apps/etterlatte-beregning-model/**
       - libs/etterlatte-ktor/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-migrering-model/**
       - libs/rapidsandrivers-extras/**
       - gradle/libs.versions.toml
@@ -32,6 +33,7 @@ on:
       - libs/saksbehandling-common/**
       - apps/etterlatte-beregning-model/**
       - libs/etterlatte-ktor/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-migrering-model/**
       - libs/rapidsandrivers-extras/**
       - gradle/libs.versions.toml

diff --git a/.github/workflows/app-etterlatte-oppdater-behandling.yaml b/.github/workflows/app-etterlatte-oppdater-behandling.yaml
@@ -20,6 +20,7 @@ on:
       - libs/etterlatte-behandling-model/**
       - libs/etterlatte-oppgave-model/**
       - libs/etterlatte-migrering-model/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-ktor/**
       - libs/etterlatte-pdl-model/**
       - libs/etterlatte-vedtaksvurdering-model/**
@@ -36,6 +37,7 @@ on:
       - libs/etterlatte-behandling-model/**
       - libs/etterlatte-oppgave-model/**
       - libs/etterlatte-migrering-model/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-ktor/**
       - libs/etterlatte-pdl-model/**
       - libs/etterlatte-vedtaksvurdering-model/**

diff --git a/.github/workflows/app-etterlatte-testdata.yaml b/.github/workflows/app-etterlatte-testdata.yaml
@@ -7,6 +7,7 @@ on:
       - main
     paths:
       - apps/etterlatte-testdata/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-ktor/**
       - gradle/libs.versions.toml
       - "!**/test/**"
@@ -15,6 +16,7 @@ on:
       - main
     paths:
       - apps/etterlatte-testdata/**
+      - libs/etterlatte-omregning-model/**
       - "!apps/etterlatte-testdata/.nais/*"
       - libs/etterlatte-ktor/**
       - gradle/libs.versions.toml

diff --git a/.github/workflows/app-etterlatte-trygdetid-kafka.yaml b/.github/workflows/app-etterlatte-trygdetid-kafka.yaml
@@ -19,6 +19,7 @@ on:
       - libs/saksbehandling-common/**
       - libs/etterlatte-trygdetid-model/**
       - libs/etterlatte-migrering-model/**
+      - libs/etterlatte-omregning-model/**
       - libs/rapidsandrivers-extras/**
       - gradle/libs.versions.toml
       - "!**/test/**"
@@ -31,6 +32,7 @@ on:
       - libs/saksbehandling-common/**
       - libs/etterlatte-trygdetid-model/**
       - libs/etterlatte-migrering-model/**
+      - libs/etterlatte-omregning-model/**
       - libs/rapidsandrivers-extras/**
       - gradle/libs.versions.toml
 

diff --git a/.github/workflows/app-etterlatte-vedtaksvurdering-kafka.yaml b/.github/workflows/app-etterlatte-vedtaksvurdering-kafka.yaml
@@ -21,6 +21,7 @@ on:
       - libs/etterlatte-funksjonsbrytere/**
       - libs/etterlatte-ktor/**
       - libs/etterlatte-migrering-model/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-oppgave-model/**
       - libs/etterlatte-utbetaling-model/**
       - libs/etterlatte-vedtaksvurdering-model/**
@@ -37,6 +38,7 @@ on:
       - libs/etterlatte-funksjonsbrytere/**
       - libs/etterlatte-ktor/**
       - libs/etterlatte-migrering-model/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-oppgave-model/**
       - libs/etterlatte-utbetaling-model/**
       - libs/etterlatte-vedtaksvurdering-model/**

diff --git a/.github/workflows/app-etterlatte-vilkaarsvurdering-kafka.yaml b/.github/workflows/app-etterlatte-vilkaarsvurdering-kafka.yaml
@@ -19,6 +19,7 @@ on:
       - libs/saksbehandling-common/**
       - libs/etterlatte-migrering-model/**
       - libs/etterlatte-vilkaarsvurdering-model/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-ktor/**
       - libs/rapidsandrivers-extras/**
       - gradle/libs.versions.toml
@@ -32,6 +33,7 @@ on:
       - libs/saksbehandling-common/**
       - libs/etterlatte-migrering-model/**
       - libs/etterlatte-vilkaarsvurdering-model/**
+      - libs/etterlatte-omregning-model/**
       - libs/etterlatte-ktor/**
       - libs/rapidsandrivers-extras/**
       - gradle/libs.versions.toml

diff --git a/.github/workflows/lib-etterlatte-omregning-model.yaml b/.github/workflows/lib-etterlatte-omregning-model.yaml
@@ -0,0 +1,23 @@
+name: etterlatte-omregning-model
+
+on:
+  workflow_dispatch: # Allow manually triggered workflow run
+  push:
+    branches:
+      - main
+    paths:
+      - libs/etterlatte-omregning-model/**
+      - gradle/libs.versions.toml
+      - "!**/test/**"
+  pull_request:
+    branches:
+      - main
+    paths:
+      - libs/etterlatte-omregning-model/**
+      - gradle/libs.versions.toml
+
+jobs:
+  test:
+    if: github.event_name == 'pull_request'
+    uses: ./.github/workflows/.lib-test.yaml
+    secrets: inherit
diff --git a/apps/etterlatte-behandling/build.gradle.kts b/apps/etterlatte-behandling/build.gradle.kts
@@ -24,6 +24,7 @@ dependencies {
     implementation(project(":libs:etterlatte-tidshendelser-model"))
     implementation(project(":libs:etterlatte-trygdetid-model"))
     implementation(project(":libs:etterlatte-beregning-model"))
+    implementation(project(":libs:etterlatte-omregning-model"))
 
     implementation(libs.cache.caffeine)
     implementation(libs.navfelles.tokenvalidationktor2) {

diff --git a/...behandling/src/main/kotlin/behandling/omregning/OmregningKlassifikasjonskodeJobService.kt b/...behandling/src/main/kotlin/behandling/omregning/OmregningKlassifikasjonskodeJobService.kt
@@ -19,11 +19,11 @@ import no.nav.etterlatte.libs.common.rapidsandrivers.TEKNISK_TID_KEY
 import no.nav.etterlatte.libs.common.sak.KjoeringRequest
 import no.nav.etterlatte.libs.common.sak.KjoeringStatus
 import no.nav.etterlatte.libs.common.sak.SakId
+import no.nav.etterlatte.omregning.OmregningData
+import no.nav.etterlatte.omregning.OmregningHendelseType
+import no.nav.etterlatte.omregning.UtbetalingVerifikasjon
 import no.nav.etterlatte.rapidsandrivers.HENDELSE_DATA_KEY
-import no.nav.etterlatte.rapidsandrivers.OmregningData
-import no.nav.etterlatte.rapidsandrivers.OmregningHendelseType
 import no.nav.etterlatte.rapidsandrivers.SAK_ID_KEY
-import no.nav.etterlatte.rapidsandrivers.UtbetalingVerifikasjon
 import org.slf4j.LoggerFactory
 import java.time.LocalDate
 import java.time.LocalDateTime

diff --git a/...rlatte-behandling/src/main/kotlin/inntektsjustering/AarligInntektsjusteringJobbService.kt b/...rlatte-behandling/src/main/kotlin/inntektsjustering/AarligInntektsjusteringJobbService.kt
@@ -52,10 +52,10 @@ import no.nav.etterlatte.libs.common.vedtak.LoependeYtelseDTO
 import no.nav.etterlatte.libs.ktor.token.Fagsaksystem
 import no.nav.etterlatte.libs.ktor.token.HardkodaSystembruker
 import no.nav.etterlatte.libs.ktor.token.Saksbehandler
+import no.nav.etterlatte.omregning.OmregningData
+import no.nav.etterlatte.omregning.OmregningDataPacket
+import no.nav.etterlatte.omregning.OmregningHendelseType
 import no.nav.etterlatte.oppgave.OppgaveService
-import no.nav.etterlatte.rapidsandrivers.OmregningData
-import no.nav.etterlatte.rapidsandrivers.OmregningDataPacket
-import no.nav.etterlatte.rapidsandrivers.OmregningHendelseType
 import no.nav.etterlatte.sak.SakService
 import org.slf4j.LoggerFactory
 import java.time.LocalTime

diff --git a/.../src/main/kotlin/inntektsjustering/selvbetjening/InntektsjusteringSelvbetjeningService.kt b/.../src/main/kotlin/inntektsjustering/selvbetjening/InntektsjusteringSelvbetjeningService.kt
@@ -18,11 +18,11 @@ import no.nav.etterlatte.libs.common.rapidsandrivers.TEKNISK_TID_KEY
 import no.nav.etterlatte.libs.common.sak.SakId
 import no.nav.etterlatte.libs.common.tidspunkt.Tidspunkt
 import no.nav.etterlatte.libs.ktor.token.HardkodaSystembruker
+import no.nav.etterlatte.omregning.OmregningData
+import no.nav.etterlatte.omregning.OmregningDataPacket
+import no.nav.etterlatte.omregning.OmregningHendelseType
+import no.nav.etterlatte.omregning.OmregningInntektsjustering
 import no.nav.etterlatte.oppgave.OppgaveService
-import no.nav.etterlatte.rapidsandrivers.OmregningData
-import no.nav.etterlatte.rapidsandrivers.OmregningDataPacket
-import no.nav.etterlatte.rapidsandrivers.OmregningHendelseType
-import no.nav.etterlatte.rapidsandrivers.OmregningInntektsjustering
 import org.slf4j.LoggerFactory
 import java.time.YearMonth
 

diff --git a/...ndling/src/test/kotlin/behandling/omregning/OmregningKlassifikasjonskodeJobServiceTest.kt b/...ndling/src/test/kotlin/behandling/omregning/OmregningKlassifikasjonskodeJobServiceTest.kt
@@ -22,9 +22,9 @@ import no.nav.etterlatte.libs.common.sak.KjoeringRequest
 import no.nav.etterlatte.libs.common.sak.KjoeringStatus
 import no.nav.etterlatte.libs.common.sak.SakId
 import no.nav.etterlatte.libs.common.toJson
+import no.nav.etterlatte.omregning.OmregningData
+import no.nav.etterlatte.omregning.UtbetalingVerifikasjon
 import no.nav.etterlatte.rapidsandrivers.HENDELSE_DATA_KEY
-import no.nav.etterlatte.rapidsandrivers.OmregningData
-import no.nav.etterlatte.rapidsandrivers.UtbetalingVerifikasjon
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test

diff --git a/apps/etterlatte-beregning-kafka/build.gradle.kts b/apps/etterlatte-beregning-kafka/build.gradle.kts
@@ -7,6 +7,7 @@ dependencies {
     implementation(project(":libs:etterlatte-beregning-model"))
     implementation(project(":libs:etterlatte-ktor"))
     implementation(project(":libs:rapidsandrivers-extras"))
+    implementation(project(":libs:etterlatte-omregning-model"))
     implementation(project(":libs:etterlatte-migrering-model"))
     implementation(project(":libs:rapidsandrivers-extras"))
     implementation(project(":libs:etterlatte-vedtaksvurdering-model"))

diff --git a/...afka/src/main/kotlin/no/nav/etterlatte/beregningkafka/OmregningHendelserBeregningRiver.kt b/...afka/src/main/kotlin/no/nav/etterlatte/beregningkafka/OmregningHendelserBeregningRiver.kt
@@ -13,17 +13,17 @@ import no.nav.etterlatte.libs.common.beregning.Beregningsperiode
 import no.nav.etterlatte.libs.common.beregning.MottattInntektsjusteringAvkortigRequest
 import no.nav.etterlatte.libs.common.feilhaandtering.ForespoerselException
 import no.nav.etterlatte.libs.common.rapidsandrivers.setEventNameForHendelseType
+import no.nav.etterlatte.omregning.OmregningData
+import no.nav.etterlatte.omregning.OmregningDataPacket
+import no.nav.etterlatte.omregning.OmregningHendelseType
+import no.nav.etterlatte.omregning.omregningData
 import no.nav.etterlatte.rapidsandrivers.BEREGNING_KEY
 import no.nav.etterlatte.rapidsandrivers.HENDELSE_DATA_KEY
 import no.nav.etterlatte.rapidsandrivers.Kontekst
 import no.nav.etterlatte.rapidsandrivers.ListenerMedLoggingOgFeilhaandtering
-import no.nav.etterlatte.rapidsandrivers.OmregningData
-import no.nav.etterlatte.rapidsandrivers.OmregningDataPacket
-import no.nav.etterlatte.rapidsandrivers.OmregningHendelseType
 import no.nav.etterlatte.rapidsandrivers.ReguleringEvents
 import no.nav.etterlatte.rapidsandrivers.ReguleringEvents.AVKORTING_ETTER
 import no.nav.etterlatte.rapidsandrivers.ReguleringEvents.AVKORTING_FOER
-import no.nav.etterlatte.rapidsandrivers.omregningData
 import no.nav.helse.rapids_rivers.JsonMessage
 import no.nav.helse.rapids_rivers.MessageContext
 import no.nav.helse.rapids_rivers.RapidsConnection

diff --git a/...-kafka/src/main/kotlin/no/nav/etterlatte/beregningkafka/SjekkOmOverstyrtBeregningRiver.kt b/...-kafka/src/main/kotlin/no/nav/etterlatte/beregningkafka/SjekkOmOverstyrtBeregningRiver.kt
@@ -2,12 +2,12 @@ package no.nav.etterlatte.beregningkafka
 
 import io.ktor.http.HttpStatusCode
 import no.nav.etterlatte.libs.common.rapidsandrivers.setEventNameForHendelseType
+import no.nav.etterlatte.omregning.OmregningHendelseType
 import no.nav.etterlatte.rapidsandrivers.AAPNE_BEHANDLINGER_KEY
 import no.nav.etterlatte.rapidsandrivers.BEHANDLING_ID_KEY
 import no.nav.etterlatte.rapidsandrivers.HENDELSE_DATA_KEY
 import no.nav.etterlatte.rapidsandrivers.Kontekst
 import no.nav.etterlatte.rapidsandrivers.ListenerMedLoggingOgFeilhaandtering
-import no.nav.etterlatte.rapidsandrivers.OmregningHendelseType
 import no.nav.etterlatte.rapidsandrivers.ReguleringHendelseType
 import no.nav.etterlatte.rapidsandrivers.aapneBehandlinger
 import no.nav.helse.rapids_rivers.JsonMessage

diff --git a/.../src/test/kotlin/no/nav/etterlatte/beregningkafka/OmregningHendelserBeregningRiverTest.kt b/.../src/test/kotlin/no/nav/etterlatte/beregningkafka/OmregningHendelserBeregningRiverTest.kt
@@ -18,7 +18,7 @@ import no.nav.etterlatte.libs.common.beregning.Beregningstype
 import no.nav.etterlatte.libs.common.grunnlag.Metadata
 import no.nav.etterlatte.libs.common.sak.SakId
 import no.nav.etterlatte.libs.common.tidspunkt.Tidspunkt
-import no.nav.etterlatte.rapidsandrivers.OmregningData
+import no.nav.etterlatte.omregning.OmregningData
 import no.nav.helse.rapids_rivers.RapidsConnection
 import no.nav.helse.rapids_rivers.River
 import org.junit.jupiter.api.Assertions.assertNotNull

diff --git a/...ka/src/test/kotlin/no/nav/etterlatte/beregningkafka/SjekkOmOverstyrtBeregningRiverTest.kt b/...ka/src/test/kotlin/no/nav/etterlatte/beregningkafka/SjekkOmOverstyrtBeregningRiverTest.kt
@@ -6,8 +6,8 @@ import io.mockk.every
 import io.mockk.mockk
 import no.nav.etterlatte.libs.common.rapidsandrivers.EVENT_NAME_KEY
 import no.nav.etterlatte.libs.common.rapidsandrivers.FEILMELDING_KEY
+import no.nav.etterlatte.omregning.OmregningHendelseType
 import no.nav.etterlatte.rapidsandrivers.EventNames
-import no.nav.etterlatte.rapidsandrivers.OmregningHendelseType
 import no.nav.helse.rapids_rivers.testsupport.TestRapid
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue

diff --git a/apps/etterlatte-oppdater-behandling/build.gradle.kts b/apps/etterlatte-oppdater-behandling/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     implementation(project(":libs:etterlatte-brev-model"))
     implementation(project(":libs:etterlatte-oppgave-model"))
     implementation(project(":libs:etterlatte-vedtaksvurdering-model"))
+    implementation(project(":libs:etterlatte-omregning-model"))
     implementation(project(":libs:rapidsandrivers-extras"))
     implementation(project(":libs:etterlatte-tidshendelser-model"))
 

diff --git a/...terlatte-oppdater-behandling/src/main/kotlin/regulering/OmregningBrevDistribusjonRiver.kt b/...terlatte-oppdater-behandling/src/main/kotlin/regulering/OmregningBrevDistribusjonRiver.kt
@@ -5,10 +5,10 @@ import no.nav.etterlatte.brev.BrevHendelseType
 import no.nav.etterlatte.libs.common.behandling.Revurderingaarsak
 import no.nav.etterlatte.libs.common.feilhaandtering.InternfeilException
 import no.nav.etterlatte.libs.common.sak.DisttribuertEllerIverksatt
+import no.nav.etterlatte.omregning.OmregningDataPacket
+import no.nav.etterlatte.omregning.omregningData
 import no.nav.etterlatte.rapidsandrivers.Kontekst
 import no.nav.etterlatte.rapidsandrivers.ListenerMedLogging
-import no.nav.etterlatte.rapidsandrivers.OmregningDataPacket
-import no.nav.etterlatte.rapidsandrivers.omregningData
 import no.nav.helse.rapids_rivers.JsonMessage
 import no.nav.helse.rapids_rivers.MessageContext
 import no.nav.helse.rapids_rivers.RapidsConnection

diff --git a/apps/etterlatte-oppdater-behandling/src/main/kotlin/regulering/OmregningFeiletRiver.kt b/apps/etterlatte-oppdater-behandling/src/main/kotlin/regulering/OmregningFeiletRiver.kt
@@ -8,12 +8,12 @@ import no.nav.etterlatte.libs.common.rapidsandrivers.correlationId
 import no.nav.etterlatte.libs.common.rapidsandrivers.feilendeSteg
 import no.nav.etterlatte.libs.common.rapidsandrivers.feilmelding
 import no.nav.etterlatte.libs.common.sak.KjoeringStatus
+import no.nav.etterlatte.omregning.OmregningDataPacket
+import no.nav.etterlatte.omregning.omregningData
 import no.nav.etterlatte.rapidsandrivers.EventNames.FEILA
 import no.nav.etterlatte.rapidsandrivers.KONTEKST_KEY
 import no.nav.etterlatte.rapidsandrivers.Kontekst
 import no.nav.etterlatte.rapidsandrivers.ListenerMedLogging
-import no.nav.etterlatte.rapidsandrivers.OmregningDataPacket
-import no.nav.etterlatte.rapidsandrivers.omregningData
 import no.nav.helse.rapids_rivers.JsonMessage
 import no.nav.helse.rapids_rivers.MessageContext
 import no.nav.helse.rapids_rivers.RapidsConnection

diff --git a/...atte-oppdater-behandling/src/main/kotlin/regulering/OmregningsHendelserBehandlingRiver.kt b/...atte-oppdater-behandling/src/main/kotlin/regulering/OmregningsHendelserBehandlingRiver.kt
@@ -11,13 +11,13 @@ import no.nav.etterlatte.libs.common.grunnlag.Grunnlagsopplysning
 import no.nav.etterlatte.libs.common.rapidsandrivers.setEventNameForHendelseType
 import no.nav.etterlatte.libs.common.revurdering.AutomatiskRevurderingRequest
 import no.nav.etterlatte.libs.common.sak.KjoeringStatus
+import no.nav.etterlatte.omregning.OmregningData
+import no.nav.etterlatte.omregning.OmregningDataPacket
+import no.nav.etterlatte.omregning.OmregningHendelseType
+import no.nav.etterlatte.omregning.omregningData
 import no.nav.etterlatte.rapidsandrivers.BEHANDLING_ID_KEY
 import no.nav.etterlatte.rapidsandrivers.Kontekst
 import no.nav.etterlatte.rapidsandrivers.ListenerMedLoggingOgFeilhaandtering
-import no.nav.etterlatte.rapidsandrivers.OmregningData
-import no.nav.etterlatte.rapidsandrivers.OmregningDataPacket
-import no.nav.etterlatte.rapidsandrivers.OmregningHendelseType
-import no.nav.etterlatte.rapidsandrivers.omregningData
 import no.nav.helse.rapids_rivers.JsonMessage
 import no.nav.helse.rapids_rivers.MessageContext
 import no.nav.helse.rapids_rivers.RapidsConnection

diff --git a/...etterlatte-oppdater-behandling/src/main/kotlin/regulering/ReguleringsforespoerselRiver.kt b/...etterlatte-oppdater-behandling/src/main/kotlin/regulering/ReguleringsforespoerselRiver.kt
@@ -11,11 +11,11 @@ import no.nav.etterlatte.libs.common.sak.KjoeringStatus
 import no.nav.etterlatte.libs.common.sak.SakIDListe
 import no.nav.etterlatte.libs.common.sak.SakId
 import no.nav.etterlatte.libs.common.sak.SakslisteDTO
+import no.nav.etterlatte.omregning.OmregningData
 import no.nav.etterlatte.rapidsandrivers.DATO_KEY
 import no.nav.etterlatte.rapidsandrivers.HENDELSE_DATA_KEY
 import no.nav.etterlatte.rapidsandrivers.Kontekst
 import no.nav.etterlatte.rapidsandrivers.ListenerMedLoggingOgFeilhaandtering
-import no.nav.etterlatte.rapidsandrivers.OmregningData
 import no.nav.etterlatte.rapidsandrivers.RapidEvents.ANTALL
 import no.nav.etterlatte.rapidsandrivers.RapidEvents.EKSKLUDERTE_SAKER
 import no.nav.etterlatte.rapidsandrivers.RapidEvents.KJOERING

diff --git a/apps/etterlatte-oppdater-behandling/src/main/kotlin/regulering/VedtakAttestertRiver.kt b/apps/etterlatte-oppdater-behandling/src/main/kotlin/regulering/VedtakAttestertRiver.kt
@@ -7,9 +7,10 @@ import no.nav.etterlatte.libs.common.rapidsandrivers.eventName
 import no.nav.etterlatte.libs.common.sak.KjoeringStatus
 import no.nav.etterlatte.libs.common.sak.LagreKjoeringRequest
 import no.nav.etterlatte.libs.common.vedtak.VedtakKafkaHendelseHendelseType
+import no.nav.etterlatte.omregning.OmregningDataPacket
+import no.nav.etterlatte.omregning.omregningData
 import no.nav.etterlatte.rapidsandrivers.Kontekst
 import no.nav.etterlatte.rapidsandrivers.ListenerMedLoggingOgFeilhaandtering
-import no.nav.etterlatte.rapidsandrivers.OmregningDataPacket
 import no.nav.etterlatte.rapidsandrivers.ReguleringEvents.AVKORTING_ETTER
 import no.nav.etterlatte.rapidsandrivers.ReguleringEvents.AVKORTING_FOER
 import no.nav.etterlatte.rapidsandrivers.ReguleringEvents.BEREGNING_BELOEP_ETTER
@@ -18,7 +19,6 @@ import no.nav.etterlatte.rapidsandrivers.ReguleringEvents.BEREGNING_BRUKT_OMREGN
 import no.nav.etterlatte.rapidsandrivers.ReguleringEvents.BEREGNING_G_ETTER
 import no.nav.etterlatte.rapidsandrivers.ReguleringEvents.BEREGNING_G_FOER
 import no.nav.etterlatte.rapidsandrivers.ReguleringEvents.VEDTAK_BELOEP
-import no.nav.etterlatte.rapidsandrivers.omregningData
 import no.nav.helse.rapids_rivers.JsonMessage
 import no.nav.helse.rapids_rivers.MessageContext
 import no.nav.helse.rapids_rivers.RapidsConnection

diff --git a/apps/etterlatte-oppdater-behandling/src/test/kotlin/regulering/OmregningFeiletRiverTest.kt b/apps/etterlatte-oppdater-behandling/src/test/kotlin/regulering/OmregningFeiletRiverTest.kt
@@ -13,11 +13,11 @@ import no.nav.etterlatte.libs.common.rapidsandrivers.lagParMedEventNameKey
 import no.nav.etterlatte.libs.common.sak.KjoeringStatus
 import no.nav.etterlatte.libs.common.sak.SakId
 import no.nav.etterlatte.libs.common.toJson
+import no.nav.etterlatte.omregning.OmregningData
 import no.nav.etterlatte.rapidsandrivers.EventNames.FEILA
 import no.nav.etterlatte.rapidsandrivers.HENDELSE_DATA_KEY
 import no.nav.etterlatte.rapidsandrivers.KONTEKST_KEY
 import no.nav.etterlatte.rapidsandrivers.Kontekst
-import no.nav.etterlatte.rapidsandrivers.OmregningData
 import no.nav.etterlatte.rapidsandrivers.SAK_ID_KEY
 import no.nav.helse.rapids_rivers.JsonMessage
 import no.nav.helse.rapids_rivers.testsupport.TestRapid

diff --git a/...-oppdater-behandling/src/test/kotlin/regulering/OmregningsHendelserBehandlingRiverTest.kt b/...-oppdater-behandling/src/test/kotlin/regulering/OmregningsHendelserBehandlingRiverTest.kt
@@ -11,8 +11,8 @@ import no.nav.etterlatte.libs.common.revurdering.AutomatiskRevurderingRequest
 import no.nav.etterlatte.libs.common.revurdering.AutomatiskRevurderingResponse
 import no.nav.etterlatte.libs.common.sak.SakId
 import no.nav.etterlatte.libs.common.toJson
+import no.nav.etterlatte.omregning.OmregningData
 import no.nav.etterlatte.rapidsandrivers.HENDELSE_DATA_KEY
-import no.nav.etterlatte.rapidsandrivers.OmregningData
 import no.nav.helse.rapids_rivers.testsupport.TestRapid
 import org.junit.jupiter.api.Test
 import java.io.FileNotFoundException

diff --git a/...rlatte-oppdater-behandling/src/test/kotlin/regulering/ReguleringsforespoerselRiverTest.kt b/...rlatte-oppdater-behandling/src/test/kotlin/regulering/ReguleringsforespoerselRiverTest.kt
@@ -21,11 +21,11 @@ import no.nav.etterlatte.libs.common.sak.BehandlingOgSak
 import no.nav.etterlatte.libs.common.sak.SakIDListe
 import no.nav.etterlatte.libs.common.sak.SakId
 import no.nav.etterlatte.libs.common.sak.SakslisteDTO
+import no.nav.etterlatte.omregning.OmregningDataPacket
 import no.nav.etterlatte.rapidsandrivers.AAPNE_BEHANDLINGER_KEY
 import no.nav.etterlatte.rapidsandrivers.DATO_KEY
 import no.nav.etterlatte.rapidsandrivers.EventNames.FEILA
 import no.nav.etterlatte.rapidsandrivers.HENDELSE_DATA_KEY
-import no.nav.etterlatte.rapidsandrivers.OmregningDataPacket
 import no.nav.etterlatte.rapidsandrivers.RapidEvents.ANTALL
 import no.nav.etterlatte.rapidsandrivers.RapidEvents.KJOERING
 import no.nav.etterlatte.rapidsandrivers.RapidEvents.SPESIFIKKE_SAKER

diff --git a/apps/etterlatte-testdata/build.gradle.kts b/apps/etterlatte-testdata/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     implementation(project(":libs:etterlatte-behandling-model"))
     implementation(project(":libs:etterlatte-ktor"))
     implementation(project(":libs:etterlatte-vedtaksvurdering-model"))
+    implementation(project(":libs:etterlatte-omregning-model"))
     implementation(project(":libs:rapidsandrivers-extras"))
     implementation(libs.ktor2.mustache)