Build snapshot

navikt · Jul 2, 2024 · 863b167 · 863b167
1 parent 13de1b8
commit 863b167
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/AltinnClient.kt b/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/AltinnClient.kt
@@ -2,12 +2,13 @@ package no.nav.helsearbeidsgiver.altinn
 
 import io.ktor.client.call.body
 import io.ktor.client.plugins.ServerResponseException
-import io.ktor.client.request.*
+import io.ktor.client.request.bearerAuth
+import io.ktor.client.request.get
+import io.ktor.client.request.header
 import io.ktor.http.HttpStatusCode
 import no.nav.helsearbeidsgiver.utils.cache.LocalCache
 import no.nav.helsearbeidsgiver.utils.cache.getIfCacheNotNull
 import no.nav.helsearbeidsgiver.utils.log.logger
-import org.apache.hc.core5.http.HttpHeaders
 import kotlin.time.Duration
 
 private const val PAGE_SIZE = 500
@@ -23,7 +24,7 @@ private const val PAGE_SIZE = 500
 class AltinnClient(
     private val url: String,
     private val serviceCode: String,
-    private val maskiportenClient: ()->String,
+    private val maskiportenClient: () -> String,
     private val altinnApiKey: String,
     cacheConfig: CacheConfig? = null,
 ) {

diff --git a/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/AltinnOrganisasjon.kt b/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/AltinnOrganisasjon.kt
@@ -1,8 +1,8 @@
 package no.nav.helsearbeidsgiver.altinn
 
 import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
 
 /**
  * En organisasjon slik de blir returnert fra Altinn.
@@ -22,17 +22,17 @@ import kotlinx.serialization.json.JsonNames
 @Serializable
 @OptIn(ExperimentalSerializationApi::class)
 data class AltinnOrganisasjon(
-    @JsonNames("Name")
+    @SerialName("Name")
     val navn: String,
-    @JsonNames("Type")
+    @SerialName("Type")
     val type: String,
-    @JsonNames("OrganizationNumber")
+    @SerialName("OrganizationNumber")
     val orgnr: String? = null,
-    @JsonNames("OrganizationForm")
+    @SerialName("OrganizationForm")
     val orgForm: String? = null,
-    @JsonNames("Status")
+    @SerialName("Status")
     val status: String? = null,
-    @JsonNames("ParentOrganizationNumber")
+    @SerialName("ParentOrganizationNumber")
     val orgnrHovedenhet: String? = null,
 ) {
     internal fun nullEmptyStrings(): AltinnOrganisasjon =

diff --git a/src/test/kotlin/no/nav/helsearbeidsgiver/altinn/MockAltinnClient.kt b/src/test/kotlin/no/nav/helsearbeidsgiver/altinn/MockAltinnClient.kt
@@ -23,6 +23,6 @@ fun mockAltinnClient(status: HttpStatusCode, content: String = ""): AltinnClient
 
     return mockStatic(::createHttpClient) {
         every { createHttpClient() } returns mockHttpClient
-        AltinnClient("url", "", "", "")
+        AltinnClient("url", "", { "" }, "")
     }
 }