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

Sletter kafka-consumeren for infotrygdhendelser for EF #1301

Merged
merged 1 commit into from
Mar 24, 2025
Merged

Sletter kafka-consumeren for infotrygdhendelser for EF #1301

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
40 changes: 0 additions & 40 deletions src/main/kotlin/no/nav/familie/baks/mottak/hendelser/EnsligForsørgerHendelseService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import no.nav.familie.baks.mottak.domene.Hendelseslogg
import no.nav.familie.baks.mottak.domene.HendelsesloggRepository
import no.nav.familie.baks.mottak.integrasjoner.BaSakClient
import no.nav.familie.baks.mottak.integrasjoner.PdlClient
import no.nav.familie.kontrakter.felles.Tema
import no.nav.familie.kontrakter.felles.ef.EnsligForsørgerVedtakhendelse
import no.nav.familie.kontrakter.felles.ef.StønadType
import org.slf4j.Logger
Expand All @@ -23,8 +22,6 @@ class EnsligForsørgerHendelseService(
val ensligForsørgerVedtakhendelseOvergangstønadCounter: Counter =
Metrics.counter("ef.hendelse.vedtak", "type", "overgangstønad")
val ensligForsørgerVedtakhendelseAnnetCounter: Counter = Metrics.counter("ef.hendelse.vedtak", "type", "annet")
val ensligForsørgerInfotrygdVedtakhendelseOvergangstønadCounter: Counter =
Metrics.counter("ef.hendelse.infotrygd.vedtak", "type", "overgangstønad")

fun prosesserEfVedtakHendelse(
offset: Long,
Expand Down Expand Up @@ -63,43 +60,6 @@ class EnsligForsørgerHendelseService(
}
}

fun prosesserEfInfotrygdHendelse(
offset: Long,
hendelse: InfotrygdHendelse,
) {
if (hendelse.typeYtelse.trim() != "EF") {
logger.info("Ignorerer infotrygdhendelse for hendelseId=${hendelse.hendelseId} fordi ytelsen ikke er EF")
return
}

if (!hendelsesloggRepository.existsByHendelseIdAndConsumer(
hendelse.hendelseId,
HendelseConsumer.EF_VEDTAK_INFOTRYGD_V1,
)
) {
secureLogger.info("Mottatt infotrygdvedtak om overgangsstønad: $hendelse")

val personIdent = pdlClient.hentPersonident(hendelse.aktørId.toString(), Tema.BAR)

baSakClient.sendVedtakOmOvergangsstønadHendelseTilBaSak(personIdent)

hendelsesloggRepository.save(
Hendelseslogg(
offset,
hendelse.hendelseId,
HendelseConsumer.EF_VEDTAK_INFOTRYGD_V1,
mapOf(
"personIdent" to personIdent,
"hendelseId" to hendelse.hendelseId,
"sats" to hendelse.sats.toString(),
).toProperties(),
ident = personIdent,
),
)
ensligForsørgerInfotrygdVedtakhendelseOvergangstønadCounter.increment()
}
}

companion object {
private val logger: Logger = LoggerFactory.getLogger(EnsligForsørgerHendelseService::class.java)
private val secureLogger: Logger = LoggerFactory.getLogger("secureLogger")
Expand Down
120 changes: 0 additions & 120 deletions ...n/kotlin/no/nav/familie/baks/mottak/hendelser/EnsligForsørgerInfotrygdHendelseConsumer.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/kotlin/no/nav/familie/baks/mottak/hendelser/JournalføringHendelseAivenConsumer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class JournalføringHendelseAivenConsumer(
}

companion object {
private val logger: Logger = LoggerFactory.getLogger(EnsligForsørgerInfotrygdHendelseConsumer::class.java)
private val logger: Logger = LoggerFactory.getLogger(JournalføringHendelseAivenConsumer::class.java)
private val secureLogger: Logger = LoggerFactory.getLogger("secureLogger")
}
}
100 changes: 0 additions & 100 deletions ...tlin/no/nav/familie/baks/mottak/hendelser/EnsligForsørgerInfotrygdHendelseConsumerTest.kt
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/test/resources/lokal-kafka-topics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@
],
"numPartitions": 1
},
{
"topicName": "teamfamilie.aapen-ef-overgangstonad-v1",
"members": [
{"member":"srvc01", "role":"CONSUMER"}
],
"numPartitions": 1
},
{
"topicName": "teamfamilie.aapen-ensligforsorger-iverksatt-vedtak",
"members": [
Expand Down