F - Endrer YtelserItem med nye verdier for preutfylling

Co-authored-by: Daniel.skarpas@nav.no
navikt · Nov 18, 2024 · a7c7c34 · a7c7c34
1 parent fbff71a
commit a7c7c34
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/kotlin/no/nav/eessi/pensjon/eux/model/sed/PensjonModel.kt b/src/main/kotlin/no/nav/eessi/pensjon/eux/model/sed/PensjonModel.kt
@@ -57,8 +57,8 @@ data class YtelserItem(
 	val ytelse: YtelseType? = null,
 	val startdatoretttilytelse: String? = null,
 	val sluttdatoUtbetaling: String? = null,
-	val beloep: String? = null,
-	val beloepsListe: List<BeloepItem>? = null,
+//	val beloep: String? = null,
+	val beloep: List<BeloepItem>? = null,
 	val status: StatusType? = null,
 	val annenbetalingshyppighetytelse: String? = null,
 	val totalbruttobeloepbostedsbasert: String? = null
@@ -71,7 +71,7 @@ data class BeloepItem(
         val beloep: String? = null,
 		val beloepBrutto: String? = null,
         val gjeldendesiden: String? = null,
-        val utbetalingshyppighetAnnen: String? = null,
+        val utbetalingshyppighetAnnen: String? = null
 )
 
 enum class BasertPaa {

diff --git a/src/test/kotlin/no/nav/eessi/pensjon/eux/model/sed/P7000Test.kt b/src/test/kotlin/no/nav/eessi/pensjon/eux/model/sed/P7000Test.kt
@@ -22,15 +22,15 @@ class P7000Test {
         val dkAvslag = p7000.pensjon?.samletVedtak?.avslag?.firstOrNull { it.pin?.land == "DK" }
 
         Assertions.assertEquals("2021-07-20", noTildelt?.revurderingtidsfrist)
-        Assertions.assertEquals("123123123123", noTildelt?.ytelser?.first()?.beloepsListe?.first()?.beloepBrutto)
+        Assertions.assertEquals("123123123123", noTildelt?.ytelser?.first()?.beloep?.first()?.beloepBrutto)
         Assertions.assertEquals(
             "4.1.8.2 revjrflkasdfjasdf asdfasd fadfg",
             noTildelt?.adressatForRevurdering?.first()?.adressatforrevurdering
         )
         Assertions.assertEquals("01", noTildelt?.pensjonType)
 
         Assertions.assertEquals("2021-07-20", seTildelt?.revurderingtidsfrist)
-        Assertions.assertEquals("41", seTildelt?.ytelser?.first()?.beloepsListe?.first()?.beloepBrutto)
+        Assertions.assertEquals("41", seTildelt?.ytelser?.first()?.beloep?.first()?.beloepBrutto)
         Assertions.assertEquals("4.1.8.2.1", seTildelt?.adressatForRevurdering?.first()?.adressatforrevurdering)
         Assertions.assertEquals("01", seTildelt?.pensjonType)