F - Legger inn håndtering av andre exceptions enn HttpClientErrorExce…

…ption not found
navikt · Jan 6, 2025 · 06ada72 · 06ada72
1 parent a9b0536
commit 06ada72
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/main/kotlin/no/nav/eessi/pensjon/prefill/KrrService.kt b/src/main/kotlin/no/nav/eessi/pensjon/prefill/KrrService.kt
@@ -44,12 +44,13 @@ class KrrService(private val krrRestTemplate: RestTemplate,
                 )
 
                 logger.debug("Hent person fra KRR: response: ${response.body}".trimMargin())
-
                 return@measure response.body?.let { mapJsonToAny<KrrPerson>(it) }
-                    ?: throw IllegalArgumentException("Mangler melding fra KRR")
             } catch (e: HttpClientErrorException.NotFound) {
                 logger.error("Person: $personIdent ikke funnet (404)")
             }
+            catch (e: Exception) {
+                logger.error("Feil ved henting av person fra KRR, ${e.message}")
+            }
             null
         }
     }

diff --git a/src/main/kotlin/no/nav/eessi/pensjon/prefill/PrefillService.kt b/src/main/kotlin/no/nav/eessi/pensjon/prefill/PrefillService.kt
@@ -85,13 +85,17 @@ class PrefillService(
     }
 
     private fun hentKrrPerson(norskIdent: String, request: ApiRequest): PersonInfo {
-        val krrPerson = krrService.hentPersonFraKrr(norskIdent).let { personResponse ->
+        val krrPerson = krrService.hentPersonFraKrr(norskIdent)?.let { personResponse ->
             KrrPerson(
-                reservert = personResponse?.reservert,
-                epostadresse = personResponse?.epostadresse.validateEmail(request.processDefinitionVersion),
-                mobiltelefonnummer = personResponse?.mobiltelefonnummer
-            )
-        }
+                reservert = personResponse.reservert,
+                epostadresse = personResponse.epostadresse.validateEmail(request.processDefinitionVersion),
+                mobiltelefonnummer = personResponse.mobiltelefonnummer
+            ).also { logger.debug("KrrPerson: ${it.toJson()}") }
+        } ?: KrrPerson(
+            reservert = false,
+            epostadresse = null,
+            mobiltelefonnummer = null
+        )
 
         val personInfo = if (krrPerson.reservert == true) {
             PersonInfo(