Skip to content

Logg prosessering av utbetalinger #815

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.

Sign up for GitHub

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

Open
nilsjorgen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Logg prosessering av utbetalinger #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/kotlin/no/nav/helse/flex/cronjob/VedtakStatusJob.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class VedtakStatusJob(
) {
val log = logger()

@Scheduled(initialDelay = 5, fixedDelay = 1, timeUnit = TimeUnit.MINUTES)
@Scheduled(initialDelay = 5, fixedDelay = 10, timeUnit = TimeUnit.MINUTES)
fun run() {
if (leaderElection.isLeader()) {
vedtakStatusService.prosesserUtbetalinger()
Expand Down
20 changes: 9 additions & 11 deletions src/main/kotlin/no/nav/helse/flex/service/SendVedtakStatus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,13 @@ class SendVedtakStatus(
}
}

fun prosesserUtbetalinger(): Int {
fun prosesserUtbetalinger() {
log.info("Starter prosessering av utbetalinger.")

val utbetalinger = utbetalingRepository.utbetalingerKlarTilVarsling()
if (utbetalinger.isEmpty()) return 0
if (utbetalinger.isEmpty()) {
return
}

val vedtakGruppert =
vedtakRepository
Expand All @@ -64,7 +68,7 @@ class SendVedtakStatus(
} != null
}

var sendt = 0
log.info("Fant ${utbetalingerMedAlleVedtak.size} utbetalinger klar til varsling.")

utbetalingerMedAlleVedtak.forEach { ut ->
val id = ut.id
Expand All @@ -80,7 +84,7 @@ class SendVedtakStatus(
val skalIkkeVisesFordi = sjekkDager(vedtakWrapper.dagerArbeidsgiver + vedtakWrapper.dagerPerson)
if (skalIkkeVisesFordi.isNotBlank()) {
log.info("Utbetaling $utbetalingId inneholder bare $skalIkkeVisesFordi og vises ikke til bruker")
skalIkkeVises(id, skalIkkeVisesFordi)
skalIkkeVises(id)
return@forEach
}

Expand All @@ -96,16 +100,10 @@ class SendVedtakStatus(
skalVisesTilBruker = true,
id = id,
)
sendt += 1
}

return sendt
}

private fun skalIkkeVises(
id: String,
grunn: String,
) {
private fun skalIkkeVises(id: String) {
utbetalingRepository.settSkalVisesOgMotattPublisert(
skalVisesTilBruker = false,
motattPublisert = null,
Expand Down
Loading