From 8a5a74c201e3460d2fd883e3173800bc0c3469ef Mon Sep 17 00:00:00 2001 From: Christian Klem Date: Fri, 14 Feb 2025 15:20:03 +0100 Subject: [PATCH] oppdater arrow-kt -> 2.0.1 --- build.gradle.kts | 2 +- .../kotlin/no/nav/lydia/virksomhet/api/VirksomhetRoutes.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 30ed999aa..4a7be7727 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -65,7 +65,7 @@ dependencies { implementation("com.github.guepardoapps:kulid:2.0.0.0") // Funksjonelle operatorer - implementation("io.arrow-kt:arrow-core:1.2.4") + implementation("io.arrow-kt:arrow-core:2.0.1") // audit log implementation("com.papertrailapp:logback-syslog4j:1.0.0") diff --git a/src/main/kotlin/no/nav/lydia/virksomhet/api/VirksomhetRoutes.kt b/src/main/kotlin/no/nav/lydia/virksomhet/api/VirksomhetRoutes.kt index 045eb1a17..46e475661 100644 --- a/src/main/kotlin/no/nav/lydia/virksomhet/api/VirksomhetRoutes.kt +++ b/src/main/kotlin/no/nav/lydia/virksomhet/api/VirksomhetRoutes.kt @@ -1,9 +1,8 @@ package no.nav.lydia.virksomhet.api +import arrow.core.left import arrow.core.right -import arrow.core.rightIfNotNull import io.ktor.http.HttpStatusCode -import io.ktor.server.application.call import io.ktor.server.application.log import io.ktor.server.response.respond import io.ktor.server.routing.Route @@ -32,7 +31,7 @@ fun Route.virksomhet( call.parameters["orgnummer"] ?: return@get call.respond(SykefraværsstatistikkError.`ugyldig orgnummer`) call.somLesebruker(adGrupper = adGrupper) { _ -> virksomhetService.hentVirksomhet(orgnr = orgnummer)?.toDto() - .rightIfNotNull { VirksomhetFeil.`fant ikke virksomhet` } + ?.right() ?: VirksomhetFeil.`fant ikke virksomhet`.left() }.also { auditLog.auditloggEither(call = call, either = it, orgnummer = orgnummer, auditType = AuditType.access) }.map {