Refactor updateRunnerStatus logic to streamline last run status updates and improve runner security visibility processing.

Author: jreynard-code

runner/src/main/kotlin/com/cosmotech/runner/service/RunnerService.kt

@@ -227,16 +227,7 @@ class RunnerService(
   }
 
   fun updateRunnerStatus(runner: Runner): Runner {
-    val updateRunnerStatusEvent =
-        UpdateRunnerStatus(
-            this,
-            runner.organizationId,
-            runner.workspaceId,
-            runner.id,
-            runner.lastRunInfo.lastRunId ?: "",
-        )
-    eventPublisher.publishEvent(updateRunnerStatusEvent)
-    val runStatus = LastRunStatus.forValue(updateRunnerStatusEvent.response!!)
+    val runStatus = getUpdatedLastRunStatus(runner)
     return runnerRepository.save(runner.apply { lastRunInfo.lastRunStatus = runStatus })
   }
 
@@ -259,7 +250,6 @@ class RunnerService(
               )
               .toList()
         }
-    runners.forEach { it.security = updateSecurityVisibility(it).security }
     runners.forEach { runner ->
       val listDatasetParts =
           datasetApiService.listDatasetParts(
@@ -269,7 +259,22 @@ class RunnerService(
               null,
               null,
           )
-      runner.apply { datasets.parameters = listDatasetParts as MutableList<Any>? }
+
+      val lastRunStatus =
+          if (
+              runner.lastRunInfo.lastRunId != null &&
+                  (runner.lastRunInfo.lastRunStatus != LastRunStatus.Failed ||
+                      runner.lastRunInfo.lastRunStatus != LastRunStatus.Successful)
+          ) {
+            getUpdatedLastRunStatus(runner)
+          } else {
+            runner.lastRunInfo.lastRunStatus
+          }
+      runner.apply {
+        lastRunInfo.lastRunStatus = lastRunStatus
+        datasets.parameters = listDatasetParts as MutableList<Any>?
+        security = updateSecurityVisibility(this).security
+      }
     }
     return runners
   }
@@ -1035,6 +1040,19 @@ class RunnerService(
       )
     }
   }
+
+  private fun getUpdatedLastRunStatus(runner: Runner): LastRunStatus {
+    val updateRunnerStatusEvent =
+        UpdateRunnerStatus(
+            this,
+            runner.organizationId,
+            runner.workspaceId,
+            runner.id,
+            runner.lastRunInfo.lastRunId ?: "",
+        )
+    eventPublisher.publishEvent(updateRunnerStatusEvent)
+    return LastRunStatus.forValue(updateRunnerStatusEvent.response!!)
+  }
 }
 
 fun RunnerSecurity?.toGenericSecurity(runnerId: String) =