Skip to content

Commit 79a3772

Browse files
lalepeejreynard-code
lalepee
and
jreynard-code
authored
merge common lib src to api src (#1059)
* merge common lib src to api src * Refactor: replace `cosmotech.api` usages with `cosmotech.common` across the codebase - Updated imports from `com.cosmotech.api` to `com.cosmotech.common` for consistency. - Adjusted integration tests, utilities, and core services to reference the new package structure. --------- Co-authored-by: Jérémy Reynard <[email protected]>
1 parent 0b5783d commit 79a3772

File tree

135 files changed

+5883
-449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+5883
-449
lines changed

‎api/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies {
2020
implementation(projects.cosmotechMetricsService)
2121
implementation(projects.cosmotechRunApi)
2222
implementation(projects.cosmotechRunnerApi)
23+
implementation(projects.cosmotechCommonApi)
2324
testImplementation("org.springframework.security:spring-security-test")
2425
testImplementation("org.springframework.restdocs:spring-restdocs-mockmvc")
2526
}

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/annotations/WithMockOauth2User.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.cosmotech.api.home.Constants.DEFAULT_ISSUER
66
import com.cosmotech.api.home.Constants.DEFAULT_SUBJECT
77
import com.cosmotech.api.home.Constants.PLATFORM_ADMIN_EMAIL
88
import com.cosmotech.api.home.factories.WithMockOauth2UserSecurityContextFactory
9-
import com.cosmotech.api.security.ROLE_PLATFORM_ADMIN
9+
import com.cosmotech.common.security.ROLE_PLATFORM_ADMIN
1010
import org.springframework.security.test.context.support.WithSecurityContext
1111

1212
/**

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/dataset/DatasetControllerTests.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import com.cosmotech.api.home.run.RunConstants.RequestContent.RUN_TEMPLATE_COMPU
2828
import com.cosmotech.api.home.run.RunConstants.RequestContent.RUN_TEMPLATE_NAME
2929
import com.cosmotech.api.home.run.RunConstants.RequestContent.TAGS
3030
import com.cosmotech.api.home.runner.RunnerConstants.RUNNER_RUN_TEMPLATE
31-
import com.cosmotech.api.rbac.ROLE_ADMIN
32-
import com.cosmotech.api.rbac.ROLE_EDITOR
33-
import com.cosmotech.api.rbac.ROLE_NONE
34-
import com.cosmotech.api.rbac.ROLE_VIEWER
31+
import com.cosmotech.common.rbac.ROLE_ADMIN
32+
import com.cosmotech.common.rbac.ROLE_EDITOR
33+
import com.cosmotech.common.rbac.ROLE_NONE
34+
import com.cosmotech.common.rbac.ROLE_VIEWER
3535
import com.cosmotech.dataset.domain.DatasetAccessControl
3636
import com.cosmotech.dataset.domain.DatasetCreateRequest
3737
import com.cosmotech.dataset.domain.DatasetPart

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/factories/WithMockCustomUserSecurityContextFactory.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package com.cosmotech.api.home.factories
44

55
import com.cosmotech.api.home.annotations.WithMockOauth2User
6-
import com.cosmotech.api.utils.objectMapper
6+
import com.cosmotech.common.utils.objectMapper
77
import com.fasterxml.jackson.core.JacksonException
88
import com.fasterxml.jackson.core.JsonParser
99
import com.fasterxml.jackson.databind.ObjectMapper

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/organization/OrganizationConstants.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
package com.cosmotech.api.home.organization
44

55
import com.cosmotech.api.home.Constants.PLATFORM_ADMIN_EMAIL
6-
import com.cosmotech.api.rbac.ROLE_ADMIN
7-
import com.cosmotech.api.rbac.ROLE_NONE
6+
import com.cosmotech.common.rbac.ROLE_ADMIN
7+
import com.cosmotech.common.rbac.ROLE_NONE
88

99
/**
1010
* Constant class that contains for Organization endpoints:

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/organization/OrganizationControllerTests.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import com.cosmotech.api.home.organization.OrganizationConstants.RequestContent.
1818
import com.cosmotech.api.home.organization.OrganizationConstants.RequestContent.MINIMAL_ORGANIZATION_REQUEST_CREATION
1919
import com.cosmotech.api.home.organization.OrganizationConstants.RequestContent.MINIMAL_ORGANIZATION_REQUEST_UPDATE
2020
import com.cosmotech.api.home.organization.OrganizationConstants.RequestContent.ORGANIZATION_REQUEST_CREATION_WITH_ACCESSES
21-
import com.cosmotech.api.rbac.ROLE_ADMIN
22-
import com.cosmotech.api.rbac.ROLE_NONE
23-
import com.cosmotech.api.rbac.ROLE_VIEWER
24-
import com.cosmotech.api.security.ROLE_ORGANIZATION_USER
21+
import com.cosmotech.common.rbac.ROLE_ADMIN
22+
import com.cosmotech.common.rbac.ROLE_NONE
23+
import com.cosmotech.common.rbac.ROLE_VIEWER
24+
import com.cosmotech.common.security.ROLE_ORGANIZATION_USER
2525
import org.json.JSONObject
2626
import org.junit.jupiter.api.Test
2727
import org.slf4j.LoggerFactory

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/run/RunControllerTests.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Licensed under the MIT license.
33
package com.cosmotech.api.home.run
44

5-
import com.cosmotech.api.events.CsmEventPublisher
6-
import com.cosmotech.api.events.UpdateRunnerStatus
75
import com.cosmotech.api.home.Constants.PLATFORM_ADMIN_EMAIL
86
import com.cosmotech.api.home.ControllerTestBase
97
import com.cosmotech.api.home.ControllerTestUtils.OrganizationUtils.constructOrganizationCreateRequest
@@ -51,6 +49,8 @@ import com.cosmotech.api.home.run.RunConstants.RequestContent.WORKFLOW_PHASE
5149
import com.cosmotech.api.home.run.RunConstants.RequestContent.WORKFLOW_PROGRESS
5250
import com.cosmotech.api.home.run.RunConstants.RequestContent.WORKSPACE_KEY
5351
import com.cosmotech.api.home.runner.RunnerConstants.RUNNER_RUN_TEMPLATE
52+
import com.cosmotech.common.events.CsmEventPublisher
53+
import com.cosmotech.common.events.UpdateRunnerStatus
5454
import com.cosmotech.run.RunApiServiceInterface
5555
import com.cosmotech.run.RunContainerFactory
5656
import com.cosmotech.run.domain.*

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/runner/RunnerControllerTests.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
// Licensed under the MIT license.
33
package com.cosmotech.api.home.runner
44

5-
import com.cosmotech.api.events.CsmEventPublisher
6-
import com.cosmotech.api.events.RunStart
7-
import com.cosmotech.api.events.UpdateRunnerStatus
85
import com.cosmotech.api.home.Constants.PLATFORM_ADMIN_EMAIL
96
import com.cosmotech.api.home.ControllerTestBase
107
import com.cosmotech.api.home.ControllerTestUtils.DatasetUtils.constructDatasetCreateRequest
@@ -27,9 +24,12 @@ import com.cosmotech.api.home.runner.RunnerConstants.NEW_USER_ROLE
2724
import com.cosmotech.api.home.runner.RunnerConstants.RUNNER_NAME
2825
import com.cosmotech.api.home.runner.RunnerConstants.RUNNER_OWNER_NAME
2926
import com.cosmotech.api.home.runner.RunnerConstants.RUNNER_RUN_TEMPLATE
30-
import com.cosmotech.api.rbac.ROLE_ADMIN
31-
import com.cosmotech.api.rbac.ROLE_NONE
32-
import com.cosmotech.api.rbac.ROLE_VIEWER
27+
import com.cosmotech.common.events.CsmEventPublisher
28+
import com.cosmotech.common.events.RunStart
29+
import com.cosmotech.common.events.UpdateRunnerStatus
30+
import com.cosmotech.common.rbac.ROLE_ADMIN
31+
import com.cosmotech.common.rbac.ROLE_NONE
32+
import com.cosmotech.common.rbac.ROLE_VIEWER
3333
import com.cosmotech.dataset.domain.DatasetPartTypeEnum
3434
import com.cosmotech.runner.domain.*
3535
import com.cosmotech.runner.domain.ResourceSizeInfo

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/solution/SolutionControllerTests.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the MIT license.
33
package com.cosmotech.api.home.solution
44

5-
import com.cosmotech.api.containerregistry.ContainerRegistryService
65
import com.cosmotech.api.home.Constants.PLATFORM_ADMIN_EMAIL
76
import com.cosmotech.api.home.ControllerTestBase
87
import com.cosmotech.api.home.ControllerTestUtils.OrganizationUtils.constructOrganizationCreateRequest
@@ -18,9 +17,10 @@ import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_NAME
1817
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_REPOSITORY
1918
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_SDK_VERSION
2019
import com.cosmotech.api.home.solution.SolutionConstants.SOLUTION_VERSION
21-
import com.cosmotech.api.rbac.ROLE_ADMIN
22-
import com.cosmotech.api.rbac.ROLE_NONE
23-
import com.cosmotech.api.rbac.ROLE_VIEWER
20+
import com.cosmotech.common.containerregistry.ContainerRegistryService
21+
import com.cosmotech.common.rbac.ROLE_ADMIN
22+
import com.cosmotech.common.rbac.ROLE_NONE
23+
import com.cosmotech.common.rbac.ROLE_VIEWER
2424
import com.cosmotech.solution.api.SolutionApiService
2525
import com.cosmotech.solution.domain.*
2626
import io.mockk.every

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/workspace/WorkspaceControllerTests.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import com.cosmotech.api.home.organization.OrganizationConstants.NEW_USER_ID
1616
import com.cosmotech.api.home.organization.OrganizationConstants.NEW_USER_ROLE
1717
import com.cosmotech.api.home.workspace.WorkspaceConstants.WORKSPACE_KEY
1818
import com.cosmotech.api.home.workspace.WorkspaceConstants.WORKSPACE_NAME
19-
import com.cosmotech.api.rbac.ROLE_ADMIN
20-
import com.cosmotech.api.rbac.ROLE_NONE
21-
import com.cosmotech.api.rbac.ROLE_VIEWER
19+
import com.cosmotech.common.rbac.ROLE_ADMIN
20+
import com.cosmotech.common.rbac.ROLE_NONE
21+
import com.cosmotech.common.rbac.ROLE_VIEWER
2222
import com.cosmotech.workspace.domain.WorkspaceAccessControl
2323
import com.cosmotech.workspace.domain.WorkspaceSecurity
2424
import org.apache.commons.io.IOUtils

0 commit comments

Comments
 (0)