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

Jump to bottom

Feature/utvid delberegning sum løpende bidrag #274

Merged
merged 3 commits into from
Oct 7, 2024
+18 −5
Merged

Feature/utvid delberegning sum løpende bidrag #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93c352d
Utvidet respons DelberegningSumLøpendeBidrag
rinnan17 Oct 7, 2024
c455223
Utvidet respons DelberegningSumLøpendeBidrag
rinnan17 Oct 7, 2024
9ec3642
Lagt til alias og defaultverdi respons DelberegningSumLøpendeBidrag
rinnan17 Oct 7, 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 bidrag-domene/src/main/kotlin/no/nav/bidrag/domene/enums/sak/Fogdårsak.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ enum class Fogdårsak(
MAUT("Utlandssak", true, Tilgangstype.MIDL, "Alle"),
MOT("Motregning", true, Tilgangstype.MIDL, "Alle"),
OORG("Omorganisering", true, Tilgangstype.EIER, "Batch"),
}
}
2 changes: 1 addition & 1 deletion bidrag-domene/src/main/kotlin/no/nav/bidrag/domene/enums/sak/SakHendelsestype.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ enum class SakHendelsestype(private val beskrivelse: String, val gyldig: Boolean
override fun toString(): String {
return beskrivelse
}
}
}
2 changes: 1 addition & 1 deletion bidrag-domene/src/main/kotlin/no/nav/bidrag/domene/enums/sak/Tilgangstype.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package no.nav.bidrag.domene.enums.sak
enum class Tilgangstype(val beskrivelse: String) {
EIER("Eierfogd"),
MIDL("Midlertidig autorisasjon"),
}
}
2 changes: 1 addition & 1 deletion bidrag-domene/src/main/kotlin/no/nav/bidrag/domene/enums/sak/UkjentPart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ package no.nav.bidrag.domene.enums.sak

enum class UkjentPart(val beskrivelse: String) {
UK("Ukjent"),
}
}
15 changes: 14 additions & 1 deletion ...transport/src/main/kotlin/no/nav/bidrag/transport/behandling/felles/grunnlag/Beregning.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import no.nav.bidrag.domene.enums.beregning.Resultatkode
import no.nav.bidrag.domene.enums.beregning.Samværsklasse
import no.nav.bidrag.domene.enums.person.AldersgruppeForskudd
import no.nav.bidrag.domene.enums.vedtak.Stønadstype
import no.nav.bidrag.domene.ident.Personident
import no.nav.bidrag.domene.sak.Saksnummer
import no.nav.bidrag.domene.tid.ÅrMånedsperiode
import java.math.BigDecimal
Expand Down Expand Up @@ -100,9 +101,21 @@ data class DelberegningUtgift(

data class DelberegningSumLøpendeBidrag(
override val periode: ÅrMånedsperiode,
val sum: BigDecimal,
@JsonAlias("sum")
val sumLøpendeBidrag: BigDecimal,
val beregningPerBarn: List<DelberegningSumLøpendeBidragPerBarn> = emptyList(),
) : Delberegning

data class DelberegningSumLøpendeBidragPerBarn(
val personidentBarn: Personident,
val saksnummer: Saksnummer,
val løpendeBeløp: BigDecimal,
val samværsfradrag: BigDecimal,
val beregnetBeløp: BigDecimal,
val faktiskBeløp: BigDecimal,
val resultat: BigDecimal,
)

data class DelberegningSamværsfradrag(
override val periode: ÅrMånedsperiode,
val beløp: BigDecimal,
Expand Down
Loading