-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
42 additions
and
52 deletions.
There are no files selected for viewing
20 changes: 0 additions & 20 deletions
20
...in/java/no/nav/foreldrepenger/kontrakter/fpsak/tilkjentytelse/TilkjentYtelseAndelDto.java
This file was deleted.
Oops, something went wrong.
43 changes: 42 additions & 1 deletion
43
...ava/no/nav/foreldrepenger/kontrakter/fpsak/tilkjentytelse/TilkjentYtelseDagytelseDto.java
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 |
---|---|---|
@@ -1,8 +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) {} | ||
public record TilkjentYtelseDagytelseDto(@Valid @NotNull List<TilkjentYtelsePeriodeDto> perioder) { | ||
|
||
public record TilkjentYtelsePeriodeDto(@NotNull LocalDate fom, | ||
@NotNull LocalDate tom, | ||
Integer dagsats, | ||
@Valid List<TilkjentYtelseAndelDto> andeler) {} | ||
|
||
public record TilkjentYtelseAndelDto(String arbeidsgiverReferanse, | ||
@Min(0) @Max(Integer.MAX_VALUE) Integer refusjon, | ||
@Min(0) @Max(Integer.MAX_VALUE) Integer tilSoker, | ||
@NotNull @Valid Aktivitetstatus aktivitetstatus, | ||
String arbeidsforholdId, | ||
@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, | ||
} | ||
|
||
} | ||
|
||
|
12 changes: 0 additions & 12 deletions
12
.../java/no/nav/foreldrepenger/kontrakter/fpsak/tilkjentytelse/TilkjentYtelsePeriodeDto.java
This file was deleted.
Oops, something went wrong.
19 changes: 0 additions & 19 deletions
19
.../java/no/nav/foreldrepenger/kontrakter/fpsak/tilkjentytelse/kodeverk/Aktivitetstatus.java
This file was deleted.
Oops, something went wrong.