Sensitivity job also runs slow run API

statnett · Dec 9, 2023 · ab82a44 · ab82a44
1 parent 680a71f
commit ab82a44
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/main/ApiDataModels.kt b/src/main/ApiDataModels.kt
@@ -2,12 +2,7 @@ package com.github.statnett.loadflowservice
 
 import com.powsybl.iidm.network.Network
 import com.powsybl.security.SecurityAnalysisResult
-<<<<<<< HEAD
-=======
-import com.powsybl.security.json.SecurityAnalysisJsonModule
 import com.powsybl.sensitivity.SensitivityAnalysisResult
-import kotlinx.serialization.KSerializer
->>>>>>> 1732bb9 (WIP: Serialize sensitivity analysis result)
 import kotlinx.serialization.Serializable
 
 /**
@@ -75,15 +70,12 @@ data class LoadFlowServiceSecurityAnalysisResult(
     @Serializable(with = SecurityAnalysisResultSerializer::class)
     val securityAnalysisResult: SecurityAnalysisResult,
     val report: String
-<<<<<<< HEAD
 ) : ComputationResult()
-=======
-)
+
 
 @Serializable
 data class LoadFlowServiceSensitivityAnalysisResult(
     @Serializable(with = SensitivityAnalysisResultSerializer::class)
     val sensitivityAnalysisResult: SensitivityAnalysisResult,
     val report: String
-)
->>>>>>> 1732bb9 (WIP: Serialize sensitivity analysis result)
+): ComputationResult()
diff --git a/src/main/App.kt b/src/main/App.kt
@@ -98,12 +98,14 @@ fun Application.module() {
 
             sensParamCnt.parameters.setLoadFlowParameters(loadParamCnt.parameters)
             val network = networkFromFirstFile(files)
-            val result = runSensitivityAnalysis(
-                network,
-                sensFactorCnt.factors,
-                sensParamCnt.parameters,
-                contingencyCnt.contingencies
-            )
+            val result = createTask(taskManager) {
+                runSensitivityAnalysis(
+                    network,
+                    sensFactorCnt.factors,
+                    sensParamCnt.parameters,
+                    contingencyCnt.contingencies
+                )
+            }
             call.respond(result)
         }
 

diff --git a/src/test/AppTest.kt b/src/test/AppTest.kt
@@ -310,9 +310,15 @@ class ApplicationTest {
                     formData = sensitivityFormData.formData(config)
                 )
                 assertEquals(HttpStatusCode.OK, response.status)
-                val body = response.bodyAsText()
-                assertTrue(body.contains("2"))
-                val result = Json.decodeFromString<LoadFlowServiceSensitivityAnalysisResult>(response.body())
+
+                val taskInfo = Json.decodeFromString<TaskInfo>(response.body())
+
+                val runResult = retryOnError(50, 10) {
+                    client.get(taskInfo.resultUrl)
+                }
+                assertEquals(HttpStatusCode.OK, runResult.status)
+
+                val result = json.decodeFromString<LoadFlowServiceSensitivityAnalysisResult>(runResult.body())
 
                 // There are two contingencies so when we have contingencies there should be three results
                 // Otherwise one