@@ -43,7 +43,7 @@ import com.cosmotech.dataset.repository.DatasetRepository
4343import com.cosmotech.organization.OrganizationApiServiceInterface
4444import com.cosmotech.organization.domain.Organization
4545import com.cosmotech.organization.domain.OrganizationAccessControl
46- import com.cosmotech.organization.domain.OrganizationCreationRequest
46+ import com.cosmotech.organization.domain.OrganizationCreateRequest
4747import com.cosmotech.organization.domain.OrganizationSecurity
4848import com.cosmotech.solution.SolutionApiServiceInterface
4949import com.cosmotech.solution.domain.Solution
@@ -123,7 +123,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
123123 lateinit var workspace: Workspace
124124
125125 lateinit var unifiedJedis: UnifiedJedis
126- lateinit var organization: OrganizationCreationRequest
126+ lateinit var organization: OrganizationCreateRequest
127127 lateinit var organizationSaved: Organization
128128 lateinit var solutionSaved: Solution
129129 lateinit var workspaceSaved: Workspace
@@ -154,7 +154,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
154154
155155 connectorSaved = connectorApiService.registerConnector(makeConnector())
156156
157- organization = makeOrganizationRequestWithRole ()
157+ organization = makeOrganizationCreateRequest ()
158158 organizationSaved = organizationApiService.createOrganization(organization)
159159 dataset = makeDatasetWithRole()
160160 datasetSaved = datasetApiService.createDataset(organizationSaved.id!! , dataset)
@@ -422,8 +422,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
422422
423423 // Create a dataset that current user should not see because it has been created under another
424424 // organization
425- val newOrganization =
426- organizationApiService.createOrganization(makeOrganizationRequestWithRole())
425+ val newOrganization = organizationApiService.createOrganization(makeOrganizationCreateRequest())
427426 val datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization =
428427 datasetApiService.createDataset(
429428 newOrganization.id!! , makeDatasetWithRole(organizationId = newOrganization.id!! ))
@@ -465,8 +464,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
465464
466465 // Create a dataset that current user should not see because it has been created under another
467466 // organization
468- val newOrganization =
469- organizationApiService.createOrganization(makeOrganizationRequestWithRole())
467+ val newOrganization = organizationApiService.createOrganization(makeOrganizationCreateRequest())
470468 val datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization =
471469 datasetApiService.createDataset(
472470 newOrganization.id!! , makeDatasetWithRole(organizationId = newOrganization.id!! ))
@@ -771,7 +769,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
771769 @Test
772770 fun `access control list shouldn't contain more than one time each user on creation` () {
773771 connectorSaved = connectorApiService.registerConnector(makeConnector())
774- organizationSaved = organizationApiService.createOrganization(makeOrganizationRequestWithRole ())
772+ organizationSaved = organizationApiService.createOrganization(makeOrganizationCreateRequest ())
775773 val brokenDataset =
776774 Dataset (
777775 name = " dataset" ,
@@ -791,7 +789,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
791789 @Test
792790 fun `access control list shouldn't contain more than one time each user on ACL addition` () {
793791 connectorSaved = connectorApiService.registerConnector(makeConnector())
794- organizationSaved = organizationApiService.createOrganization(makeOrganizationRequestWithRole ())
792+ organizationSaved = organizationApiService.createOrganization(makeOrganizationCreateRequest ())
795793 val workingDataset = makeDatasetWithRole(" dataset" , sourceType = DatasetSourceType .None )
796794 val datasetSaved = datasetApiService.createDataset(organizationSaved.id!! , workingDataset)
797795
@@ -873,7 +871,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
873871 @Test
874872 fun `status should go back to normal on rollback endpoint call` () {
875873 every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER
876- organization = makeOrganizationRequestWithRole (" organization" )
874+ organization = makeOrganizationCreateRequest (" organization" )
877875 organizationSaved = organizationApiService.createOrganization(organization)
878876 dataset = makeDatasetWithRole(sourceType = DatasetSourceType .File )
879877 datasetSaved = datasetApiService.createDataset(organizationSaved.id!! , dataset)
@@ -915,7 +913,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
915913 every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER
916914 organizationSaved =
917915 organizationApiService.createOrganization(
918- makeOrganizationRequestWithRole (" organization" ))
916+ makeOrganizationCreateRequest (" organization" ))
919917 val parentDataset =
920918 datasetApiService.createDataset(
921919 organizationSaved.id!! , makeDatasetWithRole(sourceType = sourceType))
@@ -1096,11 +1094,11 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
10961094 id = " c-AbCdEf123" )
10971095 }
10981096
1099- fun makeOrganizationRequestWithRole (
1097+ fun makeOrganizationCreateRequest (
11001098 userName : String = TEST_USER_MAIL ,
11011099 role : String = ROLE_EDITOR
1102- ): OrganizationCreationRequest {
1103- return OrganizationCreationRequest (
1100+ ): OrganizationCreateRequest {
1101+ return OrganizationCreateRequest (
11041102 name = " Organization NameRbac" ,
11051103 security =
11061104 OrganizationSecurity (
0 commit comments