Change query behind findAllDatasets when you're a Platform.Admin

- Rename repository method from findByOrganizationIdNoSecurity to findByOrganizationId
- Remove unnecessarily parenthesis in query

Author: jreynard-code

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

@@ -366,6 +366,32 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
     assertEquals(numberOfDatasets - expectedPageSize, datasetList.size)
   }
 
+  @Test
+  fun `test find All Datasets as Platform Admin with returned datasetID lists`() {
+    organizationSaved = organizationApiService.registerOrganization(organization)
+    val numberOfDatasets = 500
+    val datasetIdListCreated = mutableListOf<String>()
+    IntRange(1, numberOfDatasets).forEach {
+      datasetIdListCreated.add(
+          datasetApiService
+              .createDataset(
+                  organizationSaved.id!!, makeDatasetWithRole("d-dataset-$it", "dataset-$it"))
+              .id!!)
+    }
+    logger.info("Change current user...")
+    every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER
+    every { getCurrentAuthenticatedUserName(csmPlatformProperties) } returns "test.admin"
+    every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_PLATFORM_ADMIN)
+
+    logger.info("should find all datasets and assert there are $numberOfDatasets")
+    val datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null)
+    assertEquals(numberOfDatasets, datasetList.size)
+
+    val datasetIdListRetrieved = datasetList.map { it.id }
+    assertTrue(datasetIdListCreated.containsAll(datasetIdListRetrieved))
+    assertTrue(datasetIdListRetrieved.containsAll(datasetIdListCreated))
+  }
+
   @Test
   fun `test find All Datasets as Organization User`() {
     organizationSaved = organizationApiService.registerOrganization(organization)

dataset/src/main/kotlin/com/cosmotech/dataset/repository/DatasetRepository.kt

@@ -27,8 +27,8 @@ interface DatasetRepository : RedisDocumentRepository<Dataset, String> {
       pageRequest: PageRequest
   ): Page<Dataset>
 
-  @Query("(@organizationId:{\$organizationId})")
-  fun findByOrganizationIdNoSecurity(
+  @Query("@organizationId:{\$organizationId}")
+  fun findByOrganizationId(
       @Sanitize @Param("organizationId") organizationId: String,
       pageRequest: PageRequest
   ): Page<Dataset>

dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt

@@ -155,7 +155,7 @@ class DatasetServiceImpl(
               val currentUser = getCurrentAccountIdentifier(this.csmPlatformProperties)
               datasetRepository.findByOrganizationId(organizationId, currentUser, it).toList()
             } else {
-              datasetRepository.findByOrganizationIdNoSecurity(organizationId, it).toList()
+              datasetRepository.findByOrganizationId(organizationId, it).toList()
             }
           }
     } else {
@@ -164,7 +164,7 @@ class DatasetServiceImpl(
             val currentUser = getCurrentAccountIdentifier(this.csmPlatformProperties)
             datasetRepository.findByOrganizationId(organizationId, currentUser, pageable).toList()
           } else {
-            datasetRepository.findByOrganizationIdNoSecurity(organizationId, pageable).toList()
+            datasetRepository.findByOrganizationId(organizationId, pageable).toList()
           }
     }
     result.forEach { it.security = updateSecurityVisibility(it).security }
@@ -1142,7 +1142,7 @@ class DatasetServiceImpl(
     do {
       val datasetList =
           datasetRepository
-              .findByOrganizationIdNoSecurity(organizationUnregistered.organizationId, pageable)
+              .findByOrganizationId(organizationUnregistered.organizationId, pageable)
               .toList()
       datasetRepository.deleteAll(datasetList)
       pageable = pageable.next()

dataset/src/test/kotlin/com/cosmotech/dataset/service/DatasetServiceImplTests.kt

@@ -104,8 +104,7 @@ class DatasetServiceImplTests {
   @Test
   fun `findAllDatasets should return empty list when no dataset exists`() {
     every { organizationService.getVerifiedOrganization(ORGANIZATION_ID) } returns Organization()
-    every { datasetRepository.findByOrganizationIdNoSecurity(any(), any<PageRequest>()) } returns
-        Page.empty()
+    every { datasetRepository.findByOrganizationId(any(), any<PageRequest>()) } returns Page.empty()
 
     val result = datasetService.findAllDatasets(ORGANIZATION_ID, null, null)
     assertEquals(emptyList(), result)