feat(oppijanumero): throw OppijaNotFoundException, when oppija is not…

… found
Opetushallitus · Dec 30, 2024 · 7532815 · 7532815
1 parent 2ce38bc
commit 7532815
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/server/src/main/kotlin/fi/oph/kitu/oppijanumero/OppijanumeroException.kt b/server/src/main/kotlin/fi/oph/kitu/oppijanumero/OppijanumeroException.kt
@@ -1,8 +1,22 @@
 package fi.oph.kitu.oppijanumero
 
-class OppijanumeroException(
+open class OppijanumeroException(
     val oppija: Oppija,
     message: String,
     val oppijanumeroServiceError: OppijanumeroServiceError? = null,
     cause: Throwable? = null,
-) : Throwable(message, cause)
+) : Throwable(message, cause) {
+    class OppijaNotFoundException(
+        oppija: Oppija,
+        message: String = "Oppija not found from oppijanumero-service",
+        oppijanumeroServiceError: OppijanumeroServiceError? = null,
+        cause: Throwable? = null,
+    ) : OppijanumeroException(oppija, message, oppijanumeroServiceError, cause)
+
+    class OppijaNotIdentifiedException(
+        oppija: Oppija,
+        message: String = "Oppija with oid ${oppija.henkilo_oid} is not identified in oppijanumero-service",
+        oppijanumeroServiceError: OppijanumeroServiceError? = null,
+        cause: Throwable? = null,
+    ) : OppijanumeroException(oppija, message, oppijanumeroServiceError, cause)
+}
diff --git a/server/src/main/kotlin/fi/oph/kitu/oppijanumero/OppijanumeroService.kt b/server/src/main/kotlin/fi/oph/kitu/oppijanumero/OppijanumeroService.kt
@@ -58,24 +58,20 @@ class OppijanumeroServiceImpl(
                     .sendRequest(httpRequest)
                     .getOrLogAndThrowCasException(event)
 
-            val body = tryConvertToOppijanumeroResponse<YleistunnisteHaeResponse>(oppija, stringResponse)
-
             if (stringResponse.statusCode() == 404) {
-                throw OppijanumeroException(
-                    oppija.withYleistunnisteHaeResponse(body),
-                    "Oppija not found from oppijanumero-service",
-                )
+                throw OppijanumeroException.OppijaNotFoundException(oppija)
             } else if (stringResponse.statusCode() != 200) {
                 throw OppijanumeroException(
-                    oppija.withYleistunnisteHaeResponse(body),
+                    oppija,
                     "Oppijanumero-service returned unexpected status code ${stringResponse.statusCode()}",
                 )
             }
 
+            val body = tryConvertToOppijanumeroResponse<YleistunnisteHaeResponse>(oppija, stringResponse)
+
             if (body.oppijanumero.isNullOrEmpty()) {
-                throw OppijanumeroException(
+                throw OppijanumeroException.OppijaNotIdentifiedException(
                     oppija.withYleistunnisteHaeResponse(body),
-                    "Oppija is not identified in oppijanumero-service",
                 )
             }
 

diff --git a/server/src/test/kotlin/fi/oph/kitu/oppijanumero/OppijanumeroServiceTests.kt b/server/src/test/kotlin/fi/oph/kitu/oppijanumero/OppijanumeroServiceTests.kt
@@ -73,7 +73,7 @@ class OppijanumeroServiceTests {
                 objectMapper = objectMapper,
             )
 
-        assertThrows<OppijanumeroException> {
+        assertThrows<OppijanumeroException.OppijaNotIdentifiedException> {
             oppijanumeroService.getOppijanumero(
                 Oppija(
                     "Magdalena Testi",
@@ -113,7 +113,7 @@ class OppijanumeroServiceTests {
                 objectMapper = objectMapper,
             )
 
-        assertThrows<OppijanumeroException> {
+        assertThrows<OppijanumeroException.OppijaNotFoundException> {
             oppijanumeroService.getOppijanumero(
                 Oppija(
                     "Magdalena Testi",