From b2d4c2f334d2db9a7dd7b2ece167ad0e44af3525 Mon Sep 17 00:00:00 2001
From: Marius Eriksen <marius.eriksen@nav.no>
Date: Wed, 22 May 2024 11:34:59 +0200
Subject: [PATCH] =?UTF-8?q?Legg=20til=20type=3DNyS=C3=B8knad=20p=C3=A5=20i?=
 =?UTF-8?q?nnsending=20ferdigstilt=20mottak.=20Litt=20renaming?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Giao The Cung <giaothe@gmail.com>
---
 .../dagpenger/oppslag/journalpost/id/ApplicationBuilder.kt    | 4 ++--
 ...dingFerdigstilMottak.kt => InnsendingFerdigstiltMottak.kt} | 3 ++-
 ...igstilMottakTest.kt => InnsendingFerdigstiltMottakTest.kt} | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/{InnsendingFerdigstilMottak.kt => InnsendingFerdigstiltMottak.kt} (86%)
 rename src/test/kotlin/no/nav/dagpenger/oppslag/journalpost/id/{InnsendingFerdigstilMottakTest.kt => InnsendingFerdigstiltMottakTest.kt} (91%)

diff --git a/src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/ApplicationBuilder.kt b/src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/ApplicationBuilder.kt
index 2b60ccb..d20d7fe 100644
--- a/src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/ApplicationBuilder.kt
+++ b/src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/ApplicationBuilder.kt
@@ -15,8 +15,8 @@ internal class ApplicationBuilder(config: Map<String, String>) : RapidsConnectio
         RapidApplication.Builder(RapidApplication.RapidApplicationConfig.fromEnv(config))
             .withKtorModule {
                 journalpostApi(repository)
-            }.build().also {
-                InnsendingFerdigstilMottak(it, repository)
+            }.build().also { rapidsConnection ->
+                InnsendingFerdigstiltMottak(rapidsConnection, repository)
             }
 
     init {
diff --git a/src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstilMottak.kt b/src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstiltMottak.kt
similarity index 86%
rename from src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstilMottak.kt
rename to src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstiltMottak.kt
index 785a3a9..ff35de1 100644
--- a/src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstilMottak.kt
+++ b/src/main/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstiltMottak.kt
@@ -10,11 +10,12 @@ import java.util.UUID
 
 private val logger = KotlinLogging.logger { }
 
-class InnsendingFerdigstilMottak(rapidsConnection: RapidsConnection, private val repository: Repository) :
+class InnsendingFerdigstiltMottak(rapidsConnection: RapidsConnection, private val repository: Repository) :
     River.PacketListener {
     init {
         River(rapidsConnection).apply {
             validate { it.demandValue("@event_name", "innsending_ferdigstilt") }
+            validate { it.requireValue("type", value = "NySøknad") }
             validate { it.requireKey("fagsakId") }
             validate { it.requireKey("journalpostId") }
             validate { it.requireKey("søknadsData.søknad_uuid") }
diff --git a/src/test/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstilMottakTest.kt b/src/test/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstiltMottakTest.kt
similarity index 91%
rename from src/test/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstilMottakTest.kt
rename to src/test/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstiltMottakTest.kt
index c414e50..6962e31 100644
--- a/src/test/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstilMottakTest.kt
+++ b/src/test/kotlin/no/nav/dagpenger/oppslag/journalpost/id/InnsendingFerdigstiltMottakTest.kt
@@ -9,7 +9,7 @@ import no.nav.helse.rapids_rivers.testsupport.TestRapid
 import org.junit.jupiter.api.Test
 import java.util.UUID
 
-class InnsendingFerdigstilMottakTest {
+class InnsendingFerdigstiltMottakTest {
     private val testRapid = TestRapid()
 
     @Test
@@ -19,7 +19,7 @@ class InnsendingFerdigstilMottakTest {
                 every { it.lagre(any(), any()) } just runs
             }
 
-        InnsendingFerdigstilMottak(testRapid, repository)
+        InnsendingFerdigstiltMottak(testRapid, repository)
 
         //language=JSON
         testRapid.sendTestMessage(