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

Bruke common for oms meldt in endring #7003

Merged
merged 1 commit into from
Feb 12, 2025
Merged

Bruke common for oms meldt in endring #7003

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
1 change: 1 addition & 0 deletions .../no/nav/etterlatte/brukerdialog/omsmeldinnendring/JournalfoerOmsMeldtInnEndringService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import no.nav.etterlatte.brukerdialog.soeknad.journalfoering.OpprettJournalpostR
import no.nav.etterlatte.brukerdialog.soeknad.pdf.PdfGeneratorKlient
import no.nav.etterlatte.libs.common.RetryResult
import no.nav.etterlatte.libs.common.innsendtsoeknad.common.PDFMal
import no.nav.etterlatte.libs.common.omsmeldinnendring.OmsMeldtInnEndring
import no.nav.etterlatte.libs.common.retry
import no.nav.etterlatte.libs.common.sak.Sak
import no.nav.etterlatte.libs.common.sak.SakId
Expand Down
53 changes: 19 additions & 34 deletions ...c/main/kotlin/no/nav/etterlatte/brukerdialog/omsmeldinnendring/OmsMeldtInnEndringRiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import no.nav.etterlatte.libs.common.behandling.SakType
import no.nav.etterlatte.libs.common.event.EventnameHendelseType
import no.nav.etterlatte.libs.common.logging.getCorrelationId
import no.nav.etterlatte.libs.common.objectMapper
import no.nav.etterlatte.libs.common.omsmeldinnendring.OmsMeldtInnEndring
import no.nav.etterlatte.libs.common.oppgave.NyOppgaveDto
import no.nav.etterlatte.libs.common.oppgave.OppgaveKilde
import no.nav.etterlatte.libs.common.oppgave.OppgaveType
Expand All @@ -21,8 +22,6 @@ import no.nav.helse.rapids_rivers.JsonMessage
import no.nav.helse.rapids_rivers.MessageContext
import no.nav.helse.rapids_rivers.RapidsConnection
import org.slf4j.LoggerFactory
import java.time.Instant
import java.time.temporal.ChronoUnit
import java.util.UUID

