Skip to content

Commit

Permalink
PEK-503 les årsak ingen utbetaling
Browse files Browse the repository at this point in the history
  • Loading branch information
antonfofanov committed Sep 17, 2024
1 parent 6857ef6 commit 7ec9f10
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ object SPKMapper {
val fraOgMed = periode.fraOgMedDato
periode.delytelseListe.map { Utbetalingsperiode(fraOgMed, it.maanedligBelop, it.ytelseType) }
},
aarsakIngenUtbetaling = response.aarsakIngenUtbetaling
aarsakIngenUtbetaling = response.aarsakIngenUtbetaling.map { it.statusBeskrivelse + ": " + it.ytelseType }
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import java.time.LocalDate
data class SPKSimulerTjenestepensjonResponse(
val inkludertOrdningListe: List<InkludertOrdning>,
val utbetalingListe: List<Utbetaling>,
val aarsakIngenUtbetaling: List<String>,
val aarsakIngenUtbetaling: List<AarsakIngenUtbetaling>,
)

data class InkludertOrdning(
Expand All @@ -21,3 +21,9 @@ data class Delytelse(
val ytelseType: String,
val maanedligBelop: Int,
)

data class AarsakIngenUtbetaling(
val statusKode: String,
val statusBeskrivelse: String,
val ytelseType: String,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package no.nav.tjenestepensjon.simulering.v2025.tjenestepensjon.v1.service.spk

import org.junit.jupiter.api.Test

import org.junit.jupiter.api.Assertions.*
import java.time.LocalDate

class SPKMapperTest {

@Test
fun mapToResponse() {
val resp = SPKSimulerTjenestepensjonResponse(
listOf(InkludertOrdning("3010")),
listOf(Utbetaling(LocalDate.of(2025, 2, 1), listOf(Delytelse("BTP", 141), Delytelse("PAASLAG", 268))),
Utbetaling(LocalDate.of(2030, 2, 1), listOf(Delytelse("OT6370", 779), Delytelse("PAASLAG", 268)))),
listOf(AarsakIngenUtbetaling("IKKE_STOETTET", "Ikke stoettet", "SAERALDERSPAASLAG"))
)

val result = SPKMapper.mapToResponse(resp)

assertEquals(1, result.ordningsListe.size)
assertEquals("3010", result.ordningsListe[0].tpNummer)
assertEquals(4, result.utbetalingsperioder.size)

assertEquals(LocalDate.of(2025, 2, 1), result.utbetalingsperioder[0].fom)
assertEquals(141, result.utbetalingsperioder[0].maanedligBelop)
assertEquals("BTP", result.utbetalingsperioder[0].ytelseType)
assertEquals(268, result.utbetalingsperioder[1].maanedligBelop)
assertEquals("PAASLAG", result.utbetalingsperioder[1].ytelseType)

assertEquals(LocalDate.of(2030, 2, 1), result.utbetalingsperioder[2].fom)
assertEquals(779, result.utbetalingsperioder[2].maanedligBelop)
assertEquals("OT6370", result.utbetalingsperioder[2].ytelseType)
assertEquals(268, result.utbetalingsperioder[3].maanedligBelop)
assertEquals("PAASLAG", result.utbetalingsperioder[3].ytelseType)

assertEquals(1, result.aarsakIngenUtbetaling.size)
assertEquals("Ikke stoettet: SAERALDERSPAASLAG", result.aarsakIngenUtbetaling[0])

}
}

0 comments on commit 7ec9f10

Please sign in to comment.