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

Midlertidlig FORESPOERSEL_SVAR key lagt til #767

Merged
merged 1 commit into from
Nov 12, 2024
Merged

Midlertidlig FORESPOERSEL_SVAR key lagt til #767

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 @@ -51,6 +51,7 @@ enum class Key(
// ulik formattering
FORESPOERSEL_ID("forespoerselId"),
FORESPOERSEL_SVAR("forespoersel-svar"),
FORESPOERSEL_SVAR_V2("forespoersel_svar"),
JOURNALPOST_ID("journalpostId"),
ORGNRUNDERENHET("orgnrUnderenhet"),
SPINN_INNTEKTSMELDING_ID("spinnInntektsmeldingId"),
Expand Down
17 changes: 17 additions & 0 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,13 +8,17 @@ 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
.mapAddTemporaryReplacementKey()
.mapKeys { (key, _) -> key.toString() }
.filterValues { it !is JsonNull }
.toJson()
Expand All @@ -29,3 +33,16 @@ fun MessageContext.publish(messageFields: Map<Key, JsonElement>): JsonElement =
}.toJson()
.also(::publish)
.parseJson()

private fun Map<Key, JsonElement>.mapAddTemporaryReplacementKey(): Map<Key, JsonElement> {
val data = this[Key.DATA]?.toMap().orEmpty()

return if (!data.containsKey(Key.FORESPOERSEL_SVAR)) {
this
} else {
val newDataPair = Key.FORESPOERSEL_SVAR_V2 to data[Key.FORESPOERSEL_SVAR]
val newData = data.plus(newDataPair).mapValuesNotNull { it }

plus(Key.DATA to newData.toJson())
}
}
5 changes: 5 additions & 0 deletions ...est/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/helsebro/ForespoerselSvarRiverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ private data class PublishedData(
.shouldNotBeNull()
.toForespoersel()
.toJson(Forespoersel.serializer()),
Key.FORESPOERSEL_SVAR_V2 to
forespoerselSvar.resultat
.shouldNotBeNull()
.toForespoersel()
.toJson(Forespoersel.serializer()),
),
),
)
Expand Down