Skip to content

Commit 8a161be

Browse files
committed
Setter default afpOrdning (det har ingenting å si for beregningen)
1 parent d894515 commit 8a161be

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/main/kotlin/no/nav/pensjon/kalkulator/simulering/client/simulator/map/SimulatorAfpOrdningType.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ enum class SimulatorAfpOrdningType (val externalValue: String, val internalValue
1616
private val values = SimulatorAfpOrdningType.entries.toTypedArray()
1717

1818
fun fromInternalValue(value: AfpOrdningType?) =
19-
values.singleOrNull { it.internalValue == value }
19+
values.singleOrNull { it.internalValue == value } ?: AFPKOM
2020
}
2121
}

src/main/kotlin/no/nav/pensjon/kalkulator/simulering/client/simulator/map/SimulatorPersonligSimuleringSpecMapper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object SimulatorPersonligSimuleringSpecMapper {
2626
heltUttak = heltUttak(impersonalSpec.heltUttak),
2727
utenlandsperiodeListe = impersonalSpec.utenlandsopphold.periodeListe.map(::utlandPeriode),
2828
afpInntektMaanedFoerUttak = impersonalSpec.afpInntektMaanedFoerUttak,
29-
afpOrdning = SimulatorAfpOrdningType.fromInternalValue(impersonalSpec.afpOrdning)?.externalValue
29+
afpOrdning = SimulatorAfpOrdningType.fromInternalValue(impersonalSpec.afpOrdning).externalValue
3030
)
3131

3232
private fun gradertUttak(source: GradertUttak) =

src/test/kotlin/no/nav/pensjon/kalkulator/simulering/client/simulator/PensjonssimulatorSimuleringClientTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ class PensjonssimulatorSimuleringClientTest : WebClientTest() {
180180
"tom" : "1999-11-30",
181181
"land" : "AUS",
182182
"arbeidetUtenlands" : true
183-
} ]
183+
} ],
184+
"afpOrdning" : "AFPKOM"
184185
}"""
185186

186187
@Language("json")

0 commit comments

Comments
 (0)