Fix deleteRun

Author: jreynard-code

run/src/main/kotlin/com/cosmotech/run/service/RunEventServiceImpl.kt

@@ -31,7 +31,7 @@ class RunEventServiceImpl(private val runApiService: RunApiServiceInterface) :
     hasRunningRuns.response =
         runApiService.listAllRuns(organizationId, workspaceId, runnerId).any {
           val runState =
-              runApiService.getRunStatus(organizationId, workspaceId, runnerId, it.id!!).state
+              runApiService.getRun(organizationId, workspaceId, runnerId, it.id!!).state
                   ?: RunState.Unknown
           runState == RunState.Running
         }

run/src/main/kotlin/com/cosmotech/run/service/RunServiceImpl.kt

@@ -452,27 +452,28 @@ class RunServiceImpl(
 
       workflowService.stopWorkflow(run)
 
-      if (csmPlatformProperties.internalResultServices?.enabled == true)
-          adminRunStorageTemplate.dropDB(run.id!!)
-
-      runRepository.delete(run)
-
-      val runs = listRuns(run.organizationId!!, run.workspaceId!!, run.runnerId!!, null, null)
-      var lastRun: String? = null
-      var lastStart: Long = 0
-      if (runs.isNotEmpty()) {
-        runs.forEach {
-          if (it.createInfo.timestamp >= lastStart) {
-            lastStart = it.createInfo.timestamp
-            lastRun = it.id!!
+      val defaultPageSize = csmPlatformProperties.twincache.run.defaultPageSize
+      val pageRequest = PageRequest.ofSize(defaultPageSize)
+      val runs =
+          runRepository
+              .findByRunnerId(run.organizationId!!, run.workspaceId!!, run.runnerId!!, pageRequest)
+              .toList()
+
+      val previousRuns = runs.filter { it.id != run.id }
+      val lastRun =
+          if (previousRuns.isEmpty()) {
+            null
+          } else {
+            previousRuns.maxBy { it.createInfo.timestamp }.id
           }
-        }
-      } else {
-        lastRun = null
-      }
       val runDeleted =
           RunDeleted(this, run.organizationId, run.workspaceId, run.runnerId, run.id!!, lastRun)
       this.eventPublisher.publishEvent(runDeleted)
+
+      if (csmPlatformProperties.internalResultServices?.enabled == true)
+          adminRunStorageTemplate.dropDB(run.id)
+
+      runRepository.delete(run)
     } catch (exception: IllegalStateException) {
       logger.debug(
           "An error occurred while deleting Run {}: {}", run.id, exception.message, exception)