Alder på barn regel forbedring/forenkling #2453
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package no.nav.familie.ef.sak.vilkår.regler.vilkår | ||
|
|
||
| import java.time.LocalDate | ||
| import java.time.Month | ||
|
|
||
| object AlderPåBarnRegelUtil { | ||
|
|
||
| /** | ||
| * Et barn født i 2013 har ikke avsluttet 3'e trinn før juni det året man fyller 10 | ||
| * | ||
| * 2013 født | ||
| * 2014 fyller 1 år | ||
| * ... | ||
| * 2019 fyller 6 år - starter 1 trinn | ||
| * 2020 fyller 7 år - fullfører 1 trinn | ||
| * ... | ||
| * 2023 fyller 10 år - fullfører 4 trinn i juni | ||
| */ | ||
| fun harFullførtFjerdetrinn(fødselsdato: LocalDate, datoForBeregning: LocalDate = LocalDate.now()): Boolean { | ||
| return if (datoForBeregning.month >= Month.JUNE) { | ||
|
There was a problem hiding this comment. Vet ikke helt hvorfor vi gjorde det på denne måten tidligere, men det blir vel litt forskjell her nå? There was a problem hiding this comment. Ja, forskjellen blir at man i den tidligere løsningen fikk at man "fullført fjerne trinn" hvis man beregner i mai, det året barnet skal fullføre, som på en måte høres rart ut? 👀 |
||
| datoForBeregning.year - fødselsdato.year > 9 | ||
| } else { | ||
| datoForBeregning.year - fødselsdato.year > 10 | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package no.nav.familie.ef.sak.no.nav.familie.ef.sak.vilkår.regler.vilkår | ||
|
|
||
| import io.mockk.every | ||
| import io.mockk.mockk | ||
| import no.nav.familie.ef.sak.repository.behandling | ||
| import no.nav.familie.ef.sak.repository.behandlingBarn | ||
| import no.nav.familie.ef.sak.vilkår.Vilkårsresultat | ||
| import no.nav.familie.ef.sak.vilkår.regler.HovedregelMetadata | ||
| import no.nav.familie.ef.sak.vilkår.regler.vilkår.AlderPåBarnRegel | ||
| import org.assertj.core.api.Assertions | ||
| import org.junit.jupiter.api.BeforeEach | ||
| import org.junit.jupiter.api.Test | ||
| import java.util.UUID | ||
|
|
||
| class AlderPåBarnRegelTest { | ||
|
|
||
| val hovedregelMetadataMock = mockk<HovedregelMetadata>() | ||
| val behandlingBarnMedDnr = behandlingBarn(behandlingId = UUID.randomUUID(), personIdent = "06431960727", søknadBarnId = UUID.randomUUID()) | ||
| val behandlingBarn2 = behandlingBarn(behandlingId = UUID.randomUUID(), personIdent = "03041983106", søknadBarnId = UUID.randomUUID()) | ||
|
|
||
| @BeforeEach | ||
| fun setup() { | ||
| every { hovedregelMetadataMock.barn } returns listOf(behandlingBarnMedDnr, behandlingBarn2) | ||
| every { hovedregelMetadataMock.behandling } returns behandling() | ||
| } | ||
|
|
||
| @Test | ||
| fun `Vilkår ikke tatt stilling til og har fullført fjerdetrinn - skal automatisk oppfylle vilkår`() { | ||
| val listDelvilkårsvurdering = AlderPåBarnRegel().initiereDelvilkårsvurdering( | ||
| hovedregelMetadataMock, | ||
| Vilkårsresultat.IKKE_TATT_STILLING_TIL, | ||
| behandlingBarnMedDnr.id, | ||
| ) | ||
|
|
||
| Assertions.assertThat(listDelvilkårsvurdering.size).isEqualTo(1) | ||
| Assertions.assertThat(listDelvilkårsvurdering.first().resultat).isEqualTo(Vilkårsresultat.AUTOMATISK_OPPFYLT) | ||
| } | ||
|
|
||
| @Test | ||
| fun `Vilkår tatt stilling til i resultat, skal ikke vurdere automatisk`() { | ||
| val listDelvilkårsvurdering = AlderPåBarnRegel().initiereDelvilkårsvurdering( | ||
| hovedregelMetadataMock, | ||
| Vilkårsresultat.OPPFYLT, | ||
| null, | ||
| ) | ||
|
|
||
| Assertions.assertThat(listDelvilkårsvurdering.size).isEqualTo(1) | ||
| Assertions.assertThat(listDelvilkårsvurdering.first().resultat).isEqualTo(Vilkårsresultat.OPPFYLT) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Burde man egentlige bruke fødselsdato fra PDL her, og ikke personIdent? Det er ikke sikkert personIdent -> fødselsdato er lik faktiskt fødselsdato
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Det høres jo rimelig ut - jeg vet ikke helt hvilke potensielle fallgruver som dukker opp hvis vi bytter til fødselsdato?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Problemet er vel først og fremst at det ikke finnes noe fødselsdato i det objektet der, eller?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Det er mulig, men det burde kunne legges til då :-)