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

IS-2091: Implement ArbeidstakervarselProducer #26

Merged
merged 2 commits into from
Feb 28, 2024
Merged

IS-2091: Implement ArbeidstakervarselProducer #26

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6b6756
IS-2091: Implement ArbeidstakervarselProducer
andersrognstad Feb 27, 2024
4a7ee41
IS-2091: Rename producer implementation
andersrognstad Feb 28, 2024
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
18 changes: 15 additions & 3 deletions src/main/kotlin/no/nav/syfo/infrastructure/kafka/esyfovarsel/ArbeidstakervarselProducer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,33 @@ package no.nav.syfo.infrastructure.kafka.esyfovarsel
import no.nav.syfo.application.IVarselProducer
import no.nav.syfo.domain.PersonIdent
import no.nav.syfo.domain.Varsel
import no.nav.syfo.infrastructure.kafka.esyfovarsel.dto.*
import java.util.*
import org.apache.kafka.clients.producer.KafkaProducer
import org.apache.kafka.clients.producer.ProducerRecord
import org.slf4j.LoggerFactory

// TODO: Add esyfovarsel-hendelse as kafkaproducer value
class ArbeidstakervarselProducer(private val kafkaArbeidstakervarselProducer: KafkaProducer<String, String>) : IVarselProducer {
class ArbeidstakervarselProducer(private val kafkaArbeidstakervarselProducer: KafkaProducer<String, EsyfovarselHendelse>) : IVarselProducer {
andersrognstad marked this conversation as resolved.
Show resolved Hide resolved

override fun sendArbeidstakerVarsel(personIdent: PersonIdent, varsel: Varsel) {
val varselHendelse = ArbeidstakerHendelse(
type = HendelseType.SM_ARBEIDSUFORHET_FORHANDSVARSEL,
arbeidstakerFnr = personIdent.value,
data = VarselData(
journalpost = VarselDataJournalpost(
uuid = varsel.uuid.toString(),
id = varsel.journalpostId,
),
),
orgnummer = null,
)

try {
kafkaArbeidstakervarselProducer.send(
ProducerRecord(
ESYFOVARSEL_TOPIC,
UUID.randomUUID().toString(),
"",
varselHendelse,
)
).get()
} catch (e: Exception) {
Expand Down
11 changes: 11 additions & 0 deletions .../kotlin/no/nav/syfo/infrastructure/kafka/esyfovarsel/KafkaArbeidstakervarselSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package no.nav.syfo.infrastructure.kafka.esyfovarsel

import no.nav.syfo.infrastructure.kafka.esyfovarsel.dto.EsyfovarselHendelse
import no.nav.syfo.util.configuredJacksonMapper
import org.apache.kafka.common.serialization.Serializer

class KafkaArbeidstakervarselSerializer : Serializer<EsyfovarselHendelse> {
private val mapper = configuredJacksonMapper()
override fun serialize(topic: String?, data: EsyfovarselHendelse?): ByteArray =
mapper.writeValueAsBytes(data)
}
30 changes: 30 additions & 0 deletions src/main/kotlin/no/nav/syfo/infrastructure/kafka/esyfovarsel/dto/EsyfovarselHendelse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package no.nav.syfo.infrastructure.kafka.esyfovarsel.dto

import com.fasterxml.jackson.annotation.JsonTypeInfo
import java.io.Serializable

@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
sealed interface EsyfovarselHendelse : Serializable {
val type: HendelseType
var data: Any?
}

data class ArbeidstakerHendelse(
override val type: HendelseType,
override var data: Any?,
val arbeidstakerFnr: String,
val orgnummer: String?
) : EsyfovarselHendelse

data class VarselData(
val journalpost: VarselDataJournalpost? = null,
)

data class VarselDataJournalpost(
val uuid: String,
val id: String?
)

enum class HendelseType {
SM_ARBEIDSUFORHET_FORHANDSVARSEL,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definert i navikt/esyfovarsel#451

}
17 changes: 14 additions & 3 deletions src/test/kotlin/no/nav/syfo/application/service/VarselServiceSpek.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ import no.nav.syfo.infrastructure.database.repository.VarselRepository
import no.nav.syfo.infrastructure.database.repository.VurderingRepository
import no.nav.syfo.infrastructure.database.dropData
import no.nav.syfo.infrastructure.kafka.esyfovarsel.ArbeidstakervarselProducer
import no.nav.syfo.infrastructure.kafka.esyfovarsel.dto.ArbeidstakerHendelse
import no.nav.syfo.infrastructure.kafka.esyfovarsel.dto.EsyfovarselHendelse
import no.nav.syfo.infrastructure.kafka.esyfovarsel.dto.HendelseType
import no.nav.syfo.infrastructure.kafka.esyfovarsel.dto.VarselData
import org.amshove.kluent.shouldBeEmpty
import org.amshove.kluent.shouldBeEqualTo
import org.amshove.kluent.shouldNotBeNull
import org.apache.kafka.clients.producer.KafkaProducer
import org.apache.kafka.clients.producer.ProducerRecord
import org.apache.kafka.clients.producer.RecordMetadata
import org.spekframework.spek2.Spek
import org.spekframework.spek2.style.specification.describe
Expand All @@ -27,7 +32,7 @@ class VarselServiceSpek : Spek({

val varselRepository = VarselRepository(database = database)
val vurderingRepository = VurderingRepository(database = database)
val kafkaProducer = mockk<KafkaProducer<String, String>>()
val kafkaProducer = mockk<KafkaProducer<String, EsyfovarselHendelse>>()

val varselProducer = ArbeidstakervarselProducer(kafkaArbeidstakervarselProducer = kafkaProducer)
val varselService = VarselService(varselRepository = varselRepository, varselProducer = varselProducer)
Expand Down Expand Up @@ -60,7 +65,8 @@ class VarselServiceSpek : Spek({
failed.size shouldBeEqualTo 0
success.size shouldBeEqualTo 1

verify(exactly = 1) { kafkaProducer.send(any()) }
val producerRecordSlot = slot<ProducerRecord<String, EsyfovarselHendelse>>()
verify(exactly = 1) { kafkaProducer.send(capture(producerRecordSlot)) }

val publishedVarsel = success.first().getOrThrow()
publishedVarsel.uuid.shouldBeEqualTo(unpublishedVarsel.uuid)
Expand All @@ -69,7 +75,12 @@ class VarselServiceSpek : Spek({

varselRepository.getUnpublishedVarsler().shouldBeEmpty()

// TODO: Test kafkaproducer record value
val esyfovarselHendelse = producerRecordSlot.captured.value() as ArbeidstakerHendelse
esyfovarselHendelse.type.shouldBeEqualTo(HendelseType.SM_ARBEIDSUFORHET_FORHANDSVARSEL)
esyfovarselHendelse.arbeidstakerFnr.shouldBeEqualTo(UserConstants.ARBEIDSTAKER_PERSONIDENT.value)
val varselData = esyfovarselHendelse.data as VarselData
varselData.journalpost?.uuid.shouldBeEqualTo(publishedVarsel.uuid.toString())
varselData.journalpost?.id.shouldBeEqualTo(publishedVarsel.journalpostId)
}

it("publishes nothing when no unpublished varsel") {
Expand Down