fix: ignore a deleted branch in queries + delete branch entity after cleanup

Author: dkrizan

backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/KeysTestData.kt

@@ -9,6 +9,7 @@ import io.tolgee.model.UserAccount
 import io.tolgee.model.enums.ProjectPermissionType
 import io.tolgee.model.key.Key
 import io.tolgee.model.key.Tag
+import java.util.Date
 
 class KeysTestData {
   lateinit var enOnlyUserAccount: UserAccount
@@ -119,6 +120,17 @@ class KeysTestData {
               branch = self
             }
           }
+
+          // deleted branch with the same name
+          addBranch {
+            name = "dev"
+            archivedAt = Date(1759833439)
+          }.build {
+            addKey {
+              name = "first_key"
+              branch = self
+            }
+          }
         }
 
       addUserAccountWithoutOrganization {

backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/TranslationsTestData.kt

@@ -18,6 +18,7 @@ import io.tolgee.model.enums.TranslationState
 import io.tolgee.model.key.Key
 import io.tolgee.model.key.screenshotReference.KeyInScreenshotPosition
 import io.tolgee.model.translation.Translation
+import java.util.Date
 
 class TranslationsTestData {
   lateinit var project: Project
@@ -89,6 +90,17 @@ class TranslationsTestData {
           }
         }
 
+        // deleted branch
+        addBranch {
+          name = "from-default"
+          project = this@project.self
+          archivedAt = Date(1759834567)
+        }.build {
+          addBasicKey().apply {
+            branch = self
+          }
+        }
+
         val zKeyBuilder =
           addKey {
             name = "Z key"

backend/data/src/main/kotlin/io/tolgee/model/Project.kt

@@ -43,6 +43,7 @@ import jakarta.validation.constraints.Pattern
 import jakarta.validation.constraints.Size
 import org.hibernate.annotations.ColumnDefault
 import org.hibernate.annotations.Filter
+import org.hibernate.annotations.SQLRestriction
 import org.springframework.beans.factory.ObjectFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Configurable
@@ -145,6 +146,7 @@ class Project(
   var slackConfigs: MutableList<SlackConfig> = mutableListOf()
 
   @OneToMany(fetch = FetchType.LAZY, cascade = [CascadeType.PERSIST], mappedBy = "project")
+  @SQLRestriction("archived_at IS NULL")
   var branches: MutableList<Branch> = mutableListOf()
 
   @ColumnDefault("true")

backend/data/src/main/kotlin/io/tolgee/repository/KeyRepository.kt

@@ -40,7 +40,7 @@ interface KeyRepository : JpaRepository<Key, Long> {
       k.name = :name 
       and k.project.id = :projectId 
       and (ns.name = :namespace or (ns is null and :namespace is null))
-      and (br.name = :branch or (:branch is null and (br is null or br.isDefault)))
+      and ((br.name = :branch and br.archivedAt is null) or (:branch is null and (br is null or br.isDefault)))
   """,
   )
   fun getByNameAndNamespace(
@@ -64,7 +64,8 @@ interface KeyRepository : JpaRepository<Key, Long> {
      left join k.keyMeta km
      left join k.namespace ns
      left join k.branch br
-     where k.project.id = :projectId order by k.id
+     where k.project.id = :projectId and (br is null or br.archivedAt is null) 
+     order by k.id
     """,
   )
   fun getAllByProjectIdSortedById(projectId: Long): List<KeyView>
@@ -158,13 +159,13 @@ interface KeyRepository : JpaRepository<Key, Long> {
      left join k.namespace ns
      left join k.branch b
      where k.project.id = :projectId
-        and (k.branch.name = :branch or (:branch is null and (b is null or b.isDefault)))
+        and ((b.name = :branch and b.archivedAt is null) or (:branch is null and (b is null or b.isDefault)))
     """,
     countQuery = """
       select count(k) from Key k 
       left join k.branch b
       where k.project.id = :projectId 
-        and (k.branch.name = :branch or (:branch is null and (b is null or b.isDefault)))
+        and ((b.name = :branch and b.archivedAt is null) or (:branch is null and (b is null or b.isDefault)))
     """,
   )
   fun getAllByProjectId(
@@ -290,14 +291,14 @@ interface KeyRepository : JpaRepository<Key, Long> {
       left join fetch k.translations t
       left join fetch k.keyMeta km
       left join fetch k.namespace ns
-      left join fetch k.branch br
+      left join fetch k.branch b
       left join fetch t.labels l
       left join fetch km.tags tg
       left join fetch t.comments c
       left join fetch c.author ca
       where k.project.id = :projectId 
         and k.name = :keyName
-        and (br.name = :branchName or (:branchName is null and (br is null or br.isDefault)))
+        and ((b.name = :branchName and b.archivedAt is null) or (:branchName is null and (b is null or b.isDefault)))
     """
   )
   fun findPrefetchedByNameAndBranch(projectId: Long, keyName: String, branchName: String?): Key?

backend/data/src/main/kotlin/io/tolgee/repository/TranslationRepository.kt

@@ -28,7 +28,7 @@ interface TranslationRepository : JpaRepository<Translation, Long> {
         left join km.tags kmt
         join t.language l
         where t.key.project.id = :projectId
-         and (b.name = :branch or (:branch is null and (b is null or b.isDefault))) 
+         and ((b.name = :branch and b.archivedAt is null) or (:branch is null and (b is null or b.isDefault))) 
          and l.tag in :languages
          and ((n.name is null and :namespace is null) or n.name = :namespace)
          and (:filterTags is null or kmt.name in :filterTags)

backend/data/src/main/kotlin/io/tolgee/service/bigMeta/BigMetaService.kt

@@ -236,7 +236,10 @@ class BigMetaService(
           cb.equal(root.get(Key_.name), key.keyName),
           cb.equalNullable(namespace.get(Namespace_.name), key.namespace),
           cb.or(
-            cb.equalNullable(branch.get(Branch_.name), key.branch),
+            cb.and(
+              cb.equalNullable(branch.get(Branch_.name), key.branch),
+              cb.isNull(branch.get(Branch_.archivedAt)),
+            ),
             cb.or(
               cb.isNull(root.get(Key_.branch)),
               cb.isTrue(branch.get(Branch_.isDefault)),

backend/data/src/main/kotlin/io/tolgee/service/export/dataProvider/ExportDataProvider.kt

@@ -157,7 +157,12 @@ class ExportDataProvider(
 
   private fun filterBranch() {
     if (exportParams.filterBranch != null) {
-      whereConditions.add(cb.equal(branchJoin.get(Branch_.name), exportParams.filterBranch))
+      whereConditions.add(
+        cb.and(
+          cb.equal(branchJoin.get(Branch_.name), exportParams.filterBranch),
+            cb.isNull(branchJoin.get(Branch_.archivedAt)),
+        )
+      )
     } else {
       whereConditions.add(
         cb.or(

backend/data/src/main/kotlin/io/tolgee/service/queryBuilders/LanguageStatsProvider.kt

@@ -3,6 +3,7 @@ package io.tolgee.service.queryBuilders
 import io.tolgee.model.Language_
 import io.tolgee.model.Project
 import io.tolgee.model.Project_
+import io.tolgee.model.branching.Branch_
 import io.tolgee.model.enums.TranslationState
 import io.tolgee.model.key.Key
 import io.tolgee.model.key.Key_
@@ -107,7 +108,7 @@ open class LanguageStatsProvider(
     subquery.where(
       cb.or(
         cb.isNull(join.get(Key_.branch)),
-        cb.isTrue(branchJoin.get(io.tolgee.model.branching.Branch_.isDefault)),
+        cb.isTrue(branchJoin.get(Branch_.isDefault)),
       ),
     )
   }

backend/data/src/main/kotlin/io/tolgee/service/queryBuilders/translationViewBuilder/QueryGlobalFiltering.kt

@@ -274,7 +274,12 @@ class QueryGlobalFiltering(
         )
       )
     } else {
-      queryBase.whereConditions.add(cb.equal(branchJoin.get(Branch_.name), cb.literal(params.branch)))
+      queryBase.whereConditions.add(
+        cb.and(
+          cb.equal(branchJoin.get(Branch_.name), cb.literal(params.branch)),
+          cb.isNull(branchJoin.get(Branch_.archivedAt)),
+        )
+      )
     }
   }
 }

ee/backend/app/src/main/kotlin/io/tolgee/ee/service/branching/BranchCleanupService.kt

@@ -62,5 +62,6 @@ class BranchCleanupService(
       }
       page++
     }
+    branchRepository.delete(branch)
   }
 }