Skip to content

Lcra/update organization openapi examples prod 14189 #854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Leopold-Cramer wants to merge 5 commits into from
Closed

Lcra/update organization openapi examples prod 14189 #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ffd785e
refactor: update organization API operation IDs to follow REST naming…
Leopold-Cramer Jan 13, 2025
7bd090b
Refactor organization OpenAPI schemas to use different objects for re…
Leopold-Cramer Nov 18, 2024
31854d0
Fix failing tests
Leopold-Cramer Jan 22, 2025
9558d55
Modify required values in organization openapi objects + fix warnings
Leopold-Cramer Jan 22, 2025
48b53f7
refactor(organization): Update OpenAPI examples and documentation
Leopold-Cramer Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
372 changes: 181 additions & 191 deletions ...src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt
View file
Open in desktop

Large diffs are not rendered by default.

623 changes: 298 additions & 325 deletions dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceRBACTest.kt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1033,7 +1033,7 @@ class DatasetServiceImpl(

val defaultPageSize = csmPlatformProperties.twincache.dataset.defaultPageSize
val pageable = constructPageRequest(page, size, defaultPageSize)
var datasetList = listOf<Dataset>()
var datasetList: List<Dataset>
if (pageable != null) {
datasetList =
datasetRepository
Expand Down Expand Up @@ -1083,7 +1083,7 @@ class DatasetServiceImpl(

val rbacSecurity =
csmRbac.addUserRole(
organization.getRbac(),
organization.security.toGenericSecurity(organizationId),
dataset.getRbac(),
datasetAccessControl.id,
datasetAccessControl.role)
Expand Down
90 changes: 63 additions & 27 deletions dataset/src/test/kotlin/com/cosmotech/dataset/service/DatasetServiceImplTests.kt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions doc/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Models/GraphProperties.md
Models/IngestionStatusEnum.md
Models/Organization.md
Models/OrganizationAccessControl.md
Models/OrganizationCreationRequest.md
Models/OrganizationRole.md
Models/OrganizationSecurity.md
Models/QueryResult.md
Expand Down Expand Up @@ -67,6 +68,7 @@ Models/SourceInfo.md
Models/SubDatasetGraphQuery.md
Models/TwinGraphBatchResult.md
Models/TwincacheStatusEnum.md
Models/UpdateOrganizationRequest.md
Models/Workspace.md
Models/WorkspaceAccessControl.md
Models/WorkspaceFile.md
Expand Down
Loading
Loading