From 89f35014e04c6bccc3eafaacc9373d6d5acab9bb Mon Sep 17 00:00:00 2001
From: kyum-q <109158497+kyum-q@users.noreply.github.com>
Date: Fri, 23 Aug 2024 03:44:48 +0900
Subject: [PATCH] =?UTF-8?q?fix(repository):=20=ED=83=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EC=A4=91=EB=B3=B5=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/TemplateTagJpaRepository.java  |  7 +-
 .../tag/repository/TemplateTagRepository.java |  2 +-
 .../tag/service/TemplateTagService.java       |  7 +-
 .../TemplateTagJpaRepositoryTest.java         | 83 +++++++++++++++++++
 .../repository/FakeTemplateTagRepository.java |  5 +-
 5 files changed, 97 insertions(+), 7 deletions(-)
 create mode 100644 backend/src/test/java/codezap/tag/repository/TemplateTagJpaRepositoryTest.java

diff --git a/backend/src/main/java/codezap/tag/repository/TemplateTagJpaRepository.java b/backend/src/main/java/codezap/tag/repository/TemplateTagJpaRepository.java
index b6f94f83b..adbc3b3d4 100644
--- a/backend/src/main/java/codezap/tag/repository/TemplateTagJpaRepository.java
+++ b/backend/src/main/java/codezap/tag/repository/TemplateTagJpaRepository.java
@@ -13,7 +13,12 @@ public interface TemplateTagJpaRepository extends TemplateTagRepository, JpaRepo
 
     List<TemplateTag> findAllByTemplate(Template template);
 
