20 tags

src/main/java/com/formswim/teststream/shared/domain/Tag.java

@@ -0,0 +1,67 @@
+package com.formswim.teststream.shared.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+
+@Entity
+@Table(
+    name = "custom_tags",
+    uniqueConstraints = {
+        @UniqueConstraint(name = "uk_custom_tags_team_name", columnNames = { "team_key", "name" })
+    }
+)
+public class Tag {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, length = 50)
+    private String name;
+
+    @Column(nullable = false, length = 7)
+    private String color;
+
+    @Column(name = "team_key", nullable = false, length = 100)
+    private String teamKey;
+
+    protected Tag() {
+    }
+
+    public Tag(String name, String color, String teamKey) {
+        this.name = name;
+        this.color = color;
+        this.teamKey = teamKey;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    @JsonIgnore
+    public String getTeamKey() {
+        return teamKey;
+    }
+}

src/main/java/com/formswim/teststream/shared/domain/TagRepository.java

@@ -0,0 +1,27 @@
+package com.formswim.teststream.shared.domain;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TagRepository extends JpaRepository<Tag, Long> {
+
+    List<Tag> findByTeamKeyOrderByNameAsc(String teamKey);
+
+    Optional<Tag> findByTeamKeyAndId(String teamKey, Long id);
+
+    boolean existsByTeamKeyAndName(String teamKey, String name);
+
+    @Query(value = "SELECT tag_id, COUNT(*) FROM test_case_custom_tags WHERE tag_id IN (:tagIds) GROUP BY tag_id", nativeQuery = true)
+    List<Object[]> countUsageByTagIds(@Param("tagIds") List<Long> tagIds);
+
+    @Modifying
+    @Query(value = "DELETE FROM test_case_custom_tags WHERE tag_id = :tagId", nativeQuery = true)
+    void deleteFromJoinTableByTagId(@Param("tagId") Long tagId);
+}

src/main/java/com/formswim/teststream/shared/domain/TestCase.java

@@ -3,14 +3,20 @@
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OrderBy;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
 
+import org.hibernate.annotations.BatchSize;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -104,6 +110,15 @@ public class TestCase {
     @OrderBy("stepNumber ASC")
     private List<TestStep> steps = new ArrayList<>();
 
+    @ManyToMany(fetch = FetchType.LAZY)
+    @BatchSize(size = 50)
+    @JoinTable(
+        name = "test_case_custom_tags",
+        joinColumns = @JoinColumn(name = "test_case_id"),
+        inverseJoinColumns = @JoinColumn(name = "tag_id")
+    )
+    private List<Tag> customTags = new ArrayList<>();
+
     protected TestCase() {
     }
 
@@ -351,4 +366,12 @@ public void setFlakyScore(String flakyScore) {
     public List<TestStep> getSteps() {
         return steps;
     }
+
+    public List<Tag> getCustomTags() {
+        return customTags;
+    }
+
+    public void setCustomTags(List<Tag> customTags) {
+        this.customTags = customTags;
+    }
 }

src/main/java/com/formswim/teststream/shared/domain/TestCaseRepository.java

@@ -27,7 +27,10 @@ public interface TestCaseRepository extends JpaRepository<TestCase, Long> {
                   and (:tag is null or :tag = ''
                        or lower(coalesce(testCase.components, '')) like lower(concat('%', :tag, '%'))
                        or lower(coalesce(testCase.testCaseType, '')) like lower(concat('%', :tag, '%')))
-                        and (
+                  and (:customTagId is null or exists (
+                       select 1 from testCase.customTags ct where ct.id = :customTagId
+                  ))
+                  and (
                                 :folder is null or :folder = ''
                                 or lower(trim(function('replace', coalesce(testCase.folder, ''), '\\', '/'))) = lower(:folder)
                                 or lower(trim(function('replace', coalesce(testCase.folder, ''), '\\', '/'))) like lower(concat(:folder, '/%'))
@@ -45,6 +48,10 @@ or exists (
                             where testStep.testCase = testCase
                               and lower(coalesce(testStep.stepSummary, '')) like lower(concat('%', :search, '%'))
                         )
+                        or exists (
+                            select 1 from testCase.customTags ct
+                            where lower(ct.name) like lower(concat('%', :search, '%'))
+                        )
                     )
                 order by testCase.id desc
                 """,
@@ -57,7 +64,10 @@ select count(distinct testCase.id)
                   and (:tag is null or :tag = ''
                        or lower(coalesce(testCase.components, '')) like lower(concat('%', :tag, '%'))
                        or lower(coalesce(testCase.testCaseType, '')) like lower(concat('%', :tag, '%')))
-                        and (
+                  and (:customTagId is null or exists (
+                       select 1 from testCase.customTags ct where ct.id = :customTagId
+                  ))
+                  and (
                                 :folder is null or :folder = ''
                                 or lower(trim(function('replace', coalesce(testCase.folder, ''), '\\', '/'))) = lower(:folder)
                                 or lower(trim(function('replace', coalesce(testCase.folder, ''), '\\', '/'))) like lower(concat(:folder, '/%'))
@@ -75,6 +85,10 @@ or exists (
                             where testStep.testCase = testCase
                               and lower(coalesce(testStep.stepSummary, '')) like lower(concat('%', :search, '%'))
                         )
+                        or exists (
+                            select 1 from testCase.customTags ct
+                            where lower(ct.name) like lower(concat('%', :search, '%'))
+                        )
                     )
                 """
     )
@@ -83,6 +97,7 @@ Page<Long> findWorkspaceCaseIdsByFilters(@Param("teamKey") String teamKey,
                                              @Param("status") String status,
                                              @Param("component") String component,
                                              @Param("tag") String tag,
+                                             @Param("customTagId") Long customTagId,
                                              @Param("folder") String folder,
                                              Pageable pageable);
 
@@ -133,6 +148,15 @@ int bulkMoveToFolderByTeamKeyAndWorkKeys(@Param("teamKey") String teamKey,
     List<TestCase> findAllWithStepsByTeamKeyAndWorkKeyIn(String teamKey,
                                                          Collection<String> workKeys);
 
+    @Query("""
+            select distinct testCase
+            from TestCase testCase
+            left join fetch testCase.customTags
+            where testCase.teamKey = :teamKey and testCase.workKey = :workKey
+            """)
+    Optional<TestCase> findWithCustomTagsByTeamKeyAndWorkKey(@Param("teamKey") String teamKey,
+                                                              @Param("workKey") String workKey);
+
     @Query("""
                                                 select distinct trim(function('replace', testCase.folder, '\\', '/'))
             from TestCase testCase
@@ -235,4 +259,6 @@ int bulkRepathDescendants(@Param("teamKey") String teamKey,
                                                                                                                         @Param("suffixStartIndex") int suffixStartIndex);
 
     List<TestCase> findByTeamKeyAndStatus(String teamKey, String status);
+
+    List<TestCase> findByTeamKeyAndWorkKeyIn(String teamKey, Collection<String> workKeys);
 }