Make tests use mock version of särmä client

espoon-voltti · Feb 13, 2025 · 9b71078 · 9b71078
1 parent 1352481
commit 9b71078
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 14 deletions.
diff --git a/service/src/main/kotlin/fi/espoo/evaka/EvakaEnv.kt b/service/src/main/kotlin/fi/espoo/evaka/EvakaEnv.kt
@@ -687,10 +687,15 @@ private fun snakeCaseName(job: Enum<*>): String =
 
 data class ArchiveEnv(
     /** URL up to the endpoint name e.g. http://10.0.0.10/archive-core */
-    val url: URI
+    val url: URI,
+    val useMockClient: Boolean
 ) {
+
     companion object {
         fun fromEnvironment(env: Environment) =
-            ArchiveEnv(url = URI.create(env.lookup("evaka.integration.särmä.url")))
+            ArchiveEnv(
+                url = URI.create(env.lookup("evaka.integration.särmä.url")),
+                useMockClient = env.lookup("evaka.integration.särmä.use_mock_client") ?: false
+            )
     }
 }
diff --git a/service/src/main/kotlin/fi/espoo/evaka/document/archival/ArchiveChildDocumentService.kt b/service/src/main/kotlin/fi/espoo/evaka/document/archival/ArchiveChildDocumentService.kt
@@ -69,7 +69,7 @@ class ArchiveChildDocumentService(
             logger.info { "Successfully archived document $documentId" }
         } else {
             logger.error {
-                "Failed to archive document $documentId. Response code: $responseCode, Response body: ${responseBody?.string() ?: "No response body"}"
+                "Failed to archive document $documentId. Response code: $responseCode, Response body: ${responseBody ?: "No response body"}"
             }
         }
     }

diff --git a/service/src/main/kotlin/fi/espoo/evaka/document/archival/SärmäClientConfig.kt b/service/src/main/kotlin/fi/espoo/evaka/document/archival/SärmäClientConfig.kt
@@ -0,0 +1,18 @@
+package fi.espoo.evaka.document.archival
+
+import fi.espoo.evaka.ArchiveEnv
+import fi.espoo.evaka.EvakaEnv
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class SärmäClientConfig {
+
+    @Bean
+    fun getSärmäClient(evakaEnv: EvakaEnv, archiveEnv: ArchiveEnv?): SärmäClientInterface {
+        if (!evakaEnv.särmäEnabled || archiveEnv?.useMockClient == true) {
+            return SärmäMockClient()
+        }
+        return SärmäHttpClient(archiveEnv)
+    }
+}
diff --git a/service/src/main/kotlin/fi/espoo/evaka/document/archival/SärmäClientInterface.kt b/service/src/main/kotlin/fi/espoo/evaka/document/archival/SärmäClientInterface.kt
@@ -13,5 +13,5 @@ interface SärmäClientInterface {
         masterId: String,
         classId: String,
         virtualArchiveId: String,
-    ): Pair<Int, ResponseBody?>
+    ): Pair<Int, String?>
 }
diff --git a/...oo/evaka/document/archival/SärmäClient.kt → ...vaka/document/archival/SärmäHttpClient.kt b/...oo/evaka/document/archival/SärmäClient.kt → ...vaka/document/archival/SärmäHttpClient.kt
@@ -10,10 +10,8 @@ import java.time.Duration
 import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
-import org.springframework.stereotype.Component
 
-@Component
-class SärmäClient(private val archiveEnv: ArchiveEnv?) : SärmäClientInterface {
+class SärmäHttpClient(private val archiveEnv: ArchiveEnv?) : SärmäClientInterface {
     private val httpClient =
         OkHttpClient.Builder()
             .connectTimeout(Duration.ofMinutes(1))
@@ -26,7 +24,7 @@ class SärmäClient(private val archiveEnv: ArchiveEnv?) : SärmäClientInterfac
         masterId: String,
         classId: String,
         virtualArchiveId: String,
-    ): Pair<Int, ResponseBody?> {
+    ): Pair<Int, String?> {
         if (archiveEnv == null) {
             throw IllegalStateException("Archive environment not configured")
         }
@@ -59,8 +57,6 @@ class SärmäClient(private val archiveEnv: ArchiveEnv?) : SärmäClientInterfac
             httpClient
                 .newCall(Request.Builder().url(endpointUrl).post(requestBody).build())
                 .execute()
-        val responseCode = response.code
-        val responseBody = response.body
-        return Pair(responseCode, responseBody)
+        return Pair(response.code, response.body?.string())
     }
 }
diff --git a/service/src/main/kotlin/fi/espoo/evaka/document/archival/SärmäMockClient.kt b/service/src/main/kotlin/fi/espoo/evaka/document/archival/SärmäMockClient.kt
@@ -0,0 +1,14 @@
+package fi.espoo.evaka.document.archival
+
+import fi.espoo.evaka.s3.Document
+
+class SärmäMockClient: SärmäClientInterface {
+    override fun putDocument(
+        documentContent: Document,
+        masterId: String,
+        classId: String,
+        virtualArchiveId: String
+    ): Pair<Int, String?> {
+        return Pair(200, "OK")
+    }
+}
diff --git a/service/src/main/resources/application-local.yaml b/service/src/main/resources/application-local.yaml
@@ -63,9 +63,10 @@ evaka:
         trust_store:
           password: password
           type: JKS
-    särmä:
-      enabled: true
-      url: https://eoy3xw8tftt5shn.m.pipedream.net/archive-core
+#    särmä:
+#      enabled: true
+#      use_mock_client: true
+#      url: https://eoy3xw8tftt5shn.m.pipedream.net/archive-core
   not_for_prod:
     force_unpublish_document_template_enabled: true
   jwt: