feat: integrate tags and branches into project stats handling

Author: dkrizan

backend/app/src/test/kotlin/io/tolgee/service/ProjectStatsServiceTest.kt

@@ -4,21 +4,37 @@ import io.tolgee.AbstractSpringTest
 import io.tolgee.development.testDataBuilder.data.ProjectStatsTestData
 import io.tolgee.service.project.ProjectStatsService
 import io.tolgee.testing.assertions.Assertions.assertThat
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 
 internal class ProjectStatsServiceTest : AbstractSpringTest() {
   @Autowired
   lateinit var projectStatsService: ProjectStatsService
 
-  @Test
-  fun getProjectStats() {
-    val testData = ProjectStatsTestData()
+  lateinit var testData: ProjectStatsTestData
+
+  @BeforeEach
+  fun setup() {
+    testData = ProjectStatsTestData()
     testDataService.saveTestData(testData.root)
+  }
+
+  @Test
+  fun `test project stats`() {
     val data = projectStatsService.getProjectStats(testData.projectBuilder.self.id)
     assertThat(data.id).isPositive
     assertThat(data.memberCount).isEqualTo(3)
     assertThat(data.keyCount).isEqualTo(5)
     assertThat(data.tagCount).isEqualTo(3)
   }
+
+  @Test
+  fun `test project stats on feature branch`() {
+    val data = projectStatsService.getProjectStats(testData.projectBuilder.self.id, testData.featureBranch.id)
+    assertThat(data.id).isPositive
+    assertThat(data.memberCount).isEqualTo(3)
+    assertThat(data.keyCount).isEqualTo(1)
+    assertThat(data.tagCount).isEqualTo(1)
+  }
 }

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

@@ -329,6 +329,7 @@ class TestDataService(
     savePrompts(builder)
     saveAiPlaygroundResults(builder)
     saveLabels(builder)
+    saveTags(builder)
     saveSuggestions(builder)
   }
 
@@ -621,6 +622,12 @@ class TestDataService(
     }
   }
 
+  private fun saveTags(builder: ProjectBuilder) {
+    builder.data.tags.forEach {
+      entityManager.persist(it.self)
+    }
+  }
+
   private fun saveBranches(builder: ProjectBuilder) {
     builder.data.branches.filter { it.self.id == 0L }.forEach {
       entityManager.persist(it.self)

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

@@ -23,6 +23,7 @@ import io.tolgee.model.dataImport.ImportSettings
 import io.tolgee.model.enums.ProjectPermissionType
 import io.tolgee.model.key.Key
 import io.tolgee.model.key.Namespace
+import io.tolgee.model.key.Tag
 import io.tolgee.model.key.screenshotReference.KeyScreenshotReference
 import io.tolgee.model.keyBigMeta.KeysDistance
 import io.tolgee.model.mtServiceConfig.MtServiceConfig
@@ -82,6 +83,7 @@ class ProjectBuilder(
     val branches = mutableListOf<BranchBuilder>()
     val branchMerges = mutableListOf<BranchMergeBuilder>()
     val branchMergeChanges = mutableListOf<BranchMergeChangeBuilder>()
+    val tags = mutableListOf<TagBuilder>()
   }
 
   var data = DATA()
@@ -100,6 +102,8 @@ class ProjectBuilder(
 
   fun addTaskKey(ft: FT<TaskKey>) = addOperation(data.taskKeys, ft)
 
+  fun addTag(ft: FT<Tag>) = addOperation(data.tags, ft)
+
   fun addLabel(ft: FT<Label>) = addOperation(data.labels, ft)
 
   fun addBranch(ft: FT<Branch>) = addOperation(data.branches, ft)

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

@@ -0,0 +1,13 @@
+package io.tolgee.development.testDataBuilder.builders
+
+import io.tolgee.development.testDataBuilder.EntityDataBuilder
+import io.tolgee.model.key.Tag
+
+class TagBuilder(
+  val projectBuilder: ProjectBuilder,
+) : EntityDataBuilder<Tag, TagBuilder> {
+  override var self: Tag =
+    Tag().apply {
+      this.project = projectBuilder.self
+    }
+}

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

@@ -2,6 +2,7 @@ package io.tolgee.development.testDataBuilder.data
 
 import io.tolgee.development.testDataBuilder.builders.ProjectBuilder
 import io.tolgee.model.Language
+import io.tolgee.model.branching.Branch
 import io.tolgee.model.enums.OrganizationRoleType
 import io.tolgee.model.enums.ProjectPermissionType
 import io.tolgee.model.enums.TranslationState
@@ -10,12 +11,15 @@ import io.tolgee.model.key.Tag
 class ProjectStatsTestData : BaseTestData() {
   lateinit var germanLanguage: Language
   lateinit var czechLanguage: Language
+  lateinit var tag: Tag
+  lateinit var featureBranch: Branch
 
   init {
     projectBuilder.apply {
 
       addLanguages()
       addKeys()
+      addBranch()
 
       val organizationOwner =
         root
@@ -61,7 +65,7 @@ class ProjectStatsTestData : BaseTestData() {
   }
 
   private fun ProjectBuilder.addKeys() {
-    val tag1 =
+    tag =
       Tag().apply {
         name = "Tag1"
         project = this@addKeys.self
@@ -79,6 +83,10 @@ class ProjectStatsTestData : BaseTestData() {
         project = this@addKeys.self
       }
 
+    addTag {
+      name = "Tag4"
+    }
+
     addKey {
       name = "Super key"
     }.build {
@@ -98,7 +106,7 @@ class ProjectStatsTestData : BaseTestData() {
         state = TranslationState.TRANSLATED
       }
       addMeta {
-        tags.add(tag1)
+        tags.add(tag)
         tags.add(tag3)
       }
     }
@@ -111,7 +119,7 @@ class ProjectStatsTestData : BaseTestData() {
         text = "This text has 5 words"
       }
       addMeta {
-        tags.add(tag1)
+        tags.add(tag)
         tags.add(tag2)
       }
     }
@@ -177,4 +185,20 @@ class ProjectStatsTestData : BaseTestData() {
       }
     }
   }
+
+  private fun ProjectBuilder.addBranch() {
+    featureBranch =
+      addBranch {
+        name = "feature"
+      }.build {
+        addKey {
+          name = "feature key"
+          branch = self
+        }.build {
+          addMeta {
+            tags.add(tag)
+          }
+        }
+      }.self
+  }
 }

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

@@ -11,6 +11,7 @@ import io.tolgee.model.branching.Branch
 import io.tolgee.model.branching.Branch_
 import io.tolgee.model.enums.TaskState
 import io.tolgee.model.key.Key
+import io.tolgee.model.key.KeyMeta_
 import io.tolgee.model.key.Key_
 import io.tolgee.model.key.Tag
 import io.tolgee.model.key.Tag_
@@ -68,7 +69,15 @@ open class ProjectStatsProvider(
   private fun getTagSelection(): Selection<Long> {
     val sub = query.subquery(Long::class.java)
     val tag = sub.from(Tag::class.java)
-    sub.where(tag.get(Tag_.project) equal project)
+    val keyMeta = tag.join(Tag_.keyMetas, JoinType.INNER)
+    val key = keyMeta.join(KeyMeta_.key, JoinType.INNER)
+    val branch = key.join(Key_.branch, JoinType.LEFT)
+    sub.where(
+      cb.and(
+        tag.get(Tag_.project) equal project,
+        branchPredicate(branch, key.get(Key_.branch)),
+      ),
+    )
     return sub.select(cb.coalesce(cb.countDistinct(tag.get(Tag_.id)), 0))
   }