Fjerner mer enda mer logikk rundt innlogging.

Author: chris-santa

src/main/kotlin/no/nav/tms/statistikk/eksternVarsling/EksternVarslingRepository.kt

@@ -8,32 +8,6 @@ import java.time.ZonedDateTime
 
 class EksternVarslingRepository(val db: Database) {
 
-    fun insertEksternVarsling(eventId: String, kanal: String, ident: String, tidspunkt: LocalDateTime) {
-
-        val conflictString = when {
-            kanal.erEpost() -> "DO UPDATE SET epost=true"
-            kanal.erSms() -> "DO UPDATE SET sms=true"
-            else -> "DO NOTHING"
-        }
-
-        db.update {
-            queryOf(
-                """INSERT INTO innlogging_etter_eksternt_varsel(eventid,ident,dato,sendttimestamp,epost,sms) 
-                |VALUES(:eventId,:ident,:tidspunkt::date,:tidspunkt,:epost,:sms)
-                |ON CONFLICT(eventId,dato) 
-                |$conflictString 
-            """.trimMargin(),
-                mapOf(
-                    "eventId" to eventId,
-                    "ident" to ident,
-                    "tidspunkt" to tidspunkt,
-                    "epost" to (kanal.erEpost()),
-                    "sms" to (kanal.erSms())
-                )
-            )
-        }
-    }
-
     fun updateVarsel(eventId: String, kanal: String) = db.update {
 
         queryOf(

src/main/kotlin/no/nav/tms/statistikk/eksternVarsling/EksternVarslingSubscriber.kt

@@ -21,12 +21,6 @@ class EksternVarslingSubscriber(
         .withValue("status", "sendt")
 
     override suspend fun receive(jsonMessage: JsonMessage) {
-        eksternVarslingRepository.insertEksternVarsling(
-            eventId = jsonMessage.varselId,
-            kanal = jsonMessage.kanal,
-            ident = jsonMessage.ident,
-            tidspunkt = jsonMessage.tidspunkt
-        )
         eksternVarslingRepository.updateVarsel(jsonMessage.varselId, jsonMessage.kanal)
     }
 }

src/test/kotlin/no/nav/tms/statistikk/eksternVarsling/EksternVarslingRepositoryTest.kt

@@ -6,7 +6,6 @@ import cleanTables
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
 import no.nav.tms.kafka.application.MessageBroadcaster
-import no.nav.tms.statistikk.database.DateTimeHelper
 import no.nav.tms.statistikk.database.DateTimeHelper.nowAtUtcZ
 import no.nav.tms.statistikk.varsel.*
 import org.junit.jupiter.api.AfterEach
@@ -30,52 +29,6 @@ class EksternVarslingSubscriberTest {
         db.cleanTables("innlogging_etter_eksternt_varsel")
     }
 
-    @Test
-    fun `Plukker opp ekstern varsling sendt`() {
-        broadcaster.broadcastJson(SMS.testMessage("123"))
-        broadcaster.broadcastJson(EPOST.testMessage("124"))
-
-        db.getEksternVarsling("123").first() shouldNotBe null
-        db.getEksternVarsling("124").first() shouldNotBe null
-    }
-
-    @Test
-    fun `Oppdaterer varslingskanaler`() {
-        broadcaster.broadcastJson(SMS.testMessage("123"))
-        broadcaster.broadcastJson(EPOST.testMessage("123"))
-        db.getEksternVarsling("123").assert {
-            size shouldNotBe 0
-            first()["sms"] shouldBe true
-            first()["epost"] shouldBe true
-        }
-
-        broadcaster.broadcastJson(EPOST.testMessage("124"))
-        broadcaster.broadcastJson(SMS.testMessage("124"))
-
-        db.getEksternVarsling("123").assert {
-            size shouldBe 1
-            first()["sms"] shouldBe true
-            first()["epost"] shouldBe true
-        }
-
-    }
-
-    @Test
-    fun `Plukker opp revarsling sendt`() {
-        val testEvent = "23456789"
-        val testIdent = "987654"
-        val previous = DateTimeHelper.nowAtUtc().minusDays(11)
-
-        db.insertEksterntTestVarsel(testEvent, testIdent, previous, EPOST)
-
-        broadcaster.broadcastJson(SMS.testMessage(testEvent, testIdent))
-        broadcaster.broadcastJson(EPOST.testMessage(testEvent, testIdent))
-
-        db.getEksternVarsling(eventId = testEvent).assert {
-            size shouldBe 2
-        }
-    }
-
     @Test
     fun `oppdaterer status om ekstern varsling`() {
         val eventId1 = UUID.randomUUID().toString()
@@ -104,15 +57,6 @@ class EksternVarslingSubscriberTest {
         varsel3.eksternVarslingSendtSms shouldBe true
         varsel3.eksternVarslingSendtEpost shouldBe true
     }
-
-    @Test
-    fun `leser også eventer fra ny ekstern-varsling app`() {
-        broadcaster.broadcastJson(SMS.testMessageNew("123"))
-        broadcaster.broadcastJson(EPOST.testMessageNew("124"))
-
-        db.getEksternVarsling("123").first() shouldNotBe null
-        db.getEksternVarsling("124").first() shouldNotBe null
-    }
 }