Fjerner mer logikk rundt innlogging.

Author: chris-santa

src/main/kotlin/no/nav/tms/statistikk/api/StatistikkContent.kt

@@ -5,7 +5,6 @@ import no.nav.tms.statistikk.database.Flyway
 import no.nav.tms.statistikk.database.PostgresDatabase
 import no.nav.tms.statistikk.eksternVarsling.EksternVarslingRepository
 import no.nav.tms.statistikk.eksternVarsling.EksternVarslingSubscriber
-import no.nav.tms.statistikk.login.LoginRepository
 import no.nav.tms.statistikk.microfrontends.MicrofrontendRepository
 import no.nav.tms.statistikk.microfrontends.MicrofrontendSubscriber
 import no.nav.tms.statistikk.utkast.*
@@ -23,7 +22,6 @@ private fun startRapid(
 ) {
     val database = PostgresDatabase(environment)
 
-    val loginRepository = LoginRepository(database)
     val varselRepository = VarselRepository(database)
     val eksternVarslingRepository = EksternVarslingRepository(database)
     val utkastRespository = UtkastRespository(database)
@@ -40,7 +38,7 @@ private fun startRapid(
         }
 
         ktorModule {
-            statistikkApi(loginRepository)
+            statistikkApi()
         }
 
         subscribers(

src/main/kotlin/no/nav/tms/statistikk/api/routes.kt

@@ -1,17 +1,11 @@
 package no.nav.tms.statistikk.login
 
 import io.ktor.http.*
-import io.ktor.server.application.*
-import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 
-fun Route.loginApi(loginRepository: LoginRepository) {
+fun Route.loginApi() {
     post("/innlogging") {
-//        val login: Login = call.receive()
-//        loginRepository.registerLogin(login.ident)
         call.respond(HttpStatusCode.NoContent)
     }
 }
-
-private data class Login(val ident: String)

src/main/kotlin/no/nav/tms/statistikk/application.kt

@@ -10,14 +10,12 @@ import io.ktor.server.plugins.statuspages.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.github.oshai.kotlinlogging.KotlinLogging
-import no.nav.tms.statistikk.login.LoginRepository
 import no.nav.tms.statistikk.login.loginApi
 import no.nav.tms.token.support.azure.validation.azure
 import java.io.IOException
 import java.text.DateFormat
 
 fun Application.statistikkApi(
-    loginRepository: LoginRepository,
     installAuthenticatorsFunction: Application.() -> Unit = installAuth(),
 ) {
     installAuthenticatorsFunction()
@@ -55,7 +53,7 @@ fun Application.statistikkApi(
     }
     routing {
         authenticate {
-            loginApi(loginRepository)
+            loginApi()
         }
     }
 }

src/main/kotlin/no/nav/tms/statistikk/login/LoginRepository.kt

@@ -10,7 +10,6 @@ import io.ktor.server.application.*
 import io.ktor.server.auth.*
 import io.ktor.server.testing.*
 import kotliquery.queryOf
-import no.nav.tms.statistikk.login.LoginRepository
 import no.nav.tms.token.support.azure.validation.mock.azureMock
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -20,7 +19,6 @@ import org.junit.jupiter.api.TestInstance
 class StatistikkApiTest {
 
     private val db = LocalPostgresDatabase.cleanDb()
-    private val loginRepository = LoginRepository(db)
 
     @BeforeEach
     fun cleanDb(){
@@ -30,7 +28,7 @@ class StatistikkApiTest {
     @Test
     fun `lagrer ikke data om innlogging`() = testApplication {
         application {
-            statistikkApi(loginRepository, authorized)
+            statistikkApi(authorized)
         }
 
         client.post("/innlogging") {
@@ -60,18 +58,13 @@ class StatistikkApiTest {
                     it.int("total")
                 }.asSingle
         } shouldBe 0
-    }
-
-    @Test
-    fun `csv innlogging nedlasting`() = testApplication {
 
-        loginRepository.registerLogin("1234576512")
-        loginRepository.registerLogin("1234576515")
-        loginRepository.registerLogin("1234576516")
-
-        application {
-            statistikkApi(loginRepository, unauthorized)
-        }
+        db.query {
+            queryOf("SELECT COUNT(ident) as total FROM innlogging_etter_eksternt_varsel")
+                .map {
+                    it.int("total")
+                }.asSingle
+        } shouldBe 0
     }
 
     private val authorized: Application.() -> Unit = {