fix: Select right job status on cancellation (#2329)

tolgee · May 30, 2024 · 506c603 · 506c603
1 parent 6cd05f8
commit 506c603
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/backend/app/src/test/kotlin/io/tolgee/batch/BatchJobsCleanerTest.kt b/backend/app/src/test/kotlin/io/tolgee/batch/BatchJobsCleanerTest.kt
@@ -105,6 +105,7 @@ class BatchJobsCleanerTest : AbstractSpringTest() {
  BatchJobStatus.RUNNING,
  setOf(
  BatchJobChunkExecutionStatus.CANCELLED,
+ BatchJobChunkExecutionStatus.FAILED,
  BatchJobChunkExecutionStatus.SUCCESS,
  ),
  )
@@ -114,7 +115,6 @@ class BatchJobsCleanerTest : AbstractSpringTest() {
  testData.project,
  BatchJobStatus.RUNNING,
  setOf(
- BatchJobChunkExecutionStatus.CANCELLED,
  BatchJobChunkExecutionStatus.SUCCESS,
  BatchJobChunkExecutionStatus.FAILED,
  ),

diff --git a/backend/data/src/main/kotlin/io/tolgee/batch/cleaning/BatchJobStatusProvider.kt b/backend/data/src/main/kotlin/io/tolgee/batch/cleaning/BatchJobStatusProvider.kt
@@ -8,8 +8,8 @@ import org.springframework.stereotype.Component
 class BatchJobStatusProvider {
  fun getNewStatus(it: Collection<BatchJobChunkExecutionStatus>) =
  when {
- it.contains(BatchJobChunkExecutionStatus.FAILED) -> BatchJobStatus.FAILED
  it.contains(BatchJobChunkExecutionStatus.CANCELLED) -> BatchJobStatus.CANCELLED
+ it.contains(BatchJobChunkExecutionStatus.FAILED) -> BatchJobStatus.FAILED
  else -> BatchJobStatus.SUCCESS
  }
 }