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

Legg til erstatningskey i melding for kontekst-ID (kalt 'uuid') #774

Merged
merged 1 commit into from
Nov 19, 2024
Merged

Legg til erstatningskey i melding for kontekst-ID (kalt 'uuid') #774

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 felles/src/main/kotlin/no/nav/helsearbeidsgiver/felles/Key.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ enum class Key(
INNTEKT("inntekt"),
INNTEKTSDATO("inntektsdato"),
INNTEKTSMELDING("inntektsmelding"),
KONTEKST_ID("kontekst_id"),
LAGRET_INNTEKTSMELDING("lagret_inntektsmelding"),
OPPGAVE_ID("oppgave_id"),
ORGNR_UNDERENHETER("orgnr_underenheter"),
Expand Down
9 changes: 6 additions & 3 deletions felles/src/main/kotlin/no/nav/helsearbeidsgiver/felles/rapidsrivers/RiverUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,19 @@ import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
import kotlinx.serialization.json.JsonElement
import kotlinx.serialization.json.JsonNull
import no.nav.helsearbeidsgiver.felles.Key
import no.nav.helsearbeidsgiver.felles.json.toJson
import no.nav.helsearbeidsgiver.felles.json.toMap
import no.nav.helsearbeidsgiver.utils.collection.mapValuesNotNull
import no.nav.helsearbeidsgiver.utils.json.parseJson
import no.nav.helsearbeidsgiver.utils.json.toJson

fun MessageContext.publish(vararg messageFields: Pair<Key, JsonElement>): JsonElement = publish(messageFields.toMap())

fun MessageContext.publish(messageFields: Map<Key, JsonElement>): JsonElement =
messageFields
.mapKeys { (key, _) -> key.toString() }
.let { root ->
root
.plus(Key.KONTEKST_ID to root[Key.UUID])
.mapValuesNotNull { it }
}.mapKeys { (key, _) -> key.toString() }
.filterValues { it !is JsonNull }
.toJson()
.toString()
Expand Down