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.

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

Trenger ikke lenger å sende over lister av brukere til kafka-kø for m… #2505

Merged
merged 3 commits into from
Jan 10, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import no.nav.familie.ef.sak.fagsak.domain.FagsakPerson
import no.nav.familie.ef.sak.fagsak.domain.PersonIdent
import no.nav.familie.ef.sak.infrastruktur.exception.feilHvis
import no.nav.familie.ef.sak.infrastruktur.exception.feilHvisIkke
import no.nav.familie.ef.sak.minside.MikrofrontendEnableBrukereTask
import no.nav.familie.ef.sak.minside.MikrofrontendEnableBrukerTask
import no.nav.familie.ef.sak.repository.findByIdOrThrow
import no.nav.familie.prosessering.internal.TaskService
import org.springframework.stereotype.Service
Expand Down Expand Up @@ -43,7 +43,7 @@ class FagsakPersonService(private val fagsakPersonRepository: FagsakPersonReposi
fun oppdaterIdent(fagsakPerson: FagsakPerson, gjeldendePersonIdent: String): FagsakPerson {
if (fagsakPerson.hentAktivIdent() != gjeldendePersonIdent) {
val oppdatertFagsakPerson = fagsakPerson.medOppdatertGjeldendeIdent(gjeldendePersonIdent)
taskService.save(MikrofrontendEnableBrukereTask.opprettTask(oppdatertFagsakPerson))
taskService.save(MikrofrontendEnableBrukerTask.opprettTask(oppdatertFagsakPerson))
return fagsakPersonRepository.update(oppdatertFagsakPerson)
} else {
return fagsakPerson
Expand All @@ -52,7 +52,7 @@ class FagsakPersonService(private val fagsakPersonRepository: FagsakPersonReposi

fun opprettFagsakPersonOgAktiverForMinSide(gjeldendePersonIdent: String): FagsakPerson {
val fagsakPerson = fagsakPersonRepository.insert(FagsakPerson(identer = setOf(PersonIdent(gjeldendePersonIdent))))
taskService.save(MikrofrontendEnableBrukereTask.opprettTask(fagsakPerson))
taskService.save(MikrofrontendEnableBrukerTask.opprettTask(fagsakPerson))
return fagsakPerson
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import no.nav.familie.ef.sak.infrastruktur.exception.feilHvisIkke
import no.nav.familie.ef.sak.infrastruktur.featuretoggle.FeatureToggleService
import no.nav.familie.ef.sak.infrastruktur.featuretoggle.Toggle
import no.nav.familie.ef.sak.infrastruktur.sikkerhet.SikkerhetContext
import no.nav.familie.ef.sak.minside.MikrofrontendEnableBrukereTask
import no.nav.familie.ef.sak.minside.MinSideKafkaProducerService
import no.nav.familie.prosessering.internal.TaskService
import no.nav.security.token.support.core.api.ProtectedWithClaims
Expand Down Expand Up @@ -38,16 +37,6 @@ class MinsideForvaltningsController(
minSideKafkaProducerService.deaktiver(personIdent = personIdentDto.personIdent)
}

@PostMapping("aktiver-alle")
fun aktiverAllePersonerForMinSide() {
feilHvisIkke(erUtviklerMedVeilderrolle()) { "Kan kun kjøres av utvikler med veilederrolle" }
fagsakPersonRepository.findAll().chunked(250)
.forEach { fagsakPersoner ->
val task = MikrofrontendEnableBrukereTask.opprettTask(fagsakPersoner)
taskService.save(task)
}
}

private fun validerPersonIdent(personIdentDto: PersonIdentDto) {
if (personIdentDto.personIdent.length != 11) {
error("PersonIdent må ha 11 siffer")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package no.nav.familie.ef.sak.minside

import no.nav.familie.ef.sak.fagsak.domain.FagsakPerson
import no.nav.familie.prosessering.AsyncTaskStep
import no.nav.familie.prosessering.TaskStepBeskrivelse
import no.nav.familie.prosessering.domene.Task
import org.slf4j.LoggerFactory
import org.springframework.stereotype.Service

@Service
@TaskStepBeskrivelse(
taskStepType = MikrofrontendEnableBrukerTask.TYPE,
beskrivelse = "Sender over person til kafka-kø for minside",
)
class MikrofrontendEnableBrukerTask(val minSideKafkaProducerService: MinSideKafkaProducerService) : AsyncTaskStep {

private val logger = LoggerFactory.getLogger(this::class.java)

override fun doTask(task: Task) {
logger.info("Starter task for aktivering av bruker for mikrofrontend")
val personIdent = task.payload
minSideKafkaProducerService.aktiver(personIdent)
}

companion object {

fun opprettTask(fagsakPerson: FagsakPerson): Task {
return Task(
type = TYPE,
payload = fagsakPerson.hentAktivIdent(),
)
}
const val TYPE = "mikrofrontendEnableBrukerTask"
}
}

This file was deleted.