Skip to content

Commit

Permalink
Resultatkode
Browse files Browse the repository at this point in the history
  • Loading branch information
ugur93 committed Feb 5, 2024
1 parent aa5e154 commit 168c430
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ internal class ForskuddCore(private val forskuddPeriode: ForskuddPeriode = Forsk
resultatPeriodeCoreListe.add(
ResultatPeriodeCore(
PeriodeCore(datoFom = it.periode.datoFom, datoTil = it.periode.datoTil),
ResultatBeregningCore(belop = it.resultat.belop, kode = it.resultat.kode.toString(), regel = it.resultat.regel),
ResultatBeregningCore(belop = it.resultat.belop, kode = it.resultat.kode, regel = it.resultat.regel),
mapReferanseListe(it),
),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import no.nav.bidrag.beregn.core.dto.AvvikCore
import no.nav.bidrag.beregn.core.dto.PeriodeCore
import no.nav.bidrag.beregn.core.dto.SjablonPeriodeCore
import no.nav.bidrag.beregn.core.dto.SjablonResultatGrunnlagCore
import no.nav.bidrag.domene.enums.beregning.Resultatkode
import java.math.BigDecimal
import java.time.LocalDate

Expand Down Expand Up @@ -63,6 +64,6 @@ data class ResultatPeriodeCore(

data class ResultatBeregningCore(
val belop: BigDecimal,
val kode: String,
val kode: Resultatkode,
val regel: String,
)
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import no.nav.bidrag.beregn.forskudd.core.dto.ResultatPeriodeCore
import no.nav.bidrag.commons.service.sjablon.SjablonProvider
import no.nav.bidrag.commons.service.sjablon.Sjablontall
import no.nav.bidrag.commons.util.secureLogger
import no.nav.bidrag.domene.enums.beregning.ResultatkodeForskudd
import no.nav.bidrag.domene.enums.grunnlag.Grunnlagstype
import no.nav.bidrag.domene.tid.ÅrMånedsperiode
import no.nav.bidrag.transport.behandling.beregning.felles.BeregnGrunnlag
Expand Down Expand Up @@ -95,7 +94,7 @@ internal class BeregnForskuddService(private val forskuddCore: ForskuddCore = Fo
resultat =
ResultatBeregning(
belop = it.resultat.belop,
kode = ResultatkodeForskudd.valueOf(it.resultat.kode),
kode = it.resultat.kode,
regel = it.resultat.regel,
),
grunnlagsreferanseListe = it.grunnlagsreferanseListe,
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<kotest.version>5.8.0</kotest.version>
<swagger.version>2.2.20</swagger.version>
<ktlint.version>1.1.1</ktlint.version>
<bidrag-felles.version>2024.02.02.130821</bidrag-felles.version>
<bidrag-felles.version>2024.02.05.142254</bidrag-felles.version>
<spring-boot.version>3.2.2</spring-boot.version>
<kotlin-logging-jvm.version>6.0.3</kotlin-logging-jvm.version>
<mockito-kotlin.version>5.2.1</mockito-kotlin.version>
Expand Down

0 comments on commit 168c430

Please sign in to comment.