Skip to content

Lcra/update required data organization openapi prod 14189 #851

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

Merged
Leopold-Cramer merged 2 commits into from
Jan 24, 2025
Merged

Lcra/update required data organization openapi prod 14189 #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c7fee7
refactor: update organization API operation IDs to follow REST naming…
Leopold-Cramer Jan 13, 2025
e48195a
Modify required values in organization openapi objects + fix warnings
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
299 changes: 144 additions & 155 deletions ...src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt
View file
Open in desktop

Large diffs are not rendered by default.

397 changes: 186 additions & 211 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 @@ -1030,7 +1030,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 @@ -1080,7 +1080,7 @@ class DatasetServiceImpl(

val rbacSecurity =
csmRbac.addUserRole(
organization.getRbac(),
organization.security.toGenericSecurity(organizationId),
dataset.getRbac(),
datasetAccessControl.id,
datasetAccessControl.role)
Expand Down
4 changes: 2 additions & 2 deletions doc/Models/ComponentRolePermissions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

8 changes: 4 additions & 4 deletions doc/Models/Organization.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

2 changes: 1 addition & 1 deletion doc/Models/OrganizationUpdateRequest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

2 changes: 1 addition & 1 deletion doc/Models/UpdateOrganizationRequest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

14 changes: 7 additions & 7 deletions openapi/plantuml/schemas.plantuml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
title Cosmo Tech Platform API Schemas Diagram

entity ComponentRolePermissions {
component: String
roles: Map
* component: String
* roles: Map
}

entity Connector {
Expand Down Expand Up @@ -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 {
Expand All @@ -187,7 +187,7 @@ entity OrganizationSecurity {
}

entity OrganizationUpdateRequest {
name: String
* name: String
}

entity QueryResult {
Expand Down
Loading
Loading