fix deletion not working on great amount of scenarios

Author: Leopold-Cramer

.gitignore

@@ -49,7 +49,8 @@ api/kubernetes/cronjob/*.yaml
 ### Personal directory ###
 perso
 config/application-dev*.properties
-config/application-dev*.yml
+config/application-*.yml
+!config/application-dev.sample.yml
 api/kubernetes/helm-chart/values-vcr.yaml
 /api/kubernetes/helm-chart/values-JREY*.yaml
 

scenario/src/integrationTest/kotlin/com/cosmotech/scenario/service/ScenarioServiceIntegrationTest.kt

@@ -240,6 +240,12 @@ class ScenarioServiceIntegrationTest : CsmRedisTestBase() {
         scenarioApiService.findAllScenarios(organizationSaved.id!!, workspaceSaved.id!!, null, null)
     assertTrue(scenarioListAfterDelete.size == 1)
 
+    // We create more scenario than there can be on one page of default size to assert
+    // deleteAllScenarios still works with high quantities of scenarios
+    repeat(csmPlatformProperties.twincache.scenario.defaultPageSize + 1) {
+      scenarioApiService.createScenario(organizationSaved.id!!, workspaceSaved.id!!, makeScenario())
+    }
+
     logger.info("should delete all Scenarios and assert there is no Scenario left")
     scenarioApiService.deleteAllScenarios(organizationSaved.id!!, workspaceSaved.id!!)
     val scenarioListAfterDeleteAll =

scenario/src/main/kotlin/com/cosmotech/scenario/service/ScenarioServiceImpl.kt

@@ -321,7 +321,7 @@ internal class ScenarioServiceImpl(
     // TODO Only the workspace owner should be able to do this
     val workspace = workspaceService.findWorkspaceById(organizationId, workspaceId)
     csmRbac.verify(workspace.getRbac(), PERMISSION_WRITE)
-    var pageable = Pageable.ofSize(csmPlatformProperties.twincache.scenario.defaultPageSize)
+    val pageable = Pageable.ofSize(csmPlatformProperties.twincache.scenario.defaultPageSize)
 
     do {
       val scenarioList =
@@ -331,7 +331,6 @@ internal class ScenarioServiceImpl(
         scenarioRepository.delete(it)
         eventPublisher.publishEvent(ScenarioDeleted(this, organizationId, workspaceId, it.id!!))
       }
-      pageable = pageable.next()
     } while (scenarioList.isNotEmpty())
   }