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.

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

Sett kontekst for jobb #7013

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Sett kontekst for jobb #7013

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
20 changes: 18 additions & 2 deletions ...rlatte-behandling/src/main/kotlin/behandling/jobs/AvbryterFeilopprettedeRevurderingJob.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,26 @@ package no.nav.etterlatte.behandling.jobs

import kotlinx.coroutines.newSingleThreadContext
import kotlinx.coroutines.runBlocking
import no.nav.etterlatte.Context
import no.nav.etterlatte.Kontekst
import no.nav.etterlatte.Self
import no.nav.etterlatte.behandling.BehandlingService
import no.nav.etterlatte.behandling.hendelse.getUUID
import no.nav.etterlatte.common.ConnectionAutoclosing
import no.nav.etterlatte.common.DatabaseContext
import no.nav.etterlatte.jobs.LoggerInfo
import no.nav.etterlatte.jobs.fixedRateCancellableTimer
import no.nav.etterlatte.libs.common.TimerJob
import no.nav.etterlatte.libs.common.behandling.AarsakTilAvbrytelse
import no.nav.etterlatte.libs.database.toList
import no.nav.etterlatte.libs.ktor.token.HardkodaSystembruker
import no.nav.etterlatte.sak.SakTilgangDao
import org.slf4j.LoggerFactory
import java.time.Duration
import java.time.temporal.ChronoUnit
import java.util.Timer
import java.util.UUID
import javax.sql.DataSource

/**
* Det ble opprettet aktivitetspliktrevurderinger for 12-månederskravet for feil måneder i starten av februar.
Expand All @@ -28,9 +34,18 @@ class AvbryterFeilopprettedeRevurderingJob(
private val behandlingService: BehandlingService,
private val avbrytRevurderingerDao: AvbrytRevurderingerDao,
private val isLeader: () -> Boolean,
dataSource: DataSource,
val sakTilgangDao: SakTilgangDao,
) : TimerJob {
private val jobbNavn = this::class.java.simpleName
private val logger = LoggerFactory.getLogger(AvbryterFeilopprettedeRevurderingJob::class.java)
private var jobContext: Context =
Context(
Self(AvbrytRevurderinger::class.java.simpleName),
DatabaseContext(dataSource),
sakTilgangDao,
HardkodaSystembruker.aktivitetsplikt,
)

override fun schedule(): Timer =
fixedRateCancellableTimer(
Expand All @@ -39,7 +54,7 @@ class AvbryterFeilopprettedeRevurderingJob(
period = Duration.of(3, ChronoUnit.HOURS).toMillis(),
loggerInfo = LoggerInfo(logger = logger, sikkerLogg = null, loggTilSikkerLogg = false),
) {
AvbrytRevurderinger(behandlingService, avbrytRevurderingerDao, isLeader).run()
AvbrytRevurderinger(behandlingService, avbrytRevurderingerDao, isLeader).run(jobContext)
}
}

Expand All @@ -50,8 +65,9 @@ class AvbrytRevurderinger(
) {
private val logger = LoggerFactory.getLogger(AvbrytRevurderinger::class.java)

fun run() {
fun run(context: Context) {
if (isLeader()) {
Kontekst.set(context)
logger.info("pod er leader, kjører jobb for å avbryte revurderinger")
newSingleThreadContext("AvbrytRevurderingerJob").use { ctx ->
Runtime.getRuntime().addShutdownHook(Thread { ctx.close() })
Expand Down
2 changes: 2 additions & 0 deletions apps/etterlatte-behandling/src/main/kotlin/config/ApplicationContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,8 @@ internal class ApplicationContext(
behandlingService = behandlingService,
avbrytRevurderingerDao = AvbrytRevurderingerDao(connectionAutoclosing = autoClosingDatabase),
isLeader = { leaderElectionKlient.isLeader() },
dataSource = dataSource,
sakTilgangDao = sakTilgangDao,
)
}

Expand Down
2 changes: 2 additions & 0 deletions libs/etterlatte-ktor/src/main/kotlin/token/BrukerTokenInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ data class HardkodaSystembruker private constructor(
*/
val river = HardkodaSystembruker(Systembrukere.RIVER)
val doedshendelse = HardkodaSystembruker(Systembrukere.DOEDSHENDELSE)
val aktivitetsplikt = HardkodaSystembruker(Systembrukere.AKTIVITETSPLIKT)
val testdata = HardkodaSystembruker(Systembrukere.TESTDATA)
val oppgave = HardkodaSystembruker(Systembrukere.OPPGAVE)
val opprettGrunnlag = HardkodaSystembruker(Systembrukere.OPPRETT_GRUNNLAG) // skal bort på sikt
Expand All @@ -90,6 +91,7 @@ data class HardkodaSystembruker private constructor(
OPPRETT_GRUNNLAG("opprettgrunnlag"),
RIVER("river"),
DOEDSHENDELSE("doedshendelse"),
AKTIVITETSPLIKT("aktivitetsplikt"),
TESTDATA("testdata"),
OPPGAVE("oppgave"),
BEREGNING("beregning"),
Expand Down