From 5c777effe69e3222a7f0b5a50a119d06bdba2ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20Andreassen=20Th=C3=B8gersen?= Date: Thu, 29 Feb 2024 15:54:11 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9A=B0=EF=B8=8F=20Fjerner=20enda=20mer=20ubr?= =?UTF-8?q?ukt=20kode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakob Havstein Eriksen --- .../api/abonnement/OpptegnelseDto.kt | 7 - .../spesialist/api/vedtak/GodkjenningDto.kt | 7 - .../nav/helse/modell/kommando/DummyCommand.kt | 16 -- .../nav/helse/mediator/api/AbstractApiTest.kt | 147 ------------------ 4 files changed, 177 deletions(-) delete mode 100644 spesialist-selve/src/main/kotlin/no/nav/helse/modell/kommando/DummyCommand.kt delete mode 100644 spesialist-selve/src/test/kotlin/no/nav/helse/mediator/api/AbstractApiTest.kt diff --git a/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/abonnement/OpptegnelseDto.kt b/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/abonnement/OpptegnelseDto.kt index 722364ffb..cbb4d15ff 100644 --- a/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/abonnement/OpptegnelseDto.kt +++ b/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/abonnement/OpptegnelseDto.kt @@ -1,12 +1,5 @@ package no.nav.helse.spesialist.api.abonnement -data class OpptegnelseDto( - val aktørId: Long, - val sekvensnummer: Int, - val type: OpptegnelseType, - val payload: String -) - enum class OpptegnelseType { UTBETALING_ANNULLERING_FEILET, UTBETALING_ANNULLERING_OK, diff --git a/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/vedtak/GodkjenningDto.kt b/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/vedtak/GodkjenningDto.kt index 5e1770d05..9feba122e 100644 --- a/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/vedtak/GodkjenningDto.kt +++ b/spesialist-api/src/main/kotlin/no/nav/helse/spesialist/api/vedtak/GodkjenningDto.kt @@ -14,11 +14,4 @@ data class GodkjenningDto( init { if (!godkjent) requireNotNull(årsak) } - - fun åpenLoggString() = buildString { - append("Godkjenning(") - append("oppgavereferanse=$oppgavereferanse,") - append("godkjent=$godkjent") - append(")") - } } \ No newline at end of file diff --git a/spesialist-selve/src/main/kotlin/no/nav/helse/modell/kommando/DummyCommand.kt b/spesialist-selve/src/main/kotlin/no/nav/helse/modell/kommando/DummyCommand.kt deleted file mode 100644 index 1a2ed9184..000000000 --- a/spesialist-selve/src/main/kotlin/no/nav/helse/modell/kommando/DummyCommand.kt +++ /dev/null @@ -1,16 +0,0 @@ -package no.nav.helse.modell.kommando - -import org.slf4j.LoggerFactory - -// Det er ikke lov å ha tom liste med commands i en MacroCommand. Denne kan brukes som en placeholder til man får implementert egne Commands -internal class DummyCommand : Command { - - private companion object { - private val logg = LoggerFactory.getLogger(DummyCommand::class.java) - } - - override fun execute(context: CommandContext): Boolean { - logg.info("Kjører DummyCommand") - return true - } -} diff --git a/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/api/AbstractApiTest.kt b/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/api/AbstractApiTest.kt deleted file mode 100644 index 61bfa6c62..000000000 --- a/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/api/AbstractApiTest.kt +++ /dev/null @@ -1,147 +0,0 @@ -package no.nav.helse.mediator.api - -import io.ktor.client.HttpClient -import io.ktor.client.plugins.contentnegotiation.ContentNegotiation -import io.ktor.client.plugins.defaultRequest -import io.ktor.client.request.HttpRequestBuilder -import io.ktor.client.request.header -import io.ktor.http.ContentType -import io.ktor.serialization.jackson.JacksonConverter -import io.ktor.server.application.Application -import io.ktor.server.application.install -import io.ktor.server.auth.authenticate -import io.ktor.server.cio.CIO -import io.ktor.server.engine.applicationEngineEnvironment -import io.ktor.server.engine.connector -import io.ktor.server.engine.embeddedServer -import io.ktor.server.routing.Route -import io.ktor.server.routing.routing -import io.ktor.server.websocket.WebSockets -import java.net.ServerSocket -import java.util.UUID -import kotlinx.coroutines.runBlocking -import no.nav.helse.installErrorHandling -import no.nav.helse.objectMapper -import no.nav.helse.spesialist.api.AzureAdAppConfig -import no.nav.helse.spesialist.api.AzureConfig -import no.nav.helse.spesialist.api.azureAdAppAuthentication -import org.junit.jupiter.api.AfterAll -import org.junit.jupiter.api.TestInstance -import io.ktor.server.plugins.contentnegotiation.ContentNegotiation as ContentNegotiationServer - -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -abstract class AbstractApiTest { - - private lateinit var server: TestServerRuntime - protected lateinit var client: HttpClient - - protected fun setupServer(λ: Route.() -> Unit) { - server = TestServer(λ = λ).start() - client = server.restClient() - } - - @AfterAll - protected fun tearDown() { - server.close() - } - - companion object { - private val requiredGroup: UUID = UUID.randomUUID() - internal const val clientId = "client_id" - private const val epostadresse = "sara.saksbehandler@nav.no" - internal const val issuer = "https://jwt-provider-domain" - internal val jwtStub = JwtStub() - - fun HttpRequestBuilder.authentication(oid: UUID, group: String? = null) { - header( - "Authorization", - "Bearer ${ - jwtStub.getToken( - listOfNotNull(requiredGroup.toString(), group), - oid.toString(), - epostadresse, - clientId, - issuer - ) - }" - ) - } - } - - class TestServer( - private val httpPort: Int = ServerSocket(0).use { it.localPort }, - private val λ: Route.() -> Unit, - ) { - fun start(): TestServerRuntime { - return TestServerRuntime(λ, httpPort) - } - - fun withAuthenticatedServer(λ: suspend (HttpClient) -> T): T { - return runBlocking { - start().use { λ(it.restClient()) } - } - } - } - - class TestServerRuntime( - build: Route.() -> Unit, - private val httpPort: Int, - ) : AutoCloseable { - private val server = createEmbeddedServer(build, httpPort) - - companion object { - private fun createEmbeddedServer(build: Route.() -> Unit, httpPort: Int) = - embeddedServer(CIO, applicationEngineEnvironment { - connector { port = httpPort } - module { module(build) } - }) - } - - init { - server.start(wait = false) - } - - override fun close() { - server.stop(0, 0) - } - - - fun restClient(): HttpClient { - return HttpClient { - defaultRequest { - host = "localhost" - port = httpPort - } - expectSuccess = false - install(ContentNegotiation) { - register( - ContentType.Application.Json, - JacksonConverter(objectMapper) - ) - } - } - } - } -} - -internal fun Application.module(build: Route.() -> Unit) { - install(WebSockets) - installErrorHandling() - install(ContentNegotiationServer) { - register( - ContentType.Application.Json, - JacksonConverter(objectMapper) - ) - } - val azureAdAppConfig = AzureAdAppConfig( - azureConfig = AzureConfig( - clientId = AbstractApiTest.clientId, - issuer = AbstractApiTest.issuer, - jwkProvider = AbstractApiTest.jwtStub.getJwkProviderMock(), - tokenEndpoint = "", - ), - ) - - azureAdAppAuthentication(azureAdAppConfig) - routing { authenticate("oidc", build = build) } -}