diff --git a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt index e47da11ff..cc75ebbf3 100644 --- a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt +++ b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt @@ -157,12 +157,12 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest() organizationSaved = organizationApiService.createOrganization(organization) dataset = makeDatasetWithRole() - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) dataset2 = makeDataset() solution = makeSolution() - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) workspace = makeWorkspace() - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace) } @AfterEach @@ -174,36 +174,35 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { fun `test Dataset CRUD`() { organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) - val registeredDataset2 = datasetApiService.createDataset(organizationSaved.id!!, dataset2) + val registeredDataset2 = datasetApiService.createDataset(organizationSaved.id, dataset2) logger.info("Fetch dataset : ${datasetSaved.id}...") - retrievedDataset1 = datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + retrievedDataset1 = datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) assertNotNull(retrievedDataset1) logger.info("Fetch all datasets...") - var datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + var datasetList = datasetApiService.findAllDatasets(organizationSaved.id, null, null) for (item in datasetList) { logger.warn(item.id) } assertTrue { datasetList.size == 2 } logger.info("Delete Dataset : ${registeredDataset2.id}...") - datasetApiService.deleteDataset(organizationSaved.id!!, registeredDataset2.id!!) - datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + datasetApiService.deleteDataset(organizationSaved.id, registeredDataset2.id!!) + datasetList = datasetApiService.findAllDatasets(organizationSaved.id, null, null) assertTrue { datasetList.size == 1 } } @Test fun `test Dataset - findByOrganizationIdAndDatasetId`() { organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) logger.info("Fetch dataset...") val datasetRetrieved = - datasetApiService.findByOrganizationIdAndDatasetId( - organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.findByOrganizationIdAndDatasetId(organizationSaved.id, datasetSaved.id!!) assertNotNull(datasetRetrieved) assertEquals(datasetSaved, datasetRetrieved) } @@ -211,11 +210,11 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test Dataset - findByOrganizationIdAndDatasetId wrong dataset id`() { organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) logger.info("Fetch dataset...") val datasetRetrieved = - datasetApiService.findByOrganizationIdAndDatasetId(organizationSaved.id!!, "wrong_id") + datasetApiService.findByOrganizationIdAndDatasetId(organizationSaved.id, "wrong_id") assertNull(datasetRetrieved) } @@ -224,18 +223,18 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Register dataset : ${dataset.id}...") organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) assertNotNull(datasetSaved) logger.info("Change current user...") every { getCurrentAccountIdentifier(any()) } returns "test.user.admin@cosmotech.com" every { getCurrentAuthenticatedUserName(csmPlatformProperties) } returns "test.admin" every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_PLATFORM_ADMIN) assertNotNull(datasetSaved.id) - datasetSaved.id?.let { datasetApiService.deleteDataset(organizationSaved.id!!, it) } + datasetSaved.id?.let { datasetApiService.deleteDataset(organizationSaved.id, it) } logger.info("Fetch dataset : ${datasetSaved.id}...") assertThrows { - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) } } @@ -244,7 +243,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Register dataset : ${dataset.id}...") organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) assertNotNull(datasetSaved) logger.info("Change current user...") every { getCurrentAccountIdentifier(any()) } returns "test.user.other@cosmotech.com" @@ -252,7 +251,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_ORGANIZATION_USER) assertNotNull(datasetSaved.id) assertThrows { - datasetSaved.id?.let { datasetApiService.deleteDataset(organizationSaved.id!!, it) } + datasetSaved.id?.let { datasetApiService.deleteDataset(organizationSaved.id, it) } } } @@ -261,7 +260,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Register dataset : ${dataset.id}...") organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) assertNotNull(datasetSaved) logger.info("Change current user...") every { getCurrentAccountIdentifier(any()) } returns "test.user.admin@cosmotech.com" @@ -269,13 +268,10 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_PLATFORM_ADMIN) assertNotNull(datasetSaved.id) datasetSaved.ownerId = "new_owner_id" - datasetSaved.id?.let { - datasetApiService.updateDataset(organizationSaved.id!!, it, datasetSaved) - } + datasetSaved.id?.let { datasetApiService.updateDataset(organizationSaved.id, it, datasetSaved) } logger.info("Fetch dataset : ${datasetSaved.id}...") - val datasetUpdated = - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + val datasetUpdated = datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) assertEquals("new_owner_id", datasetUpdated.ownerId) } @@ -284,7 +280,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Register dataset : ${dataset.id}...") organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) assertNotNull(datasetSaved) logger.info("Change current user...") every { getCurrentAccountIdentifier(any()) } returns "test.user.admin@cosmotech.com" @@ -294,7 +290,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { datasetSaved.ownerId = "new_owner_id" assertThrows { datasetSaved.id?.let { - datasetApiService.updateDataset(organizationSaved.id!!, it, datasetSaved) + datasetApiService.updateDataset(organizationSaved.id, it, datasetSaved) } } } @@ -306,12 +302,12 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Search Datasets...") val datasetList = datasetApiService.searchDatasets( - organizationSaved.id!!, DatasetSearch(mutableListOf("data")), null, null) + organizationSaved.id, DatasetSearch(mutableListOf("data")), null, null) assertTrue { datasetList.size == 2 } logger.info("Update Dataset : ${datasetSaved.id}...") val retrievedDataset1 = - datasetApiService.updateDataset(organizationSaved.id!!, datasetSaved.id!!, dataset2) + datasetApiService.updateDataset(organizationSaved.id, datasetSaved.id!!, dataset2) assertNotEquals(retrievedDataset1, datasetSaved) } @@ -319,7 +315,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Add Dataset Compatibility elements...") var datasetCompatibilityList = datasetApiService.addOrReplaceDatasetCompatibilityElements( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, datasetCompatibility = listOf( @@ -328,10 +324,9 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { assertFalse { datasetCompatibilityList.isEmpty() } logger.info("Remove all Dataset Compatibility elements from dataset : ${datasetSaved.id!!}...") - datasetApiService.removeAllDatasetCompatibilityElements( - organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.removeAllDatasetCompatibilityElements(organizationSaved.id, datasetSaved.id!!) datasetCompatibilityList = - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!).compatibility!! + datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!).compatibility!! assertTrue { datasetCompatibilityList.isEmpty() } } @@ -343,7 +338,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { val expectedPageSize = 15 IntRange(1, numberOfDatasets).forEach { datasetApiService.createDataset( - organizationSaved.id!!, makeDataset("d-dataset-$it", "dataset-$it")) + organizationSaved.id, makeDataset("d-dataset-$it", "dataset-$it")) } logger.info("Change current user...") every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER @@ -351,19 +346,19 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_PLATFORM_ADMIN) logger.info("should find all datasets and assert there are $numberOfDatasets") - var datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + var datasetList = datasetApiService.findAllDatasets(organizationSaved.id, null, null) assertEquals(numberOfDatasets, datasetList.size) logger.info("should find all datasets and assert it equals defaultPageSize: $defaultPageSize") - datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 0, null) + datasetList = datasetApiService.findAllDatasets(organizationSaved.id, 0, null) assertEquals(defaultPageSize, datasetList.size) logger.info("should find all datasets and assert there are expected size: $expectedPageSize") - datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 0, expectedPageSize) + datasetList = datasetApiService.findAllDatasets(organizationSaved.id, 0, expectedPageSize) assertEquals(expectedPageSize, datasetList.size) logger.info("should find all solutions and assert it returns the second / last page") - datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 1, expectedPageSize) + datasetList = datasetApiService.findAllDatasets(organizationSaved.id, 1, expectedPageSize) assertEquals(numberOfDatasets - expectedPageSize, datasetList.size) } @@ -375,26 +370,26 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { val expectedSize = 15 IntRange(1, numberOfDatasets).forEach { datasetApiService.createDataset( - organizationSaved.id!!, + organizationSaved.id, makeDatasetWithRole( organizationId = "d-dataset-$it", parentId = "dataset-$it", userName = "ANOTHER_USER")) } logger.info("should find all datasets and assert there are $numberOfDatasets") - var datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + var datasetList = datasetApiService.findAllDatasets(organizationSaved.id, null, null) assertEquals(0, datasetList.size) logger.info("should find all datasets and assert it equals defaultPageSize: $defaultPageSize") - datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 0, null) + datasetList = datasetApiService.findAllDatasets(organizationSaved.id, 0, null) assertEquals(0, datasetList.size) logger.info("should find all datasets and assert there are expected size: $expectedSize") - datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 0, expectedSize) + datasetList = datasetApiService.findAllDatasets(organizationSaved.id, 0, expectedSize) assertEquals(0, datasetList.size) logger.info("should find all solutions and assert it returns the second / last page") - datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 1, expectedSize) + datasetList = datasetApiService.findAllDatasets(organizationSaved.id, 1, expectedSize) assertEquals(0, datasetList.size) } @@ -406,9 +401,9 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { val numberOfDatasets = 200 IntRange(1, numberOfDatasets).forEach { datasetApiService.createDataset( - organizationSaved.id!!, + organizationSaved.id, makeDatasetWithRole( - organizationId = organizationSaved.id!!, userName = "unknown_user@test.com")) + organizationId = organizationSaved.id, userName = "unknown_user@test.com")) } // Explicitly set connected user information @@ -417,7 +412,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_ORGANIZATION_USER) logger.info("should not find a dataset because of lake of permission") - var datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + var datasetList = datasetApiService.findAllDatasets(organizationSaved.id, null, null) assertEquals(0, datasetList.size) // Create a dataset that current user should not see because it has been created under another @@ -425,17 +420,17 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { val newOrganization = organizationApiService.createOrganization(makeOrganizationCreateRequest()) val datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization = datasetApiService.createDataset( - newOrganization.id!!, makeDatasetWithRole(organizationId = newOrganization.id!!)) + newOrganization.id, makeDatasetWithRole(organizationId = newOrganization.id)) assertNotNull(datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization) logger.info( "should not find a dataset because:" + " one was created with no permission assigned " + " one was created in another organization") - datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + datasetList = datasetApiService.findAllDatasets(organizationSaved.id, null, null) assertEquals(0, datasetList.size) logger.info("should find only one dataset") - datasetList = datasetApiService.findAllDatasets(newOrganization.id!!, null, null) + datasetList = datasetApiService.findAllDatasets(newOrganization.id, null, null) assertEquals(1, datasetList.size) assertEquals(datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization, datasetList[0]) } @@ -448,9 +443,9 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { val numberOfDatasets = 20 IntRange(1, numberOfDatasets).forEach { datasetApiService.createDataset( - organizationSaved.id!!, + organizationSaved.id, makeDatasetWithRole( - organizationId = organizationSaved.id!!, userName = "unknown_user@test.com")) + organizationId = organizationSaved.id, userName = "unknown_user@test.com")) } // Explicitly set connected user information @@ -459,7 +454,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_PLATFORM_ADMIN) logger.info("should find all datasets because of admin permission") - var datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + var datasetList = datasetApiService.findAllDatasets(organizationSaved.id, null, null) assertEquals(numberOfDatasets, datasetList.size) // Create a dataset that current user should not see because it has been created under another @@ -467,14 +462,14 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { val newOrganization = organizationApiService.createOrganization(makeOrganizationCreateRequest()) val datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization = datasetApiService.createDataset( - newOrganization.id!!, makeDatasetWithRole(organizationId = newOrganization.id!!)) + newOrganization.id, makeDatasetWithRole(organizationId = newOrganization.id)) assertNotNull(datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization) logger.info("should not find the new dataset because it was created in another organization") - datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + datasetList = datasetApiService.findAllDatasets(organizationSaved.id, null, null) assertEquals(numberOfDatasets, datasetList.size) logger.info("should find only one dataset") - datasetList = datasetApiService.findAllDatasets(newOrganization.id!!, null, null) + datasetList = datasetApiService.findAllDatasets(newOrganization.id, null, null) assertEquals(1, datasetList.size) assertEquals(datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization, datasetList[0]) } @@ -482,21 +477,21 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test find All Datasets with wrong pagination params`() { organizationSaved = organizationApiService.createOrganization(organization) - datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetApiService.createDataset(organizationSaved.id, dataset) logger.info("Should throw IllegalArgumentException when page and size are zeros") assertThrows { - datasetApiService.findAllDatasets(organizationSaved.id!!, 0, 0) + datasetApiService.findAllDatasets(organizationSaved.id, 0, 0) } logger.info("Should throw IllegalArgumentException when page is negative") assertThrows { - datasetApiService.findAllDatasets(organizationSaved.id!!, -1, 10) + datasetApiService.findAllDatasets(organizationSaved.id, -1, 10) } logger.info("Should throw IllegalArgumentException when size is negative") assertThrows { - datasetApiService.findAllDatasets(organizationSaved.id!!, 0, -1) + datasetApiService.findAllDatasets(organizationSaved.id, 0, -1) } } @@ -509,14 +504,12 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { val resource = ByteArrayResource(File(file!!).readBytes()) organizationSaved = organizationApiService.createOrganization(organization) dataset = makeDatasetWithRole() - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetApiService.updateDataset( - organizationSaved.id!!, - datasetSaved.id!!, - dataset.copy(sourceType = DatasetSourceType.File)) + organizationSaved.id, datasetSaved.id!!, dataset.copy(sourceType = DatasetSourceType.File)) val fileUploadValidation = - datasetApiService.uploadTwingraph(organizationSaved.id!!, datasetSaved.id!!, resource) + datasetApiService.uploadTwingraph(organizationSaved.id, datasetSaved.id!!, resource) assertEquals( FileUploadValidation( mutableListOf( @@ -533,18 +526,18 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { // add timout for while loop val timeout = Instant.now() - while (datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!) != + while (datasetApiService.getDatasetTwingraphStatus(organizationSaved.id, datasetSaved.id!!) != IngestionStatusEnum.SUCCESS.value) { if (Instant.now().minusSeconds(10).isAfter(timeout)) { throw Exception("Timeout while waiting for dataset twingraph to be ready") } Thread.sleep(500) } - datasetSaved = datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + datasetSaved = datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) do { Thread.sleep(50L) val datasetStatus = - datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetTwingraphStatus(organizationSaved.id, datasetSaved.id!!) } while (datasetStatus == IngestionStatusEnum.PENDING.value) assertEquals(12, countEntities(datasetSaved.twingraphId!!, "MATCH (n) RETURN count(n)")) assertEquals(5, countEntities(datasetSaved.twingraphId!!, "MATCH ()-[r]-() RETURN count(r)")) @@ -557,11 +550,11 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { ) val subDataset = datasetApiService.createSubDataset( - organizationSaved.id!!, datasetSaved.id!!, subDatasetParams) + organizationSaved.id, datasetSaved.id!!, subDatasetParams) do { Thread.sleep(50L) val datasetStatus = - datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, subDataset.id!!) + datasetApiService.getDatasetTwingraphStatus(organizationSaved.id, subDataset.id!!) } while (datasetStatus == IngestionStatusEnum.PENDING.value) assertEquals("subDataset", subDataset.name) @@ -578,12 +571,12 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { val subDatasetWithQuery = datasetApiService.createSubDataset( - organizationSaved.id!!, datasetSaved.id!!, subDatasetParamsQuery) + organizationSaved.id, datasetSaved.id!!, subDatasetParamsQuery) do { Thread.sleep(50L) val datasetStatus = datasetApiService.getDatasetTwingraphStatus( - organizationSaved.id!!, subDatasetWithQuery.id!!) + organizationSaved.id, subDatasetWithQuery.id!!) } while (datasetStatus == IngestionStatusEnum.PENDING.value) assertEquals("subDatasetWithQuery", subDatasetWithQuery.name) @@ -603,10 +596,10 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Create Nodes") organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) val nodeStart = datasetApiService.createTwingraphEntities( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, "node", listOf( @@ -625,13 +618,13 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Read Nodes") var nodeResult = datasetApiService.getTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("node_a", "node_b")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("node_a", "node_b")) assertEquals(nodeStart, nodeResult) logger.info("Create Relationships") val relationshipStart = datasetApiService.createTwingraphEntities( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, "relationship", listOf( @@ -646,13 +639,13 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Read Relationships") var relationshipResult = datasetApiService.getTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "relationship", listOf("relationship_a")) + organizationSaved.id, datasetSaved.id!!, "relationship", listOf("relationship_a")) assertEquals(relationshipStart, relationshipResult) logger.info("Update Nodes") nodeResult = datasetApiService.updateTwingraphEntities( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, "node", listOf( @@ -665,7 +658,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Update Relationships") relationshipResult = datasetApiService.updateTwingraphEntities( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, "relationship", listOf( @@ -679,40 +672,40 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { logger.info("Delete Relationships") datasetApiService.deleteTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("relationship_a")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("relationship_a")) assertDoesNotThrow { datasetApiService.getTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("relationship_a")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("relationship_a")) } logger.info("Delete Nodes") datasetApiService.deleteTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "relationship", listOf("node_a")) + organizationSaved.id, datasetSaved.id!!, "relationship", listOf("node_a")) assertDoesNotThrow { datasetApiService.getTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "relationship", listOf("node_a")) + organizationSaved.id, datasetSaved.id!!, "relationship", listOf("node_a")) } } @Test fun `test get security endpoint`() { organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) // should return the current security val datasetSecurity = - datasetApiService.getDatasetSecurity(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetSecurity(organizationSaved.id, datasetSaved.id!!) assertEquals(datasetSaved.security, datasetSecurity) } @Test fun `test set default security endpoint`() { organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) // should update the default security and assert it worked val datasetDefaultSecurity = datasetApiService.setDatasetDefaultSecurity( - organizationSaved.id!!, datasetSaved.id!!, DatasetRole(ROLE_VIEWER)) - datasetSaved = datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!, DatasetRole(ROLE_VIEWER)) + datasetSaved = datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) assertEquals(datasetSaved.security!!, datasetDefaultSecurity) } @@ -720,23 +713,22 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { fun `test uploadTwingraph status`() { organizationSaved = organizationApiService.createOrganization(organization) dataset.apply { sourceType = DatasetSourceType.File } - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) val file = this::class.java.getResource("/integrationTest.zip")?.file val resource = ByteArrayResource(File(file!!).readBytes()) - datasetApiService.uploadTwingraph(organizationSaved.id!!, datasetSaved.id!!, resource) + datasetApiService.uploadTwingraph(organizationSaved.id, datasetSaved.id!!, resource) var datasetStatus: String do { Thread.sleep(50L) datasetStatus = - datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetTwingraphStatus(organizationSaved.id, datasetSaved.id!!) } while (datasetStatus == IngestionStatusEnum.PENDING.value) assertEquals(IngestionStatusEnum.SUCCESS.value, datasetStatus) - val modifiedDataset = - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + val modifiedDataset = datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) assertEquals(IngestionStatusEnum.SUCCESS.value, modifiedDataset.ingestionStatus!!.value) assertEquals(TwincacheStatusEnum.FULL.value, modifiedDataset.twincacheStatus!!.value) } @@ -745,23 +737,22 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { fun `test uploadTwingraph fail set dataset status to error`() { organizationSaved = organizationApiService.createOrganization(organization) dataset.apply { sourceType = DatasetSourceType.File } - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) val file = this::class.java.getResource("/brokenGraph.zip")?.file val resource = ByteArrayResource(File(file!!).readBytes()) - datasetApiService.uploadTwingraph(organizationSaved.id!!, datasetSaved.id!!, resource) + datasetApiService.uploadTwingraph(organizationSaved.id, datasetSaved.id!!, resource) var datasetStatus: String do { Thread.sleep(50L) datasetStatus = - datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetTwingraphStatus(organizationSaved.id, datasetSaved.id!!) } while (datasetStatus == IngestionStatusEnum.PENDING.value) assertEquals(IngestionStatusEnum.ERROR.value, datasetStatus) - val modifiedDataset = - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + val modifiedDataset = datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) assertEquals(IngestionStatusEnum.ERROR.value, modifiedDataset.ingestionStatus!!.value) assertEquals(TwincacheStatusEnum.EMPTY.value, modifiedDataset.twincacheStatus!!.value) } @@ -782,7 +773,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { DatasetAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN), DatasetAccessControl(CONNECTED_ADMIN_USER, ROLE_EDITOR)))) assertThrows { - datasetApiService.createDataset(organizationSaved.id!!, brokenDataset) + datasetApiService.createDataset(organizationSaved.id, brokenDataset) } } @@ -791,11 +782,11 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { connectorSaved = connectorApiService.registerConnector(makeConnector()) organizationSaved = organizationApiService.createOrganization(makeOrganizationCreateRequest()) val workingDataset = makeDatasetWithRole("dataset", sourceType = DatasetSourceType.None) - val datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, workingDataset) + val datasetSaved = datasetApiService.createDataset(organizationSaved.id, workingDataset) assertThrows { datasetApiService.addDatasetAccessControl( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, DatasetAccessControl(CONNECTED_ADMIN_USER, ROLE_EDITOR)) } @@ -805,35 +796,35 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { fun `reupload a twingraph in dataset with source type File`() { organizationSaved = organizationApiService.createOrganization(organization) dataset.apply { sourceType = DatasetSourceType.File } - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) val fileName = this::class.java.getResource("/integrationTest.zip")?.file val file = File(fileName!!) val resource = ByteArrayResource(file.readBytes()) - datasetApiService.uploadTwingraph(organizationSaved.id!!, datasetSaved.id!!, resource) + datasetApiService.uploadTwingraph(organizationSaved.id, datasetSaved.id!!, resource) do { Thread.sleep(50L) - } while (datasetApiService.getDatasetTwingraphStatus( - organizationSaved.id!!, datasetSaved.id!!) == IngestionStatusEnum.PENDING.value) + } while (datasetApiService.getDatasetTwingraphStatus(organizationSaved.id, datasetSaved.id!!) == + IngestionStatusEnum.PENDING.value) datasetApiService.createTwingraphEntities( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, "node", listOf(GraphProperties(type = "Node", name = "newNode", params = "value:0"))) val queryResult = datasetApiService.twingraphQuery( - organizationSaved.id!!, datasetSaved.id!!, DatasetTwinGraphQuery("MATCH (n) RETURN n")) + organizationSaved.id, datasetSaved.id!!, DatasetTwinGraphQuery("MATCH (n) RETURN n")) - datasetApiService.uploadTwingraph(organizationSaved.id!!, datasetSaved.id!!, resource) + datasetApiService.uploadTwingraph(organizationSaved.id, datasetSaved.id!!, resource) do { Thread.sleep(50L) - } while (datasetApiService.getDatasetTwingraphStatus( - organizationSaved.id!!, datasetSaved.id!!) == IngestionStatusEnum.PENDING.value) + } while (datasetApiService.getDatasetTwingraphStatus(organizationSaved.id, datasetSaved.id!!) == + IngestionStatusEnum.PENDING.value) val secondQueryResult = datasetApiService.twingraphQuery( - organizationSaved.id!!, datasetSaved.id!!, DatasetTwinGraphQuery("MATCH (n) RETURN n")) + organizationSaved.id, datasetSaved.id!!, DatasetTwinGraphQuery("MATCH (n) RETURN n")) assertNotEquals(queryResult.size, secondQueryResult.size) } @@ -841,13 +832,13 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `rollback endpoint call should fail if status is not ERROR`() { organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save(datasetSaved.apply { ingestionStatus = IngestionStatusEnum.NONE }) var exception = assertThrows { - datasetApiService.rollbackRefresh(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.rollbackRefresh(organizationSaved.id, datasetSaved.id!!) } assertEquals("The dataset hasn't failed and can't be rolled back", exception.message) @@ -855,7 +846,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { datasetRepository.save(datasetSaved.apply { ingestionStatus = IngestionStatusEnum.PENDING }) exception = assertThrows { - datasetApiService.rollbackRefresh(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.rollbackRefresh(organizationSaved.id, datasetSaved.id!!) } assertEquals("The dataset hasn't failed and can't be rolled back", exception.message) @@ -863,7 +854,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { datasetRepository.save(datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) exception = assertThrows { - datasetApiService.rollbackRefresh(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.rollbackRefresh(organizationSaved.id, datasetSaved.id!!) } assertEquals("The dataset hasn't failed and can't be rolled back", exception.message) } @@ -874,28 +865,28 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest("organization") organizationSaved = organizationApiService.createOrganization(organization) dataset = makeDatasetWithRole(sourceType = DatasetSourceType.File) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetRepository.save(datasetSaved.apply { ingestionStatus = IngestionStatusEnum.ERROR }) - datasetApiService.rollbackRefresh(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.rollbackRefresh(organizationSaved.id, datasetSaved.id!!) var datasetStatus = - datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetTwingraphStatus(organizationSaved.id, datasetSaved.id!!) assertEquals(IngestionStatusEnum.NONE.value, datasetStatus) every { datasetApiService.query(any(), any()) } returns mockk() val fileName = this::class.java.getResource("/integrationTest.zip")?.file val file = File(fileName!!) val resource = ByteArrayResource(file.readBytes()) - datasetApiService.uploadTwingraph(organizationSaved.id!!, datasetSaved.id!!, resource) + datasetApiService.uploadTwingraph(organizationSaved.id, datasetSaved.id!!, resource) do { Thread.sleep(50L) datasetStatus = - datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetTwingraphStatus(organizationSaved.id, datasetSaved.id!!) } while (datasetStatus == IngestionStatusEnum.PENDING.value) datasetRepository.save(datasetSaved.apply { ingestionStatus = IngestionStatusEnum.ERROR }) - datasetApiService.rollbackRefresh(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.rollbackRefresh(organizationSaved.id, datasetSaved.id!!) datasetStatus = - datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetTwingraphStatus(organizationSaved.id, datasetSaved.id!!) assertEquals(IngestionStatusEnum.NONE.value, datasetStatus) } @@ -916,10 +907,10 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { makeOrganizationCreateRequest("organization")) val parentDataset = datasetApiService.createDataset( - organizationSaved.id!!, makeDatasetWithRole(sourceType = sourceType)) + organizationSaved.id, makeDatasetWithRole(sourceType = sourceType)) datasetSaved = datasetApiService.createDataset( - organizationSaved.id!!, + organizationSaved.id, makeDatasetWithRole(parentId = parentDataset.id!!, sourceType = sourceType)) every { eventPublisher.publishEvent(any()) } answers @@ -929,12 +920,12 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.refreshDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.refreshDataset(organizationSaved.id, datasetSaved.id!!) } assertEquals("Cannot be applied to source type '$sourceType'", exception.message) } else { assertDoesNotThrow { - datasetApiService.refreshDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.refreshDataset(organizationSaved.id, datasetSaved.id!!) } } } @@ -946,15 +937,15 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { assertNull( datasetApiService - .findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + .findDatasetById(organizationSaved.id, datasetSaved.id!!) .linkedWorkspaceIdList) - datasetApiService.linkWorkspace(organizationSaved.id!!, datasetSaved.id!!, workspaceSaved.id!!) + datasetApiService.linkWorkspace(organizationSaved.id, datasetSaved.id!!, workspaceSaved.id!!) val workspaceIds = listOf(workspaceSaved.id!!) checkLinkedWorkspaceId(workspaceIds) - datasetApiService.linkWorkspace(organizationSaved.id!!, datasetSaved.id!!, workspaceSaved.id!!) + datasetApiService.linkWorkspace(organizationSaved.id, datasetSaved.id!!, workspaceSaved.id!!) checkLinkedWorkspaceId(workspaceIds) } @@ -962,14 +953,14 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { private fun checkLinkedWorkspaceId(workspaceIds: List) { assertEquals( datasetApiService - .findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + .findDatasetById(organizationSaved.id, datasetSaved.id!!) .linkedWorkspaceIdList!! .size, workspaceIds.size) assertEquals( datasetApiService - .findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + .findDatasetById(organizationSaved.id, datasetSaved.id!!) .linkedWorkspaceIdList!!, workspaceIds) } @@ -979,17 +970,16 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { assertNull( datasetApiService - .findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + .findDatasetById(organizationSaved.id, datasetSaved.id!!) .linkedWorkspaceIdList) - datasetApiService.linkWorkspace(organizationSaved.id!!, datasetSaved.id!!, workspaceSaved.id!!) + datasetApiService.linkWorkspace(organizationSaved.id, datasetSaved.id!!, workspaceSaved.id!!) - datasetApiService.unlinkWorkspace( - organizationSaved.id!!, datasetSaved.id!!, workspaceSaved.id!!) + datasetApiService.unlinkWorkspace(organizationSaved.id, datasetSaved.id!!, workspaceSaved.id!!) assertEquals( datasetApiService - .findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + .findDatasetById(organizationSaved.id, datasetSaved.id!!) .linkedWorkspaceIdList!! .size, 0) @@ -1000,33 +990,32 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { assertNull( datasetApiService - .findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + .findDatasetById(organizationSaved.id, datasetSaved.id!!) .linkedWorkspaceIdList) assertNull( workspaceApiService - .findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + .findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) .linkedDatasetIdList) - datasetApiService.unlinkWorkspace( - organizationSaved.id!!, datasetSaved.id!!, workspaceSaved.id!!) + datasetApiService.unlinkWorkspace(organizationSaved.id, datasetSaved.id!!, workspaceSaved.id!!) assertNull( datasetApiService - .findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + .findDatasetById(organizationSaved.id, datasetSaved.id!!) .linkedWorkspaceIdList) assertNull( workspaceApiService - .findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + .findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) .linkedDatasetIdList) } @Test fun `getConnector return same connector`() { val dataset = makeDatasetWithRole() - val dataset1 = datasetApiService.createDataset(organizationSaved.id!!, dataset) - val dataset2 = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset1 = datasetApiService.createDataset(organizationSaved.id, dataset) + val dataset2 = datasetApiService.createDataset(organizationSaved.id, dataset) assertEquals(dataset1.connector!!.id, dataset2.connector!!.id) } @@ -1034,9 +1023,9 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `As viewer, I can only see my information in security property for findDatasetById`() { dataset = makeDatasetWithRole(role = ROLE_VIEWER) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) - datasetSaved = datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + datasetSaved = datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) assertEquals( DatasetSecurity( default = ROLE_NONE, mutableListOf(DatasetAccessControl(TEST_USER_MAIL, ROLE_VIEWER))), @@ -1047,12 +1036,12 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `As viewer, I can only see my information in security property for findAllDatasets`() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER - datasetApiService.deleteDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.deleteDataset(organizationSaved.id, datasetSaved.id!!) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL dataset = makeDatasetWithRole(role = ROLE_VIEWER) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) - val datasets = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + val datasets = datasetApiService.findAllDatasets(organizationSaved.id, null, null) datasets.forEach { assertEquals( DatasetSecurity( @@ -1066,14 +1055,14 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `As viewer, I can only see my information in security property for searchDatasets`() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER - datasetApiService.deleteDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.deleteDataset(organizationSaved.id, datasetSaved.id!!) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL dataset = makeDatasetWithRole(role = ROLE_VIEWER) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) val datasets = datasetApiService.searchDatasets( - organizationSaved.id!!, DatasetSearch(mutableListOf("dataset")), 0, 10) + organizationSaved.id, DatasetSearch(mutableListOf("dataset")), 0, 10) datasets.forEach { assertEquals( DatasetSecurity( @@ -1110,7 +1099,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { } fun makeDataset( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, parentId: String = "", sourceType: DatasetSourceType = DatasetSourceType.Twincache ): Dataset { @@ -1128,7 +1117,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { } fun makeDatasetWithRole( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, parentId: String = "", userName: String = TEST_USER_MAIL, role: String = ROLE_ADMIN, @@ -1155,7 +1144,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { } fun makeSolution( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, userName: String = TEST_USER_MAIL, role: String = ROLE_EDITOR ): Solution { @@ -1175,7 +1164,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { } fun makeWorkspace( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, solutionId: String = solutionSaved.id!!, name: String = "name", userName: String = TEST_USER_MAIL, diff --git a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceRBACTest.kt b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceRBACTest.kt index 8490ac1c1..91fbdba43 100644 --- a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceRBACTest.kt +++ b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceRBACTest.kt @@ -162,7 +162,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() datasetRepository.save( datasetSaved.apply { datasetSaved.ingestionStatus = IngestionStatusEnum.ERROR }) @@ -172,14 +172,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.rollbackRefresh(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.rollbackRefresh(organizationSaved.id, datasetSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.rollbackRefresh(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.rollbackRefresh(organizationSaved.id, datasetSaved.id!!) } } } @@ -201,7 +201,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() datasetRepository.save( datasetSaved.apply { datasetSaved.ingestionStatus = IngestionStatusEnum.ERROR }) @@ -211,14 +211,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.rollbackRefresh(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.rollbackRefresh(organizationSaved.id, datasetSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_WRITE", exception.message) } else { assertDoesNotThrow { - datasetApiService.rollbackRefresh(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.rollbackRefresh(organizationSaved.id, datasetSaved.id!!) } } } @@ -240,7 +240,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetTwinGraphQuery = DatasetTwinGraphQuery("MATCH (n) RETURN n") @@ -252,18 +252,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.twingraphBatchUpdate( - organizationSaved.id!!, - datasetSaved.id!!, - datasetTwinGraphQuery, - resource) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery, resource) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.twingraphBatchUpdate( - organizationSaved.id!!, datasetSaved.id!!, datasetTwinGraphQuery, resource) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery, resource) } } } @@ -285,7 +282,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetTwinGraphQuery = DatasetTwinGraphQuery("MATCH (n) RETURN n") @@ -297,10 +294,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.twingraphBatchUpdate( - organizationSaved.id!!, - datasetSaved.id!!, - datasetTwinGraphQuery, - resource) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery, resource) } if (role == ROLE_NONE) { assertEquals( @@ -314,7 +308,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.twingraphBatchUpdate( - organizationSaved.id!!, datasetSaved.id!!, datasetTwinGraphQuery, resource) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery, resource) } } } @@ -337,7 +331,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetCompatibility = DatasetCompatibility("") @@ -348,17 +342,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.addOrReplaceDatasetCompatibilityElements( - organizationSaved.id!!, - datasetSaved.id!!, - listOf(datasetCompatibility)) + organizationSaved.id, datasetSaved.id!!, listOf(datasetCompatibility)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.addOrReplaceDatasetCompatibilityElements( - organizationSaved.id!!, datasetSaved.id!!, listOf(datasetCompatibility)) + organizationSaved.id, datasetSaved.id!!, listOf(datasetCompatibility)) } } } @@ -381,7 +373,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetCompatibility = DatasetCompatibility("") @@ -392,9 +384,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.addOrReplaceDatasetCompatibilityElements( - organizationSaved.id!!, - datasetSaved.id!!, - listOf(datasetCompatibility)) + organizationSaved.id, datasetSaved.id!!, listOf(datasetCompatibility)) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_WRITE", @@ -402,7 +392,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.addOrReplaceDatasetCompatibilityElements( - organizationSaved.id!!, datasetSaved.id!!, listOf(datasetCompatibility)) + organizationSaved.id, datasetSaved.id!!, listOf(datasetCompatibility)) } } } @@ -430,14 +420,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetApiService.createDataset(organizationSaved.id, dataset) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_CREATE_CHILDREN", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_CREATE_CHILDREN", exception.message) } else { assertDoesNotThrow { - datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetApiService.createDataset(organizationSaved.id, dataset) } } } @@ -459,7 +449,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val subDatasetTwinGraphQuery = SubDatasetGraphQuery() @@ -470,15 +460,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.createSubDataset( - organizationSaved.id!!, datasetSaved.id!!, subDatasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, subDatasetTwinGraphQuery) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.createSubDataset( - organizationSaved.id!!, datasetSaved.id!!, subDatasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, subDatasetTwinGraphQuery) } } } @@ -500,7 +490,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val subDatasetTwinGraphQuery = SubDatasetGraphQuery() @@ -511,7 +501,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.createSubDataset( - organizationSaved.id!!, datasetSaved.id!!, subDatasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, subDatasetTwinGraphQuery) } if (role == ROLE_NONE) { assertEquals( @@ -525,7 +515,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.createSubDataset( - organizationSaved.id!!, datasetSaved.id!!, subDatasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, subDatasetTwinGraphQuery) } } } @@ -547,7 +537,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val graphProperties = @@ -559,18 +549,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.createTwingraphEntities( - organizationSaved.id!!, - datasetSaved.id!!, - "node", - listOf(graphProperties)) + organizationSaved.id, datasetSaved.id!!, "node", listOf(graphProperties)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.createTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf(graphProperties)) + organizationSaved.id, datasetSaved.id!!, "node", listOf(graphProperties)) } } } @@ -592,7 +579,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val graphProperties = @@ -604,10 +591,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.createTwingraphEntities( - organizationSaved.id!!, - datasetSaved.id!!, - "node", - listOf(graphProperties)) + organizationSaved.id, datasetSaved.id!!, "node", listOf(graphProperties)) } if (role == ROLE_NONE) { assertEquals( @@ -621,7 +605,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.createTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf(graphProperties)) + organizationSaved.id, datasetSaved.id!!, "node", listOf(graphProperties)) } } } @@ -643,7 +627,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -651,14 +635,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.deleteDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.deleteDataset(organizationSaved.id, datasetSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.deleteDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.deleteDataset(organizationSaved.id, datasetSaved.id!!) } } } @@ -680,7 +664,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -688,14 +672,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.deleteDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.deleteDataset(organizationSaved.id, datasetSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_DELETE", exception.message) } else { assertDoesNotThrow { - datasetApiService.deleteDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.deleteDataset(organizationSaved.id, datasetSaved.id!!) } } } @@ -717,7 +701,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -726,15 +710,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.deleteTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("")) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.deleteTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("")) } } } @@ -756,7 +740,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -765,7 +749,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.deleteTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("")) } if (role == ROLE_NONE) { assertEquals( @@ -779,7 +763,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.deleteTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("")) } } } @@ -801,7 +785,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole() - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -816,14 +800,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.downloadTwingraph(organizationSaved.id!!, "hash") + datasetApiService.downloadTwingraph(organizationSaved.id, "hash") } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.downloadTwingraph(organizationSaved.id!!, "hash") + datasetApiService.downloadTwingraph(organizationSaved.id, "hash") } } } @@ -845,7 +829,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole() - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -853,14 +837,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + datasetApiService.findAllDatasets(organizationSaved.id, null, null) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.findAllDatasets(organizationSaved.id!!, null, null) + datasetApiService.findAllDatasets(organizationSaved.id, null, null) } } } @@ -882,7 +866,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -890,14 +874,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) } } } @@ -919,7 +903,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -927,14 +911,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) } } } @@ -956,7 +940,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -965,15 +949,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.getDatasetTwingraphStatus( - organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.getDatasetTwingraphStatus( - organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!) } } } @@ -995,7 +979,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1004,7 +988,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.getDatasetTwingraphStatus( - organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -1012,7 +996,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.getDatasetTwingraphStatus( - organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!) } } } @@ -1034,7 +1018,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1043,15 +1027,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.getTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("")) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.getTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("")) } } } @@ -1073,7 +1057,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1082,7 +1066,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.getTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("")) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -1090,7 +1074,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.getTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf("")) + organizationSaved.id, datasetSaved.id!!, "node", listOf("")) } } } @@ -1113,13 +1097,12 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN, sourceType = DatasetSourceType.Twincache) - val datasetParentSaved = - datasetApiService.createDataset(organizationSaved.id!!, dataset) + val datasetParentSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetParentSaved materializeTwingraph() datasetSaved = datasetApiService.createSubDataset( - organizationSaved.id!!, datasetParentSaved.id!!, SubDatasetGraphQuery()) + organizationSaved.id, datasetParentSaved.id!!, SubDatasetGraphQuery()) advanceUntilIdle() every { eventPublisher.publishEvent(any()) } answers @@ -1131,14 +1114,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.refreshDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.refreshDataset(organizationSaved.id, datasetSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.refreshDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.refreshDataset(organizationSaved.id, datasetSaved.id!!) } } } @@ -1161,13 +1144,12 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role, sourceType = DatasetSourceType.Twincache) - val datasetParentSaved = - datasetApiService.createDataset(organizationSaved.id!!, dataset) + val datasetParentSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetParentSaved materializeTwingraph() datasetSaved = datasetApiService.createSubDataset( - organizationSaved.id!!, datasetParentSaved.id!!, SubDatasetGraphQuery()) + organizationSaved.id, datasetParentSaved.id!!, SubDatasetGraphQuery()) advanceUntilIdle() every { eventPublisher.publishEvent(any()) } answers @@ -1179,7 +1161,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - datasetApiService.refreshDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.refreshDataset(organizationSaved.id, datasetSaved.id!!) } if (role == ROLE_NONE) { assertEquals( @@ -1192,7 +1174,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } } else { assertDoesNotThrow { - datasetApiService.refreshDataset(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.refreshDataset(organizationSaved.id, datasetSaved.id!!) } } } @@ -1216,7 +1198,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1225,15 +1207,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.removeAllDatasetCompatibilityElements( - organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.removeAllDatasetCompatibilityElements( - organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!) } } } @@ -1256,7 +1238,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1265,7 +1247,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.removeAllDatasetCompatibilityElements( - organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_WRITE", @@ -1273,7 +1255,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.removeAllDatasetCompatibilityElements( - organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!) } } } @@ -1295,7 +1277,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole() - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetSearch = DatasetSearch(mutableListOf("dataset")) @@ -1306,15 +1288,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.searchDatasets( - organizationSaved.id!!, datasetSearch, null, null) + organizationSaved.id, datasetSearch, null, null) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.searchDatasets( - organizationSaved.id!!, datasetSearch, null, null) + datasetApiService.searchDatasets(organizationSaved.id, datasetSearch, null, null) } } } @@ -1336,7 +1317,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetTwinGraphQuery = DatasetTwinGraphQuery("MATCH (n) RETURN n") @@ -1348,15 +1329,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.twingraphBatchQuery( - organizationSaved.id!!, datasetSaved.id!!, datasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.twingraphBatchQuery( - organizationSaved.id!!, datasetSaved.id!!, datasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery) } } } @@ -1378,7 +1359,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetTwinGraphQuery = DatasetTwinGraphQuery("MATCH (n) RETURN n") @@ -1390,7 +1371,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.twingraphBatchQuery( - organizationSaved.id!!, datasetSaved.id!!, datasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -1398,7 +1379,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.twingraphBatchQuery( - organizationSaved.id!!, datasetSaved.id!!, datasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery) } } } @@ -1420,7 +1401,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetTwinGraphQuery = DatasetTwinGraphQuery("MATCH (n) RETURN n") @@ -1430,15 +1411,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.twingraphQuery( - organizationSaved.id!!, datasetSaved.id!!, datasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.twingraphQuery( - organizationSaved.id!!, datasetSaved.id!!, datasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery) } } } @@ -1460,7 +1441,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetTwinGraphQuery = DatasetTwinGraphQuery("MATCH (n) RETURN n") @@ -1470,7 +1451,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.twingraphQuery( - organizationSaved.id!!, datasetSaved.id!!, datasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -1478,7 +1459,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.twingraphQuery( - organizationSaved.id!!, datasetSaved.id!!, datasetTwinGraphQuery) + organizationSaved.id, datasetSaved.id!!, datasetTwinGraphQuery) } } } @@ -1500,7 +1481,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1509,15 +1490,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.updateDataset( - organizationSaved.id!!, datasetSaved.id!!, dataset) + organizationSaved.id, datasetSaved.id!!, dataset) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.updateDataset( - organizationSaved.id!!, datasetSaved.id!!, dataset) + datasetApiService.updateDataset(organizationSaved.id, datasetSaved.id!!, dataset) } } } @@ -1539,7 +1519,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1548,15 +1528,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.updateDataset( - organizationSaved.id!!, datasetSaved.id!!, dataset) + organizationSaved.id, datasetSaved.id!!, dataset) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_WRITE", exception.message) } else { assertDoesNotThrow { - datasetApiService.updateDataset( - organizationSaved.id!!, datasetSaved.id!!, dataset) + datasetApiService.updateDataset(organizationSaved.id, datasetSaved.id!!, dataset) } } } @@ -1578,7 +1557,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1587,15 +1566,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.updateTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf()) + organizationSaved.id, datasetSaved.id!!, "node", listOf()) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.updateTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf()) + organizationSaved.id, datasetSaved.id!!, "node", listOf()) } } } @@ -1617,7 +1596,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1626,7 +1605,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.updateTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf()) + organizationSaved.id, datasetSaved.id!!, "node", listOf()) } if (role == ROLE_NONE) { assertEquals( @@ -1640,7 +1619,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.updateTwingraphEntities( - organizationSaved.id!!, datasetSaved.id!!, "node", listOf()) + organizationSaved.id, datasetSaved.id!!, "node", listOf()) } } } @@ -1663,7 +1642,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN, sourceType = DatasetSourceType.File) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) val fileName = this::class.java.getResource("/integrationTest.zip")?.file val file = File(fileName!!) val resource = ByteArrayResource(file.readBytes()) @@ -1674,15 +1653,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.uploadTwingraph( - organizationSaved.id!!, datasetSaved.id!!, resource) + organizationSaved.id, datasetSaved.id!!, resource) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.uploadTwingraph( - organizationSaved.id!!, datasetSaved.id!!, resource) + organizationSaved.id, datasetSaved.id!!, resource) } } } @@ -1704,7 +1683,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role, sourceType = DatasetSourceType.File) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) val fileName = this::class.java.getResource("/integrationTest.zip")?.file val file = File(fileName!!) val resource = ByteArrayResource(file.readBytes()) @@ -1715,7 +1694,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.uploadTwingraph( - organizationSaved.id!!, datasetSaved.id!!, resource) + organizationSaved.id, datasetSaved.id!!, resource) } if (role == ROLE_NONE) { assertEquals( @@ -1729,7 +1708,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.uploadTwingraph( - organizationSaved.id!!, datasetSaved.id!!, resource) + organizationSaved.id, datasetSaved.id!!, resource) } } } @@ -1751,7 +1730,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetAccessControl = DatasetAccessControl("id", ROLE_USER) @@ -1762,15 +1741,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.addDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, datasetAccessControl) + organizationSaved.id, datasetSaved.id!!, datasetAccessControl) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.addDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, datasetAccessControl) + organizationSaved.id, datasetSaved.id!!, datasetAccessControl) } } } @@ -1792,7 +1771,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() val datasetAccessControl = DatasetAccessControl("id", ROLE_USER) @@ -1803,7 +1782,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.addDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, datasetAccessControl) + organizationSaved.id, datasetSaved.id!!, datasetAccessControl) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_WRITE_SECURITY", @@ -1811,7 +1790,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.addDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, datasetAccessControl) + organizationSaved.id, datasetSaved.id!!, datasetAccessControl) } } } @@ -1834,7 +1813,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN, sourceType = DatasetSourceType.None) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1842,15 +1821,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.getDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.getDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL) } } } @@ -1872,7 +1851,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1881,7 +1860,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.getDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ_SECURITY", @@ -1889,7 +1868,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.getDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL) } } } @@ -1911,7 +1890,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1920,18 +1899,18 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.updateDatasetAccessControl( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL, DatasetRole(ROLE_USER)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.updateDatasetAccessControl( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL, DatasetRole(ROLE_USER)) @@ -1956,7 +1935,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1965,7 +1944,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.updateDatasetAccessControl( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL, DatasetRole(ROLE_USER)) @@ -1976,7 +1955,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.updateDatasetAccessControl( - organizationSaved.id!!, + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL, DatasetRole(ROLE_USER)) @@ -2001,7 +1980,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -2010,15 +1989,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.removeDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.removeDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL) } } } @@ -2040,7 +2019,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -2049,7 +2028,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.removeDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_WRITE_SECURITY", @@ -2057,7 +2036,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.removeDatasetAccessControl( - organizationSaved.id!!, datasetSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, datasetSaved.id!!, TEST_USER_MAIL) } } } @@ -2079,7 +2058,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -2088,15 +2067,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.getDatasetSecurityUsers( - organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.getDatasetSecurityUsers( - organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetSecurityUsers(organizationSaved.id, datasetSaved.id!!) } } } @@ -2118,7 +2096,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -2127,15 +2105,14 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.getDatasetSecurityUsers( - organizationSaved.id!!, datasetSaved.id!!) + organizationSaved.id, datasetSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ_SECURITY", exception.message) } else { assertDoesNotThrow { - datasetApiService.getDatasetSecurityUsers( - organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetSecurityUsers(organizationSaved.id, datasetSaved.id!!) } } } @@ -2157,22 +2134,21 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { - datasetApiService.getDatasetSecurity( - organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetSecurity(organizationSaved.id, datasetSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - datasetApiService.getDatasetSecurity(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetSecurity(organizationSaved.id, datasetSaved.id!!) } } } @@ -2194,22 +2170,21 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { - datasetApiService.getDatasetSecurity( - organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetSecurity(organizationSaved.id, datasetSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ_SECURITY", exception.message) } else { assertDoesNotThrow { - datasetApiService.getDatasetSecurity(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.getDatasetSecurity(organizationSaved.id, datasetSaved.id!!) } } } @@ -2231,7 +2206,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole(role = role) organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -2239,15 +2214,15 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.setDatasetDefaultSecurity( - organizationSaved.id!!, datasetSaved.id!!, DatasetRole(ROLE_VIEWER)) + organizationSaved.id, datasetSaved.id!!, DatasetRole(ROLE_VIEWER)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { datasetApiService.setDatasetDefaultSecurity( - organizationSaved.id!!, datasetSaved.id!!, DatasetRole(ROLE_VIEWER)) + organizationSaved.id, datasetSaved.id!!, DatasetRole(ROLE_VIEWER)) } } } @@ -2269,7 +2244,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequestWithRole() organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -2277,7 +2252,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { datasetApiService.setDatasetDefaultSecurity( - organizationSaved.id!!, datasetSaved.id!!, DatasetRole(ROLE_VIEWER)) + organizationSaved.id, datasetSaved.id!!, DatasetRole(ROLE_VIEWER)) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_WRITE_SECURITY", @@ -2285,7 +2260,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { datasetApiService.setDatasetDefaultSecurity( - organizationSaved.id!!, datasetSaved.id!!, DatasetRole(ROLE_VIEWER)) + organizationSaved.id, datasetSaved.id!!, DatasetRole(ROLE_VIEWER)) } } } @@ -2361,7 +2336,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { } fun makeDatasetWithRole( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, parentId: String = "", id: String = TEST_USER_MAIL, role: String = ROLE_ADMIN, diff --git a/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt b/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt index c5301b963..eb44bba94 100644 --- a/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt +++ b/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt @@ -75,7 +75,7 @@ import com.cosmotech.dataset.utils.isReadOnlyQuery import com.cosmotech.dataset.utils.toCsmGraphEntity import com.cosmotech.dataset.utils.toJsonString import com.cosmotech.organization.OrganizationApiServiceInterface -import com.cosmotech.organization.service.getRbac +import com.cosmotech.organization.service.toGenericSecurity import com.google.gson.Gson import com.google.gson.reflect.TypeToken import java.io.InputStream @@ -1030,7 +1030,7 @@ class DatasetServiceImpl( val defaultPageSize = csmPlatformProperties.twincache.dataset.defaultPageSize val pageable = constructPageRequest(page, size, defaultPageSize) - var datasetList = listOf() + var datasetList: List if (pageable != null) { datasetList = datasetRepository @@ -1080,7 +1080,7 @@ class DatasetServiceImpl( val rbacSecurity = csmRbac.addUserRole( - organization.getRbac(), + organization.security.toGenericSecurity(organizationId), dataset.getRbac(), datasetAccessControl.id, datasetAccessControl.role) diff --git a/doc/Models/ComponentRolePermissions.md b/doc/Models/ComponentRolePermissions.md index b16b473b6..ebe3a86cf 100644 --- a/doc/Models/ComponentRolePermissions.md +++ b/doc/Models/ComponentRolePermissions.md @@ -3,8 +3,8 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **component** | **String** | | [optional] [default to null] | -| **roles** | [**Map**](array.md) | | [optional] [default to null] | +| **component** | **String** | | [default to null] | +| **roles** | [**Map**](array.md) | | [default to null] | [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/doc/Models/Organization.md b/doc/Models/Organization.md index e855f9d94..e2d8028a0 100644 --- a/doc/Models/Organization.md +++ b/doc/Models/Organization.md @@ -3,10 +3,10 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **id** | **String** | the Organization unique identifier | [optional] [default to null] | -| **name** | **String** | the Organization name | [optional] [default to null] | -| **ownerId** | **String** | the Owner User Id | [optional] [default to null] | -| **security** | [**OrganizationSecurity**](OrganizationSecurity.md) | | [optional] [default to null] | +| **id** | **String** | the Organization unique identifier | [default to null] | +| **name** | **String** | the Organization name | [default to null] | +| **ownerId** | **String** | the Owner User Id | [default to null] | +| **security** | [**OrganizationSecurity**](OrganizationSecurity.md) | | [default to null] | [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/doc/Models/OrganizationUpdateRequest.md b/doc/Models/OrganizationUpdateRequest.md index e5c111b2d..1f1cfa3de 100644 --- a/doc/Models/OrganizationUpdateRequest.md +++ b/doc/Models/OrganizationUpdateRequest.md @@ -3,7 +3,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **name** | **String** | the Organization name | [optional] [default to null] | +| **name** | **String** | the Organization name | [default to null] | [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/doc/Models/UpdateOrganizationRequest.md b/doc/Models/UpdateOrganizationRequest.md index 24f918b4c..1bb997d12 100644 --- a/doc/Models/UpdateOrganizationRequest.md +++ b/doc/Models/UpdateOrganizationRequest.md @@ -3,7 +3,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **name** | **String** | the Organization name | [optional] [default to null] | +| **name** | **String** | the Organization name | [default to null] | [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/openapi/plantuml/schemas.plantuml b/openapi/plantuml/schemas.plantuml index f0560e5bf..fd3ddb3cf 100644 --- a/openapi/plantuml/schemas.plantuml +++ b/openapi/plantuml/schemas.plantuml @@ -3,8 +3,8 @@ title Cosmo Tech Platform API Schemas Diagram entity ComponentRolePermissions { - component: String - roles: Map + * component: String + * roles: Map } entity Connector { @@ -161,10 +161,10 @@ entity IoTypesEnum { } entity Organization { - id: String - name: String - ownerId: String - security: OrganizationSecurity + * id: String + * name: String + * ownerId: String + * security: OrganizationSecurity } entity OrganizationAccessControl { @@ -187,7 +187,7 @@ entity OrganizationSecurity { } entity OrganizationUpdateRequest { - name: String + * name: String } entity QueryResult { diff --git a/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceIntegrationTest.kt b/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceIntegrationTest.kt index 01915946f..9f54a5b49 100644 --- a/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceIntegrationTest.kt +++ b/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceIntegrationTest.kt @@ -157,7 +157,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationRegistered = organizationApiService.createOrganization( makeSimpleOrganizationCreateRequest("o-connector-test-1")) - assertNotNull(organizationApiService.getOrganization(organizationRegistered.id!!)) + assertNotNull(organizationApiService.getOrganization(organizationRegistered.id)) } @Test @@ -199,7 +199,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { mutableListOf(OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_ADMIN))), organizationRegistered.security) assertEquals(name, organizationRegistered.name) - assertTrue(organizationRegistered.id!!.startsWith("o-")) + assertTrue(organizationRegistered.id.startsWith("o-")) } } @@ -227,7 +227,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_ADMIN))), organizationRegistered.security) assertEquals(name, organizationRegistered.name) - assertTrue(organizationRegistered.id!!.startsWith("o-")) + assertTrue(organizationRegistered.id.startsWith("o-")) } } @@ -238,7 +238,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationToRegister = makeSimpleOrganizationCreateRequest(name) val organizationRegistered = organizationApiService.createOrganization(organizationToRegister) - organizationApiService.deleteOrganization(organizationRegistered.id!!) + organizationApiService.deleteOrganization(organizationRegistered.id) } } @@ -258,7 +258,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, OTHER_TEST_USER_ID, ROLE_USER, ROLE_ADMIN) val organizationRegistered = organizationApiService.createOrganization(organizationToRegister) - organizationApiService.deleteOrganization(organizationRegistered.id!!) + organizationApiService.deleteOrganization(organizationRegistered.id) } } @@ -273,7 +273,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationRegistered = organizationApiService.createOrganization(organizationToRegister) runAsOrganizationUser() - organizationApiService.deleteOrganization(organizationRegistered.id!!) + organizationApiService.deleteOrganization(organizationRegistered.id) } } @@ -286,11 +286,11 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationRegistered.name = "my-new-name" organizationApiService.updateOrganization( - organizationRegistered.id!!, OrganizationUpdateRequest(organizationRegistered.name)) + organizationRegistered.id, OrganizationUpdateRequest(organizationRegistered.name)) assertEquals( organizationRegistered, - organizationApiService.getOrganization(organizationRegistered.id!!)) + organizationApiService.getOrganization(organizationRegistered.id)) } } @@ -308,11 +308,11 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationRegistered.name = "my-new-name" organizationApiService.updateOrganization( - organizationRegistered.id!!, OrganizationUpdateRequest(organizationRegistered.name)) + organizationRegistered.id, OrganizationUpdateRequest(organizationRegistered.name)) assertEquals( organizationRegistered, - organizationApiService.getOrganization(organizationRegistered.id!!)) + organizationApiService.getOrganization(organizationRegistered.id)) } } @@ -325,7 +325,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) runAsOrganizationUser() organizationApiService.updateOrganization( - organizationRegistered.id!!, OrganizationUpdateRequest("name")) + organizationRegistered.id, OrganizationUpdateRequest("name")) } } @@ -422,17 +422,16 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) var organizationUserPermissions = organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_VIEWER) + organizationRegistered.id, ROLE_VIEWER) assertEquals(mutableListOf(PERMISSION_READ), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_USER) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_USER) assertEquals( mutableListOf(PERMISSION_READ, PERMISSION_READ_SECURITY, PERMISSION_CREATE_CHILDREN), organizationUserPermissions) organizationUserPermissions = organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_EDITOR) + organizationRegistered.id, ROLE_EDITOR) assertEquals( mutableListOf( PERMISSION_READ, @@ -441,8 +440,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { PERMISSION_WRITE), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_ADMIN) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_ADMIN) assertEquals( mutableListOf( PERMISSION_READ, @@ -454,7 +452,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationUserPermissions) organizationUserPermissions = organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER) + organizationRegistered.id, UNKNOWN_IDENTIFIER) assertEquals(emptyList(), organizationUserPermissions) } } @@ -471,17 +469,16 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { runAsOrganizationUser() var organizationUserPermissions = organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_VIEWER) + organizationRegistered.id, ROLE_VIEWER) assertEquals(mutableListOf(PERMISSION_READ), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_USER) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_USER) assertEquals( mutableListOf(PERMISSION_READ, PERMISSION_READ_SECURITY, PERMISSION_CREATE_CHILDREN), organizationUserPermissions) organizationUserPermissions = organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_EDITOR) + organizationRegistered.id, ROLE_EDITOR) assertEquals( mutableListOf( PERMISSION_READ, @@ -490,8 +487,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { PERMISSION_WRITE), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_ADMIN) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_ADMIN) assertEquals( mutableListOf( PERMISSION_READ, @@ -503,7 +499,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationUserPermissions) organizationUserPermissions = organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER) + organizationRegistered.id, UNKNOWN_IDENTIFIER) assertEquals(emptyList(), organizationUserPermissions) } } @@ -516,7 +512,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) runAsOrganizationUser() - organizationApiService.getOrganizationPermissions(organizationRegistered.id!!, ROLE_VIEWER) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_VIEWER) } } @@ -526,7 +522,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) - assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id!!)) + assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id)) } } @@ -547,7 +543,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { makeOrganizationCreateRequestWithSimpleSecurity( name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() - assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id!!)) + assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id)) } } @@ -561,7 +557,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { makeOrganizationCreateRequestWithSimpleSecurity( name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsOrganizationUser() - organizationApiService.getOrganizationSecurity(organizationRegistered.id!!) + organizationApiService.getOrganizationSecurity(organizationRegistered.id) } } @@ -571,12 +567,12 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) - val defaultRoleCreated = organizationRegistered.security?.default + val defaultRoleCreated = organizationRegistered.security.default assertNotNull( organizationApiService.updateOrganizationDefaultSecurity( - organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN))) + organizationRegistered.id, OrganizationRole(ROLE_ADMIN))) val defaultRoleUpdated = - organizationApiService.getOrganizationSecurity(organizationRegistered.id!!).default + organizationApiService.getOrganizationSecurity(organizationRegistered.id).default assertNotEquals(defaultRoleCreated, defaultRoleUpdated) } } @@ -588,7 +584,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.updateOrganizationDefaultSecurity( - organizationRegistered.id!!, OrganizationRole(UNKNOWN_IDENTIFIER)) + organizationRegistered.id, OrganizationRole(UNKNOWN_IDENTIFIER)) } } @@ -601,13 +597,13 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization( makeOrganizationCreateRequestWithSimpleSecurity( name, TEST_USER_ID, ROLE_NONE, ROLE_ADMIN)) - val defaultRoleCreated = organizationRegistered.security?.default + val defaultRoleCreated = organizationRegistered.security.default runAsOrganizationUser() assertNotNull( organizationApiService.updateOrganizationDefaultSecurity( - organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN))) + organizationRegistered.id, OrganizationRole(ROLE_ADMIN))) val defaultRoleUpdated = - organizationApiService.getOrganizationSecurity(organizationRegistered.id!!).default + organizationApiService.getOrganizationSecurity(organizationRegistered.id).default assertNotEquals(defaultRoleCreated, defaultRoleUpdated) } } @@ -623,7 +619,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() organizationApiService.updateOrganizationDefaultSecurity( - organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN)) + organizationRegistered.id, OrganizationRole(ROLE_ADMIN)) } } @@ -635,7 +631,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) val organizationRole = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID) + organizationRegistered.id, TEST_USER_ID) assertNotNull(organizationRole) assertEquals(ROLE_ADMIN, organizationRole.role) assertEquals(TEST_USER_ID, organizationRole.id) @@ -648,7 +644,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) - organizationApiService.getOrganizationAccessControl(organizationRegistered.id!!, "UNKOWN") + organizationApiService.getOrganizationAccessControl(organizationRegistered.id, "UNKOWN") } } @@ -664,7 +660,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { runAsOrganizationUser() val organizationRole = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID) + organizationRegistered.id, TEST_USER_ID) assertNotNull(organizationRole) assertEquals(ROLE_USER, organizationRole.role) assertEquals(TEST_USER_ID, organizationRole.id) @@ -682,7 +678,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER) + organizationRegistered.id, UNKNOWN_IDENTIFIER) } } @@ -697,7 +693,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsOrganizationUser() organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER) + organizationRegistered.id, UNKNOWN_IDENTIFIER) } } @@ -709,16 +705,16 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) assertThrows { organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) } val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER) assertNotNull( organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL)) + organizationRegistered.id, otherUserACL)) val otherUserACLRetrieved = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertEquals( OrganizationAccessControl(id = OTHER_TEST_USER_ID, ROLE_VIEWER), otherUserACLRetrieved) } @@ -733,7 +729,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_NONE) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL) + organizationRegistered.id, otherUserACL) } } @@ -749,16 +745,16 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { runAsOrganizationUser() assertThrows { organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_ADMIN_USER_ID) + organizationRegistered.id, TEST_ADMIN_USER_ID) } val otherUserACL = OrganizationAccessControl(id = TEST_ADMIN_USER_ID, role = ROLE_VIEWER) assertNotNull( organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL)) + organizationRegistered.id, otherUserACL)) val otherUserACLRetrieved = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_ADMIN_USER_ID) + organizationRegistered.id, TEST_ADMIN_USER_ID) assertEquals( OrganizationAccessControl(TEST_ADMIN_USER_ID, ROLE_VIEWER), otherUserACLRetrieved) } @@ -776,11 +772,11 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { runAsOrganizationUser() assertThrows { organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_ADMIN_USER_ID) + organizationRegistered.id, TEST_ADMIN_USER_ID) } val otherUserACL = OrganizationAccessControl(id = TEST_ADMIN_USER_ID, role = ROLE_VIEWER) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL) + organizationRegistered.id, otherUserACL) } } @@ -791,7 +787,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID, OrganizationRole(role = ROLE_VIEWER)) + organizationRegistered.id, TEST_USER_ID, OrganizationRole(role = ROLE_VIEWER)) } } @@ -803,18 +799,18 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, + organizationRegistered.id, OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER)) assertNotNull( organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, + organizationRegistered.id, OTHER_TEST_USER_ID, OrganizationRole(role = ROLE_EDITOR))) val userACLRetrieved = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertNotEquals(ROLE_VIEWER, userACLRetrieved.role) assertEquals(ROLE_EDITOR, userACLRetrieved.role) } @@ -828,7 +824,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID, OrganizationRole(role = ROLE_NONE)) + organizationRegistered.id, TEST_USER_ID, OrganizationRole(role = ROLE_NONE)) } } @@ -840,7 +836,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER, OrganizationRole(role = ROLE_EDITOR)) + organizationRegistered.id, UNKNOWN_IDENTIFIER, OrganizationRole(role = ROLE_EDITOR)) } } @@ -852,7 +848,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID, OrganizationRole(role = UNKNOWN_IDENTIFIER)) + organizationRegistered.id, TEST_USER_ID, OrganizationRole(role = UNKNOWN_IDENTIFIER)) } } @@ -865,20 +861,20 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, + organizationRegistered.id, OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_ADMIN)) runAsOrganizationUser() assertNotNull( organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, + organizationRegistered.id, OTHER_TEST_USER_ID, OrganizationRole(role = ROLE_EDITOR))) val userACLRetrieved = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertEquals(ROLE_EDITOR, userACLRetrieved.role) } } @@ -892,13 +888,13 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, + organizationRegistered.id, OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER)) runAsOrganizationUser() organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID, OrganizationRole(role = ROLE_EDITOR)) + organizationRegistered.id, OTHER_TEST_USER_ID, OrganizationRole(role = ROLE_EDITOR)) } } @@ -911,13 +907,13 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, + organizationRegistered.id, OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER)) runAsOrganizationUser() organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID, OrganizationRole(role = ROLE_NONE)) + organizationRegistered.id, OTHER_TEST_USER_ID, OrganizationRole(role = ROLE_NONE)) } } @@ -929,13 +925,13 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL) + organizationRegistered.id, otherUserACL) organizationApiService.deleteOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertThrows { organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) } } @@ -948,14 +944,14 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_ADMIN) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL) + organizationRegistered.id, otherUserACL) runAsOrganizationUser() organizationApiService.deleteOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertThrows { organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) } } @@ -968,12 +964,12 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL) + organizationRegistered.id, otherUserACL) runAsOrganizationUser() assertThrows { organizationApiService.deleteOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) } } @@ -984,7 +980,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) val orgaUsers = - organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) + organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id) assertEquals(listOf(TEST_USER_ID), orgaUsers) } @@ -998,7 +994,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() val orgaUsers = - organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) + organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id) assertEquals(listOf(TEST_USER_ID, OTHER_TEST_USER_ID), orgaUsers) } @@ -1012,7 +1008,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsOrganizationUser() assertThrows { - organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) + organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id) } } @@ -1023,7 +1019,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) assertDoesNotThrow { val organizationVerified = - organizationApiService.getVerifiedOrganization(organizationRegistered.id!!) + organizationApiService.getVerifiedOrganization(organizationRegistered.id) assertEquals(organizationRegistered, organizationVerified) } } @@ -1038,7 +1034,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsOrganizationUser() assertThrows { - organizationApiService.getVerifiedOrganization(organizationRegistered.id!!) + organizationApiService.getVerifiedOrganization(organizationRegistered.id) } } @@ -1054,13 +1050,13 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(role = ROLE_VIEWER) var organizationSaved = organizationApiService.createOrganization(organization) - organizationSaved = organizationApiService.getOrganization(organizationSaved.id!!) + organizationSaved = organizationApiService.getOrganization(organizationSaved.id) assertEquals( OrganizationSecurity( default = ROLE_NONE, mutableListOf(OrganizationAccessControl(TEST_USER_ID, ROLE_VIEWER))), organizationSaved.security) - assertEquals(1, organizationSaved.security!!.accessControlList!!.size) + assertEquals(1, organizationSaved.security.accessControlList!!.size) } @Test @@ -1075,7 +1071,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { default = ROLE_NONE, mutableListOf(OrganizationAccessControl(TEST_USER_ID, ROLE_VIEWER))), it.security) - assertEquals(1, it.security!!.accessControlList!!.size) + assertEquals(1, it.security.accessControlList!!.size) } } } @@ -1131,7 +1127,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationRegistered = organizationApiService.createOrganization( makeSimpleOrganizationCreateRequest("o-connector-test-1")) - assertNotNull(organizationApiService.getOrganization(organizationRegistered.id!!)) + assertNotNull(organizationApiService.getOrganization(organizationRegistered.id)) } @Test @@ -1153,7 +1149,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { OrganizationAccessControl(id = TEST_ADMIN_USER_ID, role = ROLE_ADMIN))), organizationRegistered.security) assertEquals(name, organizationRegistered.name) - assertTrue(organizationRegistered.id!!.startsWith("o-")) + assertTrue(organizationRegistered.id.startsWith("o-")) } } } @@ -1181,7 +1177,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { OrganizationAccessControl(id = defaultName, role = ROLE_ADMIN))), organizationRegistered.security) assertEquals(name, organizationRegistered.name) - assertTrue(organizationRegistered.id!!.startsWith("o-")) + assertTrue(organizationRegistered.id.startsWith("o-")) } } @@ -1191,7 +1187,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" val organizationToRegister = makeSimpleOrganizationCreateRequest(name) val organizationRegistered = organizationApiService.createOrganization(organizationToRegister) - organizationApiService.deleteOrganization(organizationRegistered.id!!) + organizationApiService.deleteOrganization(organizationRegistered.id) } } @@ -1211,7 +1207,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { makeOrganizationCreateRequestWithSimpleSecurity(name, defaultName, ROLE_NONE, ROLE_NONE) val organizationRegistered = organizationApiService.createOrganization(organizationToRegister) runAsPlatformAdmin() - organizationApiService.deleteOrganization(organizationRegistered.id!!) + organizationApiService.deleteOrganization(organizationRegistered.id) } } @@ -1224,11 +1220,10 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationRegistered.name = "my-new-name" organizationApiService.updateOrganization( - organizationRegistered.id!!, OrganizationUpdateRequest("my-new-name")) + organizationRegistered.id, OrganizationUpdateRequest("my-new-name")) assertEquals( - organizationRegistered, - organizationApiService.getOrganization(organizationRegistered.id!!)) + organizationRegistered, organizationApiService.getOrganization(organizationRegistered.id)) } } @@ -1246,11 +1241,10 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationRegistered.name = "my-new-name" organizationApiService.updateOrganization( - organizationRegistered.id!!, OrganizationUpdateRequest(organizationRegistered.name)) + organizationRegistered.id, OrganizationUpdateRequest(organizationRegistered.name)) assertEquals( - organizationRegistered, - organizationApiService.getOrganization(organizationRegistered.id!!)) + organizationRegistered, organizationApiService.getOrganization(organizationRegistered.id)) } } @@ -1263,7 +1257,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) runAsPlatformAdmin() organizationApiService.updateOrganization( - organizationRegistered.id!!, OrganizationUpdateRequest("name")) + organizationRegistered.id, OrganizationUpdateRequest("name")) } } @@ -1359,17 +1353,15 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) var organizationUserPermissions = - organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_VIEWER) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_VIEWER) assertEquals(mutableListOf(PERMISSION_READ), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions(organizationRegistered.id!!, ROLE_USER) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_USER) assertEquals( mutableListOf(PERMISSION_READ, PERMISSION_READ_SECURITY, PERMISSION_CREATE_CHILDREN), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_EDITOR) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_EDITOR) assertEquals( mutableListOf( PERMISSION_READ, @@ -1378,7 +1370,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { PERMISSION_WRITE), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions(organizationRegistered.id!!, ROLE_ADMIN) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_ADMIN) assertEquals( mutableListOf( PERMISSION_READ, @@ -1390,7 +1382,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationUserPermissions) organizationUserPermissions = organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER) + organizationRegistered.id, UNKNOWN_IDENTIFIER) assertEquals(emptyList(), organizationUserPermissions) } } @@ -1406,17 +1398,15 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() var organizationUserPermissions = - organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_VIEWER) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_VIEWER) assertEquals(mutableListOf(PERMISSION_READ), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions(organizationRegistered.id!!, ROLE_USER) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_USER) assertEquals( mutableListOf(PERMISSION_READ, PERMISSION_READ_SECURITY, PERMISSION_CREATE_CHILDREN), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_EDITOR) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_EDITOR) assertEquals( mutableListOf( PERMISSION_READ, @@ -1425,7 +1415,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { PERMISSION_WRITE), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions(organizationRegistered.id!!, ROLE_ADMIN) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_ADMIN) assertEquals( mutableListOf( PERMISSION_READ, @@ -1437,7 +1427,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationUserPermissions) organizationUserPermissions = organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER) + organizationRegistered.id, UNKNOWN_IDENTIFIER) assertEquals(emptyList(), organizationUserPermissions) } } @@ -1453,17 +1443,15 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() var organizationUserPermissions = - organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_VIEWER) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_VIEWER) assertEquals(mutableListOf(PERMISSION_READ), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions(organizationRegistered.id!!, ROLE_USER) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_USER) assertEquals( mutableListOf(PERMISSION_READ, PERMISSION_READ_SECURITY, PERMISSION_CREATE_CHILDREN), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, ROLE_EDITOR) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_EDITOR) assertEquals( mutableListOf( PERMISSION_READ, @@ -1472,7 +1460,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { PERMISSION_WRITE), organizationUserPermissions) organizationUserPermissions = - organizationApiService.getOrganizationPermissions(organizationRegistered.id!!, ROLE_ADMIN) + organizationApiService.getOrganizationPermissions(organizationRegistered.id, ROLE_ADMIN) assertEquals( mutableListOf( PERMISSION_READ, @@ -1484,7 +1472,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationUserPermissions) organizationUserPermissions = organizationApiService.getOrganizationPermissions( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER) + organizationRegistered.id, UNKNOWN_IDENTIFIER) assertEquals(emptyList(), organizationUserPermissions) } } @@ -1495,7 +1483,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) - assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id!!)) + assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id)) } } @@ -1524,7 +1512,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { makeOrganizationCreateRequestWithSimpleSecurity( name, TEST_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() - assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id!!)) + assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id)) } } @@ -1538,7 +1526,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { makeOrganizationCreateRequestWithSimpleSecurity( name, defaultName, ROLE_NONE, ROLE_NONE)) runAsPlatformAdmin() - assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id!!)) + assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id)) } } @@ -1548,12 +1536,12 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) - val defaultRoleCreated = organizationRegistered.security?.default + val defaultRoleCreated = organizationRegistered.security.default assertNotNull( organizationApiService.updateOrganizationDefaultSecurity( - organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN))) + organizationRegistered.id, OrganizationRole(ROLE_ADMIN))) val defaultRoleUpdated = - organizationApiService.getOrganizationSecurity(organizationRegistered.id!!).default + organizationApiService.getOrganizationSecurity(organizationRegistered.id).default assertNotEquals(defaultRoleCreated, defaultRoleUpdated) } } @@ -1565,7 +1553,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.updateOrganizationDefaultSecurity( - organizationRegistered.id!!, OrganizationRole(UNKNOWN_IDENTIFIER)) + organizationRegistered.id, OrganizationRole(UNKNOWN_IDENTIFIER)) } } @@ -1576,13 +1564,13 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { runAsDifferentOrganizationUser() val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) - val defaultRoleCreated = organizationRegistered.security?.default + val defaultRoleCreated = organizationRegistered.security.default runAsPlatformAdmin() assertNotNull( organizationApiService.updateOrganizationDefaultSecurity( - organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN))) + organizationRegistered.id, OrganizationRole(ROLE_ADMIN))) val defaultRoleUpdated = - organizationApiService.getOrganizationSecurity(organizationRegistered.id!!).default + organizationApiService.getOrganizationSecurity(organizationRegistered.id).default assertNotEquals(defaultRoleCreated, defaultRoleUpdated) } } @@ -1596,13 +1584,13 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization( makeOrganizationCreateRequestWithSimpleSecurity( name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_NONE)) - val defaultRoleCreated = organizationRegistered.security?.default + val defaultRoleCreated = organizationRegistered.security.default runAsPlatformAdmin() assertNotNull( organizationApiService.updateOrganizationDefaultSecurity( - organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN))) + organizationRegistered.id, OrganizationRole(ROLE_ADMIN))) val defaultRoleUpdated = - organizationApiService.getOrganizationSecurity(organizationRegistered.id!!).default + organizationApiService.getOrganizationSecurity(organizationRegistered.id).default assertNotEquals(defaultRoleCreated, defaultRoleUpdated) } } @@ -1615,7 +1603,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) val organizationRole = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, defaultName) + organizationRegistered.id, defaultName) assertNotNull(organizationRole) assertEquals(ROLE_ADMIN, organizationRole.role) assertEquals(defaultName, organizationRole.id) @@ -1628,7 +1616,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) - organizationApiService.getOrganizationAccessControl(organizationRegistered.id!!, "UNKOWN") + organizationApiService.getOrganizationAccessControl(organizationRegistered.id, "UNKOWN") } } @@ -1644,7 +1632,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { runAsPlatformAdmin() val organizationRole = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID) + organizationRegistered.id, TEST_USER_ID) assertNotNull(organizationRole) assertEquals(ROLE_VIEWER, organizationRole.role) assertEquals(TEST_USER_ID, organizationRole.id) @@ -1662,7 +1650,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER) + organizationRegistered.id, UNKNOWN_IDENTIFIER) } } @@ -1677,7 +1665,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_NONE)) runAsPlatformAdmin() organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER) + organizationRegistered.id, UNKNOWN_IDENTIFIER) } } @@ -1693,7 +1681,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { runAsPlatformAdmin() val organizationAccessControl = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID) + organizationRegistered.id, TEST_USER_ID) assertNotNull(organizationAccessControl) assertEquals(TEST_USER_ID, organizationAccessControl.id) assertEquals(ROLE_NONE, organizationAccessControl.role) @@ -1708,16 +1696,16 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) assertThrows { organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) } val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER) assertNotNull( organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL)) + organizationRegistered.id, otherUserACL)) val otherUserACLRetrieved = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertEquals( OrganizationAccessControl(OTHER_TEST_USER_ID, ROLE_VIEWER), otherUserACLRetrieved) } @@ -1732,7 +1720,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_NONE) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL) + organizationRegistered.id, otherUserACL) } } @@ -1747,17 +1735,16 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_ADMIN)) runAsPlatformAdmin() assertThrows { - organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID) + organizationApiService.getOrganizationAccessControl(organizationRegistered.id, TEST_USER_ID) } val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER) assertNotNull( organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL)) + organizationRegistered.id, otherUserACL)) val otherUserACLRetrieved = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID) + organizationRegistered.id, TEST_USER_ID) assertEquals(otherUserACL, otherUserACLRetrieved) } } @@ -1773,17 +1760,16 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { name, defaultName, ROLE_NONE, ROLE_NONE)) runAsPlatformAdmin() assertThrows { - organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID) + organizationApiService.getOrganizationAccessControl(organizationRegistered.id, TEST_USER_ID) } val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER) assertNotNull( organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL)) + organizationRegistered.id, otherUserACL)) val otherUserACLRetrieved = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID) + organizationRegistered.id, TEST_USER_ID) assertEquals(otherUserACL, otherUserACLRetrieved) } } @@ -1795,7 +1781,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, defaultName, OrganizationRole(role = ROLE_VIEWER)) + organizationRegistered.id, defaultName, OrganizationRole(role = ROLE_VIEWER)) } } @@ -1807,18 +1793,16 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, + organizationRegistered.id, OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER)) assertNotNull( organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, - OTHER_TEST_USER_ID, - OrganizationRole(role = ROLE_EDITOR))) + organizationRegistered.id, OTHER_TEST_USER_ID, OrganizationRole(role = ROLE_EDITOR))) val userACLRetrieved = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertNotEquals(ROLE_VIEWER, userACLRetrieved.role) assertEquals(ROLE_EDITOR, userACLRetrieved.role) } @@ -1832,7 +1816,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID, OrganizationRole(role = ROLE_NONE)) + organizationRegistered.id, TEST_USER_ID, OrganizationRole(role = ROLE_NONE)) } } @@ -1844,7 +1828,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, UNKNOWN_IDENTIFIER, OrganizationRole(role = ROLE_EDITOR)) + organizationRegistered.id, UNKNOWN_IDENTIFIER, OrganizationRole(role = ROLE_EDITOR)) } } @@ -1856,7 +1840,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, TEST_USER_ID, OrganizationRole(role = UNKNOWN_IDENTIFIER)) + organizationRegistered.id, TEST_USER_ID, OrganizationRole(role = UNKNOWN_IDENTIFIER)) } } @@ -1869,20 +1853,18 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, + organizationRegistered.id, OrganizationAccessControl(id = TEST_ADMIN_USER_ID, role = ROLE_ADMIN)) runAsPlatformAdmin() assertNotNull( organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, - OTHER_TEST_USER_ID, - OrganizationRole(role = ROLE_EDITOR))) + organizationRegistered.id, OTHER_TEST_USER_ID, OrganizationRole(role = ROLE_EDITOR))) val userACLRetrieved = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertEquals(ROLE_EDITOR, userACLRetrieved.role) } } @@ -1896,20 +1878,18 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, + organizationRegistered.id, OrganizationAccessControl(id = TEST_ADMIN_USER_ID, role = ROLE_VIEWER)) runAsPlatformAdmin() assertNotNull( organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, - TEST_ADMIN_USER_ID, - OrganizationRole(role = ROLE_EDITOR))) + organizationRegistered.id, TEST_ADMIN_USER_ID, OrganizationRole(role = ROLE_EDITOR))) val userACLRetrieved = organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, TEST_ADMIN_USER_ID) + organizationRegistered.id, TEST_ADMIN_USER_ID) assertEquals(ROLE_EDITOR, userACLRetrieved.role) } } @@ -1923,13 +1903,13 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, + organizationRegistered.id, OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER)) runAsPlatformAdmin() organizationApiService.updateOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID, OrganizationRole(role = ROLE_NONE)) + organizationRegistered.id, OTHER_TEST_USER_ID, OrganizationRole(role = ROLE_NONE)) } } @@ -1940,14 +1920,13 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER) - organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL) + organizationApiService.createOrganizationAccessControl(organizationRegistered.id, otherUserACL) organizationApiService.deleteOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertThrows { organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) } } @@ -1959,15 +1938,14 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_ADMIN) - organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL) + organizationApiService.createOrganizationAccessControl(organizationRegistered.id, otherUserACL) runAsPlatformAdmin() organizationApiService.deleteOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertThrows { organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) } } @@ -1979,15 +1957,14 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_ADMIN) - organizationApiService.createOrganizationAccessControl( - organizationRegistered.id!!, otherUserACL) + organizationApiService.createOrganizationAccessControl(organizationRegistered.id, otherUserACL) runAsPlatformAdmin() organizationApiService.deleteOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) assertThrows { organizationApiService.getOrganizationAccessControl( - organizationRegistered.id!!, OTHER_TEST_USER_ID) + organizationRegistered.id, OTHER_TEST_USER_ID) } } @@ -1997,8 +1974,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val organizationRegistered = organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) - val orgaUsers = - organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) + val orgaUsers = organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id) assertEquals(listOf(defaultName), orgaUsers) } @@ -2011,8 +1987,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { makeOrganizationCreateRequestWithSimpleSecurity( name, TEST_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() - val orgaUsers = - organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) + val orgaUsers = organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id) assertEquals(listOf(TEST_USER_ID, OTHER_TEST_USER_ID), orgaUsers) } @@ -2025,8 +2000,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { makeOrganizationCreateRequestWithSimpleSecurity( name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsPlatformAdmin() - val orgaUsers = - organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) + val orgaUsers = organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id) assertEquals(listOf(TEST_USER_ID, OTHER_TEST_USER_ID), orgaUsers) } @@ -2061,7 +2035,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { organizationApiService.createOrganizationAccessControl( - organizationSaved.id!!, OrganizationAccessControl(defaultName, ROLE_EDITOR)) + organizationSaved.id, OrganizationAccessControl(defaultName, ROLE_EDITOR)) } } @@ -2072,7 +2046,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationApiService.createOrganization(makeSimpleOrganizationCreateRequest(name)) assertDoesNotThrow { val organizationVerified = - organizationApiService.getVerifiedOrganization(organizationRegistered.id!!) + organizationApiService.getVerifiedOrganization(organizationRegistered.id) assertEquals(organizationRegistered, organizationVerified) } } @@ -2088,7 +2062,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { runAsPlatformAdmin() assertDoesNotThrow { val organizationVerified = - organizationApiService.getVerifiedOrganization(organizationRegistered.id!!) + organizationApiService.getVerifiedOrganization(organizationRegistered.id) assertEquals(organizationRegistered, organizationVerified) } } @@ -2146,7 +2120,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { rungetOrganizationAs() if (throwException) { assertThrows { - (organizationApiService.getOrganization(organizationRegistered.id!!)) + (organizationApiService.getOrganization(organizationRegistered.id)) } } else { assertNotNull(organizationRegistered) diff --git a/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceRBACTest.kt b/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceRBACTest.kt index 9139fa06a..ef6365f05 100644 --- a/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceRBACTest.kt +++ b/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceRBACTest.kt @@ -114,13 +114,13 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - organizationApiService.getOrganization(organization.id!!) + organizationApiService.getOrganization(organization.id) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organization.id} - User does not have permission $PERMISSION_READ", exception.message) } else { - assertDoesNotThrow { organizationApiService.getOrganization(organization.id!!) } + assertDoesNotThrow { organizationApiService.getOrganization(organization.id) } } } } @@ -144,13 +144,13 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - organizationApiService.deleteOrganization(organization.id!!) + organizationApiService.deleteOrganization(organization.id) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_DELETE", + "RBAC ${organization.id} - User does not have permission $PERMISSION_DELETE", exception.message) } else { - assertDoesNotThrow { organizationApiService.deleteOrganization(organization.id!!) } + assertDoesNotThrow { organizationApiService.deleteOrganization(organization.id) } } } } @@ -175,15 +175,15 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { organizationApiService.updateOrganization( - organization.id!!, OrganizationUpdateRequest("name")) + organization.id, OrganizationUpdateRequest("name")) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_WRITE", + "RBAC ${organization.id} - User does not have permission $PERMISSION_WRITE", exception.message) } else { assertDoesNotThrow { organizationApiService.updateOrganization( - organization.id!!, OrganizationUpdateRequest("name")) + organization.id, OrganizationUpdateRequest("name")) } } } @@ -208,14 +208,14 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - organizationApiService.getOrganizationPermissions(organization.id!!, role) + organizationApiService.getOrganizationPermissions(organization.id, role) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_READ_SECURITY", + "RBAC ${organization.id} - User does not have permission $PERMISSION_READ_SECURITY", exception.message) } else assertDoesNotThrow { - organizationApiService.getOrganizationPermissions(organization.id!!, role) + organizationApiService.getOrganizationPermissions(organization.id, role) } } } @@ -239,14 +239,14 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - organizationApiService.getOrganizationSecurity(organization.id!!) + organizationApiService.getOrganizationSecurity(organization.id) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_READ_SECURITY", + "RBAC ${organization.id} - User does not have permission $PERMISSION_READ_SECURITY", exception.message) } else { assertDoesNotThrow { - organizationApiService.getOrganizationSecurity(organization.id!!) + organizationApiService.getOrganizationSecurity(organization.id) } } } @@ -272,15 +272,15 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { organizationApiService.updateOrganizationDefaultSecurity( - organization.id!!, OrganizationRole(role)) + organization.id, OrganizationRole(role)) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_WRITE_SECURITY", + "RBAC ${organization.id} - User does not have permission $PERMISSION_WRITE_SECURITY", exception.message) } else { assertDoesNotThrow { organizationApiService.updateOrganizationDefaultSecurity( - organization.id!!, OrganizationRole(role)) + organization.id, OrganizationRole(role)) } } } @@ -306,15 +306,15 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { organizationApiService.createOrganizationAccessControl( - organization.id!!, OrganizationAccessControl("id", role)) + organization.id, OrganizationAccessControl("id", role)) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_WRITE_SECURITY", + "RBAC ${organization.id} - User does not have permission $PERMISSION_WRITE_SECURITY", exception.message) } else { assertDoesNotThrow { organizationApiService.createOrganizationAccessControl( - organization.id!!, OrganizationAccessControl("id", role)) + organization.id, OrganizationAccessControl("id", role)) } } } @@ -340,15 +340,15 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { organizationApiService.getOrganizationAccessControl( - organization.id!!, TEST_USER_MAIL) + organization.id, TEST_USER_MAIL) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_READ_SECURITY", + "RBAC ${organization.id} - User does not have permission $PERMISSION_READ_SECURITY", exception.message) } else { assertDoesNotThrow { organizationApiService.getOrganizationAccessControl( - organization.id!!, TEST_USER_MAIL) + organization.id, TEST_USER_MAIL) } } } @@ -374,15 +374,15 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { organizationApiService.deleteOrganizationAccessControl( - organization.id!!, TEST_USER_MAIL) + organization.id, TEST_USER_MAIL) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_WRITE_SECURITY", + "RBAC ${organization.id} - User does not have permission $PERMISSION_WRITE_SECURITY", exception.message) } else { assertDoesNotThrow { organizationApiService.deleteOrganizationAccessControl( - organization.id!!, TEST_USER_MAIL) + organization.id, TEST_USER_MAIL) } } } @@ -408,15 +408,15 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { organizationApiService.updateOrganizationAccessControl( - organization.id!!, TEST_USER_MAIL, OrganizationRole(role)) + organization.id, TEST_USER_MAIL, OrganizationRole(role)) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_WRITE_SECURITY", + "RBAC ${organization.id} - User does not have permission $PERMISSION_WRITE_SECURITY", exception.message) } else { assertDoesNotThrow { organizationApiService.updateOrganizationAccessControl( - organization.id!!, TEST_USER_MAIL, OrganizationRole(role)) + organization.id, TEST_USER_MAIL, OrganizationRole(role)) } } } @@ -441,14 +441,14 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - organizationApiService.listOrganizationSecurityUsers(organization.id!!) + organizationApiService.listOrganizationSecurityUsers(organization.id) } assertEquals( - "RBAC ${organization.id!!} - User does not have permission $PERMISSION_READ_SECURITY", + "RBAC ${organization.id} - User does not have permission $PERMISSION_READ_SECURITY", exception.message) } else { assertDoesNotThrow { - organizationApiService.listOrganizationSecurityUsers(organization.id!!) + organizationApiService.listOrganizationSecurityUsers(organization.id) } } } diff --git a/organization/src/main/kotlin/com/cosmotech/organization/service/OrganizationServiceImpl.kt b/organization/src/main/kotlin/com/cosmotech/organization/service/OrganizationServiceImpl.kt index ab8ec78f4..cf259335d 100644 --- a/organization/src/main/kotlin/com/cosmotech/organization/service/OrganizationServiceImpl.kt +++ b/organization/src/main/kotlin/com/cosmotech/organization/service/OrganizationServiceImpl.kt @@ -85,13 +85,15 @@ class OrganizationServiceImpl( throw IllegalArgumentException("Organization name must not be null or blank") } + val organizationId = idGenerator.generate("organization") + val security = csmRbac.initSecurity( + organizationCreateRequest.security.toGenericSecurity(organizationId)).toResourceSecurity() val createdOrganization = Organization( - id = idGenerator.generate("organization"), + id = organizationId, name = organizationCreateRequest.name, ownerId = getCurrentAuthenticatedUserName(csmPlatformProperties), - security = organizationCreateRequest.security) - createdOrganization.setRbac(csmRbac.initSecurity(createdOrganization.getRbac())) + security = security) return organizationRepository.save(createdOrganization) } @@ -133,10 +135,7 @@ class OrganizationServiceImpl( override fun getOrganizationSecurity(organizationId: String): OrganizationSecurity { val organization = getVerifiedOrganization(organizationId, PERMISSION_READ_SECURITY) - val security = - organization.security - ?: throw CsmResourceNotFoundException("RBAC not defined for ${organization.id}") - return security + return organization.security } override fun updateOrganizationDefaultSecurity( @@ -144,10 +143,11 @@ class OrganizationServiceImpl( organizationRole: OrganizationRole ): OrganizationSecurity { val organization = getVerifiedOrganization(organizationId, PERMISSION_WRITE_SECURITY) - val rbacSecurity = csmRbac.setDefault(organization.getRbac(), organizationRole.role) - organization.setRbac(rbacSecurity) + val rbacSecurity = csmRbac.setDefault( + organization.security.toGenericSecurity(organizationId), organizationRole.role) + organization.security = rbacSecurity.toResourceSecurity() organizationRepository.save(organization) - return organization.security!! + return organization.security } override fun getOrganizationAccessControl( @@ -155,7 +155,8 @@ class OrganizationServiceImpl( identityId: String ): OrganizationAccessControl { val organization = getVerifiedOrganization(organizationId, PERMISSION_READ_SECURITY) - val rbacAccessControl = csmRbac.getAccessControl(organization.getRbac(), identityId) + val rbacAccessControl = csmRbac.getAccessControl( + organization.security.toGenericSecurity(organizationId), identityId) return OrganizationAccessControl(id = rbacAccessControl.id, role = rbacAccessControl.role) } @@ -172,11 +173,13 @@ class OrganizationServiceImpl( val rbacSecurity = csmRbac.setUserRole( - organization.getRbac(), organizationAccessControl.id, organizationAccessControl.role) - organization.setRbac(rbacSecurity) + organization.security.toGenericSecurity( + organizationId), organizationAccessControl.id, organizationAccessControl.role) + organization.security = rbacSecurity.toResourceSecurity() organizationRepository.save(organization) val rbacAccessControl = - csmRbac.getAccessControl(organization.getRbac(), organizationAccessControl.id) + csmRbac.getAccessControl(organization.security.toGenericSecurity( + organizationId), organizationAccessControl.id) return OrganizationAccessControl(id = rbacAccessControl.id, role = rbacAccessControl.role) } @@ -187,27 +190,29 @@ class OrganizationServiceImpl( ): OrganizationAccessControl { val organization = getVerifiedOrganization(organizationId, PERMISSION_WRITE_SECURITY) csmRbac.checkUserExists( - organization.getRbac(), + organization.security.toGenericSecurity(organizationId), identityId, "User '$identityId' not found in organization $organizationId") val rbacSecurity = - csmRbac.setUserRole(organization.getRbac(), identityId, organizationRole.role) - organization.setRbac(rbacSecurity) + csmRbac.setUserRole(organization.security.toGenericSecurity( + organizationId), identityId, organizationRole.role) + organization.security = rbacSecurity.toResourceSecurity() organizationRepository.save(organization) - val rbacAccessControl = csmRbac.getAccessControl(organization.getRbac(), identityId) + val rbacAccessControl = csmRbac.getAccessControl( + organization.security.toGenericSecurity(organizationId), identityId) return OrganizationAccessControl(id = rbacAccessControl.id, role = rbacAccessControl.role) } override fun deleteOrganizationAccessControl(organizationId: String, identityId: String) { val organization = getVerifiedOrganization(organizationId, PERMISSION_WRITE_SECURITY) - val rbacSecurity = csmRbac.removeUser(organization.getRbac(), identityId) - organization.setRbac(rbacSecurity) + val rbacSecurity = csmRbac.removeUser(organization.security.toGenericSecurity(organizationId), identityId) + organization.security = rbacSecurity.toResourceSecurity() organizationRepository.save(organization) } override fun listOrganizationSecurityUsers(organizationId: String): List { val organization = getVerifiedOrganization(organizationId, PERMISSION_READ_SECURITY) - return csmRbac.getUsers(organization.getRbac()) + return csmRbac.getUsers(organization.security.toGenericSecurity(organizationId)) } override fun getVerifiedOrganization( @@ -217,7 +222,7 @@ class OrganizationServiceImpl( val organization = organizationRepository.findByIdOrNull(organizationId) ?: throw CsmResourceNotFoundException("Organization $organizationId does not exist!") - csmRbac.verify(organization.getRbac(), requiredPermission) + csmRbac.verify(organization.security.toGenericSecurity(organizationId), requiredPermission) return organization } @@ -226,45 +231,40 @@ class OrganizationServiceImpl( requiredPermissions: List ): Organization { val organization = getVerifiedOrganization(organizationId) - requiredPermissions.forEach { csmRbac.verify(organization.getRbac(), it) } + requiredPermissions.forEach { csmRbac.verify(organization.security.toGenericSecurity(organizationId), it) } return organization } fun updateSecurityVisibility(organization: Organization): Organization { - if (csmRbac.check(organization.getRbac(), PERMISSION_READ_SECURITY).not()) { + if (csmRbac.check(organization.security.toGenericSecurity(organization.id), PERMISSION_READ_SECURITY).not()) { val username = getCurrentAccountIdentifier(csmPlatformProperties) - val retrievedAC = - organization.security!!.accessControlList!!.firstOrNull { it.id == username } + val retrievedAC = organization.security.accessControlList.firstOrNull { it.id == username } return if (retrievedAC != null) { organization.copy( security = OrganizationSecurity( - default = organization.security!!.default, + default = organization.security.default, accessControlList = mutableListOf(retrievedAC))) } else { organization.copy( security = OrganizationSecurity( - default = organization.security!!.default, accessControlList = mutableListOf())) + default = organization.security.default, accessControlList = mutableListOf())) } } return organization } } -fun Organization.getRbac(): RbacSecurity { - return RbacSecurity( - this.id, - this.security?.default ?: ROLE_NONE, - this.security?.accessControlList?.map { RbacAccessControl(it.id, it.role) }?.toMutableList() - ?: mutableListOf()) -} +fun OrganizationSecurity?.toGenericSecurity(organizationId: String) = RbacSecurity( + organizationId, + this?.default ?: ROLE_NONE, + this?.accessControlList?.map { RbacAccessControl(it.id, it.role) }?.toMutableList() ?: mutableListOf() + ) -fun Organization.setRbac(rbacSecurity: RbacSecurity) { - this.security = +fun RbacSecurity.toResourceSecurity() = OrganizationSecurity( - rbacSecurity.default, - rbacSecurity.accessControlList + this.default, + this.accessControlList .map { OrganizationAccessControl(it.id, it.role) } .toMutableList()) -} diff --git a/organization/src/main/openapi/organization.yaml b/organization/src/main/openapi/organization.yaml index 9ebd5f5d4..e081de536 100644 --- a/organization/src/main/openapi/organization.yaml +++ b/organization/src/main/openapi/organization.yaml @@ -453,11 +453,11 @@ components: x-field-extra-annotation: "@com.redis.om.spring.annotations.Indexed" allOf: - $ref: '#/components/schemas/OrganizationSecurity' -# required: -# - id -# - name -# - ownerId -# - security + required: + - id + - name + - ownerId + - security # CRUD Operation Schemas OrganizationCreateRequest: @@ -480,6 +480,8 @@ components: name: type: string description: the Organization name + required: + - name # Security Operation Schemas OrganizationSecurity: @@ -499,6 +501,7 @@ components: required: - default - accessControlList + OrganizationAccessControl: type: object description: Response object for organization access control @@ -514,6 +517,7 @@ components: required: - id - role + OrganizationRole: type: object description: the Organization Role @@ -523,6 +527,7 @@ components: description: the Organization Role required: - role + ComponentRolePermissions: type: object description: a RBAC by component @@ -535,6 +540,9 @@ components: type: array items: type: string + required: + - component + - roles examples: NewOrganizationIn: diff --git a/organization/src/test/kotlin/com/cosmotech/organization/service/OrganizationServiceImplTests.kt b/organization/src/test/kotlin/com/cosmotech/organization/service/OrganizationServiceImplTests.kt index 01eee22b7..2f5932cfb 100644 --- a/organization/src/test/kotlin/com/cosmotech/organization/service/OrganizationServiceImplTests.kt +++ b/organization/src/test/kotlin/com/cosmotech/organization/service/OrganizationServiceImplTests.kt @@ -81,7 +81,7 @@ class OrganizationServiceImplTests { val rbacSecurity = RbacSecurity( organization.id, - organization.security!!.default!!, + organization.security.default!!, mutableListOf(RbacAccessControl("ID", ROLE_VIEWER))) val rbacAccessControl = RbacAccessControl(USER_ID, ROLE_ADMIN) every { organizationRepository.findByIdOrNull(any()) } returns organization @@ -89,15 +89,15 @@ class OrganizationServiceImplTests { every { csmRbac.checkUserExists(any(), any(), any()) } returns rbacAccessControl every { csmRbac.setUserRole(any(), any(), any()) } returns rbacSecurity - assertEquals(organization.security?.default, rbacSecurity.default) + assertEquals(organization.security.default, rbacSecurity.default) assertEquals( - organization.security!!.accessControlList[0].id, rbacSecurity.accessControlList[0].id) + organization.security.accessControlList!![0].id, rbacSecurity.accessControlList[0].id) assertEquals( - organization.security!!.accessControlList[0].role, rbacSecurity.accessControlList[0].role) + organization.security.accessControlList!![0].role, rbacSecurity.accessControlList[0].role) every { organizationRepository.save(any()) } returns organization every { csmRbac.getAccessControl(any(), any()) } returns rbacAccessControl - var organizationAccessControl = + val organizationAccessControl = organizationApiService.updateOrganizationAccessControl( ORGANIZATION_ID, USER_ID, organizationRole) assertEquals(organizationAccessControl.id, rbacAccessControl.id) @@ -121,7 +121,7 @@ class OrganizationServiceImplTests { @Test fun `getRbac extension test`() { val organization = getMockOrganization() - val rbacExtension = organization.getRbac() + val rbacExtension = organization.security.toGenericSecurity(organization.id) val expectedRbac = RbacSecurity( id = organization.id, @@ -130,15 +130,6 @@ class OrganizationServiceImplTests { assertEquals(expectedRbac, rbacExtension) } - @Test - fun `getRbac extension test with empty Rbac`() { - val organization = Organization(id = "myTestOrganization") - val rbacExtension = organization.getRbac() - val expectedRbac = - RbacSecurity(id = organization.id, default = ROLE_NONE, accessControlList = mutableListOf()) - assertEquals(expectedRbac, rbacExtension) - } - @Test fun `setRbac extension test`() { val organization = getMockOrganization() @@ -147,8 +138,8 @@ class OrganizationServiceImplTests { id = organization.id, default = ROLE_VIEWER, accessControlList = mutableListOf(RbacAccessControl(id = "ID2", role = ROLE_ADMIN))) - organization.setRbac(newRbacSecurity) - assertEquals(newRbacSecurity, organization.getRbac()) + organization.security = newRbacSecurity.toResourceSecurity() + assertEquals(newRbacSecurity, organization.security.toGenericSecurity(organization.id)) val expectedOrganizationSecurity = OrganizationSecurity( @@ -169,7 +160,7 @@ class OrganizationServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC read: $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it - organizationApiService.getOrganization(it.id!!) + organizationApiService.getOrganization(it.id) } } @@ -186,7 +177,7 @@ class OrganizationServiceImplTests { rbacTest("Test RBAC unregister : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it every { organizationRepository.delete(any()) } returns Unit - organizationApiService.deleteOrganization(it.id!!) + organizationApiService.deleteOrganization(it.id) } } @@ -203,7 +194,7 @@ class OrganizationServiceImplTests { rbacTest("Test RBAC update : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it every { organizationRepository.save(any()) } returns it - organizationApiService.updateOrganization(it.id!!, OrganizationUpdateRequest("toto")) + organizationApiService.updateOrganization(it.id, OrganizationUpdateRequest("toto")) } } @@ -219,7 +210,7 @@ class OrganizationServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC getOrganizationSecurity : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it - organizationApiService.getOrganizationSecurity(it.id!!) + organizationApiService.getOrganizationSecurity(it.id) } } @@ -237,7 +228,7 @@ class OrganizationServiceImplTests { every { organizationRepository.findByIdOrNull(any()) } returns it every { organizationRepository.save(any()) } returns it organizationApiService.updateOrganizationDefaultSecurity( - it.id!!, OrganizationRole(role)) + it.id, OrganizationRole(role)) } } @@ -253,7 +244,7 @@ class OrganizationServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC getOrganizationAccessControl : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it - organizationApiService.getOrganizationAccessControl(it.id!!, USER_ID) + organizationApiService.getOrganizationAccessControl(it.id, USER_ID) } } @@ -271,7 +262,7 @@ class OrganizationServiceImplTests { every { organizationRepository.findByIdOrNull(any()) } returns it every { organizationRepository.save(any()) } returns it organizationApiService.createOrganizationAccessControl( - it.id!!, OrganizationAccessControl("id", "viewer")) + it.id, OrganizationAccessControl("id", "viewer")) } } @@ -289,7 +280,7 @@ class OrganizationServiceImplTests { every { organizationRepository.findByIdOrNull(any()) } returns it every { organizationRepository.save(any()) } returns it organizationApiService.updateOrganizationAccessControl( - it.id!!, "2$USER_ID", OrganizationRole("user")) + it.id, "2$USER_ID", OrganizationRole("user")) } } @@ -306,7 +297,7 @@ class OrganizationServiceImplTests { rbacTest("Test RBAC removeOrganizationAccessControl : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it every { organizationRepository.save(any()) } returns it - organizationApiService.deleteOrganizationAccessControl(it.id!!, "2$USER_ID") + organizationApiService.deleteOrganizationAccessControl(it.id, "2$USER_ID") } } @@ -322,7 +313,7 @@ class OrganizationServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC get users with role : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it - organizationApiService.listOrganizationSecurityUsers(it.id!!) + organizationApiService.listOrganizationSecurityUsers(it.id) } } diff --git a/run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt b/run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt index 2ce46732b..cafaabf0f 100644 --- a/run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt +++ b/run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt @@ -144,18 +144,18 @@ class RunServiceIntegrationTest : CsmRunTestBase() { organization = makeOrganizationCreateRequest("Organization") organizationSaved = organizationApiService.createOrganization(organization) - dataset = mockDataset(organizationSaved.id!!, "Dataset", connectorSaved) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + dataset = mockDataset(organizationSaved.id, "Dataset", connectorSaved) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) - solution = mockSolution(organizationSaved.id!!) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solution = mockSolution(organizationSaved.id) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) - workspace = mockWorkspace(organizationSaved.id!!, solutionSaved.id!!, "Workspace") - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspace = mockWorkspace(organizationSaved.id, solutionSaved.id!!, "Workspace") + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace) runnerSaved = mockRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, solutionSaved.runTemplates[0].id, @@ -163,7 +163,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { mutableListOf(datasetSaved.id!!)) every { workflowService.launchRun(any(), any(), any(), any()) } returns - mockWorkflowRun(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + mockWorkflowRun(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) every { datasetApiService.findDatasetById(any(), any()) } returns datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS } every { datasetApiService.createSubDataset(any(), any(), any()) } returns mockk(relaxed = true) @@ -182,7 +182,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { } fun mockDataset( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, name: String = "Dataset", connector: Connector = connectorSaved, roleName: String = defaultName, @@ -201,7 +201,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { ) } - fun mockSolution(organizationId: String = organizationSaved.id!!): Solution { + fun mockSolution(organizationId: String = organizationSaved.id): Solution { return Solution( id = "solutionId", key = UUID.randomUUID().toString(), @@ -236,7 +236,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { } fun mockWorkspace( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, solutionId: String = solutionSaved.id!!, name: String = "workspace" ): Workspace { @@ -255,7 +255,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { } fun mockRunner( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, workspaceId: String = workspaceSaved.id!!, solutionId: String = solutionSaved.id!!, runTemplateId: String = solutionSaved.runTemplates[0].id, @@ -306,41 +306,41 @@ class RunServiceIntegrationTest : CsmRunTestBase() { runSavedId = mockStartRun( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, solutionSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, solutionSaved.id!!) assertNotEquals("", runSavedId) logger.info("should find 1 Run") var runs = runApiService.listRuns( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, null, null) assertEquals(1, runs.size) logger.info("should find Run by id") val foundRun = runApiService.getRun( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId) assertEquals(runSavedId, foundRun.id) - assertEquals(organizationSaved.id!!, foundRun.organizationId) + assertEquals(organizationSaved.id, foundRun.organizationId) assertEquals(workspaceSaved.id!!, foundRun.workspaceId) assertEquals(runnerSaved.id!!, foundRun.runnerId) logger.info("should create second Run") val runSaved2id = mockStartRun( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, solutionSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, solutionSaved.id!!) logger.info("should find all Runs by Runner id and assert size is 2") runs = runApiService.listRuns( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, null, null) assertEquals(2, runs.size) logger.info("should delete second Run and assert size is 1") runApiService.deleteRun( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSaved2id) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSaved2id) runs = runApiService.listRuns( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, null, null) assertEquals(1, runs.size) } @@ -351,32 +351,30 @@ class RunServiceIntegrationTest : CsmRunTestBase() { val expectedSize = 15 IntRange(1, numberOfRuns).forEach { - mockStartRun( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, solutionSaved.id!!) + mockStartRun(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, solutionSaved.id!!) } logger.info("should find all Runs and assert there are $numberOfRuns") var runs = runApiService.listRuns( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, null, numberOfRuns * 2) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, null, numberOfRuns * 2) assertEquals(numberOfRuns, runs.size) logger.info("should find all Runs and assert it equals defaultPageSize: $defaultPageSize") runs = - runApiService.listRuns( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, 0, null) + runApiService.listRuns(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, 0, null) assertEquals(defaultPageSize, runs.size) logger.info("should find all Runs and assert there are expected size: $expectedSize") runs = runApiService.listRuns( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, 0, expectedSize) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, 0, expectedSize) assertEquals(expectedSize, runs.size) logger.info("should find all Runs and assert it returns the second / last page") runs = runApiService.listRuns( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, 1, expectedSize) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, 1, expectedSize) assertEquals(numberOfRuns - expectedSize, runs.size) } @@ -384,17 +382,17 @@ class RunServiceIntegrationTest : CsmRunTestBase() { fun `test find All Runs with wrong pagination params`() { logger.info("Should throw IllegalArgumentException when page and size are zeros") assertThrows { - runApiService.listRuns(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, 0, 0) + runApiService.listRuns(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, 0, 0) } logger.info("Should throw IllegalArgumentException when page is negative") assertThrows { - runApiService.listRuns(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, -1, 10) + runApiService.listRuns(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, -1, 10) } logger.info("Should throw IllegalArgumentException when size is negative") assertThrows { - runApiService.listRuns(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, 0, -1) + runApiService.listRuns(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, 0, -1) } } @@ -407,7 +405,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { fun setUp() { runSavedId = mockStartRun( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, solutionSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, solutionSaved.id!!) assertTrue(adminRunStorageTemplate.existDB(runSavedId)) val internalResultServices = csmPlatformProperties.internalResultServices!! @@ -424,7 +422,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { @Test fun `test deleteRun should remove the database`() { runApiService.deleteRun( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId) assertFalse(adminRunStorageTemplate.existDB(runSavedId)) } @@ -439,11 +437,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { val requestBody = SendRunDataRequest(id = tableName, data = data) val runDataResult = runApiService.sendRunData( - organizationSaved.id!!, - workspaceSaved.id!!, - runnerSaved.id!!, - runSavedId, - requestBody) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) assertEquals(tableName.toDataTableName(false), runDataResult.tableName) @@ -466,7 +460,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { mapOf("param3" to JSONObject(mapOf("param4" to "value4")))) val requestBody = SendRunDataRequest(id = tableName, data = data) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) assertTrue(readerRunStorageTemplate.existTable(tableName.toDataTableName(false))) @@ -480,7 +474,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { val data2 = listOf(mapOf("param1" to "value1"), mapOf("param2" to 2)) val requestBody2 = SendRunDataRequest(id = tableName2, data = data2) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody2) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody2) assertTrue(readerRunStorageTemplate.existTable(tableName2.toDataTableName(false))) @@ -499,11 +493,11 @@ class RunServiceIntegrationTest : CsmRunTestBase() { val requestBody = SendRunDataRequest(id = tableName, data = data) val requestBody2 = SendRunDataRequest(id = tableName, data = data2) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) assertFailsWith(SQLException::class, "Schema should have been rejected") { runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody2) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody2) } } @@ -515,10 +509,10 @@ class RunServiceIntegrationTest : CsmRunTestBase() { val requestBody = SendRunDataRequest(id = tableName, data = data) val requestBody2 = SendRunDataRequest(id = tableName, data = data2) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody2) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody2) val rows = readerRunStorageTemplate.queryForList( @@ -538,7 +532,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { assertFailsWith( IllegalArgumentException::class, "sendRunData must fail if data is an empty list") { runApiService.sendRunData( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, @@ -556,10 +550,10 @@ class RunServiceIntegrationTest : CsmRunTestBase() { val customDataId = "CustomData" val requestBody = SendRunDataRequest(id = customDataId, data = data) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) val queryResult = runApiService.queryRunData( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, @@ -582,11 +576,11 @@ class RunServiceIntegrationTest : CsmRunTestBase() { val customDataId = "CustomData" val requestBody = SendRunDataRequest(id = customDataId, data = data) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) val exception = assertThrows { runApiService.queryRunData( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, @@ -607,11 +601,11 @@ class RunServiceIntegrationTest : CsmRunTestBase() { val customDataId = "CustomData" val requestBody = SendRunDataRequest(id = customDataId, data = data) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) var e = assertThrows { runApiService.queryRunData( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, @@ -622,7 +616,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { e = assertThrows { runApiService.queryRunData( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, @@ -641,16 +635,16 @@ class RunServiceIntegrationTest : CsmRunTestBase() { mapOf("param3" to mapOf("param4" to "value4"))) var requestBody = SendRunDataRequest(id = "table1", data = data) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) requestBody = SendRunDataRequest(id = "table2", data = data) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) requestBody = SendRunDataRequest(id = "table3", data = data) runApiService.sendRunData( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, requestBody) val queryResult = runApiService.queryRunData( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runSavedId, diff --git a/run/src/main/kotlin/com/cosmotech/run/RunContainerFactory.kt b/run/src/main/kotlin/com/cosmotech/run/RunContainerFactory.kt index 1d5ce7b1f..c090e9267 100644 --- a/run/src/main/kotlin/com/cosmotech/run/RunContainerFactory.kt +++ b/run/src/main/kotlin/com/cosmotech/run/RunContainerFactory.kt @@ -192,7 +192,7 @@ class RunContainerFactory( getCommonEnvVars( csmPlatformProperties, csmSimulationId, - organization.id!!, + organization.id, workspace.id!!, runner.id!!, runId) @@ -231,7 +231,7 @@ class RunContainerFactory( mapOf( CSM_JOB_ID_LABEL_KEY to runId, WORKFLOW_TYPE_LABEL to workflowType, - ORGANIZATION_ID_LABEL to organization.id!!, + ORGANIZATION_ID_LABEL to organization.id, WORKSPACE_ID_LABEL to workspace.id!!, RUNNER_ID_LABEL to runner.id!!, )) diff --git a/run/src/test/kotlin/com/cosmotech/run/ContainerFactoryTests.kt b/run/src/test/kotlin/com/cosmotech/run/ContainerFactoryTests.kt index 70214882e..0d36e8228 100644 --- a/run/src/test/kotlin/com/cosmotech/run/ContainerFactoryTests.kt +++ b/run/src/test/kotlin/com/cosmotech/run/ContainerFactoryTests.kt @@ -192,7 +192,7 @@ class ContainerFactoryTests { "IDP_BASE_URL" to csmPlatformProperties.identityProvider.serverBaseUrl, "IDP_TENANT_ID" to csmPlatformProperties.identityProvider.identity.tenantId, "CSM_SIMULATION_ID" to CSM_SIMULATION_ID, - "CSM_ORGANIZATION_ID" to organization.id!!, + "CSM_ORGANIZATION_ID" to organization.id, "CSM_WORKSPACE_ID" to workspace.id!!, "CSM_RUNNER_ID" to runner.id!!, "CSM_RUN_ID" to runId, diff --git a/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt b/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt index 3ec611c35..60cea6a0a 100644 --- a/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt +++ b/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt @@ -162,19 +162,19 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest() organizationSaved = organizationApiService.createOrganization(organization) - dataset = makeDataset(organizationSaved.id!!, "Dataset", connectorSaved) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + dataset = makeDataset(organizationSaved.id, "Dataset", connectorSaved) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() - solution = makeSolution(organizationSaved.id!!) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solution = makeSolution(organizationSaved.id) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) - workspace = makeWorkspace(organizationSaved.id!!, solutionSaved.id!!, "Workspace") - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspace = makeWorkspace(organizationSaved.id, solutionSaved.id!!, "Workspace") + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace) parentRunner = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, "RunnerParent", @@ -182,11 +182,11 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { parametersValues = mutableListOf(runTemplateParameterValue1)) parentRunnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, parentRunner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, parentRunner) runner = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, name = "Runner", @@ -194,7 +194,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { datasetList = mutableListOf(datasetSaved.id!!), parametersValues = mutableListOf(runTemplateParameterValue2)) - runnerSaved = runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerSaved = runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) } @Test @@ -209,7 +209,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { "should create a new Runner and retrieve parameter varType from solution ignoring the one declared") val newRunner = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, "NewRunner", @@ -219,7 +219,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { RunnerRunTemplateParameterValue( parameterId = "param1", value = "7", varType = "ignored_var_type"))) val newRunnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, newRunner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, newRunner) assertNotNull(newRunnerSaved.parametersValues) assertTrue(newRunnerSaved.parametersValues!!.size == 1) @@ -238,14 +238,14 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { parameterId = "param1", value = "7", varType = "ignored_var_type") val newRunner = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, "NewRunner", mutableListOf(datasetSaved.id!!), parametersValues = mutableListOf(creationParameterValue)) val newRunnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, newRunner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, newRunner) assertNotNull(newRunnerSaved.parametersValues) assertTrue(newRunnerSaved.parametersValues!!.size == 1) @@ -256,7 +256,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { parameterId = "param1", value = "10", varType = "still_ignored_var_type") val updateRunnerSaved = runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, newRunnerSaved.id!!, newRunnerSaved.apply { parametersValues = mutableListOf(newParameterValue) }) @@ -273,33 +273,33 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns "random_user_with_patform_admin_role" every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_PLATFORM_ADMIN) var initialRunnerList = - runnerApiService.listRunners(organizationSaved.id!!, workspaceSaved.id!!, null, null) + runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, null, null) logger.info("should create a new Runner") val newRunner = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, "NewRunner", mutableListOf(datasetSaved.id!!)) val newRunnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, newRunner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, newRunner) logger.info("should find all Runners and assert there is one more") var runnerList = - runnerApiService.listRunners(organizationSaved.id!!, workspaceSaved.id!!, null, null) + runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, null, null) assertEquals(initialRunnerList.size + 1, runnerList.size) logger.info("should find a Runner by Id and assert it is the one created") val runnerRetrieved = - runnerApiService.getRunner(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + runnerApiService.getRunner(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) assertEquals(runnerSaved, runnerRetrieved) logger.info("should update the Runner and assert the name has been updated") val runnerUpdated = runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerRetrieved.id!!, runnerRetrieved.copy(name = "Runner Updated")) @@ -308,15 +308,15 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { runnerUpdated.copy(creationDate = null, lastUpdate = null)) logger.info("should delete the Runner and assert there is one less Runner left") - runnerApiService.deleteRunner(organizationSaved.id!!, workspaceSaved.id!!, newRunnerSaved.id!!) + runnerApiService.deleteRunner(organizationSaved.id, workspaceSaved.id!!, newRunnerSaved.id!!) val runnerListAfterDelete = - runnerApiService.listRunners(organizationSaved.id!!, workspaceSaved.id!!, null, null) + runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, null, null) assertEquals(runnerList.size - 1, runnerListAfterDelete.size) // We create more runner than there can be on one page of default size to assert // deleteAllRunners still works with high quantities of runners repeat(csmPlatformProperties.twincache.runner.defaultPageSize + 1) { - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, makeRunner()) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, makeRunner()) } } @@ -329,32 +329,31 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { IntRange(1, numberOfRunners - 1).forEach { val runner = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, "Runner$it", mutableListOf(datasetSaved.id!!)) - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) } logger.info("should find all Runners and assert there are $numberOfRunners") var runnerList = - runnerApiService.listRunners(organizationSaved.id!!, workspaceSaved.id!!, null, null) + runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, null, null) assertEquals(defaultPageSize, runnerList.size) logger.info("should find all Runners and assert it equals defaultPageSize: $defaultPageSize") - runnerList = runnerApiService.listRunners(organizationSaved.id!!, workspaceSaved.id!!, 0, null) + runnerList = runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, 0, null) assertEquals(defaultPageSize, runnerList.size) logger.info("should find all Runners and assert there are expected size: $expectedSize") runnerList = - runnerApiService.listRunners(organizationSaved.id!!, workspaceSaved.id!!, 0, expectedSize) + runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, 0, expectedSize) assertEquals(expectedSize, runnerList.size) logger.info("should find all Runners and assert it returns the second / last page") runnerList = - runnerApiService.listRunners( - organizationSaved.id!!, workspaceSaved.id!!, 1, defaultPageSize) + runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, 1, defaultPageSize) assertEquals(1, runnerList.size) } @@ -362,17 +361,17 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { fun `test find All Runners with wrong pagination params`() { logger.info("Should throw IllegalArgumentException when page and size are zeros") assertThrows { - runnerApiService.listRunners(organizationSaved.id!!, workspaceSaved.id!!, 0, 0) + runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, 0, 0) } logger.info("Should throw IllegalArgumentException when page is negative") assertThrows { - runnerApiService.listRunners(organizationSaved.id!!, workspaceSaved.id!!, -1, 10) + runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, -1, 10) } logger.info("Should throw IllegalArgumentException when size is negative") assertThrows { - runnerApiService.listRunners(organizationSaved.id!!, workspaceSaved.id!!, 0, -1) + runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, 0, -1) } } @@ -381,48 +380,47 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { // Create a 3 level hierarchy: grandParent <- parent <- child val grandParentCreation = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, ) val grandParentRunner = runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, grandParentCreation) + organizationSaved.id, workspaceSaved.id!!, grandParentCreation) val parentCreation = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, parentId = grandParentRunner.id) val parentRunner = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, parentCreation) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, parentCreation) val childCreation = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, parentId = parentRunner.id) val childRunner = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, childCreation) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, childCreation) // Initial parents check assertEquals(grandParentRunner.id, parentRunner.parentId) assertEquals(parentRunner.id, childRunner.parentId) // Delete intermediate parent, child should refer to grandParent - runnerApiService.deleteRunner(organizationSaved.id!!, workspaceSaved.id!!, parentRunner.id!!) + runnerApiService.deleteRunner(organizationSaved.id, workspaceSaved.id!!, parentRunner.id!!) var newChildParentId = runnerApiService - .getRunner(organizationSaved.id!!, workspaceSaved.id!!, childRunner.id!!) + .getRunner(organizationSaved.id, workspaceSaved.id!!, childRunner.id!!) .parentId assertEquals(grandParentRunner.id, newChildParentId) // Delete root grandParent, child should clear its parent - runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, grandParentRunner.id!!) + runnerApiService.deleteRunner(organizationSaved.id, workspaceSaved.id!!, grandParentRunner.id!!) newChildParentId = runnerApiService - .getRunner(organizationSaved.id!!, workspaceSaved.id!!, childRunner.id!!) + .getRunner(organizationSaved.id, workspaceSaved.id!!, childRunner.id!!) .parentId assertNull(newChildParentId) } @@ -433,34 +431,34 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { // <- parent2 <- child2 val grandParentCreation = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, ) val grandParentRunner = runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, grandParentCreation) + organizationSaved.id, workspaceSaved.id!!, grandParentCreation) val parentCreation = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, parentId = grandParentRunner.id) val parentRunner1 = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, parentCreation) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, parentCreation) val parentRunner2 = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, parentCreation) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, parentCreation) var childCreation = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, parentId = parentRunner1.id) val childRunner1 = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, childCreation) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, childCreation) childCreation.parentId = parentRunner2.id val childRunner2 = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, childCreation) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, childCreation) // Initial parents check assertEquals(grandParentRunner.id, parentRunner1.parentId) @@ -474,25 +472,24 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { assertEquals(grandParentRunner.id, childRunner2.rootId) // Delete grand parent - runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, grandParentRunner.id!!) + runnerApiService.deleteRunner(organizationSaved.id, workspaceSaved.id!!, grandParentRunner.id!!) assertNull( runnerApiService - .getRunner(organizationSaved.id!!, workspaceSaved.id!!, parentRunner1.id!!) + .getRunner(organizationSaved.id, workspaceSaved.id!!, parentRunner1.id!!) .rootId) assertNull( runnerApiService - .getRunner(organizationSaved.id!!, workspaceSaved.id!!, parentRunner2.id!!) + .getRunner(organizationSaved.id, workspaceSaved.id!!, parentRunner2.id!!) .rootId) assertEquals( parentRunner1.id, runnerApiService - .getRunner(organizationSaved.id!!, workspaceSaved.id!!, childRunner1.id!!) + .getRunner(organizationSaved.id, workspaceSaved.id!!, childRunner1.id!!) .rootId) assertEquals( parentRunner2.id, runnerApiService - .getRunner(organizationSaved.id!!, workspaceSaved.id!!, childRunner2.id!!) + .getRunner(organizationSaved.id, workspaceSaved.id!!, childRunner2.id!!) .rootId) } @@ -503,14 +500,14 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { logger.info("should test default security is set to ROLE_NONE") val runnerSecurity = runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) assertEquals(ROLE_NONE, runnerSecurity.default) logger.info("should set default security to ROLE_VIEWER and assert it has been set") val runnerRole = RunnerRole(ROLE_VIEWER) val runnerSecurityRegistered = runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runnerRole) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runnerRole) assertEquals(runnerRole.role, runnerSecurityRegistered.default) } @@ -522,14 +519,14 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { // Test default security assertThrows { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } logger.info("should throw CsmAccessForbiddenException when trying to set default security") val runnerRole = RunnerRole(ROLE_VIEWER) assertThrows { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runnerRole) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runnerRole) } } @@ -539,27 +536,27 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val runnerAccessControl = RunnerAccessControl(TEST_USER_MAIL, ROLE_VIEWER) var runnerAccessControlRegistered = runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runnerAccessControl) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runnerAccessControl) assertEquals(runnerAccessControl, runnerAccessControlRegistered) logger.info("should get the Access Control and assert it is the one created") runnerAccessControlRegistered = runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) assertEquals(runnerAccessControl, runnerAccessControlRegistered) logger.info( "should add an Access Control and assert it is the one created in the linked datasets") runnerSaved.datasetList!!.forEach { assertDoesNotThrow { - datasetApiService.getDatasetAccessControl(organizationSaved.id!!, it, TEST_USER_MAIL) + datasetApiService.getDatasetAccessControl(organizationSaved.id, it, TEST_USER_MAIL) } } logger.info("should update the Access Control and assert it has been updated") runnerAccessControlRegistered = runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -570,31 +567,29 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { runnerSaved.datasetList!!.forEach { assertEquals( ROLE_VIEWER, - datasetApiService - .getDatasetAccessControl(organizationSaved.id!!, it, TEST_USER_MAIL) - .role) + datasetApiService.getDatasetAccessControl(organizationSaved.id, it, TEST_USER_MAIL).role) } logger.info("should get the list of users and assert there are 2") val userList = runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) assertEquals(3, userList.size) logger.info("should remove the Access Control and assert it has been removed") runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) assertThrows { runnerAccessControlRegistered = runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } logger.info( "should remove the Access Control and assert it has been removed in the linked datasets") runnerSaved.datasetList!!.forEach { assertThrows { - datasetApiService.getDatasetAccessControl(organizationSaved.id!!, it, TEST_USER_MAIL) + datasetApiService.getDatasetAccessControl(organizationSaved.id, it, TEST_USER_MAIL) } } } @@ -607,20 +602,20 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val runnerAccessControl = RunnerAccessControl(TEST_USER_MAIL, ROLE_VIEWER) assertThrows { runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runnerAccessControl) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runnerAccessControl) } logger.info("should throw CsmAccessForbiddenException when trying to get RunnerAccessControl") assertThrows { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } logger.info( "should throw CsmAccessForbiddenException when trying to update RunnerAccessControl") assertThrows { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -630,14 +625,14 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { logger.info("should throw CsmAccessForbiddenException when getting the list of users") assertThrows { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } logger.info( "should throw CsmAccessForbiddenException when trying to remove RunnerAccessControl") assertThrows { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } @@ -645,7 +640,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { fun `test deleting a running runner`() { runnerSaved.lastRunId = "run-genid12345" runnerApiService.updateRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, runnerSaved) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runnerSaved) every { eventPublisher.publishEvent(any()) } answers { @@ -654,8 +649,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val exception = assertThrows { - runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + runnerApiService.deleteRunner(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "Can't delete runner ${runnerSaved.id}: at least one run is still running", @@ -664,10 +658,10 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test on runner delete keep datasets`() { - runnerApiService.deleteRunner(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + runnerApiService.deleteRunner(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) runnerSaved.datasetList!!.forEach { dataset -> - assertDoesNotThrow { datasetApiService.findDatasetById(organizationSaved.id!!, dataset) } + assertDoesNotThrow { datasetApiService.findDatasetById(organizationSaved.id, dataset) } } } @@ -680,13 +674,12 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val parentId = runnerApiService .createRunner( - organizationSaved.id!!, workspaceSaved.id!!, parentRunnerWithEmptyDatasetList) + organizationSaved.id, workspaceSaved.id!!, parentRunnerWithEmptyDatasetList) .id val childRunnerWithNullDatasetList = makeRunner(parentId = parentId, datasetList = null) val childRunnerDatasetList = runnerApiService - .createRunner( - organizationSaved.id!!, workspaceSaved.id!!, childRunnerWithNullDatasetList) + .createRunner(organizationSaved.id, workspaceSaved.id!!, childRunnerWithNullDatasetList) .datasetList assertNotNull(childRunnerDatasetList) @@ -703,13 +696,12 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val parentId = runnerApiService .createRunner( - organizationSaved.id!!, workspaceSaved.id!!, parentRunnerWithNonEmptyDatasetList) + organizationSaved.id, workspaceSaved.id!!, parentRunnerWithNonEmptyDatasetList) .id val childRunnerWithNullDatasetList = makeRunner(parentId = parentId, datasetList = null) val childRunnerDatasetList = runnerApiService - .createRunner( - organizationSaved.id!!, workspaceSaved.id!!, childRunnerWithNullDatasetList) + .createRunner(organizationSaved.id, workspaceSaved.id!!, childRunnerWithNullDatasetList) .datasetList assertNotNull(childRunnerDatasetList) @@ -726,14 +718,14 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val parentId = runnerApiService .createRunner( - organizationSaved.id!!, workspaceSaved.id!!, parentRunnerWithNonEmptyDatasetList) + organizationSaved.id, workspaceSaved.id!!, parentRunnerWithNonEmptyDatasetList) .id val childRunnerWithEmptyDatasetList = makeRunner(parentId = parentId, datasetList = mutableListOf()) val childRunnerDatasetList = runnerApiService .createRunner( - organizationSaved.id!!, workspaceSaved.id!!, childRunnerWithEmptyDatasetList) + organizationSaved.id, workspaceSaved.id!!, childRunnerWithEmptyDatasetList) .datasetList assertNotNull(childRunnerDatasetList) @@ -750,7 +742,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val parentId = runnerApiService .createRunner( - organizationSaved.id!!, workspaceSaved.id!!, parentRunnerWithNonEmptyDatasetList) + organizationSaved.id, workspaceSaved.id!!, parentRunnerWithNonEmptyDatasetList) .id val childDatasetList = mutableListOf("fakeDatasetIdChildRunner") val childRunnerWithNonEmptyDatasetList = @@ -758,7 +750,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val childRunnerDatasetList = runnerApiService .createRunner( - organizationSaved.id!!, workspaceSaved.id!!, childRunnerWithNonEmptyDatasetList) + organizationSaved.id, workspaceSaved.id!!, childRunnerWithNonEmptyDatasetList) .datasetList assertNotNull(childRunnerDatasetList) @@ -767,10 +759,10 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test updating (adding) runner's datasetList add runner users to new dataset`() { - val newDataset = datasetApiService.createDataset(organizationSaved.id!!, makeDataset()) + val newDataset = datasetApiService.createDataset(organizationSaved.id, makeDataset()) runnerSaved = runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, runner.copy( @@ -783,10 +775,10 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val runnerUserList = runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) val datasetUserList = - datasetApiService.getDatasetSecurityUsers(organizationSaved.id!!, newDataset.id!!) + datasetApiService.getDatasetSecurityUsers(organizationSaved.id, newDataset.id!!) datasetUserList.containsAll(runnerUserList) } @@ -794,8 +786,8 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { fun `access control list shouldn't contain more than one time each user on creation`() { organizationSaved = organizationApiService.createOrganization(makeOrganizationCreateRequest("organization")) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, makeSolution()) - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, makeWorkspace()) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, makeSolution()) + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, makeWorkspace()) val brokenRunner = Runner( name = "runner", @@ -807,7 +799,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { RunnerAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN), RunnerAccessControl(CONNECTED_ADMIN_USER, ROLE_EDITOR)))) assertThrows { - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, brokenRunner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, brokenRunner) } } @@ -815,20 +807,20 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { fun `access control list can't add an existing user`() { organizationSaved = organizationApiService.createOrganization(makeOrganizationCreateRequest("organization")) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, makeSolution()) - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, makeWorkspace()) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, makeSolution()) + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, makeWorkspace()) val workingRunner = makeRunner() runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, workingRunner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, workingRunner) val runnerSavedSecurityUsers = runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) assertEquals(2, runnerSavedSecurityUsers.size) assertThrows { runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl(defaultName, ROLE_EDITOR)) @@ -836,7 +828,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val runnerSecurityUsers = runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) assertEquals(2, runnerSecurityUsers.size) assert(runnerSavedSecurityUsers == runnerSecurityUsers) } @@ -845,20 +837,20 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { fun `access control list can't update a non-existing user`() { organizationSaved = organizationApiService.createOrganization(makeOrganizationCreateRequest("organization")) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, makeSolution()) - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, makeWorkspace()) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, makeSolution()) + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, makeWorkspace()) val workingRunner = makeRunner() runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, workingRunner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, workingRunner) val runnerSavedSecurityUsers = runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) assertEquals(2, runnerSavedSecurityUsers.size) assertThrows { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, "invalid user", @@ -867,7 +859,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val runnerSecurityUsers = runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) assertEquals(2, runnerSecurityUsers.size) assert(runnerSavedSecurityUsers == runnerSecurityUsers) } @@ -881,16 +873,16 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { solution = WorkspaceSolution(solutionSaved.id!!), id = "id", datasetCopy = false) - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace) runner = makeRunner(datasetList = mutableListOf(datasetSaved.id!!)) - runnerSaved = runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerSaved = runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) datasetSaved = - datasetApiService.findDatasetById(organizationSaved.id!!, runnerSaved.datasetList!![0]) - runnerApiService.deleteRunner(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + datasetApiService.findDatasetById(organizationSaved.id, runnerSaved.datasetList!![0]) + runnerApiService.deleteRunner(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) assertDoesNotThrow { - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) } } @@ -903,20 +895,20 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { solution = WorkspaceSolution(solutionSaved.id!!), id = "id", datasetCopy = true) - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace) runner = makeRunner(datasetList = mutableListOf(datasetSaved.id!!)) - runnerSaved = runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerSaved = runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) datasetSaved = - datasetApiService.findDatasetById(organizationSaved.id!!, runnerSaved.datasetList!![0]) + datasetApiService.findDatasetById(organizationSaved.id, runnerSaved.datasetList!![0]) runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl(id = "id", role = ROLE_EDITOR)) val datasetAC = - datasetApiService.getDatasetAccessControl(organizationSaved.id!!, datasetSaved.id!!, "id") + datasetApiService.getDatasetAccessControl(organizationSaved.id, datasetSaved.id!!, "id") assertEquals(ROLE_EDITOR, datasetAC.role) } @@ -924,7 +916,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { fun `test runner creation with unknown runtemplateId`() { val runnerWithWrongRunTemplateId = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, name = "Runner_With_unknown_runtemplate_id", @@ -936,7 +928,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val assertThrows = assertThrows { runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerWithWrongRunTemplateId) + organizationSaved.id, workspaceSaved.id!!, runnerWithWrongRunTemplateId) } assertEquals( "Run Template not found: ${runnerWithWrongRunTemplateId.runTemplateId}", @@ -948,7 +940,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val parentId = "unknown_parent_id" val runnerWithWrongParentId = makeRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, name = "Runner_With_unknown_parent", @@ -959,7 +951,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val assertThrows = assertThrows { runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerWithWrongParentId) + organizationSaved.id, workspaceSaved.id!!, runnerWithWrongParentId) } assertTrue(assertThrows.message!!.startsWith("Parent Id $parentId define on")) } @@ -979,11 +971,11 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val parentRunnerWithEmptyParams = makeRunner(name = "parent") val parentRunnerSaved = runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, parentRunnerWithEmptyParams) + organizationSaved.id, workspaceSaved.id!!, parentRunnerWithEmptyParams) val parentRunnerUpdated = runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, parentRunnerSaved.id!!, parentRunnerSaved.apply { @@ -1000,7 +992,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { val childRunnerWithEmptyParamsSaved = runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, childRunnerWithEmptyParams) + organizationSaved.id, workspaceSaved.id!!, childRunnerWithEmptyParams) assertNotNull(childRunnerWithEmptyParamsSaved.parametersValues) assertEquals(1, childRunnerWithEmptyParamsSaved.parametersValues!!.size) @@ -1016,13 +1008,12 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { firstArg().response = expectedRunId } - val run = - runnerApiService.startRun(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + val run = runnerApiService.startRun(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) assertEquals(expectedRunId, run.id) val lastRunId = runnerApiService - .getRunner(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + .getRunner(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) .lastRunId assertEquals(expectedRunId, lastRunId) } @@ -1031,10 +1022,10 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { fun `As a viewer, I can only see my information in security property for getRunner`() { every { getCurrentAccountIdentifier(any()) } returns defaultName runner = makeRunner(userName = defaultName, role = ROLE_VIEWER) - runnerSaved = runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerSaved = runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) runnerSaved = - runnerApiService.getRunner(organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + runnerApiService.getRunner(organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) assertEquals( RunnerSecurity( default = ROLE_NONE, mutableListOf(RunnerAccessControl(defaultName, ROLE_VIEWER))), @@ -1046,16 +1037,16 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { fun `As a viewer, I can only see my information in security property for listRunners`() { every { getCurrentAccountIdentifier(any()) } returns defaultName organizationSaved = organizationApiService.createOrganization(organization) - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) materializeTwingraph() - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) workspace = makeWorkspace() - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace) runner = makeRunner(userName = defaultName, role = ROLE_VIEWER) - runnerSaved = runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerSaved = runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) val runners = - runnerApiService.listRunners(organizationSaved.id!!, workspaceSaved.id!!, null, null) + runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id!!, null, null) runners.forEach { assertEquals( RunnerSecurity( @@ -1075,7 +1066,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { } fun makeDataset( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, name: String = "name", connector: Connector = connectorSaved ): Dataset { @@ -1099,7 +1090,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { DatasetAccessControl(defaultName, ROLE_USER)))) } - fun makeSolution(organizationId: String = organizationSaved.id!!): Solution { + fun makeSolution(organizationId: String = organizationSaved.id): Solution { return Solution( id = "solutionId", key = UUID.randomUUID().toString(), @@ -1150,7 +1141,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { } fun makeWorkspace( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, solutionId: String = solutionSaved.id!!, name: String = "name", userName: String = defaultName, @@ -1174,7 +1165,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { } fun makeRunner( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, workspaceId: String = workspaceSaved.id!!, solutionId: String = solutionSaved.id!!, name: String = "name", diff --git a/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceRBACTest.kt b/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceRBACTest.kt index 5cad97d6c..a65dfeab4 100644 --- a/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceRBACTest.kt +++ b/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceRBACTest.kt @@ -142,47 +142,46 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.listRunners( - organizationSaved.id!!, workspaceSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, null, null) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.listRunners( - organizationSaved.id!!, workspaceSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, null, null) } } } @@ -207,36 +206,35 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.listRunners( - organizationSaved.id!!, workspaceSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, null, null) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -244,7 +242,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.listRunners( - organizationSaved.id!!, workspaceSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, null, null) } } } @@ -269,39 +267,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.listRunners( - organizationSaved.id!!, workspaceSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, null, null) } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -309,7 +306,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.listRunners( - organizationSaved.id!!, workspaceSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, null, null) } } } @@ -333,40 +330,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.listRunners( - organizationSaved.id!!, workspaceSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, null, null) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -374,7 +369,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.listRunners( - organizationSaved.id!!, workspaceSaved.id!!, null, null) + organizationSaved.id, workspaceSaved.id!!, null, null) } } } @@ -398,45 +393,44 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, runner) + organizationSaved.id, workspaceSaved.id!!, runner) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) } } } @@ -460,39 +454,37 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, runner) + organizationSaved.id, workspaceSaved.id!!, runner) } if (role == ROLE_NONE || role == ROLE_VALIDATOR) { assertEquals( @@ -505,7 +497,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } } else { assertDoesNotThrow { - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) } } } @@ -530,45 +522,44 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, runner) + organizationSaved.id, workspaceSaved.id!!, runner) } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) } } } @@ -593,35 +584,34 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, runner) + organizationSaved.id, workspaceSaved.id!!, runner) } if (role == ROLE_VALIDATOR || role == ROLE_NONE) { assertEquals( @@ -634,7 +624,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } } else { assertDoesNotThrow { - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) } } } @@ -658,47 +648,46 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.getRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -722,40 +711,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -763,7 +750,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -788,39 +775,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -828,7 +814,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -853,36 +839,35 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -890,7 +875,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -914,39 +899,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = role) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${runnerSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -954,7 +938,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -978,49 +962,48 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved every { datasetApiService.deleteDataset(any(), any()) } returns Unit - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -1044,42 +1027,40 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved every { datasetApiService.deleteDataset(any(), any()) } returns Unit - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -1087,7 +1068,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -1112,41 +1093,40 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved every { datasetApiService.deleteDataset(any(), any()) } returns Unit - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -1154,7 +1134,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -1178,49 +1158,48 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved every { datasetApiService.deleteDataset(any(), any()) } returns Unit - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -1243,41 +1222,40 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved every { datasetApiService.deleteDataset(any(), any()) } returns Unit - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = role) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } if (role == ROLE_NONE) { assertEquals( @@ -1291,7 +1269,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.deleteRunner( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -1315,43 +1293,42 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1359,16 +1336,16 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = role)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1397,44 +1374,42 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1447,11 +1422,11 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1481,43 +1456,42 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1530,11 +1504,11 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1564,40 +1538,39 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1610,11 +1583,11 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1643,43 +1616,42 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = role) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1698,11 +1670,11 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.updateRunner( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1731,25 +1703,24 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1757,22 +1728,22 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = ROLE_ADMIN) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerPermissions( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, role) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, role) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.getRunnerPermissions( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, role) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, role) } } } @@ -1796,26 +1767,24 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1823,14 +1792,14 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = ROLE_ADMIN) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerPermissions( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, role) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, role) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -1838,7 +1807,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerPermissions( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, role) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, role) } } } @@ -1863,25 +1832,24 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1889,14 +1857,14 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = ROLE_ADMIN) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerPermissions( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, role) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, role) } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -1904,7 +1872,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerPermissions( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, role) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, role) } } } @@ -1929,22 +1897,21 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -1952,14 +1919,14 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = ROLE_ADMIN) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerPermissions( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, role) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, role) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -1967,7 +1934,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerPermissions( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, role) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, role) } } } @@ -1991,25 +1958,24 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -2017,14 +1983,14 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = role) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerPermissions( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, role) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, role) } if (role == ROLE_NONE) { assertEquals( @@ -2038,7 +2004,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerPermissions( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, role) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, role) } } } @@ -2062,47 +2028,46 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -2126,40 +2091,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -2167,7 +2130,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -2192,39 +2155,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -2232,7 +2194,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -2257,36 +2219,35 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -2294,7 +2255,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -2318,39 +2279,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = role) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } if (role == ROLE_NONE) { assertEquals( @@ -2364,7 +2324,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerSecurity( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -2388,51 +2348,50 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) materializeTwingraph(datasetSaved) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerRole(ROLE_ADMIN)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerRole(ROLE_ADMIN)) @@ -2459,41 +2418,39 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) materializeTwingraph(datasetSaved) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerRole(ROLE_ADMIN)) @@ -2504,7 +2461,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerRole(ROLE_ADMIN)) @@ -2532,40 +2489,39 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) materializeTwingraph(datasetSaved) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerRole(ROLE_ADMIN)) @@ -2576,7 +2532,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerRole(ROLE_ADMIN)) @@ -2604,36 +2560,35 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerRole(ROLE_ADMIN)) @@ -2644,7 +2599,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerRole(ROLE_ADMIN)) @@ -2671,39 +2626,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = role) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerRole(ROLE_ADMIN)) @@ -2720,7 +2674,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.setRunnerDefaultSecurity( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerRole(ROLE_ADMIN)) @@ -2747,51 +2701,50 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl("id", ROLE_ADMIN)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl("id", ROLE_ADMIN)) @@ -2819,28 +2772,27 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = - datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -2848,7 +2800,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = ROLE_ADMIN) val runnerSaved = runnerApiService.createRunner( - organizationSaved.id!!, workspaceSaved.id!!, runner) + organizationSaved.id, workspaceSaved.id!!, runner) assertDoesNotThrow { assertTrue( @@ -2860,13 +2812,13 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { .isNullOrEmpty()) runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl("unknown_user@test.com", role)) val datasetWithUpgradedACL = - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) var datasetRole = role if (role == ROLE_VALIDATOR) { datasetRole = ROLE_USER @@ -2894,8 +2846,8 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset( - organizationSaved.id!!, connectorSaved, id = "unknown_user@test.com", role = ROLE_NONE) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + organizationSaved.id, connectorSaved, id = "unknown_user@test.com", role = ROLE_NONE) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save(datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved @@ -2906,30 +2858,30 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { datasetAccessControl.id == TEST_USER_MAIL }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) - val workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) + val workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = "unknown_user@test.com", role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl(TEST_USER_MAIL, ROLE_ADMIN)) val datasetWithUpgradedACL = - datasetApiService.findDatasetById(organizationSaved.id!!, datasetSaved.id!!) + datasetApiService.findDatasetById(organizationSaved.id, datasetSaved.id!!) assertEquals( true, datasetWithUpgradedACL.security?.accessControlList?.any { datasetAccessControl -> @@ -2956,40 +2908,39 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl("id", ROLE_ADMIN)) @@ -3000,7 +2951,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl("id", ROLE_ADMIN)) @@ -3028,37 +2979,36 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) materializeTwingraph(datasetSaved) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl("id", ROLE_ADMIN)) @@ -3069,7 +3019,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl("id", ROLE_ADMIN)) @@ -3096,40 +3046,39 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = role) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl("id", ROLE_ADMIN)) @@ -3146,7 +3095,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.addRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, RunnerAccessControl("id", ROLE_ADMIN)) @@ -3173,50 +3122,49 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } } @@ -3240,40 +3188,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) @@ -3284,7 +3230,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } } @@ -3309,39 +3255,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) @@ -3352,7 +3297,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } } @@ -3377,36 +3322,35 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) @@ -3417,7 +3361,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } } @@ -3441,39 +3385,38 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = role) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) @@ -3490,7 +3433,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } } @@ -3514,51 +3457,50 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } } @@ -3582,41 +3524,39 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) @@ -3633,7 +3573,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } } @@ -3658,40 +3598,39 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) @@ -3702,7 +3641,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } } @@ -3727,37 +3666,36 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) @@ -3768,7 +3706,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } } @@ -3792,40 +3730,39 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = role) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) @@ -3842,7 +3779,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.removeRunnerAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL) } } } @@ -3866,22 +3803,21 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved every { datasetApiService.getDatasetSecurityUsers(any(), any()) } returns listOf(TEST_USER_MAIL, CONNECTED_ADMIN_USER) @@ -3890,33 +3826,33 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } returns mockk() val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, RunnerRole(ROLE_VIEWER)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -3944,23 +3880,21 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved every { datasetApiService.getDatasetSecurityUsers(any(), any()) } returns listOf(TEST_USER_MAIL, CONNECTED_ADMIN_USER) @@ -3969,21 +3903,21 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } returns mockk() val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -3995,7 +3929,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -4024,22 +3958,21 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved every { datasetApiService.getDatasetSecurityUsers(any(), any()) } returns listOf(TEST_USER_MAIL, CONNECTED_ADMIN_USER) @@ -4048,21 +3981,21 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } returns mockk() val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -4074,7 +4007,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -4103,19 +4036,18 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved every { datasetApiService.getDatasetSecurityUsers(any(), any()) } returns listOf(TEST_USER_MAIL, CONNECTED_ADMIN_USER) @@ -4124,21 +4056,21 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } returns mockk() val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = ROLE_ADMIN) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -4150,7 +4082,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -4178,22 +4110,21 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved every { datasetApiService.getDatasetSecurityUsers(any(), any()) } returns listOf(TEST_USER_MAIL, CONNECTED_ADMIN_USER) @@ -4202,21 +4133,21 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } returns mockk() val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), id = TEST_USER_MAIL, role = role) val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -4234,7 +4165,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.updateRunnerAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!, TEST_USER_MAIL, @@ -4262,25 +4193,24 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -4288,22 +4218,22 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = ROLE_ADMIN) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -4327,26 +4257,24 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) - val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + val dataset = makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, role) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -4354,14 +4282,14 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = ROLE_ADMIN) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${datasetSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -4369,7 +4297,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -4394,25 +4322,24 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, role) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, role) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -4420,14 +4347,14 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = ROLE_ADMIN) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -4435,7 +4362,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -4460,22 +4387,21 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -4483,14 +4409,14 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = ROLE_ADMIN) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -4498,7 +4424,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } @@ -4522,25 +4448,24 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) val organizationSaved = organizationApiService.createOrganization(organization) val dataset = - makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) - var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + makeDataset(organizationSaved.id, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) + var datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) datasetSaved = datasetRepository.save( datasetSaved.apply { ingestionStatus = IngestionStatusEnum.SUCCESS }) - val solution = makeSolution(organizationSaved.id!!, TEST_USER_MAIL, ROLE_ADMIN) - val solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id, TEST_USER_MAIL, ROLE_ADMIN) + val solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val workspace = makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN) val workspaceSaved = - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceApiService.createWorkspace(organizationSaved.id, workspace) val runner = makeRunnerWithRole( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, solutionSaved.id!!, mutableListOf(datasetSaved.id!!), @@ -4548,14 +4473,14 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { role = role) every { datasetApiService.createSubDataset(any(), any(), any()) } returns datasetSaved val runnerSaved = - runnerApiService.createRunner(organizationSaved.id!!, workspaceSaved.id!!, runner) + runnerApiService.createRunner(organizationSaved.id, workspaceSaved.id!!, runner) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } if (role == ROLE_NONE) { assertEquals( @@ -4569,7 +4494,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { runnerApiService.getRunnerSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!, runnerSaved.id!!) + organizationSaved.id, workspaceSaved.id!!, runnerSaved.id!!) } } } diff --git a/runner/src/main/kotlin/com/cosmotech/runner/service/RunnerService.kt b/runner/src/main/kotlin/com/cosmotech/runner/service/RunnerService.kt index ae5763663..393ea4b09 100644 --- a/runner/src/main/kotlin/com/cosmotech/runner/service/RunnerService.kt +++ b/runner/src/main/kotlin/com/cosmotech/runner/service/RunnerService.kt @@ -88,7 +88,7 @@ class RunnerService( "RunnerService's organization needs to be set. use inOrganization to do so.") } - this.workspace = workspaceApiService.findWorkspaceById(this.organization!!.id!!, workspaceId) + this.workspace = workspaceApiService.findWorkspaceById(this.organization!!.id, workspaceId) } fun userHasPermissionOnWorkspace(permission: String): RunnerService = apply { @@ -174,7 +174,7 @@ class RunnerService( fun getInstance(runnerId: String): RunnerInstance { val runner = - runnerRepository.findBy(organization!!.id!!, workspace!!.id!!, runnerId).orElseThrow { + runnerRepository.findBy(organization!!.id, workspace!!.id!!, runnerId).orElseThrow { CsmResourceNotFoundException( "Runner $runnerId not found in workspace ${workspace!!.id} and organization ${organization!!.id}") } @@ -185,18 +185,18 @@ class RunnerService( fun listInstances(pageRequest: PageRequest): List { val isPlatformAdmin = getCurrentAuthenticatedRoles(this.csmPlatformProperties).contains(ROLE_PLATFORM_ADMIN) - var runners = listOf() + val runners: List if (!this.csmPlatformProperties.rbac.enabled || isPlatformAdmin) { runners = runnerRepository - .findByWorkspaceId(organization!!.id!!, workspace!!.id!!, pageRequest) + .findByWorkspaceId(organization!!.id, workspace!!.id!!, pageRequest) .toList() } else { val currentUser = getCurrentAccountIdentifier(this.csmPlatformProperties) runners = runnerRepository .findByWorkspaceIdAndSecurity( - organization!!.id!!, workspace!!.id!!, currentUser, pageRequest) + organization!!.id, workspace!!.id!!, currentUser, pageRequest) .toList() } runners.forEach { it.security = updateSecurityVisibility(it).security } @@ -245,7 +245,7 @@ class RunnerService( if (runner.runTemplateId.isNullOrEmpty()) throw IllegalArgumentException("runner does not have a runTemplateId define") if (!solutionApiService.isRunTemplateExist( - organization!!.id!!, + organization!!.id, workspace!!.id!!, workspace!!.solution.solutionId!!, runner.runTemplateId!!)) @@ -268,9 +268,7 @@ class RunnerService( // take newly added datasets and propagate existing ACL on it this.runner.datasetList ?.filterNot { beforeMutateDatasetList.contains(it) } - ?.mapNotNull { - datasetApiService.findByOrganizationIdAndDatasetId(organization!!.id!!, it) - } + ?.mapNotNull { datasetApiService.findByOrganizationIdAndDatasetId(organization!!.id, it) } ?.forEach { dataset -> this.runner.security?.accessControlList?.forEach { roleDefinition -> addUserAccessControlOnDataset(dataset, roleDefinition) @@ -320,7 +318,7 @@ class RunnerService( this.runner.parentId?.let { this.runner.rootId = runnerRepository - .findBy(organization!!.id!!, workspace!!.id!!, it) + .findBy(organization!!.id, workspace!!.id!!, it) .orElseThrow { IllegalArgumentException("Parent runner not found: ${it}") } .rootId ?: this.runner.parentId } @@ -511,7 +509,7 @@ class RunnerService( val newDatasetAcl = dataset.getRbac().accessControlList if (newDatasetAcl.none { it.id == roleDefinition.id }) { datasetApiService.addOrUpdateAccessControl( - organization!!.id!!, dataset, roleDefinition.id, roleDefinition.role) + organization!!.id, dataset, roleDefinition.id, roleDefinition.role) } } } diff --git a/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceIntegrationTest.kt b/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceIntegrationTest.kt index 4d57aa799..cf408d118 100644 --- a/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceIntegrationTest.kt +++ b/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceIntegrationTest.kt @@ -83,8 +83,8 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest("Organization test") organizationSaved = organizationApiService.createOrganization(organization) - solution = makeSolution(organizationSaved.id!!) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solution = makeSolution(organizationSaved.id) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) } @Test @@ -93,7 +93,7 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { val solution = Solution( id = "id", - organizationId = organizationSaved.id!!, + organizationId = organizationSaved.id, key = "key", name = "name", runTemplates = mutableListOf(RunTemplate(id = "one"), RunTemplate(id = "two")), @@ -101,11 +101,11 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { SolutionSecurity( ROLE_NONE, mutableListOf(SolutionAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN)))) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val endTemplates = solutionApiService.updateSolutionRunTemplate( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, "one", RunTemplate(id = "one", name = "name_one")) @@ -113,7 +113,7 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { val expectedSolution = Solution( id = "id", - organizationId = organizationSaved.id!!, + organizationId = organizationSaved.id, key = "key", name = "name", runTemplates = @@ -127,70 +127,70 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { fun `test CRUD operations on Solution`() { logger.info("should add a new solution") - val solution2 = makeSolution(organizationSaved.id!!) - val solutionCreated = solutionApiService.createSolution(organizationSaved.id!!, solution2) + val solution2 = makeSolution(organizationSaved.id) + val solutionCreated = solutionApiService.createSolution(organizationSaved.id, solution2) logger.info("should find the new solution by id and assert it is the same as the one created") val solutionFound = - solutionApiService.findSolutionById(organizationSaved.id!!, solutionCreated.id!!) + solutionApiService.findSolutionById(organizationSaved.id, solutionCreated.id!!) assertEquals(solutionCreated, solutionFound) logger.info( "should find all solutions for the organization and assert the list contains 2 elements") - val solutionsFound = solutionApiService.findAllSolutions(organizationSaved.id!!, null, null) + val solutionsFound = solutionApiService.findAllSolutions(organizationSaved.id, null, null) assertTrue(solutionsFound.size == 2) logger.info("should update the solution and assert that the name has been updated") solutionCreated.name = "My solution updated" val solutionUpdated = solutionApiService.updateSolution( - organizationSaved.id!!, solutionCreated.id!!, solutionCreated) + organizationSaved.id, solutionCreated.id!!, solutionCreated) assertEquals(solutionCreated.name, solutionUpdated.name) logger.info( "should delete the solution and assert that the list of solutions contains only 1 element") - solutionApiService.deleteSolution(organizationSaved.id!!, solutionCreated.id!!) + solutionApiService.deleteSolution(organizationSaved.id, solutionCreated.id!!) val solutionsFoundAfterDelete = - solutionApiService.findAllSolutions(organizationSaved.id!!, null, null) + solutionApiService.findAllSolutions(organizationSaved.id, null, null) assertTrue(solutionsFoundAfterDelete.size == 1) } @Test fun `can delete solution when user is not the owner and is Platform Admin`() { logger.info("Register new solution...") - val solution = makeSolution(organizationSaved.id!!) - val solutionCreated = solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id) + val solutionCreated = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER every { getCurrentAuthenticatedUserName(csmPlatformProperties) } returns "test.admin" every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_PLATFORM_ADMIN) - solutionApiService.deleteSolution(organizationSaved.id!!, solutionCreated.id!!) + solutionApiService.deleteSolution(organizationSaved.id, solutionCreated.id!!) assertThrows { - solutionCreated.id?.let { solutionApiService.findSolutionById(organizationSaved.id!!, it) } + solutionCreated.id?.let { solutionApiService.findSolutionById(organizationSaved.id, it) } } } @Test fun `cannot delete solution when user is not the owner and is not Platform Admin`() { logger.info("Register new solution...") - val solution = makeSolution(organizationSaved.id!!) - val solutionCreated = solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id) + val solutionCreated = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns CONNECTED_READER_USER every { getCurrentAuthenticatedUserName(csmPlatformProperties) } returns "test.other.user" every { getCurrentAuthenticatedRoles(any()) } returns listOf() assertThrows { - solutionApiService.deleteSolution(organizationSaved.id!!, solutionCreated.id!!) + solutionApiService.deleteSolution(organizationSaved.id, solutionCreated.id!!) } } @Test fun `can update solution when user is not the owner and is Platform Admin`() { logger.info("Register new solution...") - val solution = makeSolution(organizationSaved.id!!) - val solutionCreated = solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id) + val solutionCreated = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER every { getCurrentAuthenticatedUserName(csmPlatformProperties) } returns "test.other.user" @@ -199,9 +199,9 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { val updateSolution = solutionApiService.updateSolution( - organizationSaved.id!!, solutionCreated.id!!, solutionCreated) + organizationSaved.id, solutionCreated.id!!, solutionCreated) - updateSolution.id?.let { solutionApiService.findSolutionById(organizationSaved.id!!, it) } + updateSolution.id?.let { solutionApiService.findSolutionById(organizationSaved.id, it) } assertEquals("new_owner_id", updateSolution.ownerId) } @@ -209,8 +209,8 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { @Test fun `cannot update solution when user is not the owner and is not Platform Admin`() { logger.info("Register new solution...") - val solution = makeSolution(organizationSaved.id!!) - val solutionCreated = solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolution(organizationSaved.id) + val solutionCreated = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns CONNECTED_READER_USER every { getCurrentAuthenticatedUserName(csmPlatformProperties) } returns "test.other.user" @@ -218,8 +218,7 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { solutionCreated.ownerId = "new_owner_id" assertThrows { - solutionApiService.updateSolution( - organizationSaved.id!!, solutionCreated.id!!, solutionCreated) + solutionApiService.updateSolution(organizationSaved.id, solutionCreated.id!!, solutionCreated) } } @@ -338,22 +337,22 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { val expectedSize = 15 IntRange(1, numberOfSolutions - 1).forEach { solutionApiService.createSolution( - organizationId = organizationSaved.id!!, solution = makeSolution(organizationSaved.id!!)) + organizationId = organizationSaved.id, solution = makeSolution(organizationSaved.id)) } logger.info("should find all solutions and assert there are $numberOfSolutions") - var solutions = solutionApiService.findAllSolutions(organizationSaved.id!!, null, null) + var solutions = solutionApiService.findAllSolutions(organizationSaved.id, null, null) assertEquals(numberOfSolutions, solutions.size) logger.info("should find all solutions and assert it equals defaultPageSize: $defaultPageSize") - solutions = solutionApiService.findAllSolutions(organizationSaved.id!!, 0, null) + solutions = solutionApiService.findAllSolutions(organizationSaved.id, 0, null) assertEquals(defaultPageSize, solutions.size) logger.info("should find all solutions and assert there are expected size: $expectedSize") - solutions = solutionApiService.findAllSolutions(organizationSaved.id!!, 0, expectedSize) + solutions = solutionApiService.findAllSolutions(organizationSaved.id, 0, expectedSize) assertEquals(expectedSize, solutions.size) logger.info("should find all solutions and assert it returns the second / last page") - solutions = solutionApiService.findAllSolutions(organizationSaved.id!!, 1, expectedSize) + solutions = solutionApiService.findAllSolutions(organizationSaved.id, 1, expectedSize) assertEquals(numberOfSolutions - expectedSize, solutions.size) } @@ -361,24 +360,24 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { fun `test find All Solutions with wrong pagination params`() { logger.info("should throw IllegalArgumentException when page and size are zero") assertThrows { - solutionApiService.findAllSolutions(organizationSaved.id!!, null, 0) + solutionApiService.findAllSolutions(organizationSaved.id, null, 0) } logger.info("should throw IllegalArgumentException when page is negative") assertThrows { - solutionApiService.findAllSolutions(organizationSaved.id!!, -1, 1) + solutionApiService.findAllSolutions(organizationSaved.id, -1, 1) } logger.info("should throw IllegalArgumentException when size is negative") assertThrows { - solutionApiService.findAllSolutions(organizationSaved.id!!, 0, -1) + solutionApiService.findAllSolutions(organizationSaved.id, 0, -1) } } @Test fun `test create solution with null runTemplates`() { - val solutionWithNullRunTemplates = makeSolution(organizationSaved.id!!) + val solutionWithNullRunTemplates = makeSolution(organizationSaved.id) val solutionWithNullRunTemplatesSaved = - solutionApiService.createSolution(organizationSaved.id!!, solutionWithNullRunTemplates) + solutionApiService.createSolution(organizationSaved.id, solutionWithNullRunTemplates) assertNotNull(solutionWithNullRunTemplatesSaved) assertNotNull(solutionWithNullRunTemplatesSaved.runTemplates) @@ -389,9 +388,9 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { fun `test create solution with empty runTemplates list`() { val solutionWithNullRunTemplates = - makeSolution(organizationSaved.id!!, runTemplates = mutableListOf()) + makeSolution(organizationSaved.id, runTemplates = mutableListOf()) val solutionWithNullRunTemplatesSaved = - solutionApiService.createSolution(organizationSaved.id!!, solutionWithNullRunTemplates) + solutionApiService.createSolution(organizationSaved.id, solutionWithNullRunTemplates) assertNotNull(solutionWithNullRunTemplatesSaved) assertNotNull(solutionWithNullRunTemplatesSaved.runTemplates) @@ -401,13 +400,13 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test update solution RunTemplate with wrong runTemplateId`() { - val baseSolution = makeSolution(organizationSaved.id!!) - val baseSolutionSaved = solutionApiService.createSolution(organizationSaved.id!!, baseSolution) + val baseSolution = makeSolution(organizationSaved.id) + val baseSolutionSaved = solutionApiService.createSolution(organizationSaved.id, baseSolution) val assertThrows = assertThrows { solutionApiService.updateSolutionRunTemplate( - organizationSaved.id!!, + organizationSaved.id, baseSolutionSaved.id!!, "WrongRunTemplateId", RunTemplate(id = "FakeRunTemplateId")) @@ -434,12 +433,12 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { run = false, parameterGroups = mutableListOf("new_p_1", "new_p_2"))) - val baseSolution = makeSolution(organizationSaved.id!!, baseSolutionRunTemplates) - val baseSolutionSaved = solutionApiService.createSolution(organizationSaved.id!!, baseSolution) + val baseSolution = makeSolution(organizationSaved.id, baseSolutionRunTemplates) + val baseSolutionSaved = solutionApiService.createSolution(organizationSaved.id, baseSolution) val updateSolutionSaved = solutionApiService.updateSolution( - organizationSaved.id!!, + organizationSaved.id, baseSolutionSaved.id!!, baseSolutionSaved.apply { runTemplates = modifiedSolutionRunTemplates }) @@ -457,12 +456,12 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { run = true, parameterGroups = mutableListOf("p_1", "p_2"))) - val baseSolution = makeSolution(organizationSaved.id!!, baseSolutionRunTemplates) - val baseSolutionSaved = solutionApiService.createSolution(organizationSaved.id!!, baseSolution) + val baseSolution = makeSolution(organizationSaved.id, baseSolutionRunTemplates) + val baseSolutionSaved = solutionApiService.createSolution(organizationSaved.id, baseSolution) val updateSolutionSaved = solutionApiService.updateSolution( - organizationSaved.id!!, + organizationSaved.id, baseSolutionSaved.id!!, baseSolutionSaved.apply { runTemplates = mutableListOf() }) @@ -473,7 +472,7 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { fun `test get security endpoint`() { // should return the current security val solutionSecurity = - solutionApiService.getSolutionSecurity(organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.getSolutionSecurity(organizationSaved.id, solutionSaved.id!!) assertEquals(solutionSaved.security, solutionSecurity) } @@ -482,8 +481,8 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { // should update the default security and assert it worked val solutionDefaultSecurity = solutionApiService.setSolutionDefaultSecurity( - organizationSaved.id!!, solutionSaved.id!!, SolutionRole(ROLE_VIEWER)) - solutionSaved = solutionApiService.findSolutionById(organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!, SolutionRole(ROLE_VIEWER)) + solutionSaved = solutionApiService.findSolutionById(organizationSaved.id, solutionSaved.id!!) assertEquals(solutionSaved.security!!, solutionDefaultSecurity) } @@ -502,7 +501,7 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { SolutionAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN), SolutionAccessControl(CONNECTED_ADMIN_USER, ROLE_EDITOR)))) assertThrows { - solutionApiService.createSolution(organizationSaved.id!!, brokenSolution) + solutionApiService.createSolution(organizationSaved.id, brokenSolution) } } @@ -511,11 +510,11 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { organizationSaved = organizationApiService.createOrganization(makeOrganizationCreateRequest("organization")) val workingSolution = makeSolution() - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, workingSolution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, workingSolution) assertThrows { solutionApiService.addSolutionAccessControl( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, SolutionAccessControl(CONNECTED_ADMIN_USER, ROLE_EDITOR)) } @@ -523,10 +522,10 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { @Test fun `As viewer, I can only see my information in security property for findSolutionById`() { - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns CONNECTED_READER_USER - solutionSaved = solutionApiService.findSolutionById(organizationSaved.id!!, solutionSaved.id!!) + solutionSaved = solutionApiService.findSolutionById(organizationSaved.id, solutionSaved.id!!) assertEquals( SolutionSecurity( default = ROLE_NONE, @@ -537,10 +536,10 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { @Test fun `As viewer, I can only see my information in security property for findAllSolutions`() { - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns CONNECTED_READER_USER - val solutions = solutionApiService.findAllSolutions(organizationSaved.id!!, null, null) + val solutions = solutionApiService.findAllSolutions(organizationSaved.id, null, null) solutions.forEach { assertEquals( SolutionSecurity( @@ -564,7 +563,7 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { } fun makeSolution( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, runTemplates: MutableList = mutableListOf(), userName: String = CONNECTED_READER_USER, role: String = ROLE_VIEWER diff --git a/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceRBACTest.kt b/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceRBACTest.kt index 38f188469..7552d536f 100644 --- a/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceRBACTest.kt +++ b/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceRBACTest.kt @@ -109,22 +109,21 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { - solutionApiService.findSolutionById( - organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.findSolutionById(organizationSaved.id, solutionSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - solutionApiService.findSolutionById(organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.findSolutionById(organizationSaved.id, solutionSaved.id!!) } } } @@ -147,22 +146,21 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { - solutionApiService.findSolutionById( - organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.findSolutionById(organizationSaved.id, solutionSaved.id!!) } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - solutionApiService.findSolutionById(organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.findSolutionById(organizationSaved.id, solutionSaved.id!!) } } } @@ -184,21 +182,21 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organizationApiService.createOrganization( makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) solutionApiService.createSolution( - organizationSaved.id!!, + organizationSaved.id, makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { - solutionApiService.findAllSolutions(organizationSaved.id!!, null, null) + solutionApiService.findAllSolutions(organizationSaved.id, null, null) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - solutionApiService.findAllSolutions(organizationSaved.id!!, null, null) + solutionApiService.findAllSolutions(organizationSaved.id, null, null) } } } @@ -226,15 +224,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionApiService.createSolution(organizationSaved.id, solution) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_CREATE_CHILDREN", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_CREATE_CHILDREN", exception.message) } else { assertDoesNotThrow { - solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionApiService.createSolution(organizationSaved.id, solution) } } } @@ -256,21 +254,21 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { - solutionApiService.deleteSolution(organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.deleteSolution(organizationSaved.id, solutionSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - solutionApiService.deleteSolution(organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.deleteSolution(organizationSaved.id, solutionSaved.id!!) } } } @@ -293,14 +291,14 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL if (shouldThrow) { val exception = assertThrows { - solutionApiService.deleteSolution(organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.deleteSolution(organizationSaved.id, solutionSaved.id!!) } assertEquals( @@ -308,7 +306,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { exception.message) } else { assertDoesNotThrow { - solutionApiService.deleteSolution(organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.deleteSolution(organizationSaved.id, solutionSaved.id!!) } } } @@ -330,7 +328,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) @@ -340,15 +338,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.updateSolution( - organizationSaved.id!!, solutionSaved.id!!, solution) + organizationSaved.id, solutionSaved.id!!, solution) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.updateSolution( - organizationSaved.id!!, solutionSaved.id!!, solution) + organizationSaved.id, solutionSaved.id!!, solution) } } } @@ -370,7 +368,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) @@ -380,7 +378,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.updateSolution( - organizationSaved.id!!, solutionSaved.id!!, solution) + organizationSaved.id, solutionSaved.id!!, solution) } assertEquals( @@ -389,7 +387,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.updateSolution( - organizationSaved.id!!, solutionSaved.id!!, solution) + organizationSaved.id, solutionSaved.id!!, solution) } } } @@ -411,7 +409,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -419,17 +417,17 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.addSolutionAccessControl( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, SolutionAccessControl("user", ROLE_USER)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.addSolutionAccessControl( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, SolutionAccessControl("user", ROLE_USER)) } @@ -453,7 +451,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -461,7 +459,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.addSolutionAccessControl( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, SolutionAccessControl("user", ROLE_USER)) } @@ -472,7 +470,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.addSolutionAccessControl( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, SolutionAccessControl("user", ROLE_USER)) } @@ -496,7 +494,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -504,15 +502,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.getSolutionAccessControl( - organizationSaved.id!!, solutionSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.getSolutionAccessControl( - organizationSaved.id!!, solutionSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL) } } } @@ -534,7 +532,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -542,7 +540,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.getSolutionAccessControl( - organizationSaved.id!!, solutionSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL) } assertEquals( @@ -551,7 +549,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.getSolutionAccessControl( - organizationSaved.id!!, solutionSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL) } } } @@ -573,7 +571,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -581,15 +579,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.getSolutionSecurityUsers( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.getSolutionSecurityUsers( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } } } @@ -611,7 +609,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -619,7 +617,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.getSolutionSecurityUsers( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } assertEquals( @@ -628,7 +626,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.getSolutionSecurityUsers( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } } } @@ -650,7 +648,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -658,15 +656,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.removeSolutionAccessControl( - organizationSaved.id!!, solutionSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.removeSolutionAccessControl( - organizationSaved.id!!, solutionSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL) } } } @@ -688,7 +686,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -696,7 +694,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.removeSolutionAccessControl( - organizationSaved.id!!, solutionSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL) } assertEquals( @@ -705,7 +703,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.removeSolutionAccessControl( - organizationSaved.id!!, solutionSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL) } } } @@ -727,7 +725,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -735,18 +733,18 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.updateSolutionAccessControl( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL, SolutionRole(ROLE_USER)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.updateSolutionAccessControl( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL, SolutionRole(ROLE_USER)) @@ -771,7 +769,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -779,7 +777,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.updateSolutionAccessControl( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL, SolutionRole(ROLE_USER)) @@ -790,7 +788,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.updateSolutionAccessControl( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, TEST_USER_MAIL, SolutionRole(ROLE_USER)) @@ -815,7 +813,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val runTemplateParameter = RunTemplateParameter("id") @@ -825,15 +823,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.addOrReplaceParameters( - organizationSaved.id!!, solutionSaved.id!!, listOf(runTemplateParameter)) + organizationSaved.id, solutionSaved.id!!, listOf(runTemplateParameter)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.addOrReplaceParameters( - organizationSaved.id!!, solutionSaved.id!!, listOf(runTemplateParameter)) + organizationSaved.id, solutionSaved.id!!, listOf(runTemplateParameter)) } } } @@ -856,7 +854,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val runTemplateParameter = RunTemplateParameter("id") @@ -866,7 +864,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.addOrReplaceParameters( - organizationSaved.id!!, solutionSaved.id!!, listOf(runTemplateParameter)) + organizationSaved.id, solutionSaved.id!!, listOf(runTemplateParameter)) } assertEquals( @@ -875,7 +873,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.addOrReplaceParameters( - organizationSaved.id!!, solutionSaved.id!!, listOf(runTemplateParameter)) + organizationSaved.id, solutionSaved.id!!, listOf(runTemplateParameter)) } } } @@ -897,7 +895,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -905,15 +903,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.removeAllSolutionParameters( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.removeAllSolutionParameters( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } } } @@ -936,7 +934,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -944,7 +942,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.removeAllSolutionParameters( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } assertEquals( @@ -953,7 +951,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.removeAllSolutionParameters( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } } } @@ -975,7 +973,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val runTemplateParameterGroup = RunTemplateParameterGroup("id") @@ -985,17 +983,17 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.addOrReplaceParameterGroups( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, listOf(runTemplateParameterGroup)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.addOrReplaceParameterGroups( - organizationSaved.id!!, solutionSaved.id!!, listOf(runTemplateParameterGroup)) + organizationSaved.id, solutionSaved.id!!, listOf(runTemplateParameterGroup)) } } } @@ -1018,7 +1016,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val runTemplateParameterGroup = RunTemplateParameterGroup("id") @@ -1028,7 +1026,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.addOrReplaceParameterGroups( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, listOf(runTemplateParameterGroup)) } @@ -1039,7 +1037,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.addOrReplaceParameterGroups( - organizationSaved.id!!, solutionSaved.id!!, listOf(runTemplateParameterGroup)) + organizationSaved.id, solutionSaved.id!!, listOf(runTemplateParameterGroup)) } } } @@ -1062,8 +1060,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = - solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1071,15 +1068,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.removeAllSolutionParameterGroups( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.removeAllSolutionParameterGroups( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } } } @@ -1102,7 +1099,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1110,7 +1107,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.removeAllSolutionParameterGroups( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_DELETE", @@ -1118,7 +1115,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.removeAllSolutionParameterGroups( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } } } @@ -1140,7 +1137,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val runTemplate = RunTemplate("id") @@ -1150,15 +1147,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.addOrReplaceRunTemplates( - organizationSaved.id!!, solutionSaved.id!!, listOf(runTemplate)) + organizationSaved.id, solutionSaved.id!!, listOf(runTemplate)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.addOrReplaceRunTemplates( - organizationSaved.id!!, solutionSaved.id!!, listOf(runTemplate)) + organizationSaved.id, solutionSaved.id!!, listOf(runTemplate)) } } } @@ -1181,7 +1178,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val runTemplate = RunTemplate("id") @@ -1191,7 +1188,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.addOrReplaceRunTemplates( - organizationSaved.id!!, solutionSaved.id!!, listOf(runTemplate)) + organizationSaved.id, solutionSaved.id!!, listOf(runTemplate)) } assertEquals( @@ -1200,7 +1197,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.addOrReplaceRunTemplates( - organizationSaved.id!!, solutionSaved.id!!, listOf(runTemplate)) + organizationSaved.id, solutionSaved.id!!, listOf(runTemplate)) } } } @@ -1222,7 +1219,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1230,15 +1227,14 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.removeAllRunTemplates( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - solutionApiService.removeAllRunTemplates( - organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.removeAllRunTemplates(organizationSaved.id, solutionSaved.id!!) } } } @@ -1261,7 +1257,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1269,7 +1265,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.removeAllRunTemplates( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } assertEquals( @@ -1277,8 +1273,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { exception.message) } else { assertDoesNotThrow { - solutionApiService.removeAllRunTemplates( - organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.removeAllRunTemplates(organizationSaved.id, solutionSaved.id!!) } } } @@ -1300,7 +1295,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1308,15 +1303,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.deleteSolutionRunTemplate( - organizationSaved.id!!, solutionSaved.id!!, "runTemplate") + organizationSaved.id, solutionSaved.id!!, "runTemplate") } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.deleteSolutionRunTemplate( - organizationSaved.id!!, solutionSaved.id!!, "runTemplate") + organizationSaved.id, solutionSaved.id!!, "runTemplate") } } } @@ -1339,7 +1334,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1347,7 +1342,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.deleteSolutionRunTemplate( - organizationSaved.id!!, solutionSaved.id!!, "runTemplate") + organizationSaved.id, solutionSaved.id!!, "runTemplate") } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_DELETE", @@ -1355,7 +1350,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.deleteSolutionRunTemplate( - organizationSaved.id!!, solutionSaved.id!!, "runTemplate") + organizationSaved.id, solutionSaved.id!!, "runTemplate") } } } @@ -1377,7 +1372,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val runTemplate = RunTemplate("runTemplate", "name") @@ -1387,15 +1382,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.updateSolutionRunTemplate( - organizationSaved.id!!, solutionSaved.id!!, "runTemplate", runTemplate) + organizationSaved.id, solutionSaved.id!!, "runTemplate", runTemplate) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.updateSolutionRunTemplate( - organizationSaved.id!!, solutionSaved.id!!, "runTemplate", runTemplate) + organizationSaved.id, solutionSaved.id!!, "runTemplate", runTemplate) } } } @@ -1418,7 +1413,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) val runTemplate = RunTemplate("runTemplate", "name") @@ -1428,7 +1423,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.updateSolutionRunTemplate( - organizationSaved.id!!, solutionSaved.id!!, "runTemplate", runTemplate) + organizationSaved.id, solutionSaved.id!!, "runTemplate", runTemplate) } assertEquals( "RBAC ${solutionSaved.id!!} - User does not have permission $PERMISSION_WRITE", @@ -1436,7 +1431,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.updateSolutionRunTemplate( - organizationSaved.id!!, solutionSaved.id!!, "runTemplate", runTemplate) + organizationSaved.id, solutionSaved.id!!, "runTemplate", runTemplate) } } } @@ -1458,8 +1453,8 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = - makeSolutionWithRole(organizationSaved.id!!, TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + makeSolutionWithRole(organizationSaved.id, TEST_USER_MAIL, role = ROLE_ADMIN) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1467,14 +1462,14 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.getSolutionSecurity( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - solutionApiService.getSolutionSecurity(organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.getSolutionSecurity(organizationSaved.id, solutionSaved.id!!) } } } @@ -1496,9 +1491,8 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) - val solution = - makeSolutionWithRole(organizationSaved.id!!, TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolutionWithRole(organizationSaved.id, TEST_USER_MAIL, role = role) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1506,7 +1500,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.getSolutionSecurity( - organizationSaved.id!!, solutionSaved.id!!) + organizationSaved.id, solutionSaved.id!!) } assertEquals( @@ -1514,7 +1508,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { exception.message) } else { assertDoesNotThrow { - solutionApiService.getSolutionSecurity(organizationSaved.id!!, solutionSaved.id!!) + solutionApiService.getSolutionSecurity(organizationSaved.id, solutionSaved.id!!) } } } @@ -1536,8 +1530,8 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role) organizationSaved = organizationApiService.createOrganization(organization) val solution = - makeSolutionWithRole(organizationSaved.id!!, TEST_USER_MAIL, role = ROLE_ADMIN) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + makeSolutionWithRole(organizationSaved.id, TEST_USER_MAIL, role = ROLE_ADMIN) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1545,15 +1539,15 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.setSolutionDefaultSecurity( - organizationSaved.id!!, solutionSaved.id!!, SolutionRole(ROLE_VIEWER)) + organizationSaved.id, solutionSaved.id!!, SolutionRole(ROLE_VIEWER)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { solutionApiService.setSolutionDefaultSecurity( - organizationSaved.id!!, solutionSaved.id!!, SolutionRole(ROLE_VIEWER)) + organizationSaved.id, solutionSaved.id!!, SolutionRole(ROLE_VIEWER)) } } } @@ -1575,9 +1569,8 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val organization = makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN) organizationSaved = organizationApiService.createOrganization(organization) - val solution = - makeSolutionWithRole(organizationSaved.id!!, TEST_USER_MAIL, role = role) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + val solution = makeSolutionWithRole(organizationSaved.id, TEST_USER_MAIL, role = role) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -1585,7 +1578,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { solutionApiService.setSolutionDefaultSecurity( - organizationSaved.id!!, solutionSaved.id!!, SolutionRole(ROLE_VIEWER)) + organizationSaved.id, solutionSaved.id!!, SolutionRole(ROLE_VIEWER)) } assertEquals( @@ -1594,7 +1587,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { solutionApiService.setSolutionDefaultSecurity( - organizationSaved.id!!, solutionSaved.id!!, SolutionRole(ROLE_VIEWER)) + organizationSaved.id, solutionSaved.id!!, SolutionRole(ROLE_VIEWER)) } } } @@ -1616,7 +1609,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { } fun makeSolutionWithRole( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, id: String, role: String ): Solution { diff --git a/solution/src/main/kotlin/com/cosmotech/solution/service/SolutionServiceImpl.kt b/solution/src/main/kotlin/com/cosmotech/solution/service/SolutionServiceImpl.kt index 267d8bdef..2d1f8b2fb 100644 --- a/solution/src/main/kotlin/com/cosmotech/solution/service/SolutionServiceImpl.kt +++ b/solution/src/main/kotlin/com/cosmotech/solution/service/SolutionServiceImpl.kt @@ -25,7 +25,7 @@ import com.cosmotech.api.utils.getCurrentAccountIdentifier import com.cosmotech.api.utils.getCurrentAuthenticatedRoles import com.cosmotech.api.utils.getCurrentAuthenticatedUserName import com.cosmotech.organization.OrganizationApiServiceInterface -import com.cosmotech.organization.service.getRbac +import com.cosmotech.organization.service.toGenericSecurity import com.cosmotech.solution.SolutionApiServiceInterface import com.cosmotech.solution.domain.RunTemplate import com.cosmotech.solution.domain.RunTemplateParameter @@ -324,7 +324,7 @@ class SolutionServiceImpl( val rbacSecurity = csmRbac.addUserRole( - organization.getRbac(), + organization.security.toGenericSecurity(organizationId), solution.getRbac(), solutionAccessControl.id, solutionAccessControl.role) diff --git a/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceIntegrationTest.kt b/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceIntegrationTest.kt index 9f91a3327..c9af76bea 100644 --- a/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceIntegrationTest.kt +++ b/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceIntegrationTest.kt @@ -105,17 +105,17 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { organization = makeOrganizationCreateRequest("Organization test") organizationSaved = organizationApiService.createOrganization(organization) - solution = makeSolution(organizationSaved.id!!) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solution = makeSolution(organizationSaved.id) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) - workspace = makeWorkspace(organizationSaved.id!!, solutionSaved.id!!, "Workspace") - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspace = makeWorkspace(organizationSaved.id, solutionSaved.id!!, "Workspace") + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace) connector = makeConnector("Connector") connectorSaved = connectorApiService.registerConnector(connector) dataset = makeDataset("dataset") - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) } @Test @@ -124,21 +124,21 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { every { getCurrentAuthenticatedRoles(any()) } returns listOf("Platform.Admin") logger.info("should create a second new workspace") - val workspace2 = makeWorkspace(organizationSaved.id!!, solutionSaved.id!!, "Workspace 2") - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace2) + val workspace2 = makeWorkspace(organizationSaved.id, solutionSaved.id!!, "Workspace 2") + workspaceApiService.createWorkspace(organizationSaved.id, workspace2) val workspaceRetrieved = - workspaceApiService.findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) assertEquals(workspaceSaved, workspaceRetrieved) logger.info("should find all workspaces and assert there are 2") val workspacesList: List = - workspaceApiService.findAllWorkspaces(organizationSaved.id!!, null, null) + workspaceApiService.findAllWorkspaces(organizationSaved.id, null, null) assertTrue(workspacesList.size == 2) logger.info("should update the name of the first workspace") val updatedWorkspace = workspaceApiService.updateWorkspace( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, workspaceSaved.copy(name = "Workspace 1 updated", organizationId = null)) assertEquals("Workspace 1 updated", updatedWorkspace.name) @@ -160,32 +160,32 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns "userLambda" logger.info("should not create a new workspace") - val workspace2 = makeWorkspace(organizationSaved.id!!, solutionSaved.id!!, "Workspace 2") + val workspace2 = makeWorkspace(organizationSaved.id, solutionSaved.id!!, "Workspace 2") assertThrows { - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace2) + workspaceApiService.createWorkspace(organizationSaved.id, workspace2) } logger.info("should not retrieve a workspace") assertThrows { - workspaceApiService.findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) } logger.info("should not find all workspaces") val workspacesList: List = - workspaceApiService.findAllWorkspaces(organizationSaved.id!!, null, null) + workspaceApiService.findAllWorkspaces(organizationSaved.id, null, null) assertTrue(workspacesList.isEmpty()) logger.info("should not update a workspace") assertThrows { workspaceApiService.updateWorkspace( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, workspaceSaved.copy(name = "Workspace 1 updated")) } logger.info("should not delete a workspace") assertThrows { - workspaceApiService.deleteWorkspace(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.deleteWorkspace(organizationSaved.id, workspaceSaved.id!!) } } @@ -196,23 +196,23 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { val defaultPageSize = csmPlatformProperties.twincache.workspace.defaultPageSize val expectedSize = 15 IntRange(1, workspaceNumber - 1).forEach { - val workspace = makeWorkspace(organizationSaved.id!!, solutionSaved.id!!, "w-workspace-$it") - workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + val workspace = makeWorkspace(organizationSaved.id, solutionSaved.id!!, "w-workspace-$it") + workspaceApiService.createWorkspace(organizationSaved.id, workspace) } logger.info("should find all workspaces and assert there are $workspaceNumber") - var workspacesList = workspaceApiService.findAllWorkspaces(organizationSaved.id!!, null, null) + var workspacesList = workspaceApiService.findAllWorkspaces(organizationSaved.id, null, null) assertEquals(workspaceNumber, workspacesList.size) logger.info("should find all workspaces and assert it equals defaultPageSize: $defaultPageSize") - workspacesList = workspaceApiService.findAllWorkspaces(organizationSaved.id!!, 0, null) + workspacesList = workspaceApiService.findAllWorkspaces(organizationSaved.id, 0, null) assertEquals(defaultPageSize, workspacesList.size) logger.info("should find all workspaces and assert there are expected size: $expectedSize") - workspacesList = workspaceApiService.findAllWorkspaces(organizationSaved.id!!, 0, expectedSize) + workspacesList = workspaceApiService.findAllWorkspaces(organizationSaved.id, 0, expectedSize) assertEquals(expectedSize, workspacesList.size) logger.info("should find all workspaces and assert it returns the second / last page") - workspacesList = workspaceApiService.findAllWorkspaces(organizationSaved.id!!, 1, expectedSize) + workspacesList = workspaceApiService.findAllWorkspaces(organizationSaved.id, 1, expectedSize) assertEquals(workspaceNumber - expectedSize, workspacesList.size) } @@ -220,15 +220,15 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { fun `test find All Workspaces with wrong pagination params`() { logger.info("should throw IllegalArgumentException when page and size are zero") assertThrows { - workspaceApiService.findAllWorkspaces(organizationSaved.id!!, 0, 0) + workspaceApiService.findAllWorkspaces(organizationSaved.id, 0, 0) } logger.info("should throw IllegalArgumentException when page is negative") assertThrows { - workspaceApiService.findAllWorkspaces(organizationSaved.id!!, -1, 1) + workspaceApiService.findAllWorkspaces(organizationSaved.id, -1, 1) } logger.info("should throw IllegalArgumentException when size is negative") assertThrows { - workspaceApiService.findAllWorkspaces(organizationSaved.id!!, 0, -1) + workspaceApiService.findAllWorkspaces(organizationSaved.id, 0, -1) } } @@ -239,14 +239,14 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { logger.info("should get default security with role NONE") val workspaceSecurity = - workspaceApiService.getWorkspaceSecurity(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.getWorkspaceSecurity(organizationSaved.id, workspaceSaved.id!!) assertEquals(ROLE_NONE, workspaceSecurity.default) logger.info("should set default security with role VIEWER") val workspaceRole = WorkspaceRole(ROLE_VIEWER) val workspaceSecurityRegistered = workspaceApiService.setWorkspaceDefaultSecurity( - organizationSaved.id!!, workspaceSaved.id!!, workspaceRole) + organizationSaved.id, workspaceSaved.id!!, workspaceRole) assertEquals(workspaceRole.role, workspaceSecurityRegistered.default) } @@ -254,7 +254,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { fun `test RBAC as User Unauthorized`() { every { getCurrentAccountIdentifier(any()) } returns "userLambda" - assertEquals(0, workspaceApiService.findAllWorkspaces(organizationSaved.id!!, null, null).size) + assertEquals(0, workspaceApiService.findAllWorkspaces(organizationSaved.id, null, null).size) } @Test @@ -264,33 +264,33 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { val workspaceAccessControl = WorkspaceAccessControl(TEST_USER_MAIL, ROLE_VIEWER) var workspaceAccessControlRegistered = workspaceApiService.addWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, workspaceAccessControl) + organizationSaved.id, workspaceSaved.id!!, workspaceAccessControl) assertEquals(workspaceAccessControl, workspaceAccessControlRegistered) logger.info("should get the access control") workspaceAccessControlRegistered = workspaceApiService.getWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) assertEquals(workspaceAccessControl, workspaceAccessControlRegistered) logger.info("should update the access control") workspaceAccessControlRegistered = workspaceApiService.updateWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL, WorkspaceRole(ROLE_EDITOR)) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL, WorkspaceRole(ROLE_EDITOR)) assertEquals(ROLE_EDITOR, workspaceAccessControlRegistered.role) logger.info("should get the list of users and assert there are 3") val userList = - workspaceApiService.getWorkspaceSecurityUsers(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.getWorkspaceSecurityUsers(organizationSaved.id, workspaceSaved.id!!) assertEquals(3, userList.size) logger.info("should remove the access control") workspaceApiService.removeWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) assertThrows { workspaceAccessControlRegistered = workspaceApiService.getWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) } } @@ -303,30 +303,30 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { val workspaceAccessControl = WorkspaceAccessControl(TEST_USER_MAIL, ROLE_VIEWER) assertThrows { workspaceApiService.addWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, workspaceAccessControl) + organizationSaved.id, workspaceSaved.id!!, workspaceAccessControl) } logger.info("should throw CsmAccessForbiddenException when getting the access control") assertThrows { workspaceApiService.getWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, "userLambda") + organizationSaved.id, workspaceSaved.id!!, "userLambda") } logger.info("should throw CsmAccessForbiddenException when updating the access control") assertThrows { workspaceApiService.updateWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL, WorkspaceRole(ROLE_VIEWER)) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL, WorkspaceRole(ROLE_VIEWER)) } logger.info("should throw CsmAccessForbiddenException when getting the list of users") assertThrows { - workspaceApiService.getWorkspaceSecurityUsers(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.getWorkspaceSecurityUsers(organizationSaved.id, workspaceSaved.id!!) } logger.info("should throw CsmAccessForbiddenException when removing the access control") assertThrows { workspaceApiService.removeWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) } } @@ -334,7 +334,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { fun `access control list shouldn't contain more than one time each user on creation`() { organizationSaved = organizationApiService.createOrganization(makeOrganizationCreateRequest("organization")) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, makeSolution()) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, makeSolution()) val brokenWorkspace = Workspace( name = "workspace", @@ -348,7 +348,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { WorkspaceAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN), WorkspaceAccessControl(CONNECTED_ADMIN_USER, ROLE_EDITOR)))) assertThrows { - workspaceApiService.createWorkspace(organizationSaved.id!!, brokenWorkspace) + workspaceApiService.createWorkspace(organizationSaved.id, brokenWorkspace) } } @@ -356,13 +356,13 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { fun `access control list shouldn't contain more than one time each user on ACL addition`() { organizationSaved = organizationApiService.createOrganization(makeOrganizationCreateRequest("organization")) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, makeSolution()) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, makeSolution()) val workingWorkspace = makeWorkspace() - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workingWorkspace) + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workingWorkspace) assertThrows { workspaceApiService.addWorkspaceAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, WorkspaceAccessControl(CONNECTED_ADMIN_USER, ROLE_EDITOR)) } @@ -373,15 +373,15 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { assertNull( workspaceApiService - .findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + .findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) .linkedDatasetIdList) - workspaceApiService.linkDataset(organizationSaved.id!!, workspaceSaved.id!!, datasetSaved.id!!) + workspaceApiService.linkDataset(organizationSaved.id, workspaceSaved.id!!, datasetSaved.id!!) val datasetIds = listOf(datasetSaved.id!!) checkLinkedDatasetId(datasetIds) - workspaceApiService.linkDataset(organizationSaved.id!!, workspaceSaved.id!!, datasetSaved.id!!) + workspaceApiService.linkDataset(organizationSaved.id, workspaceSaved.id!!, datasetSaved.id!!) checkLinkedDatasetId(datasetIds) } @@ -389,14 +389,14 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { private fun checkLinkedDatasetId(datasetIds: List) { assertEquals( workspaceApiService - .findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + .findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) .linkedDatasetIdList!! .size, datasetIds.size) assertEquals( workspaceApiService - .findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + .findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) .linkedDatasetIdList!!, datasetIds) } @@ -406,17 +406,16 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { assertNull( workspaceApiService - .findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + .findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) .linkedDatasetIdList) - workspaceApiService.linkDataset(organizationSaved.id!!, workspaceSaved.id!!, datasetSaved.id!!) + workspaceApiService.linkDataset(organizationSaved.id, workspaceSaved.id!!, datasetSaved.id!!) - workspaceApiService.unlinkDataset( - organizationSaved.id!!, workspaceSaved.id!!, datasetSaved.id!!) + workspaceApiService.unlinkDataset(organizationSaved.id, workspaceSaved.id!!, datasetSaved.id!!) assertEquals( workspaceApiService - .findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + .findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) .linkedDatasetIdList!! .size, 0) @@ -427,15 +426,14 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { assertNull( workspaceApiService - .findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + .findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) .linkedDatasetIdList) - workspaceApiService.unlinkDataset( - organizationSaved.id!!, workspaceSaved.id!!, datasetSaved.id!!) + workspaceApiService.unlinkDataset(organizationSaved.id, workspaceSaved.id!!, datasetSaved.id!!) assertNull( workspaceApiService - .findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + .findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) .linkedDatasetIdList) } @@ -447,14 +445,14 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { id = "Organization test", userName = CONNECTED_DEFAULT_USER, role = ROLE_VIEWER) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolution(userName = CONNECTED_DEFAULT_USER, role = ROLE_VIEWER) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) dataset = makeDataset() - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) workspace = makeWorkspace() - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace) workspaceSaved = - workspaceApiService.findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) assertEquals( WorkspaceSecurity( default = ROLE_NONE, @@ -471,13 +469,13 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { id = "Organization test", userName = CONNECTED_DEFAULT_USER, role = ROLE_VIEWER) organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolution(userName = CONNECTED_DEFAULT_USER, role = ROLE_VIEWER) - solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) + solutionSaved = solutionApiService.createSolution(organizationSaved.id, solution) dataset = makeDataset() - datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) + datasetSaved = datasetApiService.createDataset(organizationSaved.id, dataset) workspace = makeWorkspace() - workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workspace) + workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id, workspace) - var workspaces = workspaceApiService.findAllWorkspaces(organizationSaved.id!!, null, null) + var workspaces = workspaceApiService.findAllWorkspaces(organizationSaved.id, null, null) workspaces.forEach { assertEquals( WorkspaceSecurity( @@ -505,7 +503,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { } fun makeSolution( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, userName: String = CONNECTED_DEFAULT_USER, role: String = ROLE_USER ): Solution { @@ -525,7 +523,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { } fun makeWorkspace( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, solutionId: String = solutionSaved.id!!, name: String = "name", userName: String = CONNECTED_ADMIN_USER, @@ -560,7 +558,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { } fun makeDataset( - organizationId: String = organizationSaved.id!!, + organizationId: String = organizationSaved.id, name: String = "name", connector: Connector = connectorSaved, userName: String = CONNECTED_DEFAULT_USER, diff --git a/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceRBACTest.kt b/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceRBACTest.kt index e3bb95a59..0f12d9ca9 100644 --- a/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceRBACTest.kt +++ b/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceRBACTest.kt @@ -118,11 +118,11 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -131,14 +131,14 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - workspaceApiService.findAllWorkspaces(organizationSaved.id!!, null, null) + workspaceApiService.findAllWorkspaces(organizationSaved.id, null, null) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - workspaceApiService.findAllWorkspaces(organizationSaved.id!!, null, null) + workspaceApiService.findAllWorkspaces(organizationSaved.id, null, null) } } } @@ -161,11 +161,11 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -175,28 +175,28 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) } if (role == ROLE_NONE) { assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_CREATE_CHILDREN", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_CREATE_CHILDREN", exception.message) } } else { assertDoesNotThrow { workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -222,12 +222,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -237,11 +237,11 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.findWorkspaceById( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } if (role == ROLE_NONE) { assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertEquals( @@ -250,7 +250,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } } else { assertDoesNotThrow { - workspaceApiService.findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) } } } @@ -273,12 +273,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -288,14 +288,14 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.findWorkspaceById( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - workspaceApiService.findWorkspaceById(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.findWorkspaceById(organizationSaved.id, workspaceSaved.id!!) } } } @@ -318,12 +318,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -332,15 +332,14 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - workspaceApiService.deleteWorkspace( - organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.deleteWorkspace(organizationSaved.id, workspaceSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { - workspaceApiService.deleteWorkspace(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.deleteWorkspace(organizationSaved.id, workspaceSaved.id!!) } } } @@ -363,12 +362,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -377,15 +376,14 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { if (shouldThrow) { val exception = assertThrows { - workspaceApiService.deleteWorkspace( - organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.deleteWorkspace(organizationSaved.id, workspaceSaved.id!!) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_DELETE", exception.message) } else { assertDoesNotThrow { - workspaceApiService.deleteWorkspace(organizationSaved.id!!, workspaceSaved.id!!) + workspaceApiService.deleteWorkspace(organizationSaved.id, workspaceSaved.id!!) } } } @@ -408,12 +406,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -423,24 +421,24 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.updateWorkspace( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.updateWorkspace( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -466,12 +464,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -481,10 +479,10 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.updateWorkspace( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -495,10 +493,10 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.updateWorkspace( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -524,12 +522,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -539,15 +537,15 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.findAllWorkspaceFiles( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.findAllWorkspaceFiles( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } } } @@ -570,12 +568,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -585,7 +583,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.findAllWorkspaceFiles( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -593,7 +591,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.findAllWorkspaceFiles( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } } } @@ -616,12 +614,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -633,15 +631,15 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.uploadWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, resource, true, "") + organizationSaved.id, workspaceSaved.id!!, resource, true, "") } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.uploadWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, resource, true, "name") + organizationSaved.id, workspaceSaved.id!!, resource, true, "name") } } } @@ -664,12 +662,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -681,7 +679,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.uploadWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, resource, true, "") + organizationSaved.id, workspaceSaved.id!!, resource, true, "") } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_WRITE", @@ -689,7 +687,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.uploadWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, resource, true, "name") + organizationSaved.id, workspaceSaved.id!!, resource, true, "name") } } } @@ -712,12 +710,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -727,15 +725,15 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.deleteAllWorkspaceFiles( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.deleteAllWorkspaceFiles( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } } } @@ -758,12 +756,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -773,7 +771,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.deleteAllWorkspaceFiles( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_WRITE", @@ -781,7 +779,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.deleteAllWorkspaceFiles( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } } } @@ -804,12 +802,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -819,23 +817,23 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.downloadWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, "") + organizationSaved.id, workspaceSaved.id!!, "") } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { val filePath = Path.of( csmPlatformProperties.blobPersistence.path, - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, "name") Files.createDirectories(filePath.getParent()) Files.createFile(filePath) assertDoesNotThrow { workspaceApiService.downloadWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, "name") + organizationSaved.id, workspaceSaved.id!!, "name") } } } @@ -858,12 +856,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -873,7 +871,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.downloadWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, "") + organizationSaved.id, workspaceSaved.id!!, "") } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ", @@ -882,14 +880,14 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val filePath = Path.of( csmPlatformProperties.blobPersistence.path, - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, "name") Files.createDirectories(filePath.getParent()) Files.createFile(filePath) assertDoesNotThrow { workspaceApiService.downloadWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, "name") + organizationSaved.id, workspaceSaved.id!!, "name") } } } @@ -912,12 +910,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -927,15 +925,15 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.deleteWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, "") + organizationSaved.id, workspaceSaved.id!!, "") } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.deleteWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, "") + organizationSaved.id, workspaceSaved.id!!, "") } } } @@ -958,12 +956,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -973,7 +971,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.deleteWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, "") + organizationSaved.id, workspaceSaved.id!!, "") } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_WRITE", @@ -981,7 +979,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.deleteWorkspaceFile( - organizationSaved.id!!, workspaceSaved.id!!, "") + organizationSaved.id, workspaceSaved.id!!, "") } } } @@ -1004,12 +1002,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -1019,15 +1017,15 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.getWorkspacePermissions( - organizationSaved.id!!, workspaceSaved.id!!, ROLE_USER) + organizationSaved.id, workspaceSaved.id!!, ROLE_USER) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.getWorkspacePermissions( - organizationSaved.id!!, workspaceSaved.id!!, ROLE_USER) + organizationSaved.id, workspaceSaved.id!!, ROLE_USER) } } } @@ -1050,12 +1048,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -1065,7 +1063,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.getWorkspacePermissions( - organizationSaved.id!!, workspaceSaved.id!!, ROLE_USER) + organizationSaved.id, workspaceSaved.id!!, ROLE_USER) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ_SECURITY", @@ -1073,7 +1071,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.getWorkspacePermissions( - organizationSaved.id!!, workspaceSaved.id!!, ROLE_USER) + organizationSaved.id, workspaceSaved.id!!, ROLE_USER) } } } @@ -1096,12 +1094,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -1111,15 +1109,15 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.getWorkspaceSecurity( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.getWorkspaceSecurity( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } } } @@ -1142,12 +1140,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -1157,7 +1155,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.getWorkspaceSecurity( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ_SECURITY", @@ -1165,7 +1163,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.getWorkspaceSecurity( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } } } @@ -1188,12 +1186,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -1203,15 +1201,15 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.setWorkspaceDefaultSecurity( - organizationSaved.id!!, workspaceSaved.id!!, WorkspaceRole(ROLE_USER)) + organizationSaved.id, workspaceSaved.id!!, WorkspaceRole(ROLE_USER)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.setWorkspaceDefaultSecurity( - organizationSaved.id!!, workspaceSaved.id!!, WorkspaceRole(ROLE_USER)) + organizationSaved.id, workspaceSaved.id!!, WorkspaceRole(ROLE_USER)) } } } @@ -1234,12 +1232,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -1249,7 +1247,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.setWorkspaceDefaultSecurity( - organizationSaved.id!!, workspaceSaved.id!!, WorkspaceRole(ROLE_USER)) + organizationSaved.id, workspaceSaved.id!!, WorkspaceRole(ROLE_USER)) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_WRITE_SECURITY", @@ -1257,7 +1255,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.setWorkspaceDefaultSecurity( - organizationSaved.id!!, workspaceSaved.id!!, WorkspaceRole(ROLE_USER)) + organizationSaved.id, workspaceSaved.id!!, WorkspaceRole(ROLE_USER)) } } } @@ -1280,12 +1278,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -1295,17 +1293,17 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.addWorkspaceAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, WorkspaceAccessControl("id", ROLE_USER)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.addWorkspaceAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, WorkspaceAccessControl("id", ROLE_USER)) } @@ -1330,12 +1328,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -1345,7 +1343,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.addWorkspaceAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, WorkspaceAccessControl("id", ROLE_USER)) } @@ -1355,7 +1353,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.addWorkspaceAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, WorkspaceAccessControl("id", ROLE_USER)) } @@ -1380,12 +1378,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -1395,15 +1393,15 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.getWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.getWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) } } } @@ -1426,12 +1424,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -1441,7 +1439,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.getWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ_SECURITY", @@ -1449,7 +1447,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.getWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) } } } @@ -1472,12 +1470,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -1487,15 +1485,15 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.removeWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.removeWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) } } } @@ -1518,12 +1516,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -1533,7 +1531,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.removeWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_WRITE_SECURITY", @@ -1541,7 +1539,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.removeWorkspaceAccessControl( - organizationSaved.id!!, workspaceSaved.id!!, TEST_USER_MAIL) + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL) } } } @@ -1564,12 +1562,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -1579,18 +1577,18 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.updateWorkspaceAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL, WorkspaceRole(ROLE_ADMIN)) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.updateWorkspaceAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL, WorkspaceRole(ROLE_ADMIN)) @@ -1616,12 +1614,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -1631,7 +1629,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.updateWorkspaceAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL, WorkspaceRole(ROLE_ADMIN)) @@ -1642,7 +1640,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.updateWorkspaceAccessControl( - organizationSaved.id!!, + organizationSaved.id, workspaceSaved.id!!, TEST_USER_MAIL, WorkspaceRole(ROLE_ADMIN)) @@ -1668,12 +1666,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = ROLE_ADMIN)) @@ -1683,15 +1681,15 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.getWorkspaceSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } assertEquals( - "RBAC ${organizationSaved.id!!} - User does not have permission $PERMISSION_READ", + "RBAC ${organizationSaved.id} - User does not have permission $PERMISSION_READ", exception.message) } else { assertDoesNotThrow { workspaceApiService.getWorkspaceSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } } } @@ -1714,12 +1712,12 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { makeOrganizationCreateRequest(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( - organizationSaved.id!!, makeSolution(organizationSaved.id!!)) + organizationSaved.id, makeSolution(organizationSaved.id)) val workspaceSaved = workspaceApiService.createWorkspace( - organizationSaved.id!!, + organizationSaved.id, makeWorkspaceWithRole( - organizationSaved.id!!, + organizationSaved.id, solutionSaved.id!!, id = TEST_USER_MAIL, role = role)) @@ -1729,7 +1727,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { val exception = assertThrows { workspaceApiService.getWorkspaceSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } assertEquals( "RBAC ${workspaceSaved.id!!} - User does not have permission $PERMISSION_READ_SECURITY", @@ -1737,7 +1735,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { } else { assertDoesNotThrow { workspaceApiService.getWorkspaceSecurityUsers( - organizationSaved.id!!, workspaceSaved.id!!) + organizationSaved.id, workspaceSaved.id!!) } } } diff --git a/workspace/src/main/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImpl.kt b/workspace/src/main/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImpl.kt index b03d67305..7f0da270d 100644 --- a/workspace/src/main/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImpl.kt +++ b/workspace/src/main/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImpl.kt @@ -32,7 +32,7 @@ import com.cosmotech.api.utils.findAllPaginated import com.cosmotech.api.utils.getCurrentAccountIdentifier import com.cosmotech.api.utils.getCurrentAuthenticatedUserName import com.cosmotech.organization.OrganizationApiServiceInterface -import com.cosmotech.organization.service.getRbac +import com.cosmotech.organization.service.toGenericSecurity import com.cosmotech.solution.api.SolutionApiService import com.cosmotech.workspace.WorkspaceApiServiceInterface import com.cosmotech.workspace.domain.Workspace @@ -72,7 +72,7 @@ internal class WorkspaceServiceImpl( override fun findAllWorkspaces(organizationId: String, page: Int?, size: Int?): List { val organization = organizationService.getVerifiedOrganization(organizationId) - val isAdmin = csmRbac.isAdmin(organization.getRbac(), getCommonRolesDefinition()) + val isAdmin = csmRbac.isAdmin(organization.security.toGenericSecurity(organizationId), getCommonRolesDefinition()) val defaultPageSize = csmPlatformProperties.twincache.workspace.defaultPageSize var result: List var pageable = constructPageRequest(page, size, defaultPageSize) @@ -216,7 +216,7 @@ internal class WorkspaceServiceImpl( throw IllegalArgumentException("Invalid destination: '$destination'. '..' is not allowed") } val workspace = getVerifiedWorkspace(organizationId, workspaceId, PERMISSION_WRITE) - if (file?.filename?.contains("..") == true || file?.filename?.contains("/") == true) { + if (file.filename?.contains("..") == true || file.filename?.contains("/") == true) { throw IllegalArgumentException( "Invalid filename: '${file.filename}'. '..' and '/' are not allowed") } @@ -467,7 +467,7 @@ internal class WorkspaceServiceImpl( val rbacSecurity = csmRbac.addUserRole( - organization.getRbac(), + organization.security.toGenericSecurity(organizationId), workspace.getRbac(), workspaceAccessControl.id, workspaceAccessControl.role) diff --git a/workspace/src/test/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImplTests.kt b/workspace/src/test/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImplTests.kt index 37d5fd25c..f5b40f546 100644 --- a/workspace/src/test/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImplTests.kt +++ b/workspace/src/test/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImplTests.kt @@ -26,7 +26,7 @@ import com.cosmotech.organization.domain.Organization import com.cosmotech.organization.domain.OrganizationAccessControl import com.cosmotech.organization.domain.OrganizationSecurity import com.cosmotech.organization.repository.OrganizationRepository -import com.cosmotech.organization.service.getRbac +import com.cosmotech.organization.service.toGenericSecurity import com.cosmotech.solution.SolutionApiServiceInterface import com.cosmotech.solution.domain.Solution import com.cosmotech.workspace.domain.Workspace @@ -316,7 +316,7 @@ class WorkspaceServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC read workspace: $role", role, shouldThrow) { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace - workspaceServiceImpl.getVerifiedWorkspace(it.organization.id!!, it.workspace.id!!) + workspaceServiceImpl.getVerifiedWorkspace(it.organization.id, it.workspace.id!!) } } @@ -333,11 +333,11 @@ class WorkspaceServiceImplTests { rbacTest("Test RBAC create workspace: $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it.organization listOf(PERMISSION_READ, PERMISSION_CREATE_CHILDREN).forEach { permission -> - csmRbac.verify(it.organization.getRbac(), permission) + csmRbac.verify(it.organization.security.toGenericSecurity(it.organization.id), permission) } every { workspaceRepository.save(any()) } returns it.workspace every { solutionService.findSolutionById(any(), any()) } returns it.solution - workspaceServiceImpl.createWorkspace(it.organization.id!!, it.workspace) + workspaceServiceImpl.createWorkspace(it.organization.id, it.workspace) } } @@ -353,7 +353,7 @@ class WorkspaceServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC delete all workspace files: $role", role, shouldThrow) { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace - workspaceServiceImpl.deleteAllWorkspaceFiles(it.organization.id!!, it.workspace.id!!) + workspaceServiceImpl.deleteAllWorkspaceFiles(it.organization.id, it.workspace.id!!) } } @@ -372,7 +372,7 @@ class WorkspaceServiceImplTests { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace every { workspaceRepository.save(any()) } returns it.workspace workspaceServiceImpl.updateWorkspace( - it.organization.id!!, it.workspace.id!!, it.workspace) + it.organization.id, it.workspace.id!!, it.workspace) } } @@ -388,7 +388,7 @@ class WorkspaceServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC delete workspace: $role", role, shouldThrow) { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace - workspaceServiceImpl.deleteWorkspace(it.organization.id!!, it.workspace.id!!) + workspaceServiceImpl.deleteWorkspace(it.organization.id, it.workspace.id!!) } } @@ -404,7 +404,7 @@ class WorkspaceServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC delete workspace file: $role", role, shouldThrow) { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace - workspaceServiceImpl.deleteWorkspaceFile(it.organization.id!!, it.workspace.id!!, "") + workspaceServiceImpl.deleteWorkspaceFile(it.organization.id, it.workspace.id!!, "") } } @@ -421,11 +421,11 @@ class WorkspaceServiceImplTests { rbacTest("Test RBAC download workspace file: $role", role, shouldThrow) { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace val filePath = - Path.of(blobPersistencePath, it.organization.id!!, it.workspace.id!!, "name") + Path.of(blobPersistencePath, it.organization.id, it.workspace.id!!, "name") Files.createDirectories(filePath.getParent()) Files.createFile(filePath) workspaceServiceImpl.downloadWorkspaceFile( - it.organization.id!!, it.workspace.id!!, "name") + it.organization.id, it.workspace.id!!, "name") } } @@ -442,7 +442,7 @@ class WorkspaceServiceImplTests { rbacTest("Test RBAC upload workspace file: $role", role, shouldThrow) { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace workspaceServiceImpl.uploadWorkspaceFile( - it.organization.id!!, it.workspace.id!!, mockk(relaxed = true), true, "name") + it.organization.id, it.workspace.id!!, mockk(relaxed = true), true, "name") } } @@ -458,7 +458,7 @@ class WorkspaceServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC findAllWorkspaceFiles: $role", role, shouldThrow) { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace - workspaceServiceImpl.findAllWorkspaceFiles(it.organization.id!!, it.workspace.id!!) + workspaceServiceImpl.findAllWorkspaceFiles(it.organization.id, it.workspace.id!!) } } @@ -474,7 +474,7 @@ class WorkspaceServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC get workspace security: $role", role, shouldThrow) { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace - workspaceServiceImpl.getWorkspaceSecurity(it.organization.id!!, it.workspace.id!!) + workspaceServiceImpl.getWorkspaceSecurity(it.organization.id, it.workspace.id!!) } } @@ -492,7 +492,7 @@ class WorkspaceServiceImplTests { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace every { workspaceRepository.save(any()) } returns it.workspace workspaceServiceImpl.setWorkspaceDefaultSecurity( - it.organization.id!!, it.workspace.id!!, WorkspaceRole(ROLE_NONE)) + it.organization.id, it.workspace.id!!, WorkspaceRole(ROLE_NONE)) } } @@ -509,7 +509,7 @@ class WorkspaceServiceImplTests { rbacTest("test RBAC get workspace access control: $role", role, shouldThrow) { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace workspaceServiceImpl.getWorkspaceAccessControl( - it.organization.id!!, it.workspace.id!!, CONNECTED_DEFAULT_USER) + it.organization.id, it.workspace.id!!, CONNECTED_DEFAULT_USER) } } @@ -527,7 +527,7 @@ class WorkspaceServiceImplTests { every { workspaceRepository.save(any()) } returns it.workspace every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace workspaceServiceImpl.addWorkspaceAccessControl( - it.organization.id!!, + it.organization.id, it.workspace.id!!, WorkspaceAccessControl("3$CONNECTED_DEFAULT_USER", ROLE_USER)) } @@ -547,7 +547,7 @@ class WorkspaceServiceImplTests { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace every { workspaceRepository.save(any()) } returns it.workspace workspaceServiceImpl.updateWorkspaceAccessControl( - it.organization.id!!, + it.organization.id, it.workspace.id!!, "2$CONNECTED_DEFAULT_USER", WorkspaceRole(ROLE_USER)) @@ -568,7 +568,7 @@ class WorkspaceServiceImplTests { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace every { workspaceRepository.save(any()) } returns it.workspace workspaceServiceImpl.removeWorkspaceAccessControl( - it.organization.id!!, it.workspace.id!!, "2$CONNECTED_DEFAULT_USER") + it.organization.id, it.workspace.id!!, "2$CONNECTED_DEFAULT_USER") } } @@ -585,8 +585,7 @@ class WorkspaceServiceImplTests { rbacTest("test RBAC get workspace security users: $role", role, shouldThrow) { every { workspaceRepository.findByIdOrNull(any()) } returns it.workspace every { workspaceRepository.save(any()) } returns it.workspace - workspaceServiceImpl.getWorkspaceSecurityUsers( - it.organization.id!!, it.workspace.id!!) + workspaceServiceImpl.getWorkspaceSecurityUsers(it.organization.id, it.workspace.id!!) } } @@ -597,9 +596,9 @@ class WorkspaceServiceImplTests { testLambda: (ctx: WorkspaceTestContext) -> Unit ): DynamicTest? { val organization = mockOrganization(username = CONNECTED_DEFAULT_USER, role = role) - val solution = mockSolution(organization.id!!) + val solution = mockSolution(organization.id) val workspace = - mockWorkspace(organization.id!!, solution.id!!, "Workspace", CONNECTED_DEFAULT_USER, role) + mockWorkspace(organization.id, solution.id!!, "Workspace", CONNECTED_DEFAULT_USER, role) return DynamicTest.dynamicTest(testName) { if (shouldThrow) { assertThrows {