internal class OmsMeldtInnEndringRiver(
Expand All @@ -47,7 +46,7 @@ internal class OmsMeldtInnEndringRiver(
try {
val sak =
runBlocking {
behandlingKlient.finnEllerOpprettSak(endringer.fnr, SakType.OMSTILLINGSSTOENAD)
behandlingKlient.finnEllerOpprettSak(endringer.fnr.value, SakType.OMSTILLINGSSTOENAD)
}

val journalpostResponse =
Expand Down Expand Up @@ -81,26 +80,27 @@ internal class OmsMeldtInnEndringRiver(

private fun mottatMeldtInnEndringFullfoert(
sakId: SakId,
meldtInnEndringId: UUID
meldtInnEndringId: UUID,
) {
logger.info("Mottakk av meldt inn endring fullført, sender melding til selvbetjening sak=$sakId")
val correlationId = getCorrelationId()
val hendelsetype = OmsMeldtInnEndringHendelsetype.MOTTAK_FULLOERT.lagEventnameForType()

rapidsConnection.publish(
"mottak-meld-inn-endring-fullfoert-$sakId",
JsonMessage
.newMessage(
hendelsetype,
mapOf(
CORRELATION_ID_KEY to correlationId,
TEKNISK_TID_KEY to Tidspunkt.now(),
"meldt_inn_endring_id" to meldtInnEndringId
)
).toJson()
).also {
logger.info("Publiserte $hendelsetype for $sakId")
}
rapidsConnection
.publish(
"mottak-meld-inn-endring-fullfoert-$sakId",
JsonMessage
.newMessage(
hendelsetype,
mapOf(
CORRELATION_ID_KEY to correlationId,
TEKNISK_TID_KEY to Tidspunkt.now(),
"meldt_inn_endring_id" to meldtInnEndringId,
),
).toJson(),
).also {
logger.info("Publiserte $hendelsetype for $sakId")
}
}

private fun JsonMessage.omsMeldtInnEndringer(): OmsMeldtInnEndring =
Expand All @@ -117,23 +117,8 @@ enum class OmsMeldtInnEndringHendelsetype(
val eventname: String,
) : EventnameHendelseType {
MOTTATT(HENDELSE_KEY),
MOTTAK_FULLOERT(MOTTAK_FULLFOERT_KEY)
MOTTAK_FULLOERT(MOTTAK_FULLFOERT_KEY),
;

override fun lagEventnameForType(): String = this.eventname
}

// TODO i lib
data class OmsMeldtInnEndring(
val id: UUID = UUID.randomUUID(),
val fnr: String,
val endring: OmsEndring,
val beskrivelse: String,
val tidspunkt: Instant = Instant.now().truncatedTo(ChronoUnit.SECONDS),
)

enum class OmsEndring {
INNTEKT,
AKTIVITET_OG_INNTEKT,
ANNET,
}
11 changes: 6 additions & 5 deletions .../src/test/kotlin/no/nav/etterlatte/brukerdialog/omsendring/OmsMeldtInnEndringRiverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import io.mockk.mockk
import io.mockk.slot
import no.nav.etterlatte.brukerdialog.omsmeldinnendring.ArkiverOmsMeldtInnEndring
import no.nav.etterlatte.brukerdialog.omsmeldinnendring.JournalfoerOmsMeldtInnEndringService
import no.nav.etterlatte.brukerdialog.omsmeldinnendring.OmsEndring
import no.nav.etterlatte.brukerdialog.omsmeldinnendring.OmsMeldtInnEndring
import no.nav.etterlatte.brukerdialog.omsmeldinnendring.OmsMeldtInnEndringHendelseKeys
import no.nav.etterlatte.brukerdialog.omsmeldinnendring.OmsMeldtInnEndringRiver
import no.nav.etterlatte.brukerdialog.soeknad.client.BehandlingClient
Expand All @@ -26,8 +24,11 @@ import no.nav.etterlatte.common.Enheter
import no.nav.etterlatte.libs.common.behandling.SakType
import no.nav.etterlatte.libs.common.innsendtsoeknad.common.PDFMal
import no.nav.etterlatte.libs.common.objectMapper
import no.nav.etterlatte.libs.common.omsmeldinnendring.OmsEndring
import no.nav.etterlatte.libs.common.omsmeldinnendring.OmsMeldtInnEndring
import no.nav.etterlatte.libs.common.oppgave.OppgaveKilde
import no.nav.etterlatte.libs.common.oppgave.OppgaveType
import no.nav.etterlatte.libs.common.person.Foedselsnummer
import no.nav.etterlatte.libs.common.sak.Sak
import no.nav.etterlatte.libs.common.sak.SakId
import no.nav.etterlatte.libs.common.toJson
Expand All @@ -50,11 +51,11 @@ class OmsMeldtInnEndringRiverTest {

@Test
fun `Skal journalføre meldt inn endring for OMS og lage oppgave`() {
val sak = Sak("123", SakType.OMSTILLINGSSTOENAD, SakId(321), Enheter.PORSGRUNN.enhetNr)
val sak = Sak("15507143951", SakType.OMSTILLINGSSTOENAD, SakId(321), Enheter.PORSGRUNN.enhetNr)
val endring =
OmsMeldtInnEndring(
id = UUID.randomUUID(),
fnr = "123",
fnr = Foedselsnummer.of("15507143951"),
endring = OmsEndring.ANNET,
beskrivelse = "Endringer fra bruker..",
tidspunkt = Instant.parse("2024-08-01T05:06:07Z"),
Expand Down Expand Up @@ -84,7 +85,7 @@ class OmsMeldtInnEndringRiverTest {
val pdfDataSlot = slot<PDFMal>()

coVerify(exactly = 1) {
behandlingKlientMock.finnEllerOpprettSak("123", SakType.OMSTILLINGSSTOENAD)
behandlingKlientMock.finnEllerOpprettSak("15507143951", SakType.OMSTILLINGSSTOENAD)

dokarkivKlientMock.opprettJournalpost(capture(journalRequest))
pdfgenKlient.genererPdf(capture(pdfDataSlot), "oms_meldt_inn_endring_v1")
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ktor2-serverresources = { module = "io.ktor:ktor-server-resources", version.ref
ktor2-servertests = { module = "io.ktor:ktor-server-tests", version.ref = "ktor2-version" }
ktor2-webjars = { module = "io.ktor:ktor-server-webjars", version.ref = "ktor2-version" }

etterlatte-common = { module = "pensjon-etterlatte-felles:common", version = "2025.02.10-15.38.d7eefb49b44a" }
etterlatte-common = { module = "pensjon-etterlatte-felles:common", version = "2025.02.12-11.23.ce4c7e2277c7" }
teamdokumenthandtering-avroschemas = { module = "no.nav.teamdokumenthandtering:teamdokumenthandtering-avro-schemas", version = "08c0b2d2" }

logging-slf4japi = { module = "org.slf4j:slf4j-api", version = "2.0.16" }
Expand Down