fix: tests

Author: dkrizan

backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/tags/TagsControllerComplexOperationTest.kt

@@ -49,7 +49,7 @@ class TagsControllerComplexOperationTest : ProjectAuthControllerTest("/v2/projec
         (null to "no tag key") to listOf("other tag"),
         (null to "existing tag key 2") to listOf("existing tag 2", "other tag"),
         // branched key keeps untouched
-        (null to "branch key") to listOf("existing tag"),
+        (null to "branch key") to listOf("existing tag 2"),
       ),
     )
   }
@@ -72,7 +72,7 @@ class TagsControllerComplexOperationTest : ProjectAuthControllerTest("/v2/projec
         (null to "test key") to listOf("test", "existing tag", "existing tag 2", "new tag"),
         (null to "no tag key") to listOf("other tag"),
         (null to "existing tag key 2") to listOf("existing tag 2", "new tag"),
-        (null to "branch key") to listOf("existing tag"),
+        (null to "branch key") to listOf("existing tag 2"),
       ),
     )
   }
@@ -139,7 +139,7 @@ class TagsControllerComplexOperationTest : ProjectAuthControllerTest("/v2/projec
         (null to "test key") to listOf("test", "existing tag 2"),
         (null to "no tag key") to listOf(),
         (null to "existing tag key 2") to listOf(),
-        (null to "branch key") to listOf("existing tag"),
+        (null to "branch key") to listOf("existing tag 2"),
       ),
     )
   }
@@ -162,7 +162,7 @@ class TagsControllerComplexOperationTest : ProjectAuthControllerTest("/v2/projec
         (null to "test key") to listOf("test"),
         (null to "no tag key") to listOf(),
         (null to "existing tag key 2") to listOf(),
-        (null to "branch key") to listOf("existing tag"),
+        (null to "branch key") to listOf("existing tag 2"),
       ),
     )
   }
@@ -293,14 +293,14 @@ class TagsControllerComplexOperationTest : ProjectAuthControllerTest("/v2/projec
     performProjectAuthPut(
       "tag-complex?branch=feature",
       mapOf(
-        "filterTag" to listOf("existing tag"),
+        "filterTag" to listOf("existing tag 2"),
         "tagFiltered" to listOf("branch only"),
       ),
     ).andIsOk
 
     assertKeyTags(
       mapOf(
-        (null to "branch key") to listOf("existing tag", "branch only"),
+        (null to "branch key") to listOf("existing tag 2", "branch only"),
         // others keep untouched
         (null to "test key") to listOf("test", "existing tag", "existing tag 2"),
         ("namespace" to "namespaced key") to listOf("existing tag"),
@@ -325,7 +325,7 @@ class TagsControllerComplexOperationTest : ProjectAuthControllerTest("/v2/projec
 
     assertKeyTags(
       mapOf(
-        (null to "branch key") to listOf("existing tag", "branch only"),
+        (null to "branch key") to listOf("existing tag 2", "branch only"),
         // others keep untouched
         (null to "test key") to listOf("test", "existing tag", "existing tag 2"),
         ("namespace" to "namespaced key") to listOf("existing tag"),

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

@@ -44,7 +44,7 @@ class TagsTestData : BaseTestData("tagsTestUser", "tagsTestProject") {
           branchKey = this
         }.build {
           addMeta {
-            tags.add(existingTag)
+            tags.add(existingTag2)
           }
         }
       }

backend/data/src/main/kotlin/io/tolgee/service/branching/AbstractBranchService.kt

@@ -33,4 +33,8 @@ abstract class AbstractBranchService(
   override fun getDefaultBranch(projectId: Long): Branch? {
     return branchRepository.findDefaultByProjectId(projectId)
   }
+
+  override fun deleteAllByProjectId(projectId: Long) {
+    return branchRepository.deleteAllByProjectId(projectId)
+  }
 }

backend/data/src/main/kotlin/io/tolgee/service/branching/BranchService.kt

@@ -119,4 +119,6 @@ interface BranchService {
   )
 
   fun enableBranchingOnProject(projectId: Long)
+
+  fun deleteAllByProjectId(projectId: Long)
 }

backend/data/src/main/kotlin/io/tolgee/service/project/ProjectHardDeletingService.kt

@@ -13,6 +13,7 @@ import io.tolgee.service.AvatarService
 import io.tolgee.service.GlossaryCleanupService
 import io.tolgee.service.PromptService
 import io.tolgee.service.bigMeta.BigMetaService
+import io.tolgee.service.branching.BranchService
 import io.tolgee.service.dataImport.ImportService
 import io.tolgee.service.dataImport.ImportSettingsService
 import io.tolgee.service.key.KeyService
@@ -54,6 +55,7 @@ class ProjectHardDeletingService(
   private val importSettingsService: ImportSettingsService,
   private val glossaryCleanupService: GlossaryCleanupService,
   private val labelService: LabelService,
+  private val branchService: BranchService,
 ) : Logging {
   @Transactional
   @CacheEvict(cacheNames = [Caches.PROJECTS], key = "#project.id")
@@ -112,6 +114,7 @@ class ProjectHardDeletingService(
       avatarService.unlinkAvatarFiles(project)
       batchJobService.deleteAllByProjectId(project.id)
       bigMetaService.deleteAllByProjectId(project.id)
+      branchService.deleteAllByProjectId(project.id)
       projectRepository.delete(project)
     }
   }