Fix temporarily integrationTests and RBACTests

Author: jreynard-code

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

@@ -665,6 +665,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
   @Test
   fun `test uploadTwingraph status`() {
     organizationSaved = organizationApiService.registerOrganization(organization)
+    dataset.apply { sourceType = DatasetSourceType.File }
     datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
     val file = this::class.java.getResource("/integrationTest.zip")?.file
     val resource = ByteArrayResource(File(file!!).readBytes())
@@ -689,6 +690,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
   @Test
   fun `test uploadTwingraph fail set dataset status to error`() {
     organizationSaved = organizationApiService.registerOrganization(organization)
+    dataset.apply { sourceType = DatasetSourceType.File }
     datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
     val file = this::class.java.getResource("/brokenGraph.zip")?.file
     val resource = ByteArrayResource(File(file!!).readBytes())
@@ -748,6 +750,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
   @Test
   fun `reupload a twingraph in dataset with source type File`() {
     organizationSaved = organizationApiService.registerOrganization(organization)
+    dataset.apply { sourceType = DatasetSourceType.File }
     datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
 
     val fileName = this::class.java.getResource("/integrationTest.zip")?.file
@@ -816,7 +819,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
     every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER
     organization = makeOrganizationWithRole("organization")
     organizationSaved = organizationApiService.registerOrganization(organization)
-    makeDatasetWithRole(sourceType = DatasetSourceType.File)
+    dataset = makeDatasetWithRole(sourceType = DatasetSourceType.File)
     datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
 
     datasetRepository.save(datasetSaved.apply { ingestionStatus = IngestionStatusEnum.ERROR })
@@ -1003,7 +1006,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
   fun makeDataset(
       organizationId: String = organizationSaved.id!!,
       parentId: String = "",
-      sourceType: DatasetSourceType = DatasetSourceType.File
+      sourceType: DatasetSourceType = DatasetSourceType.Twincache
   ): Dataset {
     return Dataset(
         id = UUID.randomUUID().toString(),
@@ -1023,7 +1026,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
       parentId: String = "",
       userName: String = TEST_USER_MAIL,
       role: String = ROLE_ADMIN,
-      sourceType: DatasetSourceType = DatasetSourceType.File
+      sourceType: DatasetSourceType = DatasetSourceType.Twincache
   ): Dataset {
     return Dataset(
         id = UUID.randomUUID().toString(),

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

@@ -1660,7 +1660,8 @@ class DatasetServiceRBACTest : CsmRedisTestBase() {
 
               val organization = makeOrganizationWithRole(role = role)
               organizationSaved = organizationApiService.registerOrganization(organization)
-              val dataset = makeDatasetWithRole(role = ROLE_ADMIN)
+              val dataset =
+                  makeDatasetWithRole(role = ROLE_ADMIN, sourceType = DatasetSourceType.File)
               datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
               val fileName = this::class.java.getResource("/integrationTest.zip")?.file
               val file = File(fileName!!)
@@ -1701,7 +1702,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() {
 
               val organization = makeOrganizationWithRole()
               organizationSaved = organizationApiService.registerOrganization(organization)
-              val dataset = makeDatasetWithRole(role = role)
+              val dataset = makeDatasetWithRole(role = role, sourceType = DatasetSourceType.File)
               datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
               val fileName = this::class.java.getResource("/integrationTest.zip")?.file
               val file = File(fileName!!)
@@ -1830,9 +1831,9 @@ class DatasetServiceRBACTest : CsmRedisTestBase() {
 
               val organization = makeOrganizationWithRole(role = role)
               organizationSaved = organizationApiService.registerOrganization(organization)
-              val dataset = makeDatasetWithRole(role = ROLE_ADMIN)
+              val dataset =
+                  makeDatasetWithRole(role = ROLE_ADMIN, sourceType = DatasetSourceType.None)
               datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
-              materializeTwingraph()
 
               every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL
 
@@ -2294,7 +2295,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() {
       createTwingraph: Boolean = true
   ): Dataset {
     dataset.apply {
-      if (createTwingraph) {
+      if (createTwingraph && !this.twingraphId.isNullOrBlank()) {
         jedis.graphQuery(this.twingraphId, "CREATE (n:labelrouge)")
       }
       this.ingestionStatus = IngestionStatusEnum.SUCCESS
@@ -2314,7 +2315,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() {
   fun makeDataset(
       id: String,
       name: String,
-      sourceType: DatasetSourceType = DatasetSourceType.File
+      sourceType: DatasetSourceType = DatasetSourceType.Twincache
   ): Dataset {
     return Dataset(
         id = id,
@@ -2365,16 +2366,17 @@ class DatasetServiceRBACTest : CsmRedisTestBase() {
       parentId: String = "",
       id: String = TEST_USER_MAIL,
       role: String = ROLE_ADMIN,
-      sourceType: DatasetSourceType = DatasetSourceType.File
+      sourceType: DatasetSourceType = DatasetSourceType.Twincache
   ): Dataset {
+    val random = UUID.randomUUID().toString()
     return Dataset(
-        id = UUID.randomUUID().toString(),
+        id = random,
         name = "My datasetRbac",
         organizationId = organizationId,
         parentId = parentId,
         ownerId = "ownerId",
         connector = DatasetConnector(connectorSaved.id!!),
-        twingraphId = "graph",
+        twingraphId = "graph-${random}",
         source = SourceInfo("location", "name", "path"),
         tags = mutableListOf("dataset"),
         sourceType = sourceType,

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

@@ -213,7 +213,6 @@ class DatasetServiceImpl(
     val createdDataset =
         dataset.copy(
             id = idGenerator.generate("dataset"),
-            twingraphId = twingraphId,
             sourceType = datasetSourceType ?: DatasetSourceType.None,
             source = dataset.source ?: SourceInfo("none"),
             main = dataset.main ?: true,
@@ -222,6 +221,11 @@ class DatasetServiceImpl(
             twincacheStatus = TwincacheStatusEnum.EMPTY,
             ownerId = getCurrentAuthenticatedUserName(csmPlatformProperties),
             organizationId = organizationId)
+    createdDataset.apply {
+      if (!twingraphId.isNullOrBlank()) {
+        this.twingraphId = twingraphId
+      }
+    }
     createdDataset.setRbac(csmRbac.initSecurity(dataset.getRbac()))
 
     if (dataset.connector != null && !dataset.connector!!.id.isNullOrBlank()) {