Skip to content

Commit 367128a

Browse files
authored
Slett migreringsjobb (#839)
1 parent 8fb6ad3 commit 367128a

File tree

9 files changed

+1
-700
lines changed

9 files changed

+1
-700
lines changed

src/main/kotlin/no/nav/helse/flex/db/UtbetalingMigreringRepository.kt

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/main/kotlin/no/nav/helse/flex/db/UtbetalingRepository.kt

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,34 +62,6 @@ interface UtbetalingRepository : CrudRepository<UtbetalingDbRecord, String> {
6262
skalVisesTilBruker: Boolean?,
6363
id: String,
6464
): Boolean
65-
66-
@Query(
67-
"""
68-
SELECT
69-
*,
70-
(utbetaling::jsonb -> 'utbetalingsdager' -> 0) as første_utbetalingsdag
71-
FROM utbetaling
72-
WHERE
73-
utbetaling::jsonb -> 'utbetalingsdager' -> 0 IS NOT NULL
74-
AND utbetaling::jsonb -> 'utbetalingsdager' -> 0 ->> 'sykdomsgrad' IS NULL
75-
AND (
76-
CAST(:sistSettOpprettet AS timestamptz) IS NULL
77-
OR opprettet < CAST(:sistSettOpprettet AS timestamptz)
78-
OR (opprettet = CAST(:sistSettOpprettet AS timestamptz) AND id < :sistSettId)
79-
)
80-
AND (abs(hashtext(id)) % 100) < :andel
81-
ORDER BY opprettet DESC, id DESC
82-
LIMIT 500
83-
FOR UPDATE SKIP LOCKED;
84-
""",
85-
)
86-
fun hent500MedGammeltFormat(
87-
sistSettOpprettet: Instant? = null,
88-
sistSettId: String? = null,
89-
andel: Int = 100,
90-
): List<UtbetalingDbRecord>
91-
92-
fun findByUtbetalingIdIn(utbetalingIder: List<String>): List<UtbetalingDbRecord>
9365
}
9466

9567
@Table("utbetaling")

src/main/kotlin/no/nav/helse/flex/db/VedtakRepository.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ interface VedtakRepository : CrudRepository<VedtakDbRecord, String> {
3030
""",
3131
)
3232
fun hentUtbetalingIdForVedtakMedUtbetalingId(utbetalingIder: List<String>): List<String>
33-
34-
fun findByUtbetalingIdIn(utbetalingIds: List<String>): List<VedtakDbRecord>
3533
}
3634

3735
@Table("vedtak_v2")

src/main/kotlin/no/nav/helse/flex/domene/RSVedtak.kt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -152,22 +152,7 @@ data class RSUtbetalingdag(
152152
val beløpTilArbeidsgiver: Int? = null,
153153
val beløpTilSykmeldt: Int? = null,
154154
val sykdomsgrad: Int? = null,
155-
) {
156-
companion object {
157-
fun konverterTilUtbetalindagDto(utbetalt: RSUtbetalingdag) =
158-
UtbetalingUtbetalt.UtbetalingdagDto(
159-
dato = utbetalt.dato,
160-
type = utbetalt.type,
161-
begrunnelser =
162-
utbetalt.begrunnelser.map {
163-
UtbetalingUtbetalt.UtbetalingdagDto.Begrunnelse.valueOf(it)
164-
},
165-
beløpTilArbeidsgiver = utbetalt.beløpTilArbeidsgiver,
166-
beløpTilSykmeldt = utbetalt.beløpTilSykmeldt,
167-
sykdomsgrad = utbetalt.sykdomsgrad,
168-
)
169-
}
170-
}
155+
)
171156

172157
data class RSDag(
173158
val dato: LocalDate,

src/main/kotlin/no/nav/helse/flex/jobb/MigrerTilUtbetalingsdagerJobb.kt

Lines changed: 0 additions & 192 deletions
This file was deleted.

src/test/kotlin/no/nav/helse/flex/db/UtbetalingMigreringRepositoryTest.kt

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)