Add runnerId to Dataset creation and update related schema and tests

- Updated `DatasetCreateRequest` and `CreateInfo` model to include `runnerId`.
- Modified OpenAPI schema, service implementation, and dataset documentation to support `runnerId`.
- Added integration tests to validate `runnerId` field behavior during dataset creation.

Author: jreynard-code

api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestUtils.kt

@@ -416,6 +416,7 @@ class ControllerTestUtils {
           name = name,
           description = DATASET_DESCRIPTION,
           tags = mutableListOf("tag1", "tag2"),
+          runnerId = "r-12345678910",
           parts =
               mutableListOf(
                   DatasetPartCreateRequest(

api/src/integrationTest/kotlin/com/cosmotech/api/home/dataset/DatasetControllerTests.kt

@@ -133,6 +133,7 @@ class DatasetControllerTests : ControllerTestBase() {
         .andExpect(jsonPath("$.organizationId").value(organizationId))
         .andExpect(jsonPath("$.workspaceId").value(workspaceId))
         .andExpect(jsonPath("$.createInfo.userId").value(PLATFORM_ADMIN_EMAIL))
+        .andExpect(jsonPath("$.createInfo.runnerId").value("r-12345678910"))
         .andExpect(jsonPath("$.createInfo.timestamp").isNumber)
         .andExpect(jsonPath("$.createInfo.timestamp").value(greaterThan(0.toLong())))
         .andExpect(jsonPath("$.updateInfo.userId").value(PLATFORM_ADMIN_EMAIL))

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

@@ -135,7 +135,10 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
     val datasetTags = mutableListOf("dataset", "public", "customers")
     val datasetCreateRequest =
         DatasetCreateRequest(
-            name = datasetName, description = datasetDescription, tags = datasetTags)
+            name = datasetName,
+            description = datasetDescription,
+            tags = datasetTags,
+            runnerId = "r-12354678910")
 
     val createdDataset =
         datasetApiService.createDataset(
@@ -145,6 +148,7 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
     assertEquals(datasetName, createdDataset.name)
     assertEquals(datasetDescription, createdDataset.description)
     assertEquals(datasetTags, createdDataset.tags)
+    assertEquals("r-12354678910", createdDataset.createInfo.runnerId)
     assertEquals(0, createdDataset.parts.size)
   }
 

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

@@ -20,6 +20,7 @@ import com.cosmotech.api.utils.constructPageRequest
 import com.cosmotech.api.utils.findAllPaginated
 import com.cosmotech.api.utils.getCurrentAccountIdentifier
 import com.cosmotech.dataset.DatasetApiServiceInterface
+import com.cosmotech.dataset.domain.CreateInfo
 import com.cosmotech.dataset.domain.Dataset
 import com.cosmotech.dataset.domain.DatasetAccessControl
 import com.cosmotech.dataset.domain.DatasetCreateRequest
@@ -130,6 +131,8 @@ class DatasetServiceImpl(
     val now = Instant.now().toEpochMilli()
     val userId = getCurrentAccountIdentifier(csmPlatformProperties)
     val editInfo = EditInfo(timestamp = now, userId = userId)
+    val createInfo =
+        CreateInfo(timestamp = now, userId = userId, runnerId = datasetCreateRequest.runnerId)
     val security =
         csmRbac
             .initSecurity(datasetCreateRequest.security.toGenericSecurity(datasetId))
@@ -159,7 +162,7 @@ class DatasetServiceImpl(
             workspaceId = workspaceId,
             tags = datasetCreateRequest.tags ?: mutableListOf(),
             parts = datasetParts ?: mutableListOf(),
-            createInfo = editInfo,
+            createInfo = createInfo,
             updateInfo = editInfo,
             security = security)
     logger.debug("Registering Dataset: {}", createdDataset)

dataset/src/main/openapi/dataset.yaml

@@ -886,7 +886,7 @@ components:
         createInfo:
           description: The details of the Dataset creation
           allOf:
-            - $ref: '#/components/schemas/EditInfo'
+            - $ref: '#/components/schemas/CreateInfo'
         updateInfo:
           description: The details of the Dataset last update
           allOf:
@@ -928,6 +928,9 @@ components:
           default: []
         security:
           $ref: '#/components/schemas/DatasetSecurity'
+        runnerId:
+          type: string
+          pattern: '^r-\w{10,20}'
       required:
         - name
 
@@ -1140,3 +1143,21 @@ components:
       required:
         - timestamp
         - userId
+
+    CreateInfo:
+      type: object
+      properties:
+        timestamp:
+          description: The timestamp of the creation in millisecond
+          type: integer
+          format: int64
+        userId:
+          description: The id of the user who did the creation
+          type: string
+        runnerId:
+          description: The runner id which has created the dataset (nullable)
+          type: string
+          pattern: '^r-\w{10,20}'
+      required:
+        - timestamp
+        - userId

doc/.openapi-generator/FILES

@@ -10,6 +10,7 @@ Models/AboutInfoVersion.md
 Models/ComponentRolePermissions.md
 Models/ContainerResourceSizeInfo.md
 Models/ContainerResourceSizing.md
+Models/CreateInfo.md
 Models/CreatedRun.md
 Models/Dataset.md
 Models/DatasetAccessControl.md

doc/Models/Dataset.md

@@ -10,7 +10,7 @@
 | **workspaceId** | **String** | the associated Workspace Id | [default to null] |
 | **tags** | **List** | the list of tags | [default to null] |
 | **parts** | [**List**](DatasetPart.md) |  | [default to null] |
-| **createInfo** | [**EditInfo**](EditInfo.md) | The details of the Dataset creation | [default to null] |
+| **createInfo** | [**CreateInfo**](CreateInfo.md) | The details of the Dataset creation | [default to null] |
 | **updateInfo** | [**EditInfo**](EditInfo.md) | The details of the Dataset last update | [default to null] |
 | **security** | [**DatasetSecurity**](DatasetSecurity.md) |  | [default to null] |
 

doc/README.md

@@ -119,6 +119,7 @@ All URIs are relative to *http://localhost:8080*
  - [ComponentRolePermissions](./Models/ComponentRolePermissions.md)
  - [ContainerResourceSizeInfo](./Models/ContainerResourceSizeInfo.md)
  - [ContainerResourceSizing](./Models/ContainerResourceSizing.md)
+ - [CreateInfo](./Models/CreateInfo.md)
  - [CreatedRun](./Models/CreatedRun.md)
  - [Dataset](./Models/Dataset.md)
  - [DatasetAccessControl](./Models/DatasetAccessControl.md)

openapi/plantuml/schemas.plantuml

@@ -31,6 +31,12 @@ entity ContainerResourceSizing {
     * limits: ContainerResourceSizeInfo
 }
 
+entity CreateInfo {
+    * timestamp: Long
+    * userId: String
+    runnerId: String
+}
+
 entity CreatedRun {
     * id: String
 }
@@ -43,7 +49,7 @@ entity Dataset {
     * workspaceId: String
     * tags: List<String>
     * parts: List<DatasetPart>
-    * createInfo: EditInfo
+    * createInfo: CreateInfo
     * updateInfo: EditInfo
     * security: DatasetSecurity
 }
@@ -59,6 +65,7 @@ entity DatasetCreateRequest {
     tags: List<String>
     parts: List<DatasetPartCreateRequest>
     security: DatasetSecurity
+    runnerId: String
 }
 
 entity DatasetPart {
@@ -654,7 +661,7 @@ Solution -- "0..*" RunTemplateParameterGroup : parameterGroups
 Solution -- "0..*" RunTemplate : runTemplates
 Solution -- SolutionSecurity : security
 Dataset -- "0..*" DatasetPart : parts
-Dataset -- EditInfo : createInfo
+Dataset -- CreateInfo : createInfo
 Dataset -- EditInfo : updateInfo
 Dataset -- DatasetSecurity : security
 Run -- RunEditInfo : createInfo