Fix Scenario et ScenarioRun Tests

Author: jreynard-code

scenario/src/integrationTest/kotlin/com/cosmotech/scenario/service/ScenarioServiceIntegrationTest.kt

@@ -22,13 +22,7 @@ import com.cosmotech.connector.ConnectorApiServiceInterface
 import com.cosmotech.connector.domain.Connector
 import com.cosmotech.connector.domain.IoTypesEnum
 import com.cosmotech.dataset.DatasetApiServiceInterface
-import com.cosmotech.dataset.domain.Dataset
-import com.cosmotech.dataset.domain.DatasetAccessControl
-import com.cosmotech.dataset.domain.DatasetConnector
-import com.cosmotech.dataset.domain.DatasetSecurity
-import com.cosmotech.dataset.domain.IngestionStatusEnum
-import com.cosmotech.dataset.domain.SubDatasetGraphQuery
-import com.cosmotech.dataset.domain.TwincacheStatusEnum
+import com.cosmotech.dataset.domain.*
 import com.cosmotech.dataset.repository.DatasetRepository
 import com.cosmotech.dataset.service.getRbac
 import com.cosmotech.organization.OrganizationApiServiceInterface
@@ -161,6 +155,7 @@ class ScenarioServiceIntegrationTest : CsmRedisTestBase() {
         makeWorkspaceEventHubInfo(false)
 
     rediSearchIndexer.createIndexFor(Organization::class.java)
+    rediSearchIndexer.createIndexFor(Connector::class.java)
     rediSearchIndexer.createIndexFor(Dataset::class.java)
     rediSearchIndexer.createIndexFor(Solution::class.java)
     rediSearchIndexer.createIndexFor(Workspace::class.java)
@@ -1113,13 +1108,15 @@ class ScenarioServiceIntegrationTest : CsmRedisTestBase() {
   fun makeDataset(
       organizationId: String = organizationSaved.id!!,
       name: String = "name",
-      connector: Connector = connectorSaved
+      connector: Connector = connectorSaved,
+      sourceType: DatasetSourceType = DatasetSourceType.Twincache
   ): Dataset {
     return Dataset(
         name = name,
         organizationId = organizationId,
         creationDate = Instant.now().toEpochMilli(),
         ownerId = "ownerId",
+        sourceType = sourceType,
         connector =
             DatasetConnector(
                 id = connector.id,

scenario/src/integrationTest/kotlin/com/cosmotech/scenario/service/ScenarioServiceRBACTest.kt

@@ -28,11 +28,7 @@ import com.cosmotech.connector.api.ConnectorApiService
 import com.cosmotech.connector.domain.Connector
 import com.cosmotech.connector.domain.IoTypesEnum
 import com.cosmotech.dataset.api.DatasetApiService
-import com.cosmotech.dataset.domain.Dataset
-import com.cosmotech.dataset.domain.DatasetAccessControl
-import com.cosmotech.dataset.domain.DatasetConnector
-import com.cosmotech.dataset.domain.DatasetSecurity
-import com.cosmotech.dataset.domain.IngestionStatusEnum
+import com.cosmotech.dataset.domain.*
 import com.cosmotech.dataset.repository.DatasetRepository
 import com.cosmotech.organization.api.OrganizationApiService
 import com.cosmotech.organization.domain.Organization
@@ -131,6 +127,7 @@ class ScenarioServiceRBACTest : CsmRedisTestBase() {
     rediSearchIndexer.createIndexFor(Dataset::class.java)
     rediSearchIndexer.createIndexFor(Workspace::class.java)
     rediSearchIndexer.createIndexFor(Scenario::class.java)
+    rediSearchIndexer.createIndexFor(Connector::class.java)
 
     val context = getContext(redisStackServer)
     val containerIp =
@@ -7083,12 +7080,19 @@ class ScenarioServiceRBACTest : CsmRedisTestBase() {
         ioTypes = listOf(IoTypesEnum.read))
   }
 
-  fun makeDataset(organizationId: String, connector: Connector, id: String, role: String): Dataset {
+  fun makeDataset(
+      organizationId: String,
+      connector: Connector,
+      id: String,
+      role: String,
+      sourceType: DatasetSourceType = DatasetSourceType.Twincache
+  ): Dataset {
     return Dataset(
         name = "Dataset",
         organizationId = organizationId,
         ownerId = "ownerId",
         ingestionStatus = IngestionStatusEnum.SUCCESS,
+        sourceType = sourceType,
         connector =
             DatasetConnector(
                 id = connector.id,

scenario/src/integrationTest/resources/application-scenario-test.yml

@@ -145,6 +145,7 @@ csm:
       username: "default"
       # Leave it as blank as there's no auth with test container
       password:
+      useGraphModule: true
       scenario:
         default-page-size: 20
     internalResultServices:

scenariorun/src/integrationTest/resources/application-scenariorun-test.yml

@@ -147,6 +147,7 @@ csm:
       username: "default"
       # Leave it as blank as there's no auth with test container
       password:
+      useGraphModule: true
       scenariorun:
         default-page-size: 20
     rbac: