Handle RunnerDeleted event to delete associated datasets and parts

- Added `datasetParameterId` field to `RunnerDeleted` event.
- Implemented `onRunnerDeleted` listener in `DatasetServiceImpl` to handle cleanup of datasets and parts linked to a runner.
- Updated `RunnerService` to trigger `RunnerDeleted` with `datasetParameterId`.

Author: jreynard-code

common/src/main/kotlin/com/cosmotech/common/events/RunnerEvents.kt

@@ -13,7 +13,8 @@ class RunnerDeleted(
     publisher: Any,
     val organizationId: String,
     val workspaceId: String,
-    val runnerId: String
+    val runnerId: String,
+    val datasetParameterId: String
 ) : CsmEvent(publisher)
 
 class UpdateRunnerStatus(
@@ -24,7 +25,7 @@ class UpdateRunnerStatus(
     val lastRunId: String,
 ) : CsmRequestResponseEvent<String>(publisher)
 
-class GetAttachedRunnerToDataset(
+class GetRunnerAttachedToDataset(
     publisher: Any,
     val organizationId: String,
     val workspaceId: String,

dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt

@@ -5,7 +5,7 @@ package com.cosmotech.dataset.service
 import com.cosmotech.common.config.CsmPlatformProperties
 import com.cosmotech.common.config.existTable
 import com.cosmotech.common.events.CsmEventPublisher
-import com.cosmotech.common.events.GetAttachedRunnerToDataset
+import com.cosmotech.common.events.GetRunnerAttachedToDataset
 import com.cosmotech.common.exceptions.CsmAccessForbiddenException
 import com.cosmotech.common.exceptions.CsmResourceNotFoundException
 import com.cosmotech.common.rbac.ROLE_ADMIN
@@ -751,7 +751,7 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
     val fakeRunnerId = "r-XXXXXX"
     every { eventPublisher.publishEvent(any()) } answers
         {
-          firstArg<GetAttachedRunnerToDataset>().response = fakeRunnerId
+          firstArg<GetRunnerAttachedToDataset>().response = fakeRunnerId
         }
 
     val exception =

dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt

@@ -4,7 +4,8 @@ package com.cosmotech.dataset.service
 
 import com.cosmotech.common.CsmPhoenixService
 import com.cosmotech.common.config.DATASET_INPUTS_SCHEMA
-import com.cosmotech.common.events.GetAttachedRunnerToDataset
+import com.cosmotech.common.events.GetRunnerAttachedToDataset
+import com.cosmotech.common.events.RunnerDeleted
 import com.cosmotech.common.exceptions.CsmResourceNotFoundException
 import com.cosmotech.common.id.generateId
 import com.cosmotech.common.rbac.CsmRbac
@@ -49,6 +50,7 @@ import org.apache.commons.lang3.StringUtils
 import org.postgresql.copy.CopyManager
 import org.postgresql.core.BaseConnection
 import org.postgresql.util.PSQLException
+import org.springframework.context.event.EventListener
 import org.springframework.core.io.ByteArrayResource
 import org.springframework.core.io.Resource
 import org.springframework.jdbc.core.JdbcTemplate
@@ -195,12 +197,12 @@ class DatasetServiceImpl(
   override fun deleteDataset(organizationId: String, workspaceId: String, datasetId: String) {
     val dataset = getVerifiedDataset(organizationId, workspaceId, datasetId, PERMISSION_DELETE)
 
-    val getAttachedRunnerToDatasetEvent =
-        GetAttachedRunnerToDataset(this, organizationId, workspaceId, datasetId)
+    val getRunnerAttachedToDatasetEvent =
+        GetRunnerAttachedToDataset(this, organizationId, workspaceId, datasetId)
 
-    eventPublisher.publishEvent(getAttachedRunnerToDatasetEvent)
+    eventPublisher.publishEvent(getRunnerAttachedToDatasetEvent)
 
-    val datasetAttachedToRunnerId = getAttachedRunnerToDatasetEvent.response
+    val datasetAttachedToRunnerId = getRunnerAttachedToDatasetEvent.response
     require(datasetAttachedToRunnerId == null || datasetAttachedToRunnerId.isEmpty()) {
       "Dataset $datasetId is defined as a runner dataset ($datasetAttachedToRunnerId). It cannot be deleted"
     }
@@ -947,6 +949,25 @@ class DatasetServiceImpl(
     return datasetList
   }
 
+  @EventListener(RunnerDeleted::class)
+  fun onRunnerDeleted(runnerDeletedEvent: RunnerDeleted) {
+    val organizationId = runnerDeletedEvent.organizationId
+    val workspaceId = runnerDeletedEvent.workspaceId
+    val datasetParameterId = runnerDeletedEvent.datasetParameterId
+
+    val dataset =
+        datasetRepository.findBy(organizationId, workspaceId, datasetParameterId).orElseThrow {
+          CsmResourceNotFoundException(
+              "Dataset $datasetParameterId not found in organization $organizationId and workspace $workspaceId")
+        }
+
+    datasetRepository.delete(dataset)
+    dataset.parts.forEach {
+      datasetPartRepository.delete(it)
+      datasetPartManagementFactory.removeData(it)
+    }
+  }
+
   private fun validDatasetPartCreateRequest(
       datasetPartCreateRequest: DatasetPartCreateRequest,
       file: MultipartFile

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

@@ -5,7 +5,7 @@ package com.cosmotech.runner.service
 import com.cosmotech.common.config.CsmPlatformProperties
 import com.cosmotech.common.containerregistry.ContainerRegistryService
 import com.cosmotech.common.events.CsmEventPublisher
-import com.cosmotech.common.events.GetAttachedRunnerToDataset
+import com.cosmotech.common.events.GetRunnerAttachedToDataset
 import com.cosmotech.common.events.HasRunningRuns
 import com.cosmotech.common.events.RunStart
 import com.cosmotech.common.events.UpdateRunnerStatus
@@ -2159,7 +2159,7 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
   }
 
   @Test
-  fun `test onGetAttachedRunnerToDataset behaviour`() {
+  fun `test onGetRunnerAttachedToDataset behaviour`() {
 
     logger.info(
         "should create a new Runner and retrieve parameter varType from solution ignoring the one declared")
@@ -2179,7 +2179,7 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
     val datasetParameterId = newRunnerSaved.datasets.parameter
 
     val getAttachedRunnerToDataset =
-        GetAttachedRunnerToDataset(
+        GetRunnerAttachedToDataset(
             this, organizationSaved.id, workspaceSaved.id, datasetParameterId)
     eventPublisher.publishEvent(getAttachedRunnerToDataset)
 

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

@@ -3,7 +3,7 @@
 package com.cosmotech.runner.service
 
 import com.cosmotech.common.config.CsmPlatformProperties
-import com.cosmotech.common.events.GetAttachedRunnerToDataset
+import com.cosmotech.common.events.GetRunnerAttachedToDataset
 import com.cosmotech.common.events.RunDeleted
 import com.cosmotech.common.rbac.PERMISSION_CREATE_CHILDREN
 import com.cosmotech.common.rbac.PERMISSION_DELETE
@@ -271,16 +271,16 @@ internal class RunnerApiServiceImpl(
     }
   }
 
-  @EventListener(GetAttachedRunnerToDataset::class)
-  fun onGetAttachedRunnerToDataset(getAttachedRunnerToDataset: GetAttachedRunnerToDataset) {
-    val organizationId = getAttachedRunnerToDataset.organizationId
-    val workspaceId = getAttachedRunnerToDataset.workspaceId
-    val datasetId = getAttachedRunnerToDataset.datasetId
+  @EventListener(GetRunnerAttachedToDataset::class)
+  fun onGetAttachedRunnerToDataset(getRunnerAttachedToDataset: GetRunnerAttachedToDataset) {
+    val organizationId = getRunnerAttachedToDataset.organizationId
+    val workspaceId = getRunnerAttachedToDataset.workspaceId
+    val datasetId = getRunnerAttachedToDataset.datasetId
     val runnerService = getRunnerService().inOrganization(organizationId).inWorkspace(workspaceId)
 
     val runnerId =
         runnerService.findRunnerByDatasetParameter(organizationId, workspaceId, datasetId)?.id
 
-    getAttachedRunnerToDataset.response = runnerId
+    getRunnerAttachedToDataset.response = runnerId
   }
 }

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

@@ -141,10 +141,11 @@ class RunnerService(
     newRoots.forEach { updateChildrenRootId(parent = it, newRootId = it.id) }
 
     // Notify the deletion
-    val runnerDeleted = RunnerDeleted(this, runner.organizationId, runner.workspaceId, runner.id)
+    val runnerDeleted =
+        RunnerDeleted(
+            this, runner.organizationId, runner.workspaceId, runner.id, runner.datasets.parameter)
     this.eventPublisher.publishEvent(runnerDeleted)
-    datasetApiService.deleteDataset(
-        runner.organizationId, runner.workspaceId, runner.datasets.parameter)
+
     return runnerRepository.delete(runnerInstance.getRunnerDataObjet())
   }