fix: Debouncing job can fail on multiple results returned by key (#2104)

tolgee · Jan 25, 2024 · 5fedace · 5fedace
1 parent 5de02da
commit 5fedace
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/backend/data/src/main/kotlin/io/tolgee/repository/BatchJobRepository.kt b/backend/data/src/main/kotlin/io/tolgee/repository/BatchJobRepository.kt
@@ -106,7 +106,8 @@ interface BatchJobRepository : JpaRepository<BatchJob, Long> {
     from BatchJob j
     where j.debouncingKey = :debouncingKey
     and j.status = 'PENDING'
+    and j.id = (select max(j2.id) from BatchJob j2 where j2.debouncingKey = :debouncingKey and j2.status = 'PENDING')
   """,
   )
-  fun findBatchJobByDebouncingKey(debouncingKey: String?): BatchJob?
+  fun findBatchJobByDebouncingKey(debouncingKey: String): BatchJob?
 }
diff --git a/build.gradle b/build.gradle
@@ -90,7 +90,7 @@ project(':server-app').afterEvaluate {
     task startDbChangelogContainer {
         doLast {
             exec {
-                commandLine "docker", "run", "-e", "POSTGRES_PASSWORD=postgres", "-d", "-p55438:5432", "--name", dbSchemaContainerName, "postgres:13"
+                commandLine "docker", "run", "-e", "POSTGRES_PASSWORD=postgres", "-d", "-p55432:5432", "--name", dbSchemaContainerName, "postgres:13"
             }
             Thread.sleep(5000)
         }

diff --git a/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.1.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.1.cy.ts
@@ -12,7 +12,7 @@ import {
   visitProjectDashboard,
 } from '../../../common/shared';
 
-describe('Server admin 1', () => {
+describe('Server admin 1', { retries: { runMode: 5 } }, () => {
   it('admin', () => {
     visitProjectWithPermissions({ scopes: ['admin'] }).then((projectInfo) => {
       // login as admin