Add dataset creation utility and update tests to use dynamic dataset IDs

- Introduced `makeDatasetCreateRequest` utility for dataset creation in integration tests.
- Reordered test setup in `RunServiceIntegrationTest` to ensure dataset creation precedes workspace creation.
- Updated dataset access control to use `DatasetAccessControl` instead of `DatasetRole`.
- Modified `RunnerControllerTests` to dynamically create and use dataset IDs in test cases.

Author: jreynard-code

api/src/integrationTest/kotlin/com/cosmotech/api/home/runner/RunnerControllerTests.kt

@@ -7,6 +7,8 @@ import com.cosmotech.api.events.RunStart
 import com.cosmotech.api.events.UpdateRunnerStatus
 import com.cosmotech.api.home.Constants.PLATFORM_ADMIN_EMAIL
 import com.cosmotech.api.home.ControllerTestBase
+import com.cosmotech.api.home.ControllerTestUtils.DatasetUtils.constructDatasetCreateRequest
+import com.cosmotech.api.home.ControllerTestUtils.DatasetUtils.createDatasetAndReturnId
 import com.cosmotech.api.home.ControllerTestUtils.OrganizationUtils.constructOrganizationCreateRequest
 import com.cosmotech.api.home.ControllerTestUtils.OrganizationUtils.createOrganizationAndReturnId
 import com.cosmotech.api.home.ControllerTestUtils.RunnerUtils.constructRunnerObject
@@ -54,6 +56,7 @@ class RunnerControllerTests : ControllerTestBase() {
   private lateinit var organizationId: String
   private lateinit var workspaceId: String
   private lateinit var solutionId: String
+  private lateinit var datasetId: String
   private val logger = LoggerFactory.getLogger(RunnerControllerTests::class.java)
 
   @SpykBean @Autowired private lateinit var eventPublisher: CsmEventPublisher
@@ -91,6 +94,8 @@ class RunnerControllerTests : ControllerTestBase() {
     workspaceId =
         createWorkspaceAndReturnId(
             mvc, organizationId, constructWorkspaceCreateRequest(solutionId = solutionId))
+    datasetId =
+        createDatasetAndReturnId(mvc, organizationId, workspaceId, constructDatasetCreateRequest())
   }
 
   @Test
@@ -101,7 +106,7 @@ class RunnerControllerTests : ControllerTestBase() {
     val runTemplateName = "run_template_name"
     val description = "this_is_a_description"
     val tags = mutableListOf("tags1", "tags2")
-    val datasetList = mutableListOf("datasetId1", "datasetId2")
+    val datasetList = mutableListOf(datasetId)
     val runnerParameterId = "parameterId1"
     val runnerParameterValue = "parameter_value"
     val runnerParameterVarType = "this_is_a_vartype"
@@ -190,7 +195,7 @@ class RunnerControllerTests : ControllerTestBase() {
     val runTemplateName = "run_template_name"
     val description = "this_is_a_description"
     val tags = mutableListOf("tags1", "tags2")
-    val datasetList = mutableListOf("datasetId1", "datasetId2")
+    val datasetList = mutableListOf(datasetId)
     val runnerParameterId = "parameterId1"
     val runnerParameterValue = "parameter_value"
     val runnerParameterVarType = "this_is_a_vartype"
@@ -285,7 +290,7 @@ class RunnerControllerTests : ControllerTestBase() {
     val runTemplateName = "run_template_name"
     val description = "this_is_a_description"
     val tags = mutableListOf("tags1", "tags2")
-    val datasetList = mutableListOf("datasetId1", "datasetId2")
+    val datasetList = mutableListOf(datasetId)
     val runnerParameterId = "parameterId1"
     val runnerParameterValue = "parameter_value"
     val runnerParameterVarType = "this_is_a_vartype"

run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt

@@ -146,16 +146,18 @@ class RunServiceIntegrationTest : CsmTestBase() {
     organization = makeOrganizationCreateRequest()
     organizationSaved = organizationApiService.createOrganization(organization)
 
+    solution = makeSolutionCreateRequest()
+    solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution)
+
     workspace = makeWorkspaceCreateRequest(solutionSaved.id, "Workspace")
     workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace)
 
+    dataset = makeDatasetCreateRequest()
+
     datasetSaved =
         datasetApiService.createDataset(
             organizationSaved.id, workspaceSaved.id, dataset, emptyArray())
 
-    solution = makeSolutionCreateRequest()
-    solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution)
-
     runner =
         makeRunnerCreateRequest(
             solutionSaved.id,
@@ -170,6 +172,8 @@ class RunServiceIntegrationTest : CsmTestBase() {
     every { eventPublisher.publishEvent(any<RunDeleted>()) } returns Unit
   }
 
+  fun makeDatasetCreateRequest() = DatasetCreateRequest(name = "Dataset Test")
+
   fun makeSolutionCreateRequest() =
       SolutionCreateRequest(
           key = UUID.randomUUID().toString(),

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

@@ -26,7 +26,7 @@ import com.cosmotech.api.utils.getCurrentAccountIdentifier
 import com.cosmotech.api.utils.getCurrentAuthenticatedRoles
 import com.cosmotech.dataset.DatasetApiServiceInterface
 import com.cosmotech.dataset.domain.Dataset
-import com.cosmotech.dataset.domain.DatasetRole
+import com.cosmotech.dataset.domain.DatasetAccessControl
 import com.cosmotech.organization.OrganizationApiServiceInterface
 import com.cosmotech.organization.domain.Organization
 import com.cosmotech.runner.domain.CreatedRun
@@ -617,12 +617,11 @@ class RunnerService(
   private fun addUserAccessControlOnDataset(dataset: Dataset, roleDefinition: RunnerAccessControl) {
     val newDatasetAcl = dataset.security.accessControlList.toList()
     if (newDatasetAcl.none { it.id == roleDefinition.id }) {
-      datasetApiService.updateDatasetAccessControl(
+      datasetApiService.createDatasetAccessControl(
           organization!!.id,
           workspace!!.id,
           dataset.id,
-          roleDefinition.id,
-          DatasetRole(roleDefinition.role))
+          DatasetAccessControl(roleDefinition.id, roleDefinition.role))
     }
   }
 }