Skip to content

Commit cbce596

Browse files
committed
Update error messages for dataset file validation
- Standardized terminology: replaced "Part File" with "Multipart file" and clarified references to "sourceName" of dataset parts. - Adjusted integration tests and validation logic to reflect the updated error messages.
1 parent b00dc90 commit cbce596

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
409409
}
410410

411411
@Test
412-
fun `test createDataset with two dataset part with same name`() {
412+
fun `test createDataset with two dataset parts and same multipart file name`() {
413413

414414
val customerPartName = "Customers list"
415415
val customerPartDescription = "List of customers"
@@ -464,8 +464,8 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
464464
}
465465
assertEquals(
466466
"Part File names should be unique during dataset creation. " +
467-
"Files: [$CUSTOMER_SOURCE_FILE_NAME, $CUSTOMER_SOURCE_FILE_NAME]. " +
468-
"Dataset Parts: [$CUSTOMER_SOURCE_FILE_NAME, anotherFile.txt].",
467+
"Multipart file names: [$CUSTOMER_SOURCE_FILE_NAME, $CUSTOMER_SOURCE_FILE_NAME]. " +
468+
"Dataset parts source names: [$CUSTOMER_SOURCE_FILE_NAME, anotherFile.txt].",
469469
exception.message)
470470
}
471471

@@ -588,9 +588,9 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
588588
arrayOf(mockMultipartFile))
589589
}
590590
assertEquals(
591-
"All files must have the same name as their corresponding Dataset Part. " +
592-
"Files: [customers.csv]. " +
593-
"Dataset Parts: [wrongname.csv].",
591+
"All files must have the same name as corresponding sourceName in a Dataset Part. " +
592+
"Multipart file names: [customers.csv]. " +
593+
"Dataset parts source names: [wrongname.csv].",
594594
exception.message)
595595
}
596596

@@ -1627,7 +1627,7 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
16271627
}
16281628

16291629
@Test
1630-
fun `test updateDataset with two dataset part with same name`() {
1630+
fun `test updateDataset with two dataset parts and same multipart file name`() {
16311631

16321632
val initialDataset =
16331633
datasetApiService.createDataset(
@@ -1689,9 +1689,9 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
16891689
arrayOf(customerMockMultipartFile, customerMockMultipartFile2))
16901690
}
16911691
assertEquals(
1692-
"Part File names should be unique during dataset update. " +
1693-
"Files: [$CUSTOMER_SOURCE_FILE_NAME, $CUSTOMER_SOURCE_FILE_NAME]. " +
1694-
"Dataset Parts: [$CUSTOMER_SOURCE_FILE_NAME, anotherFile.txt].",
1692+
"Multipart file names should be unique during dataset update. " +
1693+
"Multipart file names: [$CUSTOMER_SOURCE_FILE_NAME, $CUSTOMER_SOURCE_FILE_NAME]. " +
1694+
"Dataset parts source names: [$CUSTOMER_SOURCE_FILE_NAME, anotherFile.txt].",
16951695
exception.message)
16961696
}
16971697

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -685,15 +685,15 @@ class DatasetServiceImpl(
685685
require(
686686
files.groupingBy { it.originalFilename }.eachCount().filter { it.value > 1 }.isEmpty()) {
687687
"Part File names should be unique during dataset creation. " +
688-
"Files: ${files.map { it.originalFilename }}. " +
689-
"Dataset Parts: ${datasetCreateRequest.parts?.map { it.sourceName }}."
688+
"Multipart file names: ${files.map { it.originalFilename }}. " +
689+
"Dataset parts source names: ${datasetCreateRequest.parts?.map { it.sourceName }}."
690690
}
691691
require(
692692
files.mapNotNull { it.originalFilename }.toSortedSet(naturalOrder()) ==
693693
datasetCreateRequest.parts?.map { it.sourceName }?.toSortedSet(naturalOrder())) {
694-
"All files must have the same name as their corresponding Dataset Part. " +
695-
"Files: ${files.map { it.originalFilename }}. " +
696-
"Dataset Parts: ${datasetCreateRequest.parts?.map { it.sourceName }}."
694+
"All files must have the same name as corresponding sourceName in a Dataset Part. " +
695+
"Multipart file names: ${files.map { it.originalFilename }}. " +
696+
"Dataset parts source names: ${datasetCreateRequest.parts?.map { it.sourceName }}."
697697
}
698698
files.forEach { file ->
699699
require(
@@ -720,17 +720,17 @@ class DatasetServiceImpl(
720720
}
721721
require(
722722
files.groupingBy { it.originalFilename }.eachCount().filter { it.value > 1 }.isEmpty()) {
723-
"Part File names should be unique during dataset update. " +
724-
"Files: ${files.map { it.originalFilename }}. " +
725-
"Dataset Parts: ${datasetUpdateRequest.parts?.map { it.sourceName }}."
723+
"Multipart file names should be unique during dataset update. " +
724+
"Multipart file names: ${files.map { it.originalFilename }}. " +
725+
"Dataset parts source names: ${datasetUpdateRequest.parts?.map { it.sourceName }}."
726726
}
727727
require(
728728
files.mapNotNull { it.originalFilename }.toSortedSet(naturalOrder()) ==
729729
(datasetUpdateRequest.parts?.map { it.sourceName }?.toSortedSet(naturalOrder())
730730
?: emptySet<String>())) {
731-
"All files must have the same name as their corresponding Dataset Part. " +
732-
"Files: ${files.map { it.originalFilename }}. " +
733-
"Dataset Parts: ${datasetUpdateRequest.parts?.map { it.sourceName } ?: emptyList()}."
731+
"All files must have the same name as corresponding sourceName in a Dataset Part. " +
732+
"Multipart file names: ${files.map { it.originalFilename }}. " +
733+
"Dataset parts source names: ${datasetUpdateRequest.parts?.map { it.sourceName } ?: emptyList()}."
734734
}
735735

736736
files.forEach { file ->

0 commit comments

Comments
 (0)