-    List<TemplateTag> findDistinctByTemplateIn(List<Template> templates);
+    @Query("""
+            SELECT DISTINCT tt.id.tagId
+            FROM TemplateTag tt
+            WHERE tt.id.templateId IN :templateIds
+            """)
+    List<Long> findDistinctByTemplateIn(List<Long> templateIds);
 
     @Query("""
             SELECT DISTINCT tt.id.templateId
diff --git a/backend/src/main/java/codezap/tag/repository/TemplateTagRepository.java b/backend/src/main/java/codezap/tag/repository/TemplateTagRepository.java
index 903349cb8..4bad45799 100644
--- a/backend/src/main/java/codezap/tag/repository/TemplateTagRepository.java
+++ b/backend/src/main/java/codezap/tag/repository/TemplateTagRepository.java
@@ -9,7 +9,7 @@ public interface TemplateTagRepository {
 
     List<TemplateTag> findAllByTemplate(Template template);
 
-    List<TemplateTag> findDistinctByTemplateIn(List<Template> templates);
+    List<Long> findDistinctByTemplateIn(List<Long> templateIds);
 
     List<TemplateTag> findAll();
 
diff --git a/backend/src/main/java/codezap/tag/service/TemplateTagService.java b/backend/src/main/java/codezap/tag/service/TemplateTagService.java
index dc57752a8..2dd8579a8 100644
--- a/backend/src/main/java/codezap/tag/service/TemplateTagService.java
+++ b/backend/src/main/java/codezap/tag/service/TemplateTagService.java
@@ -66,10 +66,11 @@ private void validateTagId(Long tagId) {
     }
 
     public FindAllTagsResponse findAllByTemplates(List<Template> templates) {
-        List<TemplateTag> templateTags = templateTagRepository.findDistinctByTemplateIn(templates);
+        List<Long> templateIds = templates.stream().map(Template::getId).toList();
+        List<Long> templateTagIds = templateTagRepository.findDistinctByTemplateIn(templateIds);
         return new FindAllTagsResponse(
-                templateTags.stream()
-                        .map(templateTag -> FindTagResponse.from(templateTag.getTag()))
+                templateTagIds.stream()
+                        .map(id -> FindTagResponse.from(tagRepository.fetchById(id)))
                         .toList()
         );
     }
diff --git a/backend/src/test/java/codezap/tag/repository/TemplateTagJpaRepositoryTest.java b/backend/src/test/java/codezap/tag/repository/TemplateTagJpaRepositoryTest.java
new file mode 100644
index 000000000..0148c561d
--- /dev/null
+++ b/backend/src/test/java/codezap/tag/repository/TemplateTagJpaRepositoryTest.java
@@ -0,0 +1,83 @@
+package codezap.tag.repository;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import codezap.category.domain.Category;
+import codezap.category.repository.CategoryRepository;
+import codezap.global.repository.JpaRepositoryTest;
+import codezap.member.domain.Member;
+import codezap.member.repository.MemberRepository;
+import codezap.tag.domain.Tag;
+import codezap.template.domain.Template;
+import codezap.template.domain.TemplateTag;
+import codezap.template.repository.TemplateRepository;
+
+@JpaRepositoryTest
+class TemplateTagJpaRepositoryTest {
+
+    @Autowired
+    private TemplateRepository templateRepository;
+    @Autowired
+    private MemberRepository memberRepository;
+    @Autowired
+    private CategoryRepository categoryRepository;
+    @Autowired
+    private TagRepository tagRepository;
+    @Autowired
+    private TemplateTagRepository templateTagRepository;
+
+    private Member member1, member2;
+    private Category category1, category2;
+    private Tag tag1, tag2;
+
+    @BeforeEach
+    void setUp() {
+        member1 = memberRepository.save(new Member("user1@test.com", "pp"));
+        member2 = memberRepository.save(new Member("user2@test.com", "pp"));
+
+        category1 = categoryRepository.save(new Category("Category 1", member1));
+        category2 = categoryRepository.save(new Category("Category 2", member1));
+
+        tag1 = tagRepository.save(new Tag("Tag 1"));
+        tag2 = tagRepository.save(new Tag("Tag 2"));
+
+        Template template1 = new Template(member1, "Template 1", "Description 1", category1);
+        TemplateTag templateTag11 = new TemplateTag(template1, tag1);
+        TemplateTag templateTag12 = new TemplateTag(template1, tag2);
+        templateRepository.save(template1);
+        templateTagRepository.save(templateTag11);
+        templateTagRepository.save(templateTag12);
+
+        Template template2 = new Template(member1, "Template 2", "Description 2", category2);
+        TemplateTag templateTag21 = new TemplateTag(template2, tag1);
+        TemplateTag templateTag22 = new TemplateTag(template2, tag2);
+        templateRepository.save(template2);
+        templateTagRepository.save(templateTag21);
+        templateTagRepository.save(templateTag22);
+
+        Template template3 = new Template(member2, "Another Template", "Another Description", category1);
+        TemplateTag templateTag31 = new TemplateTag(template3, tag2);
+        templateRepository.save(template3);
+        templateTagRepository.save(templateTag31);
+    }
+
+    @Test
+    void testFindDistinctByTemplateIn() {
+        // given
+        List<Long> templateIds = List.of(1L, 2L, 3L);
+
+        // when
+        List<Long> result = templateTagRepository.findDistinctByTemplateIn(templateIds);
+
+        // then
+        assertThat(result).isNotEmpty();
+        assertThat(result.stream().distinct().count())
+                .isEqualTo(result.size());
+    }
+}
diff --git a/backend/src/test/java/codezap/template/repository/FakeTemplateTagRepository.java b/backend/src/test/java/codezap/template/repository/FakeTemplateTagRepository.java
index 1a7a99f0c..f0b9e4b2c 100644
--- a/backend/src/test/java/codezap/template/repository/FakeTemplateTagRepository.java
+++ b/backend/src/test/java/codezap/template/repository/FakeTemplateTagRepository.java
@@ -51,10 +51,11 @@ public List<TemplateTag> findAll() {
     }
 
     @Override
-    public List<TemplateTag> findDistinctByTemplateIn(List<Template> templates) {
+    public List<Long> findDistinctByTemplateIn(List<Long> templateIds) {
         return templateTags.stream()
-                .filter(templateTag -> templates.contains(templateTag.getTemplate()))
+                .filter(templateTag -> templateIds.contains(templateTag.getTemplate().getId()))
                 .distinct()
+                .map(templateTag -> templateTag.getTag().getId())
                 .toList();
     }