Slettet midlertidlig FORESPOERSEL_SVAR key (#768)

navikt · Nov 12, 2024 · 7930cea · 7930cea
1 parent 741ddd4
commit 7930cea
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 24 deletions.
diff --git a/felles/src/main/kotlin/no/nav/helsearbeidsgiver/felles/Key.kt b/felles/src/main/kotlin/no/nav/helsearbeidsgiver/felles/Key.kt
@@ -47,11 +47,10 @@ enum class Key(
     VEDTAKSPERIODE_ID_LISTE("vedtaksperiode_id_liste"),
     VIRKSOMHET("virksomhet"),
     VIRKSOMHETER("virksomheter"),
+    FORESPOERSEL_SVAR("forespoersel_svar"),
 
     // ulik formattering
     FORESPOERSEL_ID("forespoerselId"),
-    FORESPOERSEL_SVAR("forespoersel-svar"),
-    FORESPOERSEL_SVAR_V2("forespoersel_svar"),
     JOURNALPOST_ID("journalpostId"),
     ORGNRUNDERENHET("orgnrUnderenhet"),
     SPINN_INNTEKTSMELDING_ID("spinnInntektsmeldingId"),

diff --git a/felles/src/main/kotlin/no/nav/helsearbeidsgiver/felles/rapidsrivers/RiverUtils.kt b/felles/src/main/kotlin/no/nav/helsearbeidsgiver/felles/rapidsrivers/RiverUtils.kt
@@ -8,17 +8,13 @@ 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()
@@ -33,16 +29,3 @@ 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())
-    }
-}
diff --git a/...est/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/helsebro/ForespoerselSvarRiverTest.kt b/...est/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/helsebro/ForespoerselSvarRiverTest.kt
@@ -107,11 +107,6 @@ private data class PublishedData(
                                     .shouldNotBeNull()
                                     .toForespoersel()
                                     .toJson(Forespoersel.serializer()),
-                            Key.FORESPOERSEL_SVAR_V2 to
-                                forespoerselSvar.resultat
-                                    .shouldNotBeNull()
-                                    .toForespoersel()
-                                    .toJson(Forespoersel.serializer()),
                         ),
                     ),
             )