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

Feature/sivilstander #324

Merged
merged 4 commits into from
Nov 14, 2024
Merged

Feature/sivilstander #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf92ac9
t - Innfører sivilstand
MariamPervez Nov 12, 2024
1293ed8
t - Fikser tester ifht sivilstandRina enum
MariamPervez Nov 12, 2024
febe153
t - Retter opp tester til å bruke SivilstandRina
MariamPervez Nov 13, 2024
7f737c0
u - Bumper ep-eux fra 2.3.38 -> 2.3.39
MariamPervez Nov 13, 2024
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 build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dependencies {
implementation("com.google.cloud:google-cloud-storage:2.44.1")

// Eessi pensjon biblioteker
implementation("no.nav.eessi.pensjon:ep-eux:2.3.37")
implementation("no.nav.eessi.pensjon:ep-eux:2.3.39")
implementation("no.nav.eessi.pensjon:ep-metrics:2.0.89")
implementation("no.nav.eessi.pensjon:ep-logging:2.1.87")

Expand Down
79 changes: 37 additions & 42 deletions src/test/kotlin/no/nav/eessi/pensjon/integrasjonstest/saksflyt/PBuc01IntegrationTest.kt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/test/kotlin/no/nav/eessi/pensjon/integrasjonstest/saksflyt/PBuc10IntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ internal class PBuc10IntegrationTest : JournalforingTestBase() {
gjenlevendeFnr = fnrSokVoken,
sivilstand = SivilstandItem(
fradato = "01-30-1980",
status = "01"
status = SivilstandRina.enslig
),
krav = GJENLEV,
relasjon = RelasjonTilAvdod.EKTEFELLE,
Expand Down
5 changes: 3 additions & 2 deletions src/test/kotlin/no/nav/eessi/pensjon/journalforing/KravInitialiseringsServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package no.nav.eessi.pensjon.journalforing

import no.nav.eessi.pensjon.eux.model.sed.*
import no.nav.eessi.pensjon.eux.model.sed.Bruker
import no.nav.eessi.pensjon.journalforing.krav.validerForKravinit
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
Expand All @@ -17,7 +18,7 @@ internal class KravInitialiseringsServiceTest {
sivilstand = listOf(
SivilstandItem(
dato.toString(),
"gift"
SivilstandRina.gift
)
),
statsborgerskap = listOf(
Expand Down Expand Up @@ -48,7 +49,7 @@ internal class KravInitialiseringsServiceTest {
person = Person(
sivilstand = listOf(
SivilstandItem(null,
"enslig"
SivilstandRina.enslig
)
),
statsborgerskap = listOf(
Expand Down
15 changes: 3 additions & 12 deletions src/test/kotlin/no/nav/eessi/pensjon/personidentifisering/helpers/SedFnrSokTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
package no.nav.eessi.pensjon.personidentifisering.helpers

import no.nav.eessi.pensjon.eux.model.SedType
import no.nav.eessi.pensjon.eux.model.sed.Bruker
import no.nav.eessi.pensjon.eux.model.sed.Kontekst
import no.nav.eessi.pensjon.eux.model.sed.Nav
import no.nav.eessi.pensjon.eux.model.sed.Navsak
import no.nav.eessi.pensjon.eux.model.sed.Person
import no.nav.eessi.pensjon.eux.model.sed.PinItem
import no.nav.eessi.pensjon.eux.model.sed.PinLandItem
import no.nav.eessi.pensjon.eux.model.sed.SED

import no.nav.eessi.pensjon.eux.model.sed.X005
import no.nav.eessi.pensjon.eux.model.sed.XNav
import no.nav.eessi.pensjon.eux.model.sed.*
import no.nav.eessi.pensjon.utils.mapJsonToAny
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertTrue
Expand All @@ -38,7 +28,8 @@ internal class SedFnrSokTest {
val sed = SED(
type = SedType.H020,
nav = Nav(
bruker = Bruker(person = Person(pinland = PinLandItem(
bruker = Bruker(person = Person(
pinland = PinLandItem(
oppholdsland = "22117320034",
kompetenteuland = "09035225916"
)
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/buc/P2000-NAV.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"fradato" : "2018-02-01",
"status" : "gift"
}, {
"status" : "skilt_fra_registrert_partnerskap",
"status" : "skilt",
"fradato" : "2016-02-01"
} ],
"pin" : [ {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/buc/P2100-PinDK-NAV.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"etternavnvedfoedsel": "gdafgadfgadfgd",
"sivilstand": [
{
"status": "enke_enkemann",
"status": "enslig",
"fradato": "2002-12-19"
}
],
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/buc/P2100-PinNO.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"etternavnvedfoedsel": "gdafgadfgadfgd",
"sivilstand": [
{
"status": "enke_enkemann",
"status": "enslig",
"fradato": "2002-12-19"
}
],
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/eux/SedResponseP2000.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"fradato" : "2018-02-01",
"status" : "gift"
}, {
"status" : "skilt_fra_registrert_partnerskap",
"status" : "skilt",
"fradato" : "2016-02-01"
} ],
"pin" : [ {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/sed/P2000-NAV.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"fradato" : "2018-02-01",
"status" : "gift"
}, {
"status" : "skilt_fra_registrert_partnerskap",
"status" : "skilt",
"fradato" : "2016-02-01"
} ],
"pin" : [ {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/sed/P2000-ugyldigFNR-NAV.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"fradato" : "2018-02-01",
"status" : "gift"
}, {
"status" : "skilt_fra_registrert_partnerskap",
"status" : "skilt",
"fradato" : "2016-02-01"
} ],
"pin" : [ {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/sed/P2100-PinNO-NAV.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"etternavnvedfoedsel": "gdafgadfgadfgd",
"sivilstand": [
{
"status": "enke_enkemann",
"status": "enslig",
"fradato": "2002-12-19"
}
],
Expand Down
Loading