feat: add sourceName to updatable data in datasetPart PUT endpoint

Author: Leopold-Cramer

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

@@ -682,6 +682,7 @@ class DatasetControllerTests : ControllerTestBase() {
         createDatasetPartAndReturnId(
             mvc, organizationId, workspaceId, datasetId, constructDatasetPartCreateRequest())
 
+    val newSourceName = "source_name_updated.csv"
     val newDescription = "this_a_new_description_for_dataset_part"
     val newTags = mutableListOf("tag_part1_updated", "tag_part2_updated")
 
@@ -690,7 +691,9 @@ class DatasetControllerTests : ControllerTestBase() {
             "datasetPartUpdateRequest",
             null,
             MediaType.APPLICATION_JSON_VALUE,
-            JSONObject(DatasetPartUpdateRequest(description = newDescription, tags = newTags))
+            JSONObject(
+                    DatasetPartUpdateRequest(
+                        sourceName = newSourceName, description = newDescription, tags = newTags))
                 .toString()
                 .byteInputStream())
     val newFile =
@@ -715,7 +718,7 @@ class DatasetControllerTests : ControllerTestBase() {
         .andDo(MockMvcResultHandlers.print())
         .andExpect(jsonPath("$.id").value(datasetPartId))
         .andExpect(jsonPath("$.name").value(DATASET_PART_NAME))
-        .andExpect(jsonPath("$.sourceName").value(TEST_FILE_NAME))
+        .andExpect(jsonPath("$.sourceName").value(newSourceName))
         .andExpect(jsonPath("$.description").value(newDescription))
         .andExpect(jsonPath("$.createInfo.userId").value(PLATFORM_ADMIN_EMAIL))
         .andExpect(jsonPath("$.createInfo.timestamp").isNumber)

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

@@ -1932,10 +1932,12 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
     assertEquals(DatasetPartTypeEnum.File, datasetPartToReplace.type)
 
     // New Part to replace the existing one in the dataset
+    val newDatasetSourceName = "updatedResourceFile.csv"
     val newDatasetPartDescription = "New Data for customer list"
     val newDatasetPartTags = mutableListOf("part", "public", "new", "customer")
     val datasetPartUpdateRequest =
         DatasetPartUpdateRequest(
+            sourceName = newDatasetSourceName,
             description = newDatasetPartDescription,
             tags = newDatasetPartTags,
         )
@@ -1967,9 +1969,10 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
 
     assertEquals(datasetPartToReplace.id, replacedDatasetPart.id)
     assertEquals(datasetPartToReplace.name, replacedDatasetPart.name)
+    assertEquals(replacedDatasetPart.sourceName, newDatasetSourceName)
     assertEquals(replacedDatasetPart.description, newDatasetPartDescription)
     assertEquals(replacedDatasetPart.tags, newDatasetPartTags)
-    assertEquals(CUSTOMER_SOURCE_FILE_NAME, replacedDatasetPart.sourceName)
+    assertEquals("updatedResourceFile.csv", replacedDatasetPart.sourceName)
     assertEquals(DatasetPartTypeEnum.File, replacedDatasetPart.type)
 
     val newDatasetPartFilePath = constructFilePathForDatasetPart(datasetWithReplacedPart, 0)
@@ -2029,7 +2032,9 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
     // Create a DatasetUpdateRequest with new dataset part
     val datasetPartUpdateRequest =
         DatasetPartUpdateRequest(
-            description = "Dataset for shop", tags = mutableListOf("dataset", "public", "shop"))
+            sourceName = "updatedResourceFile.csv",
+            description = "Dataset for shop",
+            tags = mutableListOf("dataset", "public", "shop"))
 
     val wrongTypeTestFile =
         resourceLoader.getResource("classpath:/$UNALLOWED_MIME_TYPE_SOURCE_FILE_NAME").file
@@ -2099,7 +2104,9 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
 
     val datasetPartUpdateRequest =
         DatasetPartUpdateRequest(
-            description = "Dataset for shop", tags = mutableListOf("dataset", "public", "shop"))
+            sourceName = "updatedResourceFile.csv",
+            description = "Dataset for shop",
+            tags = mutableListOf("dataset", "public", "shop"))
 
     val wrongTypeMockMultipartFile =
         MockMultipartFile(

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

@@ -568,21 +568,26 @@ class DatasetServiceImpl(
     val now = Instant.now().toEpochMilli()
     val userId = getCurrentAccountIdentifier(csmPlatformProperties)
     val editInfo = EditInfo(timestamp = now, userId = userId)
-
+    val datasetPartUpdated = datasetPart.copy()
     dataset.parts
         .find { it.id == datasetPartId }
         ?.let {
+          it.sourceName = datasetPartUpdateRequest?.sourceName ?: it.sourceName
           it.description = datasetPartUpdateRequest?.description ?: it.description
           it.tags = datasetPartUpdateRequest?.tags ?: it.tags
           it.updateInfo = editInfo
 
-          datasetPart.description = datasetPartUpdateRequest?.description ?: datasetPart.description
-          datasetPart.tags = datasetPartUpdateRequest?.tags ?: datasetPart.tags
-          datasetPart.updateInfo = editInfo
+          datasetPartUpdated.sourceName =
+              datasetPartUpdateRequest?.sourceName ?: datasetPart.sourceName
+          datasetPartUpdated.description =
+              datasetPartUpdateRequest?.description ?: datasetPart.description
+          datasetPartUpdated.tags = datasetPartUpdateRequest?.tags ?: datasetPart.tags
+          datasetPartUpdated.updateInfo = editInfo
         }
-    datasetPartManagementFactory.storeData(datasetPart, file, true)
+    datasetPartManagementFactory.removeData(datasetPart)
+    datasetPartManagementFactory.storeData(datasetPartUpdated, file, true)
     datasetRepository.update(dataset)
-    return datasetPartRepository.update(datasetPart)
+    return datasetPartRepository.update(datasetPartUpdated)
   }
 
   override fun searchDatasetParts(

dataset/src/main/openapi/dataset.yaml

@@ -877,6 +877,11 @@ components:
       type: object
       description: Dataset part update request object
       properties:
+        sourceName:
+          description: the source data name (e.g. filename associated to the dataset part)
+          type: string
+          minLength: 1
+          maxLength: 50
         description:
           type: string
         tags:

doc/Models/DatasetPartUpdateRequest.md

@@ -3,6 +3,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
+| **sourceName** | **String** | the source data name (e.g. filename associated to the dataset part) | [optional] [default to null] |
 | **description** | **String** |  | [optional] [default to null] |
 | **tags** | **List** |  | [optional] [default to null] |
 

openapi/plantuml/schemas.plantuml

@@ -94,6 +94,7 @@ entity DatasetPartTypeEnum {
 }
 
 entity DatasetPartUpdateRequest {
+    sourceName: String
     description: String
     tags: List<String>
 }