Vallum: add method to fetch all surveys (#206)

Intended for project Energiepolders Hoeksche Waard because it uses surveys from multiple projects.
Zenmo · Jan 14, 2025 · 8a41817 · 8a41817
1 parent 01b0141
commit 8a41817
Showing 1 changed file with 28 additions and 17 deletions.
diff --git a/vallum/src/main/kotlin/Vallum.kt b/vallum/src/main/kotlin/Vallum.kt
@@ -23,29 +23,40 @@ constructor(
     private val baseUrl: String = "https://ztor.zero.zenmo.com",
     private val tokenUrl: String = "https://keycloak.zenmo.com/realms/zenmo/protocol/openid-connect/token",
 ) {
+    private val client = HttpClient(CIO) {
+        install(ContentNegotiation) {
+            json(Json {
+                ignoreUnknownKeys = true
+            })
+        }
+    }
+
     fun getHessenpoortSurveys(): List<Survey> =
         getSurveysByProject("Hessenpoort")
 
     @JvmOverloads
-    fun getSurveysByProject(project: String, includeInSimulation: Boolean? = true): List<Survey> {
-        val client = HttpClient(CIO) {
-            install(ContentNegotiation) {
-                json(Json {
-                    ignoreUnknownKeys = true
-                })
+    fun getSurveysByProject(project: String, includeInSimulation: Boolean? = true): List<Survey> = runBlocking {
+        val accessToken = getAccessToken(client)
+        client.get(baseUrl.trimEnd('/') + "/company-surveys") {
+            parameter("project", project)
+            parameter("includeInSimulation", includeInSimulation)
+            headers {
+                append("Authorization", "Bearer $accessToken")
             }
-        }
+        }.body<List<Survey>>()
+    }
 
-        return runBlocking {
-            val accessToken = getAccessToken(client)
-            client.get(baseUrl.trimEnd('/') + "/company-surveys") {
-                parameter("project", project)
-                parameter("includeInSimulation", includeInSimulation)
-                headers {
-                    append("Authorization", "Bearer $accessToken")
-                }
-            }.body<List<Survey>>()
-        }
+    /**
+     * Get all surveys the account has access to and are configured to include in the simulation
+     */
+    fun getAllEnabledSurveys(): List<Survey> = runBlocking {
+        val accessToken = getAccessToken(client)
+        client.get(baseUrl.trimEnd('/') + "/company-surveys") {
+            parameter("includeInSimulation", true)
+            headers {
+                append("Authorization", "Bearer $accessToken")
+            }
+        }.body<List<Survey>>()
     }
 
     private suspend fun getAccessToken(client: HttpClient): String {