fix openapi and apply pr requests

Author: Leopold-Cramer

dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt

@@ -19,7 +19,6 @@ import com.cosmotech.api.rbac.ROLE_VIEWER
 import com.cosmotech.api.security.ROLE_ORGANIZATION_USER
 import com.cosmotech.api.security.ROLE_PLATFORM_ADMIN
 import com.cosmotech.api.tests.CsmRedisTestBase
-import com.cosmotech.api.tests.CsmRedisTestBase.Companion.redisStackServer
 import com.cosmotech.api.utils.ResourceScanner
 import com.cosmotech.api.utils.bulkQueryKey
 import com.cosmotech.api.utils.getCurrentAccountIdentifier
@@ -495,15 +494,20 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
   }
 
   @Test
-  fun `test security endpoints`() {
+  fun `test get security endpoint`() {
     organizationSaved = organizationApiService.registerOrganization(organization)
     datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
-    logger.info("should return the current security")
+    // should return the current security
     val datasetSecurity =
         datasetApiService.getDatasetSecurity(organizationSaved.id!!, datasetSaved.id!!)
     assertEquals(datasetSaved.security, datasetSecurity)
+  }
 
-    logger.info("should update the default security and assert it worked")
+  @Test
+  fun `test set default security endpoint`() {
+    organizationSaved = organizationApiService.registerOrganization(organization)
+    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))
@@ -1629,7 +1633,6 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
               organizationSaved = organizationApiService.registerOrganization(organization)
               val dataset = makeDatasetWithRole(role = role)
               datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
-              materializeTwingraph()
 
               every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL
 
@@ -1673,7 +1676,6 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
               organizationSaved = organizationApiService.registerOrganization(organization)
               val dataset = makeDatasetWithRole(role = role)
               datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
-              materializeTwingraph()
 
               every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL
 

dataset/src/main/openapi/dataset.yaml

@@ -1074,9 +1074,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/DatasetSecurity'
-              examples:
-                DatasetSecurity:
-                  $ref: '#/components/examples/BreweryDatasetSecurity'
         "404":
           description: the Dataset specified is unknown or you don't have access to it
   /organizations/{organization_id}/datasets/{dataset_id}/security/default:

solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceIntegrationTest.kt

@@ -31,7 +31,7 @@ import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit5.MockKExtension
 import io.mockk.mockkStatic
-import java.util.UUID
+import java.util.*
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import org.junit.jupiter.api.BeforeEach
@@ -394,13 +394,16 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() {
   }
 
   @Test
-  fun `test security endpoints`() {
-    logger.info("should return the current security")
+  fun `test get security endpoint`() {
+    // should return the current security
     val solutionSecurity =
         solutionApiService.getSolutionSecurity(organizationRegistered.id!!, solutionRegistered.id!!)
     assertEquals(solutionRegistered.security, solutionSecurity)
+  }
 
-    logger.info("should update the default security and assert it worked")
+  @Test
+  fun `test set default security endpoint`() {
+    // should update the default security and assert it worked
     val solutionDefaultSecurity =
         solutionApiService.setSolutionDefaultSecurity(
             organizationRegistered.id!!, solutionRegistered.id!!, SolutionRole(ROLE_VIEWER))

solution/src/main/openapi/solution.yaml

@@ -504,9 +504,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/SolutionSecurity'
-              examples:
-                SolutionSecurity:
-                  $ref: '#/components/examples/BrewerySolutionSecurity'
         "404":
           description: the Solution specified is unknown or you don't have access to it
   /organizations/{organization_id}/solutions/{solution_id}/security/default: