kan søke opp person via uuid

Co-authored-by: Erik Maximilian Forsman <erik.maximilian.forsman@nav.no>
navikt · Dec 13, 2023 · e2c5960 · e2c5960
1 parent 3ac1db3
commit e2c5960
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/backend/src/main/kotlin/no/nav/spanner/Personer.kt b/backend/src/main/kotlin/no/nav/spanner/Personer.kt
@@ -55,7 +55,10 @@ class Spleis(
     }
 
     override suspend fun person(id: String, idType: IdType, accessToken: String): String {
-        val url = URLBuilder(baseUrl).apply { path("api", "person-json") }.build()
+        val url = URLBuilder(baseUrl).apply {
+            if (idType == IdType.MASKERT_ID) path("api", "person-json", id)
+            else path("api", "person-json")
+        }.build()
 
         val oboToken = token(accessToken, spleisClientId)
         val log = Log.logger(Personer::class.java)

diff --git a/backend/src/main/kotlin/no/nav/spanner/Spanner.kt b/backend/src/main/kotlin/no/nav/spanner/Spanner.kt
@@ -30,7 +30,7 @@ import java.time.LocalDateTime
 import java.util.*
 
 enum class IdType(val header: String) {
-    FNR("fnr"), AKTORID("aktorId")
+    FNR("fnr"), AKTORID("aktorId"), MASKERT_ID("maskertId")
 }
 
 private val logg = Log.logger("Spanner")
@@ -218,8 +218,10 @@ fun Application.spanner(spleis: Personer, config: AzureADConfig, development: Bo
 }
 
 private fun ApplicationCall.personId() =
-    request.headers[IdType.FNR.header]?.let {
-        Pair(IdType.FNR, request.header(IdType.FNR.header))
+    request.headers[IdType.MASKERT_ID.header]?.let {
+        Pair(IdType.MASKERT_ID, it)
+    } ?: request.headers[IdType.FNR.header]?.let {
+        Pair(IdType.FNR, it)
     } ?: Pair(IdType.AKTORID, request.header(IdType.AKTORID.header))
 
 

diff --git a/frontend/src/external/backend.ts b/frontend/src/external/backend.ts
@@ -4,6 +4,7 @@ import { createContext, useContext } from '../state/contexts'
 export type Backend = {
     personForFnr: (fnr: string) => Promise<PersonDto>
     personForAktørId: (aktørId: string) => Promise<PersonDto>
+    personForUUID: (maskertId: string) => Promise<PersonDto>
     hendelseForRef: (meldingsreferanse: string) => Promise<MeldingDto>
 }
 
@@ -16,6 +17,8 @@ export const personRequestFactory = (personId: string, backend: Backend) => {
         return () => backend.personForFnr(personId)
     } else if (personId.length == 13 || personId.length == 2) {
         return () => backend.personForAktørId(personId)
+    } else if (personId.length == 36) {
+        return () => backend.personForUUID(personId)
     } else {
         throw Error('Ikke gyldig fnr eller aktør-id')
     }

diff --git a/frontend/src/external/jsonBackend.ts b/frontend/src/external/jsonBackend.ts
@@ -14,6 +14,9 @@ export let hardCodedBackend: Backend = {
     personForFnr(ignore: string): Promise<PersonDto> {
         return Promise.resolve(jsonPerson)
     },
+    personForUUID(ignore: string): Promise<PersonDto> {
+        return Promise.reject(lagfinnesIkkeFeil())
+    },
     hendelseForRef: function (_: string): Promise<MeldingDto> {
         return Promise.resolve(jsonHendelse)
     },

diff --git a/frontend/src/external/restBackend.ts b/frontend/src/external/restBackend.ts
@@ -17,6 +17,18 @@ export const restBackend = (development: boolean): Backend => {
                 .then(feilVedDårligRespons)
                 .then((response) => response.json())
         },
+        personForUUID(maskertId: string): Promise<PersonDto> {
+            return fetch(`${baseUrl}/api/person/`, {
+                method: 'get',
+                headers: {
+                    Accept: 'application/json',
+                    maskertId: `${maskertId}`,
+                },
+            })
+                .catch(wrapNnettverksFeil)
+                .then(feilVedDårligRespons)
+                .then((response) => response.json())
+        },
         personForFnr(fnr: string): Promise<PersonDto> {
             return fetch(`${baseUrl}/api/person/`, {
                 method: 'get',