Skip to content

Commit 7478629

Browse files
committed
add default value for dataset.source
prevent falling in source!! error. also prevent NONE type refresh
1 parent 13fabed commit 7478629

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,7 @@ import com.cosmotech.connector.domain.ConnectorParameter
3939
import com.cosmotech.connector.domain.ConnectorParameterGroup
4040
import com.cosmotech.dataset.api.DatasetApiService
4141
import com.cosmotech.dataset.bulk.QueryBuffer
42-
import com.cosmotech.dataset.domain.Dataset
43-
import com.cosmotech.dataset.domain.DatasetAccessControl
44-
import com.cosmotech.dataset.domain.DatasetCompatibility
45-
import com.cosmotech.dataset.domain.DatasetConnector
46-
import com.cosmotech.dataset.domain.DatasetCopyParameters
47-
import com.cosmotech.dataset.domain.DatasetRole
48-
import com.cosmotech.dataset.domain.DatasetSearch
49-
import com.cosmotech.dataset.domain.DatasetSecurity
50-
import com.cosmotech.dataset.domain.DatasetSourceType
51-
import com.cosmotech.dataset.domain.DatasetTwinGraphHash
52-
import com.cosmotech.dataset.domain.DatasetTwinGraphInfo
53-
import com.cosmotech.dataset.domain.DatasetTwinGraphQuery
54-
import com.cosmotech.dataset.domain.GraphProperties
55-
import com.cosmotech.dataset.domain.SubDatasetGraphQuery
56-
import com.cosmotech.dataset.domain.TwinGraphBatchResult
42+
import com.cosmotech.dataset.domain.*
5743
import com.cosmotech.dataset.repository.DatasetRepository
5844
import com.cosmotech.dataset.utils.CsmGraphEntityType
5945
import com.cosmotech.dataset.utils.isReadOnlyQuery
@@ -176,6 +162,7 @@ class DatasetServiceImpl(
176162
id = idGenerator.generate("dataset"),
177163
twingraphId = twingraphId,
178164
sourceType = dataset.sourceType ?: DatasetSourceType.None,
165+
source = dataset.source ?: SourceInfo("none"),
179166
main = dataset.main ?: true,
180167
creationDate = Instant.now().toEpochMilli(),
181168
status = Dataset.Status.DRAFT,
@@ -357,6 +344,8 @@ class DatasetServiceImpl(
357344

358345
dataset.takeUnless { it.sourceType == DatasetSourceType.File }
359346
?: throw CsmResourceNotFoundException("Cannot be applied to source type 'File'")
347+
dataset.takeUnless { it.sourceType == DatasetSourceType.None }
348+
?: throw CsmResourceNotFoundException("Cannot be applied to source type 'None'")
360349
dataset.status?.takeUnless { it == Dataset.Status.PENDING }
361350
?: throw CsmClientException("Dataset in use, cannot update. Retry later")
362351

0 commit comments

Comments
 (0)