-
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
Tjeneste til Pensjon for uthenting av perioder med barnetrygd #393
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6533853
Tjeneste til Pensjon for uthenting av perioder med barnetrygd for en …
tnarland 0eed0a0
Merge branch 'main' into tjeneste_for_henting_av_perioder_til_pensjon
tnarland 5cbacad
Fikser kompileringsfeil etter merge med main
tnarland 3e2db58
Fjerner utbetaltPrMnd da den ikke brukes til noe
tnarland 29f925e
Legger til endepunkt for henting av alle personer med barnetrygd et b…
tnarland 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
96 changes: 96 additions & 0 deletions
96
src/main/kotlin/no/nav/familie/ba/infotrygd/rest/controller/PensjonController.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,96 @@ | ||
package no.nav.familie.ba.infotrygd.rest.controller | ||
|
||
import com.fasterxml.jackson.annotation.JsonProperty | ||
import io.micrometer.core.annotation.Timed | ||
import io.swagger.v3.oas.annotations.Operation | ||
import io.swagger.v3.oas.annotations.Parameter | ||
import io.swagger.v3.oas.annotations.media.Content | ||
import io.swagger.v3.oas.annotations.media.ExampleObject | ||
import io.swagger.v3.oas.annotations.media.Schema | ||
import no.nav.commons.foedselsnummer.FoedselsNr | ||
import no.nav.familie.ba.infotrygd.service.BarnetrygdService | ||
import no.nav.familie.ba.infotrygd.service.ClientValidator | ||
import no.nav.security.token.support.core.api.Protected | ||
import org.springframework.http.HttpStatus | ||
import org.springframework.web.bind.annotation.GetMapping | ||
import org.springframework.web.bind.annotation.PostMapping | ||
import org.springframework.web.bind.annotation.RequestBody | ||
import org.springframework.web.bind.annotation.RequestMapping | ||
import org.springframework.web.bind.annotation.RequestParam | ||
import org.springframework.web.bind.annotation.RestController | ||
import org.springframework.web.server.ResponseStatusException | ||
import java.time.LocalDate | ||
import java.time.YearMonth | ||
import io.swagger.v3.oas.annotations.parameters.RequestBody as ApiRequestBody | ||
|
||
@Protected | ||
@RestController | ||
@Timed(value = "infotrygd_historikk_pensjon_controller", percentiles = [0.5, 0.95]) | ||
@RequestMapping("/infotrygd/barnetrygd") | ||
class PensjonController( | ||
private val barnetrygdService: BarnetrygdService, | ||
private val clientValidator: ClientValidator, | ||
) { | ||
|
||
@Operation(summary = "Uttrekk barnetrygdperioder på en person fra en bestemet måned. Maks 2 år tilbake i tid") | ||
@PostMapping(path = ["pensjon"], consumes = ["application/json"]) | ||
@ApiRequestBody(content = [Content(examples = [ExampleObject(value = """{"ident": "12345678910", "fraDato": "2022-12-01"}""")])]) | ||
fun hentBarnetrygd(@RequestBody request: BarnetrygdTilPensjonRequest): BarnetrygdTilPensjonResponse { | ||
clientValidator.authorizeClient() | ||
tnarland marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
val fraDato = YearMonth.of(request.fraDato.year, request.fraDato.month) | ||
|
||
if (fraDato.isBefore(YearMonth.now().minusYears(2))) { | ||
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "fraDato kan ikke være lenger enn 2 år tilbake i tid") | ||
} | ||
|
||
val bruker = FoedselsNr(request.ident) | ||
|
||
return BarnetrygdTilPensjonResponse( | ||
saker = barnetrygdService.finnBarnetrygdForPensjon(bruker, fraDato) | ||
) | ||
} | ||
|
||
@Operation(summary = "Finner alle personer med barnetrygd innenfor et bestemt år på vegne av Psys") | ||
@GetMapping(path = ["pensjon"]) | ||
fun personerMedBarnetrygd(@Parameter(name = "aar") @RequestParam("aar") år: String): List<FoedselsNr> { | ||
clientValidator.authorizeClient() | ||
return barnetrygdService.finnPersonerBarnetrygdPensjon(år) | ||
} | ||
|
||
|
||
data class BarnetrygdTilPensjonRequest( | ||
val ident: String, | ||
@Schema(implementation = String::class, example = "2020-12-01") val fraDato: LocalDate, | ||
) | ||
|
||
data class BarnetrygdTilPensjonResponse( | ||
@JsonProperty("fagsaker") val saker: List<BarnetrygdTilPensjon> | ||
) | ||
|
||
data class BarnetrygdTilPensjon( | ||
@JsonProperty("fagsakEiersIdent") val fnr: String, | ||
val barnetrygdPerioder: List<BarnetrygdPeriode>, | ||
) | ||
|
||
data class BarnetrygdPeriode( | ||
val personIdent: String, | ||
val delingsprosentYtelse: YtelseProsent, | ||
val ytelseTypeEkstern: YtelseTypeEkstern?, | ||
val stønadFom: YearMonth, | ||
val stønadTom: YearMonth, | ||
val kildesystem: String = "Infotrygd" | ||
) | ||
|
||
enum class YtelseTypeEkstern { | ||
ORDINÆR_BARNETRYGD, | ||
UTVIDET_BARNETRYGD, | ||
SMÅBARNSTILLEGG, | ||
} | ||
|
||
enum class YtelseProsent { | ||
FULL, | ||
DELT, | ||
USIKKER | ||
} | ||
} |
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.
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.
Så kun ute etter perioder for saker som også løper i ba?
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.
Nei, er egentlig en oppgave som består av to 2 deler. Regner med vi kommer til å trenge et "finnPersonerTilPensjon"-endepunkt i den andre delen av oppgaven