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

Fjern overgangsfaselogikk for lesing av melding fra Simba #612

Merged
merged 1 commit into from
Jan 2, 2025
Merged

Fjern overgangsfaselogikk for lesing av melding fra Simba #612

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: 2 additions & 18 deletions src/main/kotlin/no/nav/syfo/simba/InntektsmeldingConsumer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package no.nav.syfo.simba

import kotlinx.serialization.Serializable
import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.Inntektsmelding
import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.JournalfoertInntektsmelding
import no.nav.helsearbeidsgiver.pdl.PdlClient
import no.nav.helsearbeidsgiver.utils.json.fromJson
import no.nav.helsearbeidsgiver.utils.json.parseJson
Expand All @@ -24,7 +24,6 @@ import org.apache.kafka.clients.consumer.ConsumerRecord
import org.apache.kafka.clients.consumer.KafkaConsumer
import java.time.Duration
import java.time.LocalDateTime
import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.JournalfoertInntektsmelding as JournalfoertInntektsmeldingV1

class InntektsmeldingConsumer(
props: Map<String, Any>,
Expand Down Expand Up @@ -79,15 +78,7 @@ class InntektsmeldingConsumer(
private fun behandleRecord(record: ConsumerRecord<String, String>) {
val json = record.value().parseJson()
sikkerlogger.info("InntektsmeldingConsumer: Mottar record fra Simba.\n${json.toPretty()}")
// Skal bytte fra JournalfoertInntektsmelding til JournalfoertInntektsmeldingV1. Tåler begge i overgangsfase.
val meldingFraSimba =
runCatching {
json.fromJson(JournalfoertInntektsmeldingV1.serializer())
}.recover { _ ->
json.fromJson(JournalfoertInntektsmelding.serializer()).let {
JournalfoertInntektsmeldingV1(it.journalpostId, it.inntektsmeldingV1)
}
}.getOrThrow()
val meldingFraSimba = json.fromJson(JournalfoertInntektsmelding.serializer())

val im = inntektsmeldingService.findByJournalpost(meldingFraSimba.journalpostId)
if (im != null) {
Expand Down Expand Up @@ -168,10 +159,3 @@ class InntektsmeldingConsumer(
}
}
}

// Midlertidig klasse, skal erstattes med v1.JournalfoertInntektsmelding etter overgangsfase
@Serializable
private data class JournalfoertInntektsmelding(
val journalpostId: String,
val inntektsmeldingV1: Inntektsmelding,
)
Loading