sett personident header for skatt istedenfor som request-param

navikt · Oct 4, 2024 · 284ef4d · 284ef4d
1 parent 738dc3b
commit 284ef4d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...r/skatt/infrastructure/src/main/kotlin/vilkår/skatt/infrastructure/client/SkatteClient.kt b/...r/skatt/infrastructure/src/main/kotlin/vilkår/skatt/infrastructure/client/SkatteClient.kt
@@ -130,13 +130,14 @@ class SkatteClient(
     ): Either<SkatteoppslagFeil, Skattegrunnlag.SkattegrunnlagForÅr> {
         val url = "${skatteetatenConfig.apiBaseUrl}/api/v2/summertskattegrunnlag"
         val params =
-            "personidentifikator=$fnr&inntektsaar=$inntektsÅr&stadie=${stadie.verdi}&rettighetspakke=${skatteetatenConfig.rettighetspakke}"
+            "inntektsaar=$inntektsÅr&stadie=${stadie.verdi}&rettighetspakke=${skatteetatenConfig.rettighetspakke}"
         val getRequest = HttpRequest.newBuilder()
             .uri(URI.create("$url?$params"))
             .setHeader("Accept", "application/json")
             .setHeader("Authorization", "Bearer $token")
             .setHeader("Nav-Call-Id", correlationId.toString())
             .setHeader("Nav-Consumer-Id", skatteetatenConfig.consumerId)
+            .setHeader("Nav-Personident", fnr.toString())
             .GET()
             .build()
 

diff --git a/...att/infrastructure/src/test/kotlin/vilkår/skatt/infrastructure/client/SkatteClientTest.kt b/...att/infrastructure/src/test/kotlin/vilkår/skatt/infrastructure/client/SkatteClientTest.kt
@@ -3,6 +3,7 @@ package vilkår.skatt.infrastructure.client
 import arrow.core.left
 import arrow.core.right
 import com.github.tomakehurst.wiremock.client.WireMock
+import com.github.tomakehurst.wiremock.client.WireMock.matching
 import com.github.tomakehurst.wiremock.http.Body
 import com.github.tomakehurst.wiremock.http.Fault
 import io.kotest.assertions.arrow.core.shouldBeLeft
@@ -267,9 +268,11 @@ internal class SkatteClientTest {
 
     @Test
     fun `success response gir mapped data`() {
+        val fnr = Fnr(fnr = "04900148157")
         startedWireMockServerWithCorrelationId {
             stubFor(
                 WireMock.get(WireMock.urlPathEqualTo("/api/v2/summertskattegrunnlag"))
+                    .withHeader("Nav-Personident", matching(fnr.toString()))
                     .willReturn(
                         WireMock.ok(
                             """
@@ -333,7 +336,7 @@ internal class SkatteClientTest {
 
             val år = Year.of(2021)
             client(baseUrl()).hentSamletSkattegrunnlag(
-                fnr = Fnr(fnr = "04900148157"),
+                fnr = fnr,
                 år = år,
             ) shouldBe SamletSkattegrunnlagForÅr(
                 utkast = SamletSkattegrunnlagForÅrOgStadie.Utkast(