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.

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

Kontrakt for tilkjent ytelse til bruk mellom formidling og fpsak #469

Merged
merged 4 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package no.nav.foreldrepenger.kontrakter.fpsak.tilkjentytelse;

import jakarta.validation.Valid;
import jakarta.validation.constraints.DecimalMax;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.Digits;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;

public record TilkjentYtelseDagytelseDto(@Valid @NotNull List<TilkjentYtelsePeriodeDto> perioder) {
pekern marked this conversation as resolved.
Show resolved Hide resolved

public record TilkjentYtelsePeriodeDto(@NotNull LocalDate fom,
@NotNull LocalDate tom,
Integer dagsats,
pekern marked this conversation as resolved.
Show resolved Hide resolved
@Valid List<TilkjentYtelseAndelDto> andeler) {}
pekern marked this conversation as resolved.
Show resolved Hide resolved
pekern marked this conversation as resolved.
Show resolved Hide resolved

public record TilkjentYtelseAndelDto(String arbeidsgiverReferanse,
pekern marked this conversation as resolved.
Show resolved Hide resolved
@Min(0) @Max(Integer.MAX_VALUE) Integer refusjon,
@Min(0) @Max(Integer.MAX_VALUE) Integer tilSoker,
@NotNull @Valid Aktivitetstatus aktivitetstatus,
pekern marked this conversation as resolved.
Show resolved Hide resolved
String arbeidsforholdId,
pekern marked this conversation as resolved.
Show resolved Hide resolved
@Valid @Digits(integer = 8, fraction = 2) @DecimalMin("0.00") @DecimalMax("10000000.00") BigDecimal stillingsprosent) {}

public enum Aktivitetstatus {
ARBEIDSAVKLARINGSPENGER,
ARBEIDSTAKER,
DAGPENGER,
FRILANSER,
MILITÆR_ELLER_SIVIL,
SELVSTENDIG_NÆRINGSDRIVENDE,
KOMBINERT_AT_FL,
KOMBINERT_AT_SN,
KOMBINERT_FL_SN,
KOMBINERT_AT_FL_SN,
BRUKERS_ANDEL,
KUN_YTELSE,
TTLSTØTENDE_YTELSE,
VENTELØNN_VARTPENGER,
UDEFINERT,
}

}


Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package no.nav.foreldrepenger.kontrakter.fpsak.tilkjentytelse;

public record TilkjentYtelseEngangsstønadDto(Long beregnetTilkjentYtelse) {}
pekern marked this conversation as resolved.
Show resolved Hide resolved