[PROD-13929] Update Runner.parentId on parent deletion

Author: sjoubert

runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt

@@ -57,6 +57,7 @@ import java.util.*
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 import kotlin.test.assertTrue
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.BeforeEach
@@ -308,6 +309,58 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() {
     }
   }
 
+  @Test
+  fun `update parentId on Runner delete`() {
+    // Create a 3 level hierarchy: grandParent <- parent <- child
+    val grandParentCreation =
+        makeRunner(
+            organizationSaved.id!!,
+            workspaceSaved.id!!,
+            solutionSaved.id!!,
+        )
+    val grandParentRunner =
+        runnerApiService.createRunner(
+            organizationSaved.id!!, workspaceSaved.id!!, grandParentCreation)
+    val parentCreation =
+        makeRunner(
+            organizationSaved.id!!,
+            workspaceSaved.id!!,
+            solutionSaved.id!!,
+            parentId = grandParentRunner.id)
+    val parentRunner =
+        runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, parentCreation)
+    val childCreation =
+        makeRunner(
+            organizationSaved.id!!,
+            workspaceSaved.id!!,
+            solutionSaved.id!!,
+            parentId = parentRunner.id)
+    val childRunner =
+        runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, childCreation)
+
+    // Initial parents check
+    assertEquals(grandParentRunner.id, parentRunner.parentId)
+    assertEquals(parentRunner.id, childRunner.parentId)
+
+    // Delete intermediate parent, child should refer to grandParent
+    runnerApiService.deleteRunner(organizationSaved.id!!, workspaceSaved.id!!, parentRunner.id!!)
+    var newChildParentId =
+        runnerApiService
+            .getRunner(organizationSaved.id!!, workspaceSaved.id!!, childRunner.id!!)
+            .parentId
+    assertEquals(grandParentRunner.id, newChildParentId)
+
+    // Delete root grandParent, child should clear its parent
+    runnerApiService.deleteRunner(
+        organizationSaved.id!!, workspaceSaved.id!!, grandParentRunner.id!!)
+    newChildParentId =
+        runnerApiService
+            .getRunner(organizationSaved.id!!, workspaceSaved.id!!, childRunner.id!!)
+            .parentId
+    assertNull(newChildParentId)
+  }
+
+  @Test
   fun `test RBAC RunnerSecurity as Platform Admin`() {
     every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_PLATFORM_ADMIN)
 

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

@@ -44,6 +44,7 @@ import com.cosmotech.workspace.service.getRbac
 import java.time.Instant
 import org.springframework.context.annotation.Scope
 import org.springframework.data.domain.PageRequest
+import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Component
 
 @Component
@@ -93,6 +94,20 @@ class RunnerService(
           "Can't delete runner ${runner.id!!}: at least one run is still running")
     }
 
+    // Update parent references to delete runner to point to grand-parent
+    var pageRequest: Pageable =
+        PageRequest.ofSize(csmPlatformProperties.twincache.runner.defaultPageSize)
+    do {
+      val pagedRunners =
+          runnerRepository.findByParentId(
+              runner.organizationId!!, runner.workspaceId!!, runner.id!!, pageRequest)
+      pagedRunners.stream().forEach {
+        it.parentId = runner.parentId
+        runnerRepository.save(it)
+      }
+      pageRequest = pagedRunners.nextPageable()
+    } while (pagedRunners.hasNext())
+
     // Notify the deletion
     val runnerDeleted =
         RunnerDeleted(this, runner.organizationId!!, runner.workspaceId!!, runner.id!!)