-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Slå sammen perioder i brev dersom de er like #1561
Open
olekvernberg
wants to merge
25
commits into
main
Choose a base branch
from
slå-sammen-perioder-i-brev
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
The head ref may contain hidden characters: "sl\u00E5-sammen-perioder-i-brev"
Open
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
23f418a
WIP: Slår sammen perioder i brev
olekvernberg 5692b59
Skal kun lage tekst en gang, ikke for hver periode.
gunnsteingarmo ed473fa
List opp alle perioder som har feilutbetaling til å starte med
olekvernberg 60fdaa1
Merge remote-tracking branch 'origin/main' into slå-sammen-perioder-i…
olekvernberg 6b978e4
Oppdatert vedtaksbrevsoppsummering database med skal_sammenslå_period…
gunnsteingarmo e598524
Endrer slåSammenPerioder til post mapping
gunnsteingarmo 7344230
Endrer navn på kolonne, kan ikke bruke å bytter til aa
gunnsteingarmo 5286907
Foreldelsesperioder er like hvis steget er autoutført
olekvernberg 3635668
Sender ikke med skal sammenslå fra frontend, skal hentes fra databasen
olekvernberg e2dea69
Sender med og bruker erPerioderLike for å sjekke hvilket brev som ska…
gunnsteingarmo cc1c23c
Egen fakta handlebar for sammenslåing av perioder, da beløp pr period…
olekvernberg c5f65d2
Skal som default slå sammen perioder. Startet på å slå sammen avsnitt…
gunnsteingarmo 2e98cbf
Fiks avsnitt for sammenslåtte perioder på vedtaskbrev-siden
olekvernberg 215443f
Skal ha med fritekstfelt i fakta
olekvernberg 3100b43
Bugfix - dersom perioder er like kan de default sammenslås
olekvernberg 19210f9
Bugfix: Hardkodet verdi erstattet med parameter som sendes inn - skal…
olekvernberg 4b6b882
Tar utgangspunkt i første perioder i sammenslått avsnitt
olekvernberg 318a070
Fjerner unødvendig handlebar
olekvernberg 0e7853b
Fjernet logger.info
gunnsteingarmo 220a43a
Merge branch 'main' into slå-sammen-perioder-i-brev
olekvernberg 8f1d637
Skal bare slå sammen like perioder dersom det er fagsak av type ensli…
olekvernberg 41eb127
Slå sammen perioder i vilkårsvurderingssteg dersom perioder er like o…
olekvernberg bd99296
Skal oppdatere skalSammenslåPerioder i vedtaksbrevoppsummering
gunnsteingarmo 1d3d3d5
Sletter endepunktet erPerioderSlaattSammen da det ikke lenger er beho…
gunnsteingarmo 57e8968
Deler opp skal-sammen-slaa endepunktet til to nye, en for å samen slå…
gunnsteingarmo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
25 changes: 25 additions & 0 deletions
25
src/main/kotlin/no/nav/familie/tilbake/dokumentbestilling/vedtak/PeriodeService.kt
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,25 @@ | ||
package no.nav.familie.tilbake.dokumentbestilling.vedtak | ||
|
||
import no.nav.familie.kontrakter.felles.Tema | ||
import no.nav.familie.tilbake.behandling.FagsakRepository | ||
import no.nav.familie.tilbake.faktaomfeilutbetaling.FaktaFeilutbetalingService | ||
import no.nav.familie.tilbake.foreldelse.ForeldelseService | ||
import no.nav.familie.tilbake.vilkårsvurdering.VilkårsvurderingService | ||
import org.springframework.stereotype.Service | ||
import java.util.UUID | ||
|
||
@Service | ||
class PeriodeService( | ||
private val faktaFeilutbetalingService: FaktaFeilutbetalingService, | ||
private val foreldelseService: ForeldelseService, | ||
private val vilkårsvurderingService: VilkårsvurderingService, | ||
private val fagsakRepository: FagsakRepository, | ||
) { | ||
fun erEnsligForsørgerOgPerioderLike(behandlingId: UUID): Boolean { | ||
val fagsak = fagsakRepository.finnFagsakForBehandlingId(behandlingId) | ||
return faktaFeilutbetalingService.sjekkOmFaktaPerioderErLike(behandlingId) && | ||
foreldelseService.sjekkOmForeldelsePerioderErLike(behandlingId) && | ||
vilkårsvurderingService.sjekkOmVilkårsvurderingPerioderErLike(behandlingId) && | ||
fagsak.ytelsestype.tilTema() == Tema.ENF | ||
} | ||
} |
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
Oops, something went wrong.
Oops, something went wrong.
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.
Er litt skeptisk til at en "GET"-er oppdaterer en verdi.
Bør denne sjekken og oppdateringen utføres når vilkårsvurderingen lagres ned - gitt at det eksisterer en vedtaksbrevoppsummering for behandlingen?