Fix 404 exception handler

navikt · Feb 14, 2024 · c0c94ed · c0c94ed
1 parent 547fa4f
commit c0c94ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/kotlin/no/nav/tilbakemeldingsmottak/exceptions/ErrorCode.kt b/app/src/main/kotlin/no/nav/tilbakemeldingsmottak/exceptions/ErrorCode.kt
@@ -6,6 +6,7 @@ enum class ErrorCode(val value: String) {
     GENERAL_ERROR("GENERAL_ERROR"), // generell feilmelding "noe gikk galt"
     AUTH_ERROR("AUTH_ERROR"), // feilmelding for autentisering
     TOKEN_EMAIL_MISSING("TOKEN_EMAIL_MISSING"), // kan ikke hente ut epost fra token
+    NOT_FOUND("NOT_FOUND"), // ressurs ikke funnet
 
     // EREG
     EREG_UNAUTHORIZED("EREG_UNAUTHORIZED"), // ikke autentisert for å hente data fra ereg

diff --git a/app/src/main/kotlin/no/nav/tilbakemeldingsmottak/rest/common/handlers/ControllerAdvice.kt b/app/src/main/kotlin/no/nav/tilbakemeldingsmottak/rest/common/handlers/ControllerAdvice.kt
@@ -109,12 +109,18 @@ class ControllerAdvice {
     @ExceptionHandler(value = [ClientErrorNotFoundException::class, NoResourceFoundException::class])
     fun notFoundErrorResponse(
         request: HttpServletRequest,
-        ex: ClientErrorNotFoundException
+        ex: Exception
     ): ResponseEntity<ErrorResponse> {
-        log.warn("Feil i kall til {}: ({}) {}", request.requestURI, ex.errorCode.value, ex.message, ex)
+        if (ex is ClientErrorNotFoundException) {
+            log.warn("Feil i kall til {}: ({}) {}", request.requestURI, ex.errorCode.value, ex.message, ex)
+            return ResponseEntity
+                .status(HttpStatus.NOT_FOUND)
+                .body(ErrorResponse(ex.message, ex.errorCode.value))
+        }
+        log.warn("Feil i kall til {}: {}", request.requestURI, ex.message, ex)
         return ResponseEntity
             .status(HttpStatus.NOT_FOUND)
-            .body(ErrorResponse(ex.message, ex.errorCode.value))
+            .body(ErrorResponse(ex.message, ErrorCode.NOT_FOUND.value))
     }
 
     // 500