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

Bare en sakid #6878

Closed
wants to merge 3 commits into from
Closed

Bare en sakid #6878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ba2532
Bare en sakid
sebassonav Jan 27, 2025
a59b481
jaja går ikke å refaktorere i intellij lenger...
sebassonav Jan 29, 2025
8e89631
Feilmelding
sebassonav Jan 29, 2025
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
2 changes: 1 addition & 1 deletion apps/etterlatte-api/src/main/kotlin/no/nav/etterlatte/behandling/sak/BehandlingKlient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class BehandlingKlient(
logger.info("Henter sak med id=$sakId")

return try {
httpClient.get("$behandlingUrl/sak/${sakId.sakId}").body<Sak>()
httpClient.get("$behandlingUrl/sak/${sakId.value}").body<Sak>()
} catch (e: ClientRequestException) {
if (e.response.status == HttpStatusCode.NotFound) {
logger.info("Ingen sak med id=$sakId funnet")
Expand Down
2 changes: 1 addition & 1 deletion ...erlatte-api/src/main/kotlin/no/nav/etterlatte/behandling/sak/VedtaksvurderingSakKlient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class VedtaksvurderingSakKlient(
logger.info("Henter lopende vedtak, date=$dato")
return try {
httpClient
.get("$vedtaksvurderingUrl/loepende/${sakId.sakId}?dato=$dato")
.get("$vedtaksvurderingUrl/loepende/${sakId.value}?dato=$dato")
.body()
} catch (e: ClientRequestException) {
logger.error("Det oppstod feil i kall til vedtak API", e)
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-api/src/main/kotlin/no/nav/etterlatte/oppgave/OppgaveKlient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class OppgaveKlient(

return try {
httpClient
.post("$behandlingUrl/oppgaver/sak/${sakId.sakId}/opprett") {
.post("$behandlingUrl/oppgaver/sak/${sakId.value}/opprett") {
accept(ContentType.Application.Json)
contentType(ContentType.Application.Json)
setBody(oppgave)
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-api/src/main/kotlin/no/nav/etterlatte/vedtak/VedtakService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class VedtakService(
fun VedtakDto.fromDto(): Vedtak {
val vedtakInnhold = (innhold as VedtakInnholdDto.VedtakBehandlingDto)
return Vedtak(
sakId = sak.id.sakId,
sakId = sak.id.value,
sakType = sak.sakType.name,
virkningstidspunkt = vedtakInnhold.virkningstidspunkt.atStartOfMonth(),
type = VedtakType.valueOf(type.name),
Expand Down
8 changes: 4 additions & 4 deletions ...rlatte-behandling-kafka/src/main/kotlin/no/nav/etterlatte/behandling/BehandlingService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ class BehandlingServiceImpl(
): UUID =
runBlocking {
behandlingKlient
.post("$url/oppgaver/sak/${sakId.sakId}/opprett") {
.post("$url/oppgaver/sak/${sakId.value}/opprett") {
contentType(ContentType.Application.Json)
setBody(
NyOppgaveDto(
Expand All @@ -339,7 +339,7 @@ class BehandlingServiceImpl(
): OpprettRevurderingForAktivitetspliktResponse =
runBlocking {
behandlingKlient
.post("$url/api/sak/${sakId.sakId}/aktivitetsplikt/revurdering") {
.post("$url/api/sak/${sakId.value}/aktivitetsplikt/revurdering") {
contentType(ContentType.Application.Json)
setBody(
OpprettRevurderingForAktivitetspliktDto(
Expand All @@ -360,7 +360,7 @@ class BehandlingServiceImpl(
): OpprettOppgaveForAktivitetspliktResponse =
runBlocking {
behandlingKlient
.post("$url/api/sak/${sakId.sakId}/aktivitetsplikt/varigUnntak") {
.post("$url/api/sak/${sakId.value}/aktivitetsplikt/varigUnntak") {
contentType(ContentType.Application.Json)
setBody(
OpprettOppgaveForAktivitetspliktDto(
Expand All @@ -381,7 +381,7 @@ class BehandlingServiceImpl(
): OpprettOppgaveForAktivitetspliktResponse =
runBlocking {
behandlingKlient
.post("$url/api/sak/${sakId.sakId}/aktivitetsplikt/oppgave-oppfoelging") {
.post("$url/api/sak/${sakId.value}/aktivitetsplikt/oppgave-oppfoelging") {
contentType(ContentType.Application.Json)
setBody(
OpprettOppgaveForAktivitetspliktDto(
Expand Down
4 changes: 2 additions & 2 deletions ...g-kafka/src/main/kotlin/no/nav/etterlatte/brukerdialog/soeknad/client/BehandlingClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class BehandlingClient(

fun hentSakMedBehandlinger(sakId: SakId): SakMedBehandlinger =
runBlocking {
sakOgBehandlingApp.get("$url/saker/${sakId.sakId}/behandlinger").body()
sakOgBehandlingApp.get("$url/saker/${sakId.value}/behandlinger").body()
}

fun opprettOppgave(
Expand All @@ -93,7 +93,7 @@ class BehandlingClient(
): UUID =
runBlocking {
sakOgBehandlingApp
.post("$url/oppgaver/sak/${sakId.sakId}/opprett") {
.post("$url/oppgaver/sak/${sakId.value}/opprett") {
contentType(ContentType.Application.Json)
setBody(oppgave)
}.body<OppgaveIntern>()
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/kotlin/no/nav/etterlatte/brukerdialog/omsendring/OmsMeldtInnEndringRiverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class OmsMeldtInnEndringRiverTest {

val pdfData = objectMapper.readValue<ArkiverOmsMeldtInnEndring>(pdfDataSlot.captured.toJson())
with(pdfData) {
sakId.sakId shouldBe 321L
sakId.value shouldBe 321L
type shouldBe "ANNET"
endringer shouldBe "Endringer fra bruker.."
tidspunkt shouldBe "01.08.2024 05:06:07"
Expand Down
2 changes: 1 addition & 1 deletion ...tterlatte-behandling/src/main/kotlin/behandling/aktivitetsplikt/AktivitetspliktBrevDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class AktivitetspliktBrevDao(
begrunnelse = excluded.begrunnelse
""".trimIndent(),
)
stmt.setLong(1, data.sakid.sakId)
stmt.setLong(1, data.sakid.value)
stmt.setObject(2, data.oppgaveId)
stmt.setObject(3, data.utbetaling)
stmt.setObject(4, data.redusertEtterInntekt)
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/main/kotlin/behandling/brevutsendelse/BrevutsendelseDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class BrevutsendelseDao(
""".trimIndent(),
)
statement.setObject(1, brevutsendelse.id)
statement.setLong(2, brevutsendelse.sakId.sakId)
statement.setLong(2, brevutsendelse.sakId.value)
statement.setString(3, brevutsendelse.status.name)
statement.setObject(4, brevutsendelse.merknad)
statement.setObject(5, brevutsendelse.resultat)
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/main/kotlin/behandling/domain/Behandling.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ internal fun Behandling.toStatistikkBehandling(
internal fun Behandling.toDetaljertBehandlingWithPersongalleri(persongalleri: Persongalleri): DetaljertBehandling =
DetaljertBehandling(
id = id,
sak = sak.id,
sakId = sak.id,
sakType = sak.sakType,
soeker = persongalleri.soeker,
status = status,
Expand Down
12 changes: 6 additions & 6 deletions apps/etterlatte-behandling/src/main/kotlin/behandling/klienter/BrevApiKlient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class BrevApiKlientObo(
resource =
Resource(
clientId = clientId,
url = "$resourceUrl/api/brev/$brevId?${SAKID_CALL_PARAMETER}=${sakId.sakId}",
url = "$resourceUrl/api/brev/$brevId?${SAKID_CALL_PARAMETER}=${sakId.value}",
),
brukerTokenInfo = brukerTokenInfo,
).mapBoth(
Expand Down Expand Up @@ -223,7 +223,7 @@ class BrevApiKlientObo(
brukerTokenInfo: BrukerTokenInfo,
): Brev =
post(
url = "$resourceUrl/api/brev/behandling/$behandlingId/vedtak?sakId=${sakId.sakId}",
url = "$resourceUrl/api/brev/behandling/$behandlingId/vedtak?sakId=${sakId.value}",
onSuccess = { resource -> deserialize(resource.response!!.toJson()) },
brukerTokenInfo = brukerTokenInfo,
)
Expand All @@ -246,7 +246,7 @@ class BrevApiKlientObo(
brukerTokenInfo: BrukerTokenInfo,
) {
post(
url = "$resourceUrl/api/brev/$brevId/oversendelse/ferdigstill?sakId=${sakId.sakId}",
url = "$resourceUrl/api/brev/$brevId/oversendelse/ferdigstill?sakId=${sakId.value}",
postBody = "",
onSuccess = {},
brukerTokenInfo = brukerTokenInfo,
Expand All @@ -259,7 +259,7 @@ class BrevApiKlientObo(
brukerTokenInfo: BrukerTokenInfo,
): JournalpostIdDto =
post(
url = "$resourceUrl/api/brev/$brevId/journalfoer?sakId=${sakId.sakId}",
url = "$resourceUrl/api/brev/$brevId/journalfoer?sakId=${sakId.value}",
onSuccess = { resource -> deserialize(resource.response!!.toJson()) },
brukerTokenInfo = brukerTokenInfo,
)
Expand All @@ -270,7 +270,7 @@ class BrevApiKlientObo(
brukerTokenInfo: BrukerTokenInfo,
): BestillingsIdDto =
post(
url = "$resourceUrl/api/brev/$brevId/distribuer?sakId=${sakId.sakId}",
url = "$resourceUrl/api/brev/$brevId/distribuer?sakId=${sakId.value}",
onSuccess = { resource -> deserialize(resource.response!!.toJson()) },
brukerTokenInfo = brukerTokenInfo,
)
Expand All @@ -281,7 +281,7 @@ class BrevApiKlientObo(
brukerTokenInfo: BrukerTokenInfo,
): Brev =
get(
url = "$resourceUrl/api/brev/$brevId?sakId=${sakId.sakId}",
url = "$resourceUrl/api/brev/$brevId?sakId=${sakId.value}",
onSuccess = { resource -> deserialize(resource.response!!.toJson()) },
brukerTokenInfo = brukerTokenInfo,
)
Expand Down
10 changes: 5 additions & 5 deletions apps/etterlatte-behandling/src/main/kotlin/behandling/klienter/GrunnlagKlient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ class GrunnlagKlientImpl(
resource =
Resource(
clientId = clientId,
url = "$resourceApiUrl/grunnlag/sak/${sakId.sakId}",
url = "$resourceApiUrl/grunnlag/sak/${sakId.value}",
),
brukerTokenInfo = brukerTokenInfo,
).mapBoth(
Expand Down Expand Up @@ -298,7 +298,7 @@ class GrunnlagKlientImpl(
resource =
Resource(
clientId = clientId,
url = "$resourceApiUrl/grunnlag/sak/${sakId.sakId}/opprett-grunnlag",
url = "$resourceApiUrl/grunnlag/sak/${sakId.value}/opprett-grunnlag",
),
postBody = opplysningsbehov.toJson(),
brukerTokenInfo = brukerTokenInfo,
Expand Down Expand Up @@ -398,7 +398,7 @@ class GrunnlagKlientImpl(
resource =
Resource(
clientId = clientId,
url = "$resourceApiUrl/grunnlag/sak/${sakId.sakId}/nye-opplysninger",
url = "$resourceApiUrl/grunnlag/sak/${sakId.value}/nye-opplysninger",
),
postBody = saksopplysninger.toJson(),
brukerTokenInfo = brukerTokenInfo,
Expand All @@ -414,7 +414,7 @@ class GrunnlagKlientImpl(
resource =
Resource(
clientId = clientId,
url = "$resourceApiUrl/grunnlag/sak/${sakId.sakId}",
url = "$resourceApiUrl/grunnlag/sak/${sakId.value}",
),
brukerTokenInfo = Kontekst.get().brukerTokenInfo!!,
).mapBoth(
Expand Down Expand Up @@ -475,7 +475,7 @@ class GrunnlagKlientImpl(
resource =
Resource(
clientId = clientId,
url = "$resourceUrl/api/grunnlag/aldersovergang/sak/${sakId.sakId}/${sakType.name}",
url = "$resourceUrl/api/grunnlag/aldersovergang/sak/${sakId.value}/${sakType.name}",
),
brukerTokenInfo = brukerTokenInfo,
).mapBoth(
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/main/kotlin/behandling/klienter/MigreringKlient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MigreringKlient(
sakId: SakId,
) {
retry {
client.post("$url/migrering/${sakId.sakId}/$behandlingId") {
client.post("$url/migrering/${sakId.value}/$behandlingId") {
contentType(ContentType.Application.Json)
setBody(pesysId)
}
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/main/kotlin/behandling/klienter/TilbakekrevingKlient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class TilbakekrevingKlientImpl(
): Kravgrunnlag {
logger.info("Henter oppdatert kravgrunnlag tilknyttet tilbakekreving for sak $sakId")
val response =
client.get("$url/api/tilbakekreving/${sakId.sakId}/kravgrunnlag/$kravgrunnlagId") {
client.get("$url/api/tilbakekreving/${sakId.value}/kravgrunnlag/$kravgrunnlagId") {
contentType(ContentType.Application.Json)
}
if (!response.status.isSuccess()) {
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/main/kotlin/behandling/klienter/VedtakKlientImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ class VedtakKlientImpl(
resource =
Resource(
clientId = clientId,
url = "$resourceUrl/api/vedtak/loepende/${sakId.sakId}?dato=$dato",
url = "$resourceUrl/api/vedtak/loepende/${sakId.value}?dato=$dato",
),
brukerTokenInfo = brukerTokenInfo,
).mapBoth(
Expand Down
4 changes: 2 additions & 2 deletions apps/etterlatte-behandling/src/main/kotlin/behandling/omregning/OmregningDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class OmregningDao(

statement.setString(1, kjoering)
if (harEkskluderteSaker) {
statement.setArray(2, createArrayOf("bigint", ekskluderteSaker.map { it.sakId }.toTypedArray()))
statement.setArray(2, createArrayOf("bigint", ekskluderteSaker.map { it.value }.toTypedArray()))
}
statement.setInt(if (harEkskluderteSaker) 3 else 2, antall)

Expand Down Expand Up @@ -165,7 +165,7 @@ class OmregningDao(
""".trimIndent(),
)
statement.setString(1, kjoering)
statement.setLong(2, sakId.sakId)
statement.setLong(2, sakId.value)
statement.executeQuery().singleOrNull {
Pair(
getLong("sak_id"),
Expand Down
2 changes: 1 addition & 1 deletion .../etterlatte-behandling/src/main/kotlin/grunnlagsendring/doedshendelse/DoedshendelseDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class DoedshendelseDao(
WHERE id = ?
""".trimIndent(),
).apply {
setLong(1, doedshendelseInternal.sakId?.sakId)
setLong(1, doedshendelseInternal.sakId?.value)
setString(2, doedshendelseInternal.status.name)
setString(3, doedshendelseInternal.utfall?.name)
setTidspunkt(4, doedshendelseInternal.endret)
Expand Down
8 changes: 4 additions & 4 deletions .../src/main/kotlin/inntektsjustering/selvbetjening/InntektsjusteringSelvbetjeningService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class InntektsjusteringSelvbetjeningService(
private val logger = LoggerFactory.getLogger(this::class.java)

suspend fun behandleInntektsjustering(mottattInntektsjustering: MottattInntektsjustering) {
logger.info("Starter behandling av innmeldt inntektsjustering for sak ${mottattInntektsjustering.sak.sakId}")
logger.info("Starter behandling av innmeldt inntektsjustering for sak ${mottattInntektsjustering.sak.value}")

if (skalGjoeresAutomatisk(mottattInntektsjustering.sak)) {
startAutomatiskBehandling(mottattInntektsjustering)
Expand All @@ -52,7 +52,7 @@ class InntektsjusteringSelvbetjeningService(
}

private fun startAutomatiskBehandling(mottattInntektsjustering: MottattInntektsjustering) {
logger.info("Behandles automatisk: starter omregning for sak ${mottattInntektsjustering.sak.sakId}")
logger.info("Behandles automatisk: starter omregning for sak ${mottattInntektsjustering.sak.value}")
val correlationId = getCorrelationId()
rapid
.publiser(
Expand Down Expand Up @@ -83,9 +83,9 @@ class InntektsjusteringSelvbetjeningService(

private fun startManuellBehandling(mottattInntektsjustering: MottattInntektsjustering) =
inTransaction {
logger.info("Behandles manuelt: oppretter oppgave for mottatt inntektsjustering for sak ${mottattInntektsjustering.sak.sakId}")
logger.info("Behandles manuelt: oppretter oppgave for mottatt inntektsjustering for sak ${mottattInntektsjustering.sak.value}")
oppgaveService.opprettOppgave(
sakId = SakId(mottattInntektsjustering.sak.sakId),
sakId = SakId(mottattInntektsjustering.sak.value),
kilde = OppgaveKilde.BRUKERDIALOG,
type = OppgaveType.INNTEKTSOPPLYSNING,
merknad = "Ny inntektsopplysning",
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/main/kotlin/oppgave/OppgaveDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ class OppgaveDaoImpl(
)
""".trimIndent(),
)
statement.setLong(1, sakId.sakId)
statement.setLong(1, sakId.value)
statement.setString(2, type.name)
statement.executeQuery().single {
val trueOrFalsePostgresFormat = getString("exists")
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/main/kotlin/sak/SakSkrivDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class SakSkrivDao(
""".trimIndent(),
).apply {
setString(1, nyIdent.value)
setLong(2, sakId.sakId)
setLong(2, sakId.value)
}.executeUpdate()
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/main/kotlin/vilkaarsvurdering/dao/VilkaarsvurderingDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class VilkaarsvurderingDao(
session.hent(
queryString = Queries.HENT_MIGRERT_YRKESSKADE,
params =
mapOf("sak_id" to sakId.sakId),
mapOf("sak_id" to sakId.value),
) {
true
} ?: false
Expand Down
10 changes: 5 additions & 5 deletions ...latte-behandling/src/test/kotlin/behandling/aktivitetsplikt/AktivitetspliktServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ class AktivitetspliktServiceTest {
val vurdering = service.hentVurderingForOppgave(oppgaveId)

vurdering shouldNotBe null
vurdering?.aktivitet?.isEmpty() shouldNotBe true
vurdering?.unntak shouldBe emptyList()
vurdering.aktivitet.isEmpty() shouldNotBe true
vurdering.unntak shouldBe emptyList()

verify { aktivitetspliktAktivitetsgradDao.hentAktivitetsgradForOppgave(oppgaveId) }
verify { aktivitetspliktUnntakDao.hentUnntakForOppgave(oppgaveId) }
Expand Down Expand Up @@ -343,8 +343,8 @@ class AktivitetspliktServiceTest {
val vurdering = service.hentVurderingForOppgave(oppgaveId)

vurdering shouldNotBe null
vurdering?.aktivitet shouldBe emptyList()
vurdering?.unntak?.isEmpty() shouldBe false
vurdering.aktivitet shouldBe emptyList()
vurdering.unntak.isEmpty() shouldBe false

verify { aktivitetspliktAktivitetsgradDao.hentAktivitetsgradForOppgave(oppgaveId) }
verify { aktivitetspliktUnntakDao.hentUnntakForOppgave(oppgaveId) }
Expand Down Expand Up @@ -707,7 +707,7 @@ class AktivitetspliktServiceTest {
}

@Test
fun `opprette revurdering aktivitetsplikt ikke er oppfylt, aktivitetsgrad over 50skjønnsmessig nei - 12 mnd`() {
fun `opprette revurdering aktivitetsplikt ikke er oppfylt, aktivitetsgrad over 50 skjønnsmessig nei - 12 mnd`() {
val revurdering =
mockk<Revurdering> {
every { id } returns UUID.randomUUID()
Expand Down
4 changes: 2 additions & 2 deletions ...tte-behandling/src/test/kotlin/behandling/klage/VedtaksbehandlingRoutesIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ import no.nav.etterlatte.libs.common.behandling.Klage
import no.nav.etterlatte.libs.common.behandling.SakType
import no.nav.etterlatte.libs.common.deserialize
import no.nav.etterlatte.libs.common.sak.Sak
import no.nav.etterlatte.libs.common.sak.SakId
import no.nav.etterlatte.libs.common.tilbakekreving.Kontrollfelt
import no.nav.etterlatte.libs.common.tilbakekreving.Kravgrunnlag
import no.nav.etterlatte.libs.common.tilbakekreving.KravgrunnlagId
import no.nav.etterlatte.libs.common.tilbakekreving.KravgrunnlagStatus
import no.nav.etterlatte.libs.common.tilbakekreving.NavIdent
import no.nav.etterlatte.libs.common.tilbakekreving.SakId
import no.nav.etterlatte.libs.common.tilbakekreving.VedtakId
import no.nav.etterlatte.libs.testdata.grunnlag.BARN_FOEDSELSNUMMER
import no.nav.etterlatte.libs.testdata.grunnlag.HALVSOESKEN_ANNEN_FORELDER
Expand Down Expand Up @@ -241,7 +241,7 @@ class VedtaksbehandlingRoutesIntegrationTest : BehandlingIntegrationTest() {
private fun kravgrunnlag(sak: Sak) =
Kravgrunnlag(
kravgrunnlagId = KravgrunnlagId(123L),
sakId = SakId(sak.id.sakId),
sakId = SakId(sak.id.value),
vedtakId = VedtakId(2L),
kontrollFelt = Kontrollfelt(""),
status = KravgrunnlagStatus.ANNU,
Expand Down
Loading