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

Jump to bottom

Dev #236

Merged
merged 2 commits into from
Nov 23, 2023
Merged

Dev #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22f084b
skipping exception on consumed message if envclass is dev
helehar Nov 22, 2023
05bab6c
skipping error in dev
helehar Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 22 additions & 12 deletions src/main/kotlin/no/nav/syfo/Bootstrap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ fun launchListeners(
applicationState = applicationState,
aivenConsumer = kafkaConsumerJournalfoeringHendelseAiven,
behandlingService = behandlingService,
env = env,
)
}
}
Expand All @@ -293,23 +294,32 @@ suspend fun blockingApplicationLogic(
applicationState: ApplicationState,
aivenConsumer: KafkaConsumer<String, JournalfoeringHendelseRecord>,
behandlingService: BehandlingService,
env: Environment,
) {
while (applicationState.ready) {
aivenConsumer.poll(Duration.ofMillis(1000)).forEach { consumerRecord ->
val journalfoeringHendelseRecord = consumerRecord.value()
val sykmeldingId = UUID.randomUUID().toString()
val loggingMeta =
LoggingMeta(
try {
val journalfoeringHendelseRecord = consumerRecord.value()
val sykmeldingId = UUID.randomUUID().toString()
val loggingMeta =
LoggingMeta(
sykmeldingId = sykmeldingId,
journalpostId = journalfoeringHendelseRecord.journalpostId.toString(),
hendelsesId = journalfoeringHendelseRecord.hendelsesId,
)

behandlingService.handleJournalpost(
journalfoeringEvent = journalfoeringHendelseRecord,
loggingMeta = loggingMeta,
sykmeldingId = sykmeldingId,
journalpostId = journalfoeringHendelseRecord.journalpostId.toString(),
hendelsesId = journalfoeringHendelseRecord.hendelsesId,
)

behandlingService.handleJournalpost(
journalfoeringEvent = journalfoeringHendelseRecord,
loggingMeta = loggingMeta,
sykmeldingId = sykmeldingId,
)
} catch (e: Exception) {
if (env.cluster != "dev-gcp") {
throw e
} else {
log.warn("Skipping error in dev", e)
}
}
}
}
}
96 changes: 55 additions & 41 deletions src/main/kotlin/no/nav/syfo/opprettsykmelding/OpprettSykmeldingService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import no.nav.syfo.pdl.service.PdlPersonService
import no.nav.syfo.securelog
import no.nav.syfo.service.SykmeldingService
import no.nav.syfo.util.LoggingMeta
import org.apache.kafka.clients.consumer.ConsumerRecord
import org.apache.kafka.clients.consumer.KafkaConsumer
import org.apache.kafka.common.serialization.StringDeserializer
import org.slf4j.LoggerFactory
Expand Down Expand Up @@ -78,49 +79,62 @@ class OpprettSykmeldingService(
kafkaConsumer.subscribe(listOf(env.opprettSykmeldingTopic))
while (applicationState.ready) {
kafkaConsumer.poll(Duration.ofMillis(1000)).forEach { consumerRecord ->
val opprettSykmeldingRecord = consumerRecord.value()
val sykmeldingId = UUID.randomUUID().toString()
val loggingMeta =
LoggingMeta(
sykmeldingId = sykmeldingId,
journalpostId = opprettSykmeldingRecord.data.journalpostId,
hendelsesId = opprettSykmeldingRecord.data.journalpostId,
)
val journalpostId = opprettSykmeldingRecord.data.journalpostId
log.info("received opprett sykmelding for $journalpostId {}", fields(loggingMeta))
securelog.info(
"received opprett sykmelding message $opprettSykmeldingRecord {}",
fields(loggingMeta)
)
val journalpostMetadata =
safJournalpostClient.getJournalpostMetadata(
journalpostId,
journalPostQuery,
loggingMeta,
)
?: throw IllegalStateException(
"Unable to find journalpost with id $journalpostId",
)

val fnrEllerAktorId =
when (journalpostMetadata.bruker.type) {
"ORGNR" -> throw IllegalStateException("Bruker id is ORGNR")
else -> journalpostMetadata.bruker.id
}
?: throw IllegalStateException("Bruker id is null")
try {
handleOpprettSykmelding(consumerRecord)
}catch (e: Exception) {
log.error("error in handeling message", e)
if (env.cluster == "dev-gcp"){
log.warn("skipping error in dev")
} else {
throw e
}
}
}
}
}

val pasient = pdlPersonService.getPdlPerson(fnrEllerAktorId, loggingMeta)
sykmeldingService.behandleSykmelding(
journalpostId = journalpostId,
pasient = pasient,
datoOpprettet = journalpostMetadata.datoOpprettet,
dokumentInfoIdPdf = journalpostMetadata.dokumentInfoIdPdf,
dokumentInfoId = journalpostMetadata.dokumentInfoId,
temaEndret = false,
loggingMeta = loggingMeta,
sykmeldingId = sykmeldingId,
private suspend fun handleOpprettSykmelding(consumerRecord: ConsumerRecord<String, OpprettSykmeldingRecord>) {
val opprettSykmeldingRecord = consumerRecord.value()
val sykmeldingId = UUID.randomUUID().toString()
val loggingMeta =
LoggingMeta(
sykmeldingId = sykmeldingId,
journalpostId = opprettSykmeldingRecord.data.journalpostId,
hendelsesId = opprettSykmeldingRecord.data.journalpostId,
)
val journalpostId = opprettSykmeldingRecord.data.journalpostId
log.info("received opprett sykmelding for $journalpostId {}", fields(loggingMeta))
securelog.info(
"received opprett sykmelding message $opprettSykmeldingRecord {}",
fields(loggingMeta)
)
val journalpostMetadata =
safJournalpostClient.getJournalpostMetadata(
journalpostId,
journalPostQuery,
loggingMeta,
)
?: throw IllegalStateException(
"Unable to find journalpost with id $journalpostId",
)

val fnrEllerAktorId =
when (journalpostMetadata.bruker.type) {
"ORGNR" -> throw IllegalStateException("Bruker id is ORGNR")
else -> journalpostMetadata.bruker.id
}
}
?: throw IllegalStateException("Bruker id is null")

val pasient = pdlPersonService.getPdlPerson(fnrEllerAktorId, loggingMeta)
sykmeldingService.behandleSykmelding(
journalpostId = journalpostId,
pasient = pasient,
datoOpprettet = journalpostMetadata.datoOpprettet,
dokumentInfoIdPdf = journalpostMetadata.dokumentInfoIdPdf,
dokumentInfoId = journalpostMetadata.dokumentInfoId,
temaEndret = false,
loggingMeta = loggingMeta,
sykmeldingId = sykmeldingId,
)
}
}