Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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

This file was deleted.

28 changes: 0 additions & 28 deletions src/main/kotlin/no/nav/helse/flex/db/UtbetalingRepository.kt
Original file line number Diff line number Diff line change
Expand Up @@ -62,34 +62,6 @@ interface UtbetalingRepository : CrudRepository<UtbetalingDbRecord, String> {
skalVisesTilBruker: Boolean?,
id: String,
): Boolean

@Query(
"""
SELECT
*,
(utbetaling::jsonb -> 'utbetalingsdager' -> 0) as første_utbetalingsdag
FROM utbetaling
WHERE
utbetaling::jsonb -> 'utbetalingsdager' -> 0 IS NOT NULL
AND utbetaling::jsonb -> 'utbetalingsdager' -> 0 ->> 'sykdomsgrad' IS NULL
AND (
CAST(:sistSettOpprettet AS timestamptz) IS NULL
OR opprettet < CAST(:sistSettOpprettet AS timestamptz)
OR (opprettet = CAST(:sistSettOpprettet AS timestamptz) AND id < :sistSettId)
)
AND (abs(hashtext(id)) % 100) < :andel
ORDER BY opprettet DESC, id DESC
LIMIT 500
FOR UPDATE SKIP LOCKED;
""",
)
fun hent500MedGammeltFormat(
sistSettOpprettet: Instant? = null,
sistSettId: String? = null,
andel: Int = 100,
): List<UtbetalingDbRecord>

fun findByUtbetalingIdIn(utbetalingIder: List<String>): List<UtbetalingDbRecord>
}

@Table("utbetaling")
Expand Down
2 changes: 0 additions & 2 deletions src/main/kotlin/no/nav/helse/flex/db/VedtakRepository.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ interface VedtakRepository : CrudRepository<VedtakDbRecord, String> {
""",
)
fun hentUtbetalingIdForVedtakMedUtbetalingId(utbetalingIder: List<String>): List<String>

fun findByUtbetalingIdIn(utbetalingIds: List<String>): List<VedtakDbRecord>
}

@Table("vedtak_v2")
Expand Down
17 changes: 1 addition & 16 deletions src/main/kotlin/no/nav/helse/flex/domene/RSVedtak.kt
Original file line number Diff line number Diff line change
Expand Up @@ -152,22 +152,7 @@ data class RSUtbetalingdag(
val beløpTilArbeidsgiver: Int? = null,
val beløpTilSykmeldt: Int? = null,
val sykdomsgrad: Int? = null,
) {
companion object {
fun konverterTilUtbetalindagDto(utbetalt: RSUtbetalingdag) =
UtbetalingUtbetalt.UtbetalingdagDto(
dato = utbetalt.dato,
type = utbetalt.type,
begrunnelser =
utbetalt.begrunnelser.map {
UtbetalingUtbetalt.UtbetalingdagDto.Begrunnelse.valueOf(it)
},
beløpTilArbeidsgiver = utbetalt.beløpTilArbeidsgiver,
beløpTilSykmeldt = utbetalt.beløpTilSykmeldt,
sykdomsgrad = utbetalt.sykdomsgrad,
)
}
}
)

data class RSDag(
val dato: LocalDate,
Expand Down

This file was deleted.

This file was deleted.

Loading