validate received school organization oids

Opetushallitus · Jan 23, 2025 · 754f709 · 754f709
1 parent f8fdd7e
commit 754f709
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/server/src/main/kotlin/fi/oph/kitu/kotoutumiskoulutus/KielitestiSuoritus.kt b/server/src/main/kotlin/fi/oph/kitu/kotoutumiskoulutus/KielitestiSuoritus.kt
@@ -1,5 +1,6 @@
 package fi.oph.kitu.kotoutumiskoulutus
 
+import fi.oph.kitu.Oid
 import org.springframework.data.annotation.Id
 import org.springframework.data.relational.core.mapping.Table
 import java.time.Instant
@@ -14,7 +15,7 @@ data class KielitestiSuoritus(
     val oppijanumero: String,
     val email: String,
     val timeCompleted: Instant,
-    val schoolOid: String,
+    val schoolOid: Oid,
     val courseid: Int,
     val coursename: String,
     val luetunYmmartaminenResultSystem: String,

diff --git a/server/src/main/kotlin/fi/oph/kitu/kotoutumiskoulutus/KoealustaMappingService.kt b/server/src/main/kotlin/fi/oph/kitu/kotoutumiskoulutus/KoealustaMappingService.kt
@@ -3,6 +3,7 @@ package fi.oph.kitu.kotoutumiskoulutus
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
+import fi.oph.kitu.Oid
 import fi.oph.kitu.kotoutumiskoulutus.KoealustaSuorituksetResponse.User
 import fi.oph.kitu.kotoutumiskoulutus.KoealustaSuorituksetResponse.User.Completion
 import fi.oph.kitu.oppijanumero.Oppija
@@ -203,6 +204,17 @@ class KoealustaMappingService(
         return result
     }
 
+    fun getSchoolOid(
+        userId: Int,
+        oid: String,
+    ): Oid =
+        Oid.valueOf(oid)
+            ?: throw Error.Validation.MalformedField(
+                userId,
+                "schoolOID",
+                oid,
+            )
+
     fun completionToEntity(
         user: User,
         oppijanumero: String,
@@ -212,6 +224,7 @@ class KoealustaMappingService(
         val kuullunYmmartaminen = getKuullunYmmartaminen(user.userid, completion)
         val puhe = getPuhe(user.userid, completion)
         val kirjoittaminen = getKirjoittaminen(user.userid, completion)
+        val schoolOid = getSchoolOid(user.userid, completion.schoolOID)
 
         if (user.preferredname.isNullOrEmpty()) {
             throw Error.Validation.MissingField("preferred name", user.userid)
@@ -224,7 +237,7 @@ class KoealustaMappingService(
             email = user.email,
             oppijanumero = oppijanumero,
             timeCompleted = Instant.ofEpochSecond(completion.timecompleted),
-            schoolOid = completion.schoolOID,
+            schoolOid = schoolOid,
             courseid = completion.courseid,
             coursename = completion.coursename,
             luetunYmmartaminenResultSystem = luetunYmmartaminen.quiz_result_system!!,
@@ -273,6 +286,12 @@ class KoealustaMappingService(
                 field: String,
                 userId: Int,
             ) : Validation(userId, "Missing student \"$field\" for user \"$userId\"")
+
+            class MalformedField(
+                userId: Int,
+                field: String,
+                value: String,
+            ) : Validation(userId, "Malformed value \"$value\" in \"$field\" for user \"$userId\"")
         }
     }
 }
diff --git a/server/src/test/kotlin/fi/oph/kitu/kotoutumiskoulutus/KoealustaServiceTests.kt b/server/src/test/kotlin/fi/oph/kitu/kotoutumiskoulutus/KoealustaServiceTests.kt
@@ -1,6 +1,7 @@
 package fi.oph.kitu.kotoutumiskoulutus
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import fi.oph.kitu.Oid
 import fi.oph.kitu.oppijanumero.OppijanumeroServiceMock
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
@@ -57,7 +58,7 @@ class KoealustaServiceTests {
                             {
                               "courseid": 32,
                               "coursename": "Integraatio testaus",
-                              "schoolOID": "",
+                              "schoolOID": "1.2.246.562.10.1234567890",
                               "results": [
                                 {
                                   "name": "luetun ymm\u00e4rt\u00e4minen",
@@ -125,5 +126,9 @@ class KoealustaServiceTests {
             expected = "Integraatio testaus",
             actual = mervi.coursename,
         )
+        assertEquals(
+            expected = Oid.valueOf("1.2.246.562.10.1234567890"),
+            actual = mervi.schoolOid,
+        )
     }
 }