From 9227acffedebdbdc6e4d38d5a6b2c94974ec3b86 Mon Sep 17 00:00:00 2001
From: zangsu <zangsu_@naver.com>
Date: Wed, 7 Aug 2024 12:19:34 +0900
Subject: [PATCH 01/12] =?UTF-8?q?feat(template):=20=EC=B9=B4=ED=85=8C?=
 =?UTF-8?q?=EA=B3=A0=EB=A6=AC,=20=ED=83=9C=EA=B7=B8=20=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=EB=A5=BC=20=EA=B2=80=EC=83=89=20=EC=A1=B0=EA=B1=B4=EC=97=90=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/TemplateRepository.java        | 63 ++++++++++++++++++-
 .../template/service/TemplateService.java     |  2 +-
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/codezap/template/repository/TemplateRepository.java b/backend/src/main/java/codezap/template/repository/TemplateRepository.java
index 34ddb0f69..2e35ed9fd 100644
--- a/backend/src/main/java/codezap/template/repository/TemplateRepository.java
+++ b/backend/src/main/java/codezap/template/repository/TemplateRepository.java
@@ -22,10 +22,66 @@ default Template fetchById(Long id) {
 
     boolean existsByCategoryId(Long categoryId);
 
+
+
+    @Query("""
+            SELECT DISTINCT t
+            FROM Template t JOIN Snippet s ON t.id = s.template.id
+            WHERE t.member.id = :memberId AND
+            (
+                t.title LIKE :topic
+                OR s.filename LIKE :topic
+                OR s.content LIKE :topic
+                OR t.description LIKE :topic
+            )
+            """)
+    Page<Template> searchBy(
+            @Param("memberId") Long memberId,
+            @Param("topic") String topic,
+            Pageable pageable);
+
+    @Query("""
+            SELECT DISTINCT t
+            FROM Template t JOIN Snippet s ON t.id = s.template.id
+            WHERE t.member.id = :memberId AND
+            t.id in :templateIds AND
+            (
+                t.title LIKE :topic
+                OR s.filename LIKE :topic
+                OR s.content LIKE :topic
+                OR t.description LIKE :topic
+            )
+            """)
+    Page<Template> searchBy(
+            @Param("templateIds") List<Long> templateIds,
+            @Param("memberId") Long memberId,
+            @Param("topic") String topic,
+            Pageable pageable);
+
+    @Query("""
+            SELECT DISTINCT t
+            FROM Template t JOIN Snippet s ON t.id = s.template.id
+            WHERE t.member.id = :memberId AND
+            t.category.id = :categoryId AND
+            (
+                t.title LIKE :topic
+                OR s.filename LIKE :topic
+                OR s.content LIKE :topic
+                OR t.description LIKE :topic
+            )
+            """)
+    Page<Template> searchBy(
+            @Param("categoryId") Long categoryId,
+            @Param("memberId") Long memberId,
+            @Param("topic") String topic,
+            Pageable pageable);
+
     @Query("""
             SELECT DISTINCT t
             FROM Template t JOIN Snippet s ON t.id = s.template.id
             WHERE t.member.id = :memberId AND
+            t.category.id = :categoryId AND
+            t.id in :templateIds AND
             (
                 t.title LIKE :topic
                 OR s.filename LIKE :topic
@@ -33,7 +89,12 @@ default Template fetchById(Long id) {
                 OR t.description LIKE :topic
             )
             """)
-    Page<Template> searchByTopic(@Param("memberId") Long memberId, @Param("topic") String topic, Pageable pageable);
+    Page<Template> searchBy(
+            @Param("categoryId") Long categoryId,
+            @Param("templateIds") List<Long> templateIds,
+            @Param("memberId") Long memberId,
+            @Param("topic") String topic,
+            Pageable pageable);
 
     Page<Template> findBy(Pageable pageable);
 
diff --git a/backend/src/main/java/codezap/template/service/TemplateService.java b/backend/src/main/java/codezap/template/service/TemplateService.java
index 950d1a7c3..0170bbed6 100644
--- a/backend/src/main/java/codezap/template/service/TemplateService.java
+++ b/backend/src/main/java/codezap/template/service/TemplateService.java
@@ -291,7 +291,7 @@ public FindAllMyTemplatesResponse findContainTopic(Long memberId, String topic,
     private Page<Template> getTemplates(Long memberId, String topic, Pageable pageable) {
         String topicWithWildcards = "%" + topic + "%";
         Pageable newPageable = PageRequest.of(pageable.getPageNumber() - 1, pageable.getPageSize());
-        return templateRepository.searchByTopic(memberId, topicWithWildcards, newPageable);
+        return templateRepository.searchBy(memberId, topicWithWildcards, newPageable);
     }
 
     private FindMyTemplateResponse findByTemplate(Template template) {

From 388a7df57066966f09615590f0e6906880cb01cf Mon Sep 17 00:00:00 2001
From: zangsu <zangsu_@naver.com>
Date: Wed, 7 Aug 2024 14:01:13 +0900
Subject: [PATCH 02/12] =?UTF-8?q?feat(template):=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SpringDocTemplateController.java          |   9 +-
 .../controller/TemplateController.java        |   9 +-
 .../repository/TemplateRepository.java        |  10 +-
 .../template/service/TemplateService.java     |  25 +-
 .../service/TemplateServiceSearchTest.java    | 235 ++++++++++++++++++
 .../template/service/TemplateServiceTest.java |  28 ++-
 6 files changed, 280 insertions(+), 36 deletions(-)

diff --git a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
index 44745d05a..310cf4b3a 100644
--- a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
@@ -1,8 +1,8 @@
 package codezap.template.controller;
 
-import org.springframework.data.domain.Pageable;
 import java.util.List;
 
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -11,8 +11,8 @@
 import codezap.member.dto.MemberDto;
 import codezap.template.dto.request.CreateTemplateRequest;
 import codezap.template.dto.request.UpdateTemplateRequest;
-import codezap.template.dto.response.FindAllMyTemplatesResponse;
 import codezap.template.dto.response.ExploreTemplatesResponse;
+import codezap.template.dto.response.FindAllMyTemplatesResponse;
 import codezap.template.dto.response.FindAllTemplatesResponse;
 import codezap.template.dto.response.FindTemplateResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -53,11 +53,12 @@ public interface SpringDocTemplateController {
     @ApiResponse(responseCode = "200", description = "템플릿 단건 조회 성공",
             content = {@Content(schema = @Schema(implementation = ExploreTemplatesResponse.class))})
     ResponseEntity<FindAllTemplatesResponse> getTemplates(
-            //Long memberId,
+            Long memberId,
+            String topic,
             Integer pageNumber,
             Integer pageSize,
             Long categoryId,
-            List<String> tagNames
+            List<String> tags
     );
 
     @Operation(summary = "템플릿 단건 조회", description = "해당하는 식별자의 템플릿을 조회합니다.")
diff --git a/backend/src/main/java/codezap/template/controller/TemplateController.java b/backend/src/main/java/codezap/template/controller/TemplateController.java
index 08c94201a..9490bfe0e 100644
--- a/backend/src/main/java/codezap/template/controller/TemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/TemplateController.java
@@ -55,14 +55,17 @@ public ResponseEntity<Void> create(
 
     @GetMapping
     public ResponseEntity<FindAllTemplatesResponse> getTemplates(
-            //@RequestParam Long memberId,
+            @RequestParam Long memberId,
+            @RequestParam("topic") String topic,
             @RequestParam(required = false, defaultValue = "1") Integer pageNumber,
             @RequestParam(required = false, defaultValue = "20") Integer pageSize,
             @RequestParam(required = false) Long categoryId,
             @RequestParam(required = false) List<String> tags
     ) {
-
-        return ResponseEntity.ok(templateService.findAllBy(PageRequest.of(pageNumber - 1, pageSize), categoryId, tags));
+        Pageable pageable = PageRequest.of(pageNumber - 1, pageSize);
+        FindAllTemplatesResponse response =
+                templateService.findAllBy(memberId, topic, categoryId, tags, pageable);
+        return ResponseEntity.ok(response);
     }
 
     @GetMapping("/explore")
diff --git a/backend/src/main/java/codezap/template/repository/TemplateRepository.java b/backend/src/main/java/codezap/template/repository/TemplateRepository.java
index 2e35ed9fd..a3c24a86d 100644
--- a/backend/src/main/java/codezap/template/repository/TemplateRepository.java
+++ b/backend/src/main/java/codezap/template/repository/TemplateRepository.java
@@ -22,8 +22,6 @@ default Template fetchById(Long id) {
 
     boolean existsByCategoryId(Long categoryId);
 
-
-
     @Query("""
             SELECT DISTINCT t
             FROM Template t JOIN Snippet s ON t.id = s.template.id
@@ -53,9 +51,9 @@ Page<Template> searchBy(
             )
             """)
     Page<Template> searchBy(
-            @Param("templateIds") List<Long> templateIds,
             @Param("memberId") Long memberId,
             @Param("topic") String topic,
+            @Param("templateIds") List<Long> templateIds,
             Pageable pageable);
 
     @Query("""
@@ -71,9 +69,9 @@ Page<Template> searchBy(
             )
             """)
     Page<Template> searchBy(
-            @Param("categoryId") Long categoryId,
             @Param("memberId") Long memberId,
             @Param("topic") String topic,
+            @Param("categoryId") Long categoryId,
             Pageable pageable);
 
     @Query("""
@@ -90,10 +88,10 @@ Page<Template> searchBy(
             )
             """)
     Page<Template> searchBy(
-            @Param("categoryId") Long categoryId,
-            @Param("templateIds") List<Long> templateIds,
             @Param("memberId") Long memberId,
             @Param("topic") String topic,
+            @Param("categoryId") Long categoryId,
+            @Param("templateIds") List<Long> templateIds,
             Pageable pageable);
 
     Page<Template> findBy(Pageable pageable);
diff --git a/backend/src/main/java/codezap/template/service/TemplateService.java b/backend/src/main/java/codezap/template/service/TemplateService.java
index 0170bbed6..e352a8cab 100644
--- a/backend/src/main/java/codezap/template/service/TemplateService.java
+++ b/backend/src/main/java/codezap/template/service/TemplateService.java
@@ -139,31 +139,36 @@ private void validateTemplateAuthorizeMember(Template template, Member member) {
     }
 
     public FindAllTemplatesResponse findAllBy(
-            //long memberId,
-            PageRequest pageRequest,
+            long memberId,
+            String topic,
             Long categoryId,
-            List<String> tagNames
-    ) {
+            List<String> tagNames,
+            Pageable pageable
+            ) {
+        topic = "%" + topic + "%";
         if (categoryId != null && tagNames != null) {
             List<Long> templateIds = filterTemplatesBy(tagNames);
             Page<Template> templatePage =
-                    templateRepository.findByIdInAndCategoryId(pageRequest, templateIds, categoryId);
+                    templateRepository.searchBy(memberId,topic, categoryId, templateIds, pageable);
             long totalTemplatesCount = templateRepository.countByIdInAndCategoryId(templateIds, categoryId);
             return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
-
         }
         if (categoryId != null && tagNames == null) {
-            Page<Template> templatePage = templateRepository.findByCategoryId(pageRequest, categoryId);
+            Page<Template> templatePage = templateRepository.searchBy(memberId, topic, categoryId, pageable);
             long totalTemplatesCount = templateRepository.countByCategoryId(categoryId);
             return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
         }
         if (categoryId == null && tagNames != null) {
             List<Long> templateIds = filterTemplatesBy(tagNames);
-            Page<Template> templatePage = templateRepository.findByIdIn(pageRequest, templateIds);
+            Page<Template> templatePage =
+                    templateRepository.searchBy(memberId, topic, templateIds, pageable);
+
             long totalTemplatesCount = templateRepository.countByIdIn(templateIds);
             return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
         }
-        Page<Template> templatePage = templateRepository.findBy(pageRequest);
+        Page<Template> templatePage =
+                //templateRepository.searchBy(memberId, topic, pageable);
+                getTemplates(memberId, topic, pageable);
         long totalTemplatesCount = templateRepository.count();
         return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
     }
@@ -290,7 +295,7 @@ public FindAllMyTemplatesResponse findContainTopic(Long memberId, String topic,
 
     private Page<Template> getTemplates(Long memberId, String topic, Pageable pageable) {
         String topicWithWildcards = "%" + topic + "%";
-        Pageable newPageable = PageRequest.of(pageable.getPageNumber() - 1, pageable.getPageSize());
+        Pageable newPageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize());
         return templateRepository.searchBy(memberId, topicWithWildcards, newPageable);
     }
 
diff --git a/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java b/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
index d08d89717..ad3429136 100644
--- a/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
+++ b/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
@@ -1,6 +1,8 @@
 package codezap.template.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertAll;
+
 
 import java.util.List;
 
@@ -30,6 +32,7 @@
 import codezap.template.dto.request.CreateSnippetRequest;
 import codezap.template.dto.request.CreateTemplateRequest;
 import codezap.template.dto.response.FindAllMyTemplatesResponse;
+import codezap.template.dto.response.FindAllTemplatesResponse;
 import codezap.template.dto.response.FindMyTemplateResponse;
 import codezap.template.repository.SnippetRepository;
 import codezap.template.repository.TagRepository;
@@ -247,6 +250,40 @@ void findAllDescriptionContainTopicSuccess() {
             assertThat(templates.templates()).hasSize(1);
         }
 
+        @Test
+        @DisplayName("전체 탐색 / 1페이지 성공")
+        void findAllFirstPageSuccess() {
+            MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
+            Member member = memberRepository.fetchById(memberDto.id());
+            Category category = categoryRepository.save(new Category("category", member));
+
+
+            saveTemplate(makeTemplateRequest("hello topic 1"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 2"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 3"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 4"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 5"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 6"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 7"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 8"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 9"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 10"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 11"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 12"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 13"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 14"), member, category);
+            saveTemplate(makeTemplateRequest("hello topic 15"), member, category);
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", null, null, PageRequest.of(1, 5));
+
+            assertAll(
+                    () -> assertThat(allBy.templates().size()).isEqualTo(20),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() <= 20),
+                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
+            );
+
+        }
+
         @Test
         @DisplayName("템플릿 토픽 검색 성공 : 페이징 성공")
         void findAllContainTopicPaging() {
@@ -280,4 +317,202 @@ void findAllContainTopicPaging() {
                     "hello topic 6", "hello topic 7", "hello topic 8", "hello topic 9", "hello topic 10");
         }
     }
+
+
+    //
+
+    @Nested
+    @DisplayName("조건에 따른 페이지 조회 메서드 동작 확인")
+    class FilteringPageTest {
+
+        private static final PageRequest DEFUALT_PAGING_REQUEST = PageRequest.of(0, 20);
+        private static Category firstCategory;
+        private static Tag tag1;
+        private static Tag tag2;
+        private static Member member;
+
+        /*@BeforeEach
+        void setUp() {
+            //템플릿 30개 / 카테고리는 홀수 : 1번, 짝수 : 2번으로 매핑 / 태그는 16보다 작으면 1, 16 이상이면 2로 매핑
+            MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
+            member = memberJpaRepository.fetchById(memberDto.id());
+            firstCategory = categoryRepository.save(new Category("category1", member));
+            categoryRepository.save(new Category("category2", member));
+            for (int i = 1; i <= 30; i++) {
+                long categoryId = i % 2 == 0 ? firstCategory.getId() + 1 : firstCategory.getId();
+                templateRepository.save(new Template(
+                        member,
+                        "title" + i,
+                        "description",
+                        categoryRepository.fetchById(categoryId)
+                ));
+
+            }
+            tag1 = tagRepository.save(new Tag("tag1"));
+            tag2 = tagRepository.save(new Tag("tag2"));
+            for (long i = 1L; i <= 30L; i++) {
+                templateTagRepository.save(new TemplateTag(
+                        templateRepository.fetchById(i),
+                        tagRepository.fetchById((i / 16) + 1)
+                ));
+            }
+
+            System.out.println();
+        }
+*/
+        @Test
+        @DisplayName("전체 탐색 / 1페이지 성공")
+        void findAllFirstPageSuccess() {
+            //given
+            MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
+            Member member = memberRepository.fetchById(memberDto.id());
+            Category category1 = categoryRepository.save(new Category("category1", member));
+            Category category2 = categoryRepository.save(new Category("category2", member));
+            saveDefault15Templates(member, category1);
+            saveDefault15Templates(member, category2);
+
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", null, null, PageRequest.of(0, 20));
+
+            //when & then
+            assertAll(
+                    () -> assertThat(allBy.templates().size()).isEqualTo(20),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() <= 20),
+                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
+            );
+        }
+
+        @Test
+        @DisplayName("전체 탐색 / 2페이지 성공")
+        void findAllSecondPageSuccess() {
+            //given
+            MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
+            Member member = memberRepository.fetchById(memberDto.id());
+            Category category1 = categoryRepository.save(new Category("category1", member));
+            Category category2 = categoryRepository.save(new Category("category2", member));
+            saveDefault15Templates(member, category1);
+            saveDefault15Templates(member, category2);
+
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", null, null, PageRequest.of(1, 20));
+
+            assertAll(
+                    () -> assertThat(allBy.templates().size()).isEqualTo(10),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() > 20),
+                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
+            );
+        }
+
+        @Test
+        @DisplayName("카테고리 탐색 성공")
+        void findByCategoryPageSuccess() {
+            MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
+            Member member = memberRepository.fetchById(memberDto.id());
+            Category category1 = categoryRepository.save(new Category("category1", member));
+            Category category2 = categoryRepository.save(new Category("category2", member));
+            saveDefault15Templates(member, category1);
+            saveDefault15Templates(member, category2);
+
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", category1.getId(), null, PageRequest.of(0, 20));
+
+            assertAll(
+                    () -> assertThat(allBy.templates().size()).isEqualTo(15),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() <= 15),
+                    () -> assertThat(allBy.totalElements()).isEqualTo(15)
+            );
+        }
+
+        @Test
+        @DisplayName("단일 태그 탐색 성공")
+        void findBySingleTagPageSuccess() {
+            MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
+            Member member = memberRepository.fetchById(memberDto.id());
+            Category category1 = categoryRepository.save(new Category("category1", member));
+            Category category2 = categoryRepository.save(new Category("category2", member));
+            saveDefault15Templates(member, category1);
+            saveDefault15Templates(member, category2);
+            for (long i = 1L; i <= 30L; i++) {
+                templateTagRepository.save(new TemplateTag(
+                        templateRepository.fetchById(i),
+                        tagRepository.fetchById((i / 15) + 1)
+                ));
+            }
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", null, List.of("tag1"), DEFUALT_PAGING_REQUEST);
+
+            assertAll(
+                    () -> assertThat(allBy.templates().size()).isEqualTo(15),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 16),
+                    () -> assertThat(allBy.totalElements()).isEqualTo(15)
+            );
+        }
+
+        @Test
+        @DisplayName("복수 태그 탐색 성공")
+        void findByMultipleTagPageSuccess() {
+            MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
+            Member member = memberRepository.fetchById(memberDto.id());
+            Category category1 = categoryRepository.save(new Category("category1", member));
+            Category category2 = categoryRepository.save(new Category("category2", member));
+            saveDefault15Templates(member, category1);
+            saveDefault15Templates(member, category2);
+            for (long i = 1L; i <= 30L; i++) {
+                templateTagRepository.save(new TemplateTag(
+                        templateRepository.fetchById(i),
+                        tagRepository.fetchById((i / 15) + 1)
+                ));
+            }
+
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", null, List.of("tag1", "tag2"), DEFUALT_PAGING_REQUEST);
+
+            assertAll(
+                    () -> assertThat(allBy.templates().size()).isEqualTo(20),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 21),
+                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
+            );
+        }
+
+        @Test
+        @DisplayName("카테고리 & 단일 태그 탐색 성공")
+        void findByCategoryAndSingleTagPageSuccess() {
+            MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
+            Member member = memberRepository.fetchById(memberDto.id());
+            Category category1 = categoryRepository.save(new Category("category1", member));
+            Category category2 = categoryRepository.save(new Category("category2", member));
+            saveDefault15Templates(member, category1);
+            saveDefault15Templates(member, category2);
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", firstCategory.getId(), List.of("tag1"), DEFUALT_PAGING_REQUEST);
+
+            assertAll(
+                    () -> assertThat(allBy.templates().size()).isEqualTo(8),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 16),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 1),
+                    () -> assertThat(allBy.totalElements()).isEqualTo(8)
+            );
+        }
+    }
+
+    private void saveDefault15Templates(Member member, Category category) {
+        saveTemplate(makeTemplateRequest("hello topic 1"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 2"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 3"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 4"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 5"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 6"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 7"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 8"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 9"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 10"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 11"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 12"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 13"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 14"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 15"), member, category);
+
+        tagRepository.save(new Tag("tag1"));
+        tagRepository.save(new Tag("tag2"));
+    }
 }
diff --git a/backend/src/test/java/codezap/template/service/TemplateServiceTest.java b/backend/src/test/java/codezap/template/service/TemplateServiceTest.java
index 2f4d6a14e..4f761e2d3 100644
--- a/backend/src/test/java/codezap/template/service/TemplateServiceTest.java
+++ b/backend/src/test/java/codezap/template/service/TemplateServiceTest.java
@@ -124,12 +124,13 @@ class FilteringPageTest {
         private static Category firstCategory;
         private static Tag tag1;
         private static Tag tag2;
+        private static Member member;
 
         @BeforeEach
         void setUp() {
             //템플릿 30개 / 카테고리는 홀수 : 1번, 짝수 : 2번으로 매핑 / 태그는 16보다 작으면 1, 16 이상이면 2로 매핑
             MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
-            Member member = memberJpaRepository.fetchById(memberDto.id());
+            member = memberJpaRepository.fetchById(memberDto.id());
             firstCategory = categoryRepository.save(new Category("category1", member));
             categoryRepository.save(new Category("category2", member));
             for (int i = 1; i <= 30; i++) {
@@ -150,14 +151,13 @@ void setUp() {
                         tagRepository.fetchById((i / 16) + 1)
                 ));
             }
-
-            System.out.println();
         }
 
         @Test
         @DisplayName("전체 탐색 / 1페이지 성공")
         void findAllFirstPageSuccess() {
-            FindAllTemplatesResponse allBy = templateService.findAllBy(DEFUALT_PAGING_REQUEST, null, null);
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", null, null, DEFUALT_PAGING_REQUEST);
 
             assertAll(
                     () -> assertThat(allBy.templates().size()).isEqualTo(20),
@@ -170,7 +170,8 @@ void findAllFirstPageSuccess() {
         @Test
         @DisplayName("전체 탐색 / 2페이지 성공")
         void findAllSecondPageSuccess() {
-            FindAllTemplatesResponse allBy = templateService.findAllBy(PageRequest.of(1, 20), null, null);
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", null, null, PageRequest.of(1, 20));
 
             assertAll(
                     () -> assertThat(allBy.templates().size()).isEqualTo(10),
@@ -182,8 +183,8 @@ void findAllSecondPageSuccess() {
         @Test
         @DisplayName("카테고리 탐색 성공")
         void findByCategoryPageSuccess() {
-            FindAllTemplatesResponse allBy = templateService.findAllBy(DEFUALT_PAGING_REQUEST, firstCategory.getId(),
-                    null);
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", firstCategory.getId(), null, DEFUALT_PAGING_REQUEST);
 
             assertAll(
                     () -> assertThat(allBy.templates().size()).isEqualTo(15),
@@ -195,8 +196,8 @@ void findByCategoryPageSuccess() {
         @Test
         @DisplayName("단일 태그 탐색 성공")
         void findBySingleTagPageSuccess() {
-            FindAllTemplatesResponse allBy = templateService.findAllBy(DEFUALT_PAGING_REQUEST, null,
-                    List.of(tag1.getName()));
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", null, List.of(tag1.getName()), DEFUALT_PAGING_REQUEST);
 
             assertAll(
                     () -> assertThat(allBy.templates().size()).isEqualTo(15),
@@ -208,8 +209,8 @@ void findBySingleTagPageSuccess() {
         @Test
         @DisplayName("복수 태그 탐색 성공")
         void findByMultipleTagPageSuccess() {
-            FindAllTemplatesResponse allBy = templateService.findAllBy(DEFUALT_PAGING_REQUEST, null,
-                    List.of(tag1.getName(), tag2.getName()));
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", null, List.of(tag1.getName(), tag2.getName()), DEFUALT_PAGING_REQUEST);
 
             assertAll(
                     () -> assertThat(allBy.templates().size()).isEqualTo(20),
@@ -221,8 +222,8 @@ void findByMultipleTagPageSuccess() {
         @Test
         @DisplayName("카테고리 & 단일 태그 탐색 성공")
         void findByCategoryAndSingleTagPageSuccess() {
-            FindAllTemplatesResponse allBy = templateService.findAllBy(DEFUALT_PAGING_REQUEST, firstCategory.getId(),
-                    List.of(tag1.getName()));
+            FindAllTemplatesResponse allBy
+                    = templateService.findAllBy(member.getId(), "", firstCategory.getId(), List.of(tag1.getName()), DEFUALT_PAGING_REQUEST);
 
             assertAll(
                     () -> assertThat(allBy.templates().size()).isEqualTo(8),
@@ -398,4 +399,5 @@ private void saveTemplateBySnippetContent(String templateTitle, String firstCont
         snippetRepository.save(new Snippet(savedTemplate, "filename2", secondContent, 2));
         thumbnailSnippetRepository.save(new ThumbnailSnippet(savedTemplate, savedFirstSnippet));
     }
+
 }

From 25d3cc9776dc0da192def0814221dd13135a40bf Mon Sep 17 00:00:00 2001
From: kyum-q <109158497+kyum-q@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:03:20 +0900
Subject: [PATCH 03/12] =?UTF-8?q?refactor(template):=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=20&=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EB=B3=91=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SpringDocTemplateController.java          |  15 +-
 .../controller/TemplateController.java        |  33 +---
 .../service/MyTemplateFacadeService.java      |  29 ---
 .../template/service/TemplateService.java     |  26 +--
 .../service/TemplateServiceSearchTest.java    | 175 ++++++------------
 .../template/service/TemplateServiceTest.java | 123 ------------
 6 files changed, 72 insertions(+), 329 deletions(-)
 delete mode 100644 backend/src/main/java/codezap/template/service/MyTemplateFacadeService.java

diff --git a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
index 310cf4b3a..6d3c33b20 100644
--- a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -12,7 +11,6 @@
 import codezap.template.dto.request.CreateTemplateRequest;
 import codezap.template.dto.request.UpdateTemplateRequest;
 import codezap.template.dto.response.ExploreTemplatesResponse;
-import codezap.template.dto.response.FindAllMyTemplatesResponse;
 import codezap.template.dto.response.FindAllTemplatesResponse;
 import codezap.template.dto.response.FindTemplateResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -55,10 +53,10 @@ public interface SpringDocTemplateController {
     ResponseEntity<FindAllTemplatesResponse> getTemplates(
             Long memberId,
             String topic,
-            Integer pageNumber,
-            Integer pageSize,
             Long categoryId,
-            List<String> tags
+            List<String> tags,
+            Integer pageNumber,
+            Integer pageSize
     );
 
     @Operation(summary = "템플릿 단건 조회", description = "해당하는 식별자의 템플릿을 조회합니다.")
@@ -69,13 +67,6 @@ ResponseEntity<FindAllTemplatesResponse> getTemplates(
     })
     ResponseEntity<FindTemplateResponse> getTemplateById(Long id, MemberDto memberDto);
 
-    @Operation(summary = "템플릿 토픽 검색", description = "토픽이 포함된 템플릿들을 검색합니다.")
-    @ApiResponse(responseCode = "200", description = "템플릿 토픽 검색 성공",
-            content = {@Content(schema = @Schema(implementation = FindAllTemplatesResponse.class))})
-    ResponseEntity<FindAllMyTemplatesResponse> getMyTemplatesContainTopic(
-            MemberDto memberDto, Long memberId, String topic, Pageable pageable
-    );
-
     @Operation(summary = "템플릿 수정", description = "해당하는 식별자의 템플릿을 수정합니다.")
     @ApiResponse(responseCode = "200", description = "템플릿 수정 성공")
     @ApiErrorResponse(status = HttpStatus.BAD_REQUEST, instance = "/templates/1", errorCases = {
diff --git a/backend/src/main/java/codezap/template/controller/TemplateController.java b/backend/src/main/java/codezap/template/controller/TemplateController.java
index 9490bfe0e..e4d61f9e8 100644
--- a/backend/src/main/java/codezap/template/controller/TemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/TemplateController.java
@@ -3,11 +3,8 @@
 import java.net.URI;
 import java.util.List;
 
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableDefault;
-import org.apache.commons.lang3.NotImplementedException;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.data.repository.query.Param;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -24,11 +21,9 @@
 import codezap.member.dto.MemberDto;
 import codezap.template.dto.request.CreateTemplateRequest;
 import codezap.template.dto.request.UpdateTemplateRequest;
-import codezap.template.dto.response.FindAllMyTemplatesResponse;
 import codezap.template.dto.response.ExploreTemplatesResponse;
 import codezap.template.dto.response.FindAllTemplatesResponse;
 import codezap.template.dto.response.FindTemplateResponse;
-import codezap.template.service.MyTemplateFacadeService;
 import codezap.template.service.TemplateService;
 
 @RestController
@@ -36,11 +31,9 @@
 public class TemplateController implements SpringDocTemplateController {
 
     private final TemplateService templateService;
-    private final MyTemplateFacadeService myTemplateFacadeService;
 
-    public TemplateController(TemplateService templateService, MyTemplateFacadeService myTemplateFacadeService) {
+    public TemplateController(TemplateService templateService) {
         this.templateService = templateService;
-        this.myTemplateFacadeService = myTemplateFacadeService;
     }
 
     @PostMapping
@@ -57,10 +50,10 @@ public ResponseEntity<Void> create(
     public ResponseEntity<FindAllTemplatesResponse> getTemplates(
             @RequestParam Long memberId,
             @RequestParam("topic") String topic,
-            @RequestParam(required = false, defaultValue = "1") Integer pageNumber,
-            @RequestParam(required = false, defaultValue = "20") Integer pageSize,
             @RequestParam(required = false) Long categoryId,
-            @RequestParam(required = false) List<String> tags
+            @RequestParam(required = false) List<String> tags,
+            @RequestParam(required = false, defaultValue = "1") Integer pageNumber,
+            @RequestParam(required = false, defaultValue = "20") Integer pageSize
     ) {
         Pageable pageable = PageRequest.of(pageNumber - 1, pageSize);
         FindAllTemplatesResponse response =
@@ -74,20 +67,10 @@ public ResponseEntity<ExploreTemplatesResponse> explore() {
     }
 
     @GetMapping("/{id}")
-    public ResponseEntity<FindTemplateResponse> getTemplateById(@PathVariable Long id, @BasicAuthentication MemberDto memberDto) {
-        return ResponseEntity.ok(templateService.findByIdAndMember(id, memberDto));
-    }
-
-    @GetMapping("/search")
-    public ResponseEntity<FindAllMyTemplatesResponse> getMyTemplatesContainTopic(
-            @BasicAuthentication MemberDto memberDto,
-            @RequestParam("memberId") Long memberId,
-            @RequestParam("topic") String topic,
-            @PageableDefault Pageable pageable
+    public ResponseEntity<FindTemplateResponse> getTemplateById(@PathVariable Long id,
+            @BasicAuthentication MemberDto memberDto
     ) {
-        FindAllMyTemplatesResponse response = myTemplateFacadeService
-                .searchMyTemplatesContainTopic(memberDto, memberId, topic, pageable);
-        return ResponseEntity.ok(response);
+        return ResponseEntity.ok(templateService.findByIdAndMember(id, memberDto));
     }
 
     @PostMapping("/{id}")
diff --git a/backend/src/main/java/codezap/template/service/MyTemplateFacadeService.java b/backend/src/main/java/codezap/template/service/MyTemplateFacadeService.java
deleted file mode 100644
index dd0bcb5cc..000000000
--- a/backend/src/main/java/codezap/template/service/MyTemplateFacadeService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package codezap.template.service;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-
-import codezap.member.dto.MemberDto;
-import codezap.member.service.MemberService;
-import codezap.template.dto.response.FindAllMyTemplatesResponse;
-
-@Service
-public class MyTemplateFacadeService {
-    private final MemberService memberService;
-    private final TemplateService templateService;
-
-    public MyTemplateFacadeService(MemberService memberService, TemplateService templateService
-    ) {
-        this.memberService = memberService;
-        this.templateService = templateService;
-    }
-
-    public FindAllMyTemplatesResponse searchMyTemplatesContainTopic(
-            MemberDto memberDto, Long memberId, String topic, Pageable pageable
-    ) {
-        memberService.validateMemberId(memberDto, memberId);
-        return templateService.findContainTopic(memberId, topic, pageable);
-    }
-
-
-}
diff --git a/backend/src/main/java/codezap/template/service/TemplateService.java b/backend/src/main/java/codezap/template/service/TemplateService.java
index e352a8cab..fa438b0ac 100644
--- a/backend/src/main/java/codezap/template/service/TemplateService.java
+++ b/backend/src/main/java/codezap/template/service/TemplateService.java
@@ -4,7 +4,6 @@
 import java.util.Objects;
 
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -25,11 +24,10 @@
 import codezap.template.dto.request.CreateTemplateRequest;
 import codezap.template.dto.request.UpdateSnippetRequest;
 import codezap.template.dto.request.UpdateTemplateRequest;
-import codezap.template.dto.response.FindAllMyTemplatesResponse;
 import codezap.template.dto.response.ExploreTemplatesResponse;
 import codezap.template.dto.response.FindAllTemplatesResponse;
-import codezap.template.dto.response.FindMyTemplateResponse;
 import codezap.template.dto.response.FindAllTemplatesResponse.ItemResponse;
+import codezap.template.dto.response.FindMyTemplateResponse;
 import codezap.template.dto.response.FindTemplateResponse;
 import codezap.template.repository.SnippetRepository;
 import codezap.template.repository.TagRepository;
@@ -144,12 +142,12 @@ public FindAllTemplatesResponse findAllBy(
             Long categoryId,
             List<String> tagNames,
             Pageable pageable
-            ) {
+    ) {
         topic = "%" + topic + "%";
         if (categoryId != null && tagNames != null) {
             List<Long> templateIds = filterTemplatesBy(tagNames);
             Page<Template> templatePage =
-                    templateRepository.searchBy(memberId,topic, categoryId, templateIds, pageable);
+                    templateRepository.searchBy(memberId, topic, categoryId, templateIds, pageable);
             long totalTemplatesCount = templateRepository.countByIdInAndCategoryId(templateIds, categoryId);
             return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
         }
@@ -167,8 +165,7 @@ public FindAllTemplatesResponse findAllBy(
             return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
         }
         Page<Template> templatePage =
-                //templateRepository.searchBy(memberId, topic, pageable);
-                getTemplates(memberId, topic, pageable);
+                templateRepository.searchBy(memberId, topic, pageable);
         long totalTemplatesCount = templateRepository.count();
         return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
     }
@@ -284,21 +281,6 @@ public void deleteById(Long id, MemberDto memberDto) {
         templateRepository.deleteById(id);
     }
 
-    public FindAllMyTemplatesResponse findContainTopic(Long memberId, String topic, Pageable pageable) {
-        Page<Template> templates = getTemplates(memberId, topic, pageable);
-        List<FindMyTemplateResponse> myTemplateResponses = templates.stream()
-                .map(this::findByTemplate)
-                .toList();
-
-        return FindAllMyTemplatesResponse.of(myTemplateResponses, templates.getTotalPages());
-    }
-
-    private Page<Template> getTemplates(Long memberId, String topic, Pageable pageable) {
-        String topicWithWildcards = "%" + topic + "%";
-        Pageable newPageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize());
-        return templateRepository.searchBy(memberId, topicWithWildcards, newPageable);
-    }
-
     private FindMyTemplateResponse findByTemplate(Template template) {
         List<Tag> tags = templateTagRepository.findAllByTemplate(template)
                 .stream()
diff --git a/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java b/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
index ad3429136..9fdf3578e 100644
--- a/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
+++ b/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
@@ -3,7 +3,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 
-
 import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -31,9 +30,8 @@
 import codezap.template.domain.ThumbnailSnippet;
 import codezap.template.dto.request.CreateSnippetRequest;
 import codezap.template.dto.request.CreateTemplateRequest;
-import codezap.template.dto.response.FindAllMyTemplatesResponse;
 import codezap.template.dto.response.FindAllTemplatesResponse;
-import codezap.template.dto.response.FindMyTemplateResponse;
+import codezap.template.dto.response.FindAllTemplatesResponse.ItemResponse;
 import codezap.template.repository.SnippetRepository;
 import codezap.template.repository.TagRepository;
 import codezap.template.repository.TemplateRepository;
@@ -103,10 +101,6 @@ private Template saveTemplate(CreateTemplateRequest createTemplateRequest, Membe
         Snippet savedFirstSnippet = snippetRepository.save(new Snippet(savedTemplate, "filename1", "content1", 1));
         snippetRepository.save(new Snippet(savedTemplate, "filename2", "content2", 2));
         thumbnailSnippetRepository.save(new ThumbnailSnippet(savedTemplate, savedFirstSnippet));
-        createTemplateRequest.tags().stream()
-                .map(Tag::new)
-                .map(tagRepository::save)
-                .forEach(tag -> templateTagRepository.save(new TemplateTag(savedTemplate, tag)));
 
         return savedTemplate;
     }
@@ -151,6 +145,29 @@ private void saveTemplateBySnippetContent(
         thumbnailSnippetRepository.save(new ThumbnailSnippet(savedTemplate, savedFirstSnippet));
     }
 
+    private void saveDefault15Templates(Member member, Category category) {
+        saveTemplate(makeTemplateRequest("hello topic 1"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 2"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 3"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 4"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 5"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 6"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 7"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 8"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 9"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 10"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 11"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 12"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 13"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 14"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 15"), member, category);
+
+        tagRepository.save(new Tag("tag1"));
+        tagRepository.save(new Tag("tag2"));
+    }
+
+    //
+
     @Nested
     @DisplayName("템플릿 토픽 검색")
     class searchContainTopic {
@@ -167,8 +184,8 @@ void findAllTemplatesTitleContainTopicSuccess() {
             saveTemplate(makeTemplateRequest("hello topic !"), member, category);
 
             //when
-            FindAllMyTemplatesResponse templates = templateService.findContainTopic(member.getId(), "topic",
-                    PageRequest.of(1, 3));
+            FindAllTemplatesResponse templates = templateService.findAllBy(
+                    member.getId(), "topic", null, null, PageRequest.of(0, 3));
 
             //then
             assertThat(templates.templates()).hasSize(3);
@@ -186,8 +203,8 @@ void findAllSnippetFilenameContainTopicSuccess() {
             saveTemplateBySnippetFilename("tempate3", "login.js", "signup.java", member, category);
 
             //when
-            FindAllMyTemplatesResponse templates = templateService.findContainTopic(member.getId(), "java",
-                    PageRequest.of(1, 2));
+            FindAllTemplatesResponse templates = templateService.findAllBy(
+                    member.getId(), "java", null, null, PageRequest.of(0, 3));
 
             //then
             assertThat(templates.templates()).hasSize(2);
@@ -205,8 +222,8 @@ void findAllSnippetContentContainTopicSuccess() {
             saveTemplateBySnippetContent("tempate3", "console.log", "a+b=3", member, category);
 
             //when
-            FindAllMyTemplatesResponse templates = templateService.findContainTopic(member.getId(), "Car",
-                    PageRequest.of(1, 2));
+            FindAllTemplatesResponse templates = templateService.findAllBy(
+                    member.getId(), "Car", null, null, PageRequest.of(0, 3));
 
             //then
             assertThat(templates.templates()).hasSize(2);
@@ -243,8 +260,8 @@ void findAllDescriptionContainTopicSuccess() {
             saveTemplate(request2, member, category);
 
             //when
-            FindAllMyTemplatesResponse templates = templateService.findContainTopic(member.getId(), "Login",
-                    PageRequest.of(1, 1));
+            FindAllTemplatesResponse templates = templateService.findAllBy(
+                    member.getId(), "Login", null, null, PageRequest.of(0, 3));
 
             //then
             assertThat(templates.templates()).hasSize(1);
@@ -255,33 +272,18 @@ void findAllDescriptionContainTopicSuccess() {
         void findAllFirstPageSuccess() {
             MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
             Member member = memberRepository.fetchById(memberDto.id());
-            Category category = categoryRepository.save(new Category("category", member));
-
-
-            saveTemplate(makeTemplateRequest("hello topic 1"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 2"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 3"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 4"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 5"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 6"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 7"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 8"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 9"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 10"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 11"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 12"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 13"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 14"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 15"), member, category);
+            Category category1 = categoryRepository.save(new Category("category1", member));
+            Category category2 = categoryRepository.save(new Category("category2", member));
+            saveDefault15Templates(member, category1);
+            saveDefault15Templates(member, category2);
             FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, null, PageRequest.of(1, 5));
+                    = templateService.findAllBy(member.getId(), "", null, null, PageRequest.of(0, 20));
 
             assertAll(
                     () -> assertThat(allBy.templates().size()).isEqualTo(20),
                     () -> assertThat(allBy.templates()).allMatch(template -> template.id() <= 20),
                     () -> assertThat(allBy.totalElements()).isEqualTo(30)
             );
-
         }
 
         @Test
@@ -291,75 +293,25 @@ void findAllContainTopicPaging() {
             MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
             Member member = memberRepository.fetchById(memberDto.id());
             Category category = categoryRepository.save(new Category("category", member));
-            saveTemplate(makeTemplateRequest("hello topic 1"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 2"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 3"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 4"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 5"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 6"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 7"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 8"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 9"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 10"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 11"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 12"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 13"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 14"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic 15"), member, category);
+            saveDefault15Templates(member, category);
 
             //when
-            FindAllMyTemplatesResponse templates = templateService.findContainTopic(member.getId(), "topic",
-                    PageRequest.of(2, 5));
+            FindAllTemplatesResponse templates = templateService.findAllBy(
+                    member.getId(), "topic", null, null, PageRequest.of(1, 5));
 
             //then
-            List<String> titles = templates.templates().stream().map(FindMyTemplateResponse::title).toList();
+            List<String> titles = templates.templates().stream().map(ItemResponse::title).toList();
             assertThat(titles).containsExactly(
                     "hello topic 6", "hello topic 7", "hello topic 8", "hello topic 9", "hello topic 10");
         }
     }
 
-
-    //
-
     @Nested
     @DisplayName("조건에 따른 페이지 조회 메서드 동작 확인")
     class FilteringPageTest {
 
         private static final PageRequest DEFUALT_PAGING_REQUEST = PageRequest.of(0, 20);
-        private static Category firstCategory;
-        private static Tag tag1;
-        private static Tag tag2;
-        private static Member member;
-
-        /*@BeforeEach
-        void setUp() {
-            //템플릿 30개 / 카테고리는 홀수 : 1번, 짝수 : 2번으로 매핑 / 태그는 16보다 작으면 1, 16 이상이면 2로 매핑
-            MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
-            member = memberJpaRepository.fetchById(memberDto.id());
-            firstCategory = categoryRepository.save(new Category("category1", member));
-            categoryRepository.save(new Category("category2", member));
-            for (int i = 1; i <= 30; i++) {
-                long categoryId = i % 2 == 0 ? firstCategory.getId() + 1 : firstCategory.getId();
-                templateRepository.save(new Template(
-                        member,
-                        "title" + i,
-                        "description",
-                        categoryRepository.fetchById(categoryId)
-                ));
-
-            }
-            tag1 = tagRepository.save(new Tag("tag1"));
-            tag2 = tagRepository.save(new Tag("tag2"));
-            for (long i = 1L; i <= 30L; i++) {
-                templateTagRepository.save(new TemplateTag(
-                        templateRepository.fetchById(i),
-                        tagRepository.fetchById((i / 16) + 1)
-                ));
-            }
 
-            System.out.println();
-        }
-*/
         @Test
         @DisplayName("전체 탐색 / 1페이지 성공")
         void findAllFirstPageSuccess() {
@@ -435,7 +387,7 @@ void findBySingleTagPageSuccess() {
             for (long i = 1L; i <= 30L; i++) {
                 templateTagRepository.save(new TemplateTag(
                         templateRepository.fetchById(i),
-                        tagRepository.fetchById((i / 15) + 1)
+                        tagRepository.fetchById((i % 2) + 1)
                 ));
             }
             FindAllTemplatesResponse allBy
@@ -443,7 +395,7 @@ void findBySingleTagPageSuccess() {
 
             assertAll(
                     () -> assertThat(allBy.templates().size()).isEqualTo(15),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 16),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 0), // 테그
                     () -> assertThat(allBy.totalElements()).isEqualTo(15)
             );
         }
@@ -465,7 +417,8 @@ void findByMultipleTagPageSuccess() {
             }
 
             FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, List.of("tag1", "tag2"), DEFUALT_PAGING_REQUEST);
+                    = templateService.findAllBy(member.getId(), "", null, List.of("tag1", "tag2"),
+                    DEFUALT_PAGING_REQUEST);
 
             assertAll(
                     () -> assertThat(allBy.templates().size()).isEqualTo(20),
@@ -483,36 +436,22 @@ void findByCategoryAndSingleTagPageSuccess() {
             Category category2 = categoryRepository.save(new Category("category2", member));
             saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category2);
+            for (long i = 1L; i <= 30L; i++) {
+                templateTagRepository.save(new TemplateTag(
+                        templateRepository.fetchById(i),
+                        tagRepository.fetchById((i % 2) + 1)
+                ));
+            }
             FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", firstCategory.getId(), List.of("tag1"), DEFUALT_PAGING_REQUEST);
+                    = templateService.findAllBy(member.getId(), "", category1.getId(), List.of("tag1"),
+                    DEFUALT_PAGING_REQUEST);
 
             assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(8),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 16),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 1),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(8)
+                    () -> assertThat(allBy.templates().size()).isEqualTo(7), // 태그 및 카테고리
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 16), //카테고리
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 0), // 테그
+                    () -> assertThat(allBy.totalElements()).isEqualTo(7)
             );
         }
     }
-
-    private void saveDefault15Templates(Member member, Category category) {
-        saveTemplate(makeTemplateRequest("hello topic 1"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 2"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 3"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 4"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 5"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 6"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 7"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 8"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 9"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 10"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 11"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 12"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 13"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 14"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 15"), member, category);
-
-        tagRepository.save(new Tag("tag1"));
-        tagRepository.save(new Tag("tag2"));
-    }
 }
diff --git a/backend/src/test/java/codezap/template/service/TemplateServiceTest.java b/backend/src/test/java/codezap/template/service/TemplateServiceTest.java
index 4f761e2d3..7bca0ce79 100644
--- a/backend/src/test/java/codezap/template/service/TemplateServiceTest.java
+++ b/backend/src/test/java/codezap/template/service/TemplateServiceTest.java
@@ -7,13 +7,11 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,9 +32,6 @@
 import codezap.template.dto.request.UpdateSnippetRequest;
 import codezap.template.dto.request.UpdateTemplateRequest;
 import codezap.template.dto.response.ExploreTemplatesResponse;
-import codezap.template.dto.response.FindAllMyTemplatesResponse;
-import codezap.template.dto.response.FindAllTemplatesResponse;
-import codezap.template.dto.response.FindMyTemplateResponse;
 import codezap.template.dto.response.FindTemplateResponse;
 import codezap.template.repository.SnippetRepository;
 import codezap.template.repository.TagRepository;
@@ -116,124 +111,6 @@ void findAllTemplatesSuccess() {
         assertThat(allTemplates.templates()).hasSize(2);
     }
 
-    @Nested
-    @DisplayName("조건에 따른 페이지 조회 메서드 동작 확인")
-    class FilteringPageTest {
-
-        private static final PageRequest DEFUALT_PAGING_REQUEST = PageRequest.of(0, 20);
-        private static Category firstCategory;
-        private static Tag tag1;
-        private static Tag tag2;
-        private static Member member;
-
-        @BeforeEach
-        void setUp() {
-            //템플릿 30개 / 카테고리는 홀수 : 1번, 짝수 : 2번으로 매핑 / 태그는 16보다 작으면 1, 16 이상이면 2로 매핑
-            MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
-            member = memberJpaRepository.fetchById(memberDto.id());
-            firstCategory = categoryRepository.save(new Category("category1", member));
-            categoryRepository.save(new Category("category2", member));
-            for (int i = 1; i <= 30; i++) {
-                long categoryId = i % 2 == 0 ? firstCategory.getId() + 1 : firstCategory.getId();
-                templateRepository.save(new Template(
-                        member,
-                        "title" + i,
-                        "description",
-                        categoryRepository.fetchById(categoryId)
-                ));
-
-            }
-            tag1 = tagRepository.save(new Tag("tag1"));
-            tag2 = tagRepository.save(new Tag("tag2"));
-            for (long i = 1L; i <= 30L; i++) {
-                templateTagRepository.save(new TemplateTag(
-                        templateRepository.fetchById(i),
-                        tagRepository.fetchById((i / 16) + 1)
-                ));
-            }
-        }
-
-        @Test
-        @DisplayName("전체 탐색 / 1페이지 성공")
-        void findAllFirstPageSuccess() {
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, null, DEFUALT_PAGING_REQUEST);
-
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(20),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() <= 20),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
-            );
-
-        }
-
-        @Test
-        @DisplayName("전체 탐색 / 2페이지 성공")
-        void findAllSecondPageSuccess() {
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, null, PageRequest.of(1, 20));
-
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(10),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() > 20),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
-            );
-        }
-
-        @Test
-        @DisplayName("카테고리 탐색 성공")
-        void findByCategoryPageSuccess() {
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", firstCategory.getId(), null, DEFUALT_PAGING_REQUEST);
-
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(15),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 1),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(15)
-            );
-        }
-
-        @Test
-        @DisplayName("단일 태그 탐색 성공")
-        void findBySingleTagPageSuccess() {
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, List.of(tag1.getName()), DEFUALT_PAGING_REQUEST);
-
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(15),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 16),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(15)
-            );
-        }
-
-        @Test
-        @DisplayName("복수 태그 탐색 성공")
-        void findByMultipleTagPageSuccess() {
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, List.of(tag1.getName(), tag2.getName()), DEFUALT_PAGING_REQUEST);
-
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(20),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 21),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
-            );
-        }
-
-        @Test
-        @DisplayName("카테고리 & 단일 태그 탐색 성공")
-        void findByCategoryAndSingleTagPageSuccess() {
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", firstCategory.getId(), List.of(tag1.getName()), DEFUALT_PAGING_REQUEST);
-
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(8),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 16),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 1),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(8)
-            );
-        }
-    }
-
     @Test
     @DisplayName("템플릿 단건 조회 성공")
     void findOneTemplateSuccess() {

From 95ad96547225da20ddefe1b19d623cb2895c85b7 Mon Sep 17 00:00:00 2001
From: kyum-q <109158497+kyum-q@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:09:19 +0900
Subject: [PATCH 04/12] =?UTF-8?q?refactor(template):=20pageable=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B0=9B=EA=B3=A0=20page=20=EC=8B=9C=EC=9E=91=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=201=EB=A1=9C=20=EB=B3=80=EA=B2=BD=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SpringDocTemplateController.java          |   5 +-
 .../controller/TemplateController.java        |   7 +-
 .../template/service/TemplateService.java     |  13 +-
 .../service/TemplateServiceSearchTest.java    | 247 +++++++-----------
 4 files changed, 108 insertions(+), 164 deletions(-)

diff --git a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
index 6d3c33b20..36d7309c5 100644
--- a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -51,12 +52,12 @@ public interface SpringDocTemplateController {
     @ApiResponse(responseCode = "200", description = "템플릿 단건 조회 성공",
             content = {@Content(schema = @Schema(implementation = ExploreTemplatesResponse.class))})
     ResponseEntity<FindAllTemplatesResponse> getTemplates(
+            MemberDto memberDto,
             Long memberId,
             String topic,
             Long categoryId,
             List<String> tags,
-            Integer pageNumber,
-            Integer pageSize
+            Pageable pageable
     );
 
     @Operation(summary = "템플릿 단건 조회", description = "해당하는 식별자의 템플릿을 조회합니다.")
diff --git a/backend/src/main/java/codezap/template/controller/TemplateController.java b/backend/src/main/java/codezap/template/controller/TemplateController.java
index e4d61f9e8..b7bf15bfc 100644
--- a/backend/src/main/java/codezap/template/controller/TemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/TemplateController.java
@@ -3,8 +3,8 @@
 import java.net.URI;
 import java.util.List;
 
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -48,14 +48,13 @@ public ResponseEntity<Void> create(
 
     @GetMapping
     public ResponseEntity<FindAllTemplatesResponse> getTemplates(
+            @BasicAuthentication MemberDto memberDto,
             @RequestParam Long memberId,
             @RequestParam("topic") String topic,
             @RequestParam(required = false) Long categoryId,
             @RequestParam(required = false) List<String> tags,
-            @RequestParam(required = false, defaultValue = "1") Integer pageNumber,
-            @RequestParam(required = false, defaultValue = "20") Integer pageSize
+            @PageableDefault(size = 20, page = 1) Pageable pageable
     ) {
-        Pageable pageable = PageRequest.of(pageNumber - 1, pageSize);
         FindAllTemplatesResponse response =
                 templateService.findAllBy(memberId, topic, categoryId, tags, pageable);
         return ResponseEntity.ok(response);
diff --git a/backend/src/main/java/codezap/template/service/TemplateService.java b/backend/src/main/java/codezap/template/service/TemplateService.java
index fa438b0ac..3fde91254 100644
--- a/backend/src/main/java/codezap/template/service/TemplateService.java
+++ b/backend/src/main/java/codezap/template/service/TemplateService.java
@@ -4,6 +4,7 @@
 import java.util.Objects;
 
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -27,7 +28,6 @@
 import codezap.template.dto.response.ExploreTemplatesResponse;
 import codezap.template.dto.response.FindAllTemplatesResponse;
 import codezap.template.dto.response.FindAllTemplatesResponse.ItemResponse;
-import codezap.template.dto.response.FindMyTemplateResponse;
 import codezap.template.dto.response.FindTemplateResponse;
 import codezap.template.repository.SnippetRepository;
 import codezap.template.repository.TagRepository;
@@ -144,6 +144,8 @@ public FindAllTemplatesResponse findAllBy(
             Pageable pageable
     ) {
         topic = "%" + topic + "%";
+        pageable = PageRequest.of(pageable.getPageNumber() - 1, pageable.getPageSize(), pageable.getSort());
+
         if (categoryId != null && tagNames != null) {
             List<Long> templateIds = filterTemplatesBy(tagNames);
             Page<Template> templatePage =
@@ -281,15 +283,6 @@ public void deleteById(Long id, MemberDto memberDto) {
         templateRepository.deleteById(id);
     }
 
-    private FindMyTemplateResponse findByTemplate(Template template) {
-        List<Tag> tags = templateTagRepository.findAllByTemplate(template)
-                .stream()
-                .map(TemplateTag::getTag)
-                .toList();
-
-        return FindMyTemplateResponse.of(template, tags);
-    }
-
     private CodeZapException throwNotFoundSnippet() {
         throw new CodeZapException(HttpStatus.NOT_FOUND, "해당하는 스니펫이 존재하지 않습니다.");
     }
diff --git a/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java b/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
index 9fdf3578e..ba9c3a053 100644
--- a/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
+++ b/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
@@ -77,27 +77,35 @@ void setting() {
     }
 
     private CreateTemplateRequest makeTemplateRequest(String title) {
-        return new CreateTemplateRequest(
-                title,
-                "description",
-                List.of(
-                        new CreateSnippetRequest("filename1", "content1", 1),
-                        new CreateSnippetRequest("filename2", "content2", 2)
-                ),
-                1L,
-                List.of("tag1", "tag2")
-        );
+        return new CreateTemplateRequest(title, "description",
+                List.of(new CreateSnippetRequest("filename1", "content1", 1),
+                        new CreateSnippetRequest("filename2", "content2", 2)), 1L, List.of("tag1", "tag2"));
+    }
+
+    private void saveDefault15Templates(Member member, Category category) {
+        saveTemplate(makeTemplateRequest("hello topic 1"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 2"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 3"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 4"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 5"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 6"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 7"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 8"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 9"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 10"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 11"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 12"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 13"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 14"), member, category);
+        saveTemplate(makeTemplateRequest("hello topic 15"), member, category);
+
+        tagRepository.save(new Tag("tag1"));
+        tagRepository.save(new Tag("tag2"));
     }
 
     private Template saveTemplate(CreateTemplateRequest createTemplateRequest, Member member, Category category) {
         Template savedTemplate = templateRepository.save(
-                new Template(
-                        member,
-                        createTemplateRequest.title(),
-                        createTemplateRequest.description(),
-                        category
-                )
-        );
+                new Template(member, createTemplateRequest.title(), createTemplateRequest.description(), category));
         Snippet savedFirstSnippet = snippetRepository.save(new Snippet(savedTemplate, "filename1", "content1", 1));
         snippetRepository.save(new Snippet(savedTemplate, "filename2", "content2", 2));
         thumbnailSnippetRepository.save(new ThumbnailSnippet(savedTemplate, savedFirstSnippet));
@@ -105,18 +113,12 @@ private Template saveTemplate(CreateTemplateRequest createTemplateRequest, Membe
         return savedTemplate;
     }
 
-    private void saveTemplateBySnippetFilename(
-            String templateTitle, String firstFilename, String secondFilename, Member member, Category category
+    private void saveTemplateBySnippetFilename(String templateTitle, String firstFilename, String secondFilename,
+            Member member, Category category
     ) {
-        CreateTemplateRequest createTemplateRequest = new CreateTemplateRequest(
-                templateTitle, "설명",
-                List.of(
-                        new CreateSnippetRequest(firstFilename, "content1", 1),
-                        new CreateSnippetRequest(secondFilename, "content2", 2)
-                ),
-                category.getId(),
-                List.of()
-        );
+        CreateTemplateRequest createTemplateRequest = new CreateTemplateRequest(templateTitle, "설명",
+                List.of(new CreateSnippetRequest(firstFilename, "content1", 1),
+                        new CreateSnippetRequest(secondFilename, "content2", 2)), category.getId(), List.of());
         Template savedTemplate = templateRepository.save(
                 new Template(member, createTemplateRequest.title(), createTemplateRequest.description(), category));
 
@@ -125,18 +127,12 @@ private void saveTemplateBySnippetFilename(
         thumbnailSnippetRepository.save(new ThumbnailSnippet(savedTemplate, savedFirstSnippet));
     }
 
-    private void saveTemplateBySnippetContent(
-            String templateTitle, String firstContent, String secondContent, Member member, Category category
+    private void saveTemplateBySnippetContent(String templateTitle, String firstContent, String secondContent,
+            Member member, Category category
     ) {
-        CreateTemplateRequest createTemplateRequest = new CreateTemplateRequest(
-                templateTitle, "설명",
-                List.of(
-                        new CreateSnippetRequest("filename1", firstContent, 1),
-                        new CreateSnippetRequest("filename2", secondContent, 2)
-                ),
-                category.getId(),
-                List.of()
-        );
+        CreateTemplateRequest createTemplateRequest = new CreateTemplateRequest(templateTitle, "설명",
+                List.of(new CreateSnippetRequest("filename1", firstContent, 1),
+                        new CreateSnippetRequest("filename2", secondContent, 2)), category.getId(), List.of());
         Template savedTemplate = templateRepository.save(
                 new Template(member, createTemplateRequest.title(), createTemplateRequest.description(), category));
 
@@ -145,29 +141,6 @@ private void saveTemplateBySnippetContent(
         thumbnailSnippetRepository.save(new ThumbnailSnippet(savedTemplate, savedFirstSnippet));
     }
 
-    private void saveDefault15Templates(Member member, Category category) {
-        saveTemplate(makeTemplateRequest("hello topic 1"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 2"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 3"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 4"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 5"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 6"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 7"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 8"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 9"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 10"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 11"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 12"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 13"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 14"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 15"), member, category);
-
-        tagRepository.save(new Tag("tag1"));
-        tagRepository.save(new Tag("tag2"));
-    }
-
-    //
-
     @Nested
     @DisplayName("템플릿 토픽 검색")
     class searchContainTopic {
@@ -185,7 +158,8 @@ void findAllTemplatesTitleContainTopicSuccess() {
 
             //when
             FindAllTemplatesResponse templates = templateService.findAllBy(
-                    member.getId(), "topic", null, null, PageRequest.of(0, 3));
+                    member.getId(), "topic", null, null, PageRequest.of(1, 3)
+            );
 
             //then
             assertThat(templates.templates()).hasSize(3);
@@ -204,7 +178,8 @@ void findAllSnippetFilenameContainTopicSuccess() {
 
             //when
             FindAllTemplatesResponse templates = templateService.findAllBy(
-                    member.getId(), "java", null, null, PageRequest.of(0, 3));
+                    member.getId(), "java", null, null, PageRequest.of(1, 3)
+            );
 
             //then
             assertThat(templates.templates()).hasSize(2);
@@ -223,7 +198,8 @@ void findAllSnippetContentContainTopicSuccess() {
 
             //when
             FindAllTemplatesResponse templates = templateService.findAllBy(
-                    member.getId(), "Car", null, null, PageRequest.of(0, 3));
+                    member.getId(), "Car", null, null, PageRequest.of(1, 3)
+            );
 
             //then
             assertThat(templates.templates()).hasSize(2);
@@ -236,32 +212,21 @@ void findAllDescriptionContainTopicSuccess() {
             MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
             Member member = memberRepository.fetchById(memberDto.id());
             Category category = categoryRepository.save(new Category("category", member));
-            CreateTemplateRequest request1 = new CreateTemplateRequest(
-                    "타이틀",
-                    "Login 구현",
-                    List.of(
-                            new CreateSnippetRequest("filename1", "content1", 1),
-                            new CreateSnippetRequest("filename2", "content2", 2)
-                    ),
-                    category.getId(),
-                    List.of("tag1", "tag2")
-            );
+            CreateTemplateRequest request1 = new CreateTemplateRequest("타이틀", "Login 구현",
+                    List.of(new CreateSnippetRequest("filename1", "content1", 1),
+                            new CreateSnippetRequest("filename2", "content2", 2)), category.getId(),
+                    List.of("tag1", "tag2"));
             saveTemplate(request1, member, category);
-            CreateTemplateRequest request2 = new CreateTemplateRequest(
-                    "타이틀",
-                    "Signup 구현",
-                    List.of(
-                            new CreateSnippetRequest("filename1", "content1", 1),
-                            new CreateSnippetRequest("filename2", "content2", 2)
-                    ),
-                    category.getId(),
-                    List.of("tag1", "tag2")
-            );
+            CreateTemplateRequest request2 = new CreateTemplateRequest("타이틀", "Signup 구현",
+                    List.of(new CreateSnippetRequest("filename1", "content1", 1),
+                            new CreateSnippetRequest("filename2", "content2", 2)), category.getId(),
+                    List.of("tag1", "tag2"));
             saveTemplate(request2, member, category);
 
             //when
             FindAllTemplatesResponse templates = templateService.findAllBy(
-                    member.getId(), "Login", null, null, PageRequest.of(0, 3));
+                    member.getId(), "Login", null, null, PageRequest.of(1, 3)
+            );
 
             //then
             assertThat(templates.templates()).hasSize(1);
@@ -276,14 +241,13 @@ void findAllFirstPageSuccess() {
             Category category2 = categoryRepository.save(new Category("category2", member));
             saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category2);
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, null, PageRequest.of(0, 20));
+            FindAllTemplatesResponse allBy = templateService.findAllBy(
+                    member.getId(), "", null, null, PageRequest.of(1, 20)
+            );
 
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(20),
+            assertAll(() -> assertThat(allBy.templates()).hasSize(20),
                     () -> assertThat(allBy.templates()).allMatch(template -> template.id() <= 20),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
-            );
+                    () -> assertThat(allBy.totalElements()).isEqualTo(30));
         }
 
         @Test
@@ -297,12 +261,13 @@ void findAllContainTopicPaging() {
 
             //when
             FindAllTemplatesResponse templates = templateService.findAllBy(
-                    member.getId(), "topic", null, null, PageRequest.of(1, 5));
+                    member.getId(), "topic", null, null, PageRequest.of(2, 5)
+            );
 
             //then
             List<String> titles = templates.templates().stream().map(ItemResponse::title).toList();
-            assertThat(titles).containsExactly(
-                    "hello topic 6", "hello topic 7", "hello topic 8", "hello topic 9", "hello topic 10");
+            assertThat(titles).containsExactly("hello topic 6", "hello topic 7", "hello topic 8", "hello topic 9",
+                    "hello topic 10");
         }
     }
 
@@ -310,7 +275,7 @@ void findAllContainTopicPaging() {
     @DisplayName("조건에 따른 페이지 조회 메서드 동작 확인")
     class FilteringPageTest {
 
-        private static final PageRequest DEFUALT_PAGING_REQUEST = PageRequest.of(0, 20);
+        private static final PageRequest DEFAULT_PAGING_REQUEST = PageRequest.of(1, 20);
 
         @Test
         @DisplayName("전체 탐색 / 1페이지 성공")
@@ -323,15 +288,14 @@ void findAllFirstPageSuccess() {
             saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category2);
 
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, null, PageRequest.of(0, 20));
+            FindAllTemplatesResponse allBy = templateService.findAllBy(
+                    member.getId(), "", null, null, PageRequest.of(1, 20)
+            );
 
             //when & then
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(20),
+            assertAll(() -> assertThat(allBy.templates()).hasSize(20),
                     () -> assertThat(allBy.templates()).allMatch(template -> template.id() <= 20),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
-            );
+                    () -> assertThat(allBy.totalElements()).isEqualTo(30));
         }
 
         @Test
@@ -345,14 +309,13 @@ void findAllSecondPageSuccess() {
             saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category2);
 
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, null, PageRequest.of(1, 20));
+            FindAllTemplatesResponse allBy = templateService.findAllBy(
+                    member.getId(), "", null, null, PageRequest.of(2, 20)
+            );
 
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(10),
+            assertAll(() -> assertThat(allBy.templates()).hasSize(10),
                     () -> assertThat(allBy.templates()).allMatch(template -> template.id() > 20),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
-            );
+                    () -> assertThat(allBy.totalElements()).isEqualTo(30));
         }
 
         @Test
@@ -365,14 +328,13 @@ void findByCategoryPageSuccess() {
             saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category2);
 
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", category1.getId(), null, PageRequest.of(0, 20));
+            FindAllTemplatesResponse allBy = templateService.findAllBy(
+                    member.getId(), "", category1.getId(), null, PageRequest.of(1, 20)
+            );
 
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(15),
+            assertAll(() -> assertThat(allBy.templates()).hasSize(15),
                     () -> assertThat(allBy.templates()).allMatch(template -> template.id() <= 15),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(15)
-            );
+                    () -> assertThat(allBy.totalElements()).isEqualTo(15));
         }
 
         @Test
@@ -385,19 +347,16 @@ void findBySingleTagPageSuccess() {
             saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category2);
             for (long i = 1L; i <= 30L; i++) {
-                templateTagRepository.save(new TemplateTag(
-                        templateRepository.fetchById(i),
-                        tagRepository.fetchById((i % 2) + 1)
-                ));
+                templateTagRepository.save(
+                        new TemplateTag(templateRepository.fetchById(i), tagRepository.fetchById((i % 2) + 1)));
             }
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, List.of("tag1"), DEFUALT_PAGING_REQUEST);
+            FindAllTemplatesResponse allBy = templateService.findAllBy(
+                    member.getId(), "", null, List.of("tag1"), DEFAULT_PAGING_REQUEST
+            );
 
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(15),
+            assertAll(() -> assertThat(allBy.templates()).hasSize(15),
                     () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 0), // 테그
-                    () -> assertThat(allBy.totalElements()).isEqualTo(15)
-            );
+                    () -> assertThat(allBy.totalElements()).isEqualTo(15));
         }
 
         @Test
@@ -410,21 +369,17 @@ void findByMultipleTagPageSuccess() {
             saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category2);
             for (long i = 1L; i <= 30L; i++) {
-                templateTagRepository.save(new TemplateTag(
-                        templateRepository.fetchById(i),
-                        tagRepository.fetchById((i / 15) + 1)
-                ));
+                templateTagRepository.save(
+                        new TemplateTag(templateRepository.fetchById(i), tagRepository.fetchById((i / 15) + 1)));
             }
 
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", null, List.of("tag1", "tag2"),
-                    DEFUALT_PAGING_REQUEST);
+            FindAllTemplatesResponse allBy = templateService.findAllBy(
+                    member.getId(), "", null, List.of("tag1", "tag2"), DEFAULT_PAGING_REQUEST
+            );
 
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(20),
+            assertAll(() -> assertThat(allBy.templates()).hasSize(20),
                     () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 21),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(30)
-            );
+                    () -> assertThat(allBy.totalElements()).isEqualTo(30));
         }
 
         @Test
@@ -437,21 +392,17 @@ void findByCategoryAndSingleTagPageSuccess() {
             saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category2);
             for (long i = 1L; i <= 30L; i++) {
-                templateTagRepository.save(new TemplateTag(
-                        templateRepository.fetchById(i),
-                        tagRepository.fetchById((i % 2) + 1)
-                ));
+                templateTagRepository.save(
+                        new TemplateTag(templateRepository.fetchById(i), tagRepository.fetchById((i % 2) + 1)));
             }
-            FindAllTemplatesResponse allBy
-                    = templateService.findAllBy(member.getId(), "", category1.getId(), List.of("tag1"),
-                    DEFUALT_PAGING_REQUEST);
-
-            assertAll(
-                    () -> assertThat(allBy.templates().size()).isEqualTo(7), // 태그 및 카테고리
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 16), //카테고리
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 0), // 테그
-                    () -> assertThat(allBy.totalElements()).isEqualTo(7)
+            FindAllTemplatesResponse allBy = templateService.findAllBy(
+                    member.getId(), "", category1.getId(), List.of("tag1"), DEFAULT_PAGING_REQUEST
             );
+
+            assertAll(() -> assertThat(allBy.templates()).hasSize(7),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 16),
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 0),
+                    () -> assertThat(allBy.totalElements()).isEqualTo(7));
         }
     }
 }

From bbee9f83b8eabd1054ac41f1f686945ec9b56009 Mon Sep 17 00:00:00 2001
From: kyum-q <109158497+kyum-q@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:13:02 +0900
Subject: [PATCH 05/12] =?UTF-8?q?refactor(template):=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20=EC=BB=A8=EB=B2=A4=EC=85=98=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codezap/category/domain/Category.java     |  6 +--
 .../error/ApiErrorResponsesCustomizer.java    |  3 +-
 .../controller/SpringDocMemberController.java |  4 +-
 .../codezap/member/service/MemberService.java |  2 +-
 .../codezap/template/domain/Template.java     |  1 -
 .../response/FindAllMyTemplatesResponse.java  | 20 ---------
 .../dto/response/FindMyTemplateResponse.java  | 44 -------------------
 .../repository/TemplateRepository.java        | 12 +++--
 8 files changed, 17 insertions(+), 75 deletions(-)
 delete mode 100644 backend/src/main/java/codezap/template/dto/response/FindAllMyTemplatesResponse.java
 delete mode 100644 backend/src/main/java/codezap/template/dto/response/FindMyTemplateResponse.java

diff --git a/backend/src/main/java/codezap/category/domain/Category.java b/backend/src/main/java/codezap/category/domain/Category.java
index 818b99453..a1621b296 100644
--- a/backend/src/main/java/codezap/category/domain/Category.java
+++ b/backend/src/main/java/codezap/category/domain/Category.java
@@ -22,10 +22,10 @@
 @AllArgsConstructor
 @Getter
 @Table(
-        uniqueConstraints={
+        uniqueConstraints = {
                 @UniqueConstraint(
-                        name="name_with_member",
-                        columnNames={"member_id", "name"}
+                        name = "name_with_member",
+                        columnNames = {"member_id", "name"}
                 )
         }
 )
diff --git a/backend/src/main/java/codezap/global/swagger/error/ApiErrorResponsesCustomizer.java b/backend/src/main/java/codezap/global/swagger/error/ApiErrorResponsesCustomizer.java
index 05bf8b5e7..f61ac0463 100644
--- a/backend/src/main/java/codezap/global/swagger/error/ApiErrorResponsesCustomizer.java
+++ b/backend/src/main/java/codezap/global/swagger/error/ApiErrorResponsesCustomizer.java
@@ -21,7 +21,8 @@ public class ApiErrorResponsesCustomizer implements OperationCustomizer {
     @Override
     public Operation customize(Operation operation, HandlerMethod handlerMethod) {
         if (handlerMethod.hasMethodAnnotation(ApiErrorResponse.class)) {
-            ApiErrorResponse apiErrorResponse = Objects.requireNonNull(handlerMethod.getMethodAnnotation(ApiErrorResponse.class));
+            ApiErrorResponse apiErrorResponse = Objects.requireNonNull(
+                    handlerMethod.getMethodAnnotation(ApiErrorResponse.class));
             ApiResponses responses = operation.getResponses();
             String statusCode = String.valueOf(apiErrorResponse.status().value());
             responses.addApiResponse(statusCode, makeFailResponse(apiErrorResponse));
diff --git a/backend/src/main/java/codezap/member/controller/SpringDocMemberController.java b/backend/src/main/java/codezap/member/controller/SpringDocMemberController.java
index 8d5f4a06a..431db21ca 100644
--- a/backend/src/main/java/codezap/member/controller/SpringDocMemberController.java
+++ b/backend/src/main/java/codezap/member/controller/SpringDocMemberController.java
@@ -195,7 +195,9 @@ public interface SpringDocMemberController {
     @ApiResponse(
             responseCode = "200",
             description = "로그인 성공",
-            headers = {@Header(name = "Set-Cookie", description = "base64(${email}:${password}); path=\"/\"; HttpOnly; Secure;")}
+            headers = {
+                    @Header(name = "Set-Cookie", description = "base64(${email}:${password}); path=\"/\"; HttpOnly; "
+                            + "Secure;")}
     )
     @ApiResponse(
             responseCode = "400",
diff --git a/backend/src/main/java/codezap/member/service/MemberService.java b/backend/src/main/java/codezap/member/service/MemberService.java
index 83a358a26..5b5f025ef 100644
--- a/backend/src/main/java/codezap/member/service/MemberService.java
+++ b/backend/src/main/java/codezap/member/service/MemberService.java
@@ -56,7 +56,7 @@ public void validateMemberId(MemberDto memberDto, Long memberId) {
             throw new CodeZapException(HttpStatus.UNAUTHORIZED, "다른 사람의 템플릿은 확인할 수 없습니다.");
         }
 
-        if(!memberRepository.existsById(memberId)) {
+        if (!memberRepository.existsById(memberId)) {
             throw new CodeZapException(HttpStatus.UNAUTHORIZED, "로그인 정보가 잘못되었습니다.");
         }
     }
diff --git a/backend/src/main/java/codezap/template/domain/Template.java b/backend/src/main/java/codezap/template/domain/Template.java
index 4e7a9c436..e3faf2060 100644
--- a/backend/src/main/java/codezap/template/domain/Template.java
+++ b/backend/src/main/java/codezap/template/domain/Template.java
@@ -6,7 +6,6 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 
 import codezap.category.domain.Category;
diff --git a/backend/src/main/java/codezap/template/dto/response/FindAllMyTemplatesResponse.java b/backend/src/main/java/codezap/template/dto/response/FindAllMyTemplatesResponse.java
deleted file mode 100644
index 0efa46369..000000000
--- a/backend/src/main/java/codezap/template/dto/response/FindAllMyTemplatesResponse.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package codezap.template.dto.response;
-
-import java.util.List;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-public record FindAllMyTemplatesResponse(
-        @Schema(description = "총 페이지", example = "5")
-        long totalPage,
-
-        @Schema(description = "템플릿 목록")
-        List<FindMyTemplateResponse> templates
-) {
-    public static FindAllMyTemplatesResponse of(List<FindMyTemplateResponse> myTemplateResponses, long totalPage) {
-        return new FindAllMyTemplatesResponse(
-                totalPage,
-                myTemplateResponses
-        );
-    }
-}
diff --git a/backend/src/main/java/codezap/template/dto/response/FindMyTemplateResponse.java b/backend/src/main/java/codezap/template/dto/response/FindMyTemplateResponse.java
deleted file mode 100644
index 01607c123..000000000
--- a/backend/src/main/java/codezap/template/dto/response/FindMyTemplateResponse.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package codezap.template.dto.response;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-import codezap.template.domain.Tag;
-import codezap.template.domain.Template;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-public record FindMyTemplateResponse(
-        @Schema(description = "템플릿 식별자", example = "0")
-        Long id,
-
-        @Schema(description = "템플릿 이름", example = "스프링 로그인 구현")
-        String title,
-
-        @Schema(description = "템플릿 설명", example = "JWT를 사용하여 로그인 기능을 구현함")
-        String description,
-
-        @Schema(description = "태그 목록")
-        List<FindTagResponse> tags,
-
-        @Schema(description = "템플릿 수정 시간", example = "2024-11-11 12:00", type = "string")
-        LocalDateTime modifiedAt
-) {
-    public static FindMyTemplateResponse of(Template template, List<Tag> tags) {
-        return new FindMyTemplateResponse(
-                template.getId(),
-                template.getTitle(),
-                template.getDescription(),
-                mapToFindTagByTemplateResponse(tags),
-                template.getModifiedAt()
-        );
-    }
-
-    private static List<FindTagResponse> mapToFindTagByTemplateResponse(
-            List<Tag> tags
-    ) {
-        return tags.stream()
-                .map(FindTagResponse::from)
-                .toList();
-    }
-}
-
diff --git a/backend/src/main/java/codezap/template/repository/TemplateRepository.java b/backend/src/main/java/codezap/template/repository/TemplateRepository.java
index a3c24a86d..1281a0703 100644
--- a/backend/src/main/java/codezap/template/repository/TemplateRepository.java
+++ b/backend/src/main/java/codezap/template/repository/TemplateRepository.java
@@ -36,7 +36,8 @@ default Template fetchById(Long id) {
     Page<Template> searchBy(
             @Param("memberId") Long memberId,
             @Param("topic") String topic,
-            Pageable pageable);
+            Pageable pageable
+    );
 
     @Query("""
             SELECT DISTINCT t
@@ -54,7 +55,8 @@ Page<Template> searchBy(
             @Param("memberId") Long memberId,
             @Param("topic") String topic,
             @Param("templateIds") List<Long> templateIds,
-            Pageable pageable);
+            Pageable pageable
+    );
 
     @Query("""
             SELECT DISTINCT t
@@ -72,7 +74,8 @@ Page<Template> searchBy(
             @Param("memberId") Long memberId,
             @Param("topic") String topic,
             @Param("categoryId") Long categoryId,
-            Pageable pageable);
+            Pageable pageable
+    );
 
     @Query("""
             SELECT DISTINCT t
@@ -92,7 +95,8 @@ Page<Template> searchBy(
             @Param("topic") String topic,
             @Param("categoryId") Long categoryId,
             @Param("templateIds") List<Long> templateIds,
-            Pageable pageable);
+            Pageable pageable
+    );
 
     Page<Template> findBy(Pageable pageable);
 

From 639d183956025cf062de77b0b36aa1f5677416b7 Mon Sep 17 00:00:00 2001
From: kyum-q <109158497+kyum-q@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:33:22 +0900
Subject: [PATCH 06/12] =?UTF-8?q?refactor(service):=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=20=EA=B2=B0=EA=B3=BC=20=EC=A4=91=20=EC=A0=84=EC=B2=B4=20?=
 =?UTF-8?q?=ED=85=9C=ED=94=8C=EB=A6=BF=20=EA=B0=9C=EC=88=98=EB=A5=BC=20pag?=
 =?UTF-8?q?e=20=EA=B2=B0=EA=B3=BC=EB=A5=BC=20=ED=86=B5=ED=95=B4=20?=
 =?UTF-8?q?=EC=95=8C=EC=95=84=EB=82=B4=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/service/TemplateService.java     | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/codezap/template/service/TemplateService.java b/backend/src/main/java/codezap/template/service/TemplateService.java
index 3fde91254..542a289b4 100644
--- a/backend/src/main/java/codezap/template/service/TemplateService.java
+++ b/backend/src/main/java/codezap/template/service/TemplateService.java
@@ -150,26 +150,19 @@ public FindAllTemplatesResponse findAllBy(
             List<Long> templateIds = filterTemplatesBy(tagNames);
             Page<Template> templatePage =
                     templateRepository.searchBy(memberId, topic, categoryId, templateIds, pageable);
-            long totalTemplatesCount = templateRepository.countByIdInAndCategoryId(templateIds, categoryId);
-            return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
+            return makeTemplatesResponseBy(templatePage);
         }
         if (categoryId != null && tagNames == null) {
             Page<Template> templatePage = templateRepository.searchBy(memberId, topic, categoryId, pageable);
-            long totalTemplatesCount = templateRepository.countByCategoryId(categoryId);
-            return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
+            return makeTemplatesResponseBy(templatePage);
         }
         if (categoryId == null && tagNames != null) {
             List<Long> templateIds = filterTemplatesBy(tagNames);
-            Page<Template> templatePage =
-                    templateRepository.searchBy(memberId, topic, templateIds, pageable);
-
-            long totalTemplatesCount = templateRepository.countByIdIn(templateIds);
-            return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
+            Page<Template> templatePage = templateRepository.searchBy(memberId, topic, templateIds, pageable);
+            return makeTemplatesResponseBy(templatePage);
         }
-        Page<Template> templatePage =
-                templateRepository.searchBy(memberId, topic, pageable);
-        long totalTemplatesCount = templateRepository.count();
-        return makeTemplatesResponseBy(totalTemplatesCount, templatePage);
+        Page<Template> templatePage = templateRepository.searchBy(memberId, topic, pageable);
+        return makeTemplatesResponseBy(templatePage);
     }
 
     private List<Long> filterTemplatesBy(List<String> tagNames) {
@@ -181,11 +174,11 @@ private List<Long> filterTemplatesBy(List<String> tagNames) {
                 .toList();
     }
 
-    private FindAllTemplatesResponse makeTemplatesResponseBy(long totalTemplatesCount, Page<Template> page) {
+    private FindAllTemplatesResponse makeTemplatesResponseBy(Page<Template> page) {
         List<ItemResponse> itemResponses = page.stream()
                 .map(template -> ItemResponse.of(template, getTemplateTags(template)))
                 .toList();
-        return new FindAllTemplatesResponse(page.getTotalPages(), totalTemplatesCount, itemResponses);
+        return new FindAllTemplatesResponse(page.getTotalPages(), page.getTotalElements(), itemResponses);
     }
 
     private List<Tag> getTemplateTags(Template template) {

From b8226c96ba89b625379efe18f6bea919c4e52c58 Mon Sep 17 00:00:00 2001
From: kyum-q <109158497+kyum-q@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:36:36 +0900
Subject: [PATCH 07/12] =?UTF-8?q?refactor(service):=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=20value=20=EC=9D=B4=EB=A6=84=EC=9D=84=20topic=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20keyword=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SpringDocTemplateController.java          |  2 +-
 .../controller/TemplateController.java        |  4 +-
 .../repository/TemplateRepository.java        | 40 ++++++-------
 .../template/service/TemplateService.java     | 12 ++--
 .../service/TemplateServiceSearchTest.java    | 56 +++++++++----------
 5 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
index 36d7309c5..42b353953 100644
--- a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
@@ -54,7 +54,7 @@ public interface SpringDocTemplateController {
     ResponseEntity<FindAllTemplatesResponse> getTemplates(
             MemberDto memberDto,
             Long memberId,
-            String topic,
+            String keyword,
             Long categoryId,
             List<String> tags,
             Pageable pageable
diff --git a/backend/src/main/java/codezap/template/controller/TemplateController.java b/backend/src/main/java/codezap/template/controller/TemplateController.java
index b7bf15bfc..7f1216810 100644
--- a/backend/src/main/java/codezap/template/controller/TemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/TemplateController.java
@@ -50,13 +50,13 @@ public ResponseEntity<Void> create(
     public ResponseEntity<FindAllTemplatesResponse> getTemplates(
             @BasicAuthentication MemberDto memberDto,
             @RequestParam Long memberId,
-            @RequestParam("topic") String topic,
+            @RequestParam("keyword") String keyword,
             @RequestParam(required = false) Long categoryId,
             @RequestParam(required = false) List<String> tags,
             @PageableDefault(size = 20, page = 1) Pageable pageable
     ) {
         FindAllTemplatesResponse response =
-                templateService.findAllBy(memberId, topic, categoryId, tags, pageable);
+                templateService.findAllBy(memberId, keyword, categoryId, tags, pageable);
         return ResponseEntity.ok(response);
     }
 
diff --git a/backend/src/main/java/codezap/template/repository/TemplateRepository.java b/backend/src/main/java/codezap/template/repository/TemplateRepository.java
index 1281a0703..54e208063 100644
--- a/backend/src/main/java/codezap/template/repository/TemplateRepository.java
+++ b/backend/src/main/java/codezap/template/repository/TemplateRepository.java
@@ -27,15 +27,15 @@ default Template fetchById(Long id) {
             FROM Template t JOIN Snippet s ON t.id = s.template.id
             WHERE t.member.id = :memberId AND
             (
-                t.title LIKE :topic
-                OR s.filename LIKE :topic
-                OR s.content LIKE :topic
-                OR t.description LIKE :topic
+                t.title LIKE :keyword
+                OR s.filename LIKE :keyword
+                OR s.content LIKE :keyword
+                OR t.description LIKE :keyword
             )
             """)
     Page<Template> searchBy(
             @Param("memberId") Long memberId,
-            @Param("topic") String topic,
+            @Param("keyword") String keyword,
             Pageable pageable
     );
 
@@ -45,15 +45,15 @@ Page<Template> searchBy(
             WHERE t.member.id = :memberId AND
             t.id in :templateIds AND
             (
-                t.title LIKE :topic
-                OR s.filename LIKE :topic
-                OR s.content LIKE :topic
-                OR t.description LIKE :topic
+                t.title LIKE :keyword
+                OR s.filename LIKE :keyword
+                OR s.content LIKE :keyword
+                OR t.description LIKE :keyword
             )
             """)
     Page<Template> searchBy(
             @Param("memberId") Long memberId,
-            @Param("topic") String topic,
+            @Param("keyword") String keyword,
             @Param("templateIds") List<Long> templateIds,
             Pageable pageable
     );
@@ -64,15 +64,15 @@ Page<Template> searchBy(
             WHERE t.member.id = :memberId AND
             t.category.id = :categoryId AND
             (
-                t.title LIKE :topic
-                OR s.filename LIKE :topic
-                OR s.content LIKE :topic
-                OR t.description LIKE :topic
+                t.title LIKE :keyword
+                OR s.filename LIKE :keyword
+                OR s.content LIKE :keyword
+                OR t.description LIKE :keyword
             )
             """)
     Page<Template> searchBy(
             @Param("memberId") Long memberId,
-            @Param("topic") String topic,
+            @Param("keyword") String keyword,
             @Param("categoryId") Long categoryId,
             Pageable pageable
     );
@@ -84,15 +84,15 @@ Page<Template> searchBy(
             t.category.id = :categoryId AND
             t.id in :templateIds AND
             (
-                t.title LIKE :topic
-                OR s.filename LIKE :topic
-                OR s.content LIKE :topic
-                OR t.description LIKE :topic
+                t.title LIKE :keyword
+                OR s.filename LIKE :keyword
+                OR s.content LIKE :keyword
+                OR t.description LIKE :keyword
             )
             """)
     Page<Template> searchBy(
             @Param("memberId") Long memberId,
-            @Param("topic") String topic,
+            @Param("keyword") String keyword,
             @Param("categoryId") Long categoryId,
             @Param("templateIds") List<Long> templateIds,
             Pageable pageable
diff --git a/backend/src/main/java/codezap/template/service/TemplateService.java b/backend/src/main/java/codezap/template/service/TemplateService.java
index 542a289b4..22ab6bcf5 100644
--- a/backend/src/main/java/codezap/template/service/TemplateService.java
+++ b/backend/src/main/java/codezap/template/service/TemplateService.java
@@ -138,30 +138,30 @@ private void validateTemplateAuthorizeMember(Template template, Member member) {
 
     public FindAllTemplatesResponse findAllBy(
             long memberId,
-            String topic,
+            String keyword,
             Long categoryId,
             List<String> tagNames,
             Pageable pageable
     ) {
-        topic = "%" + topic + "%";
+        keyword = "%" + keyword + "%";
         pageable = PageRequest.of(pageable.getPageNumber() - 1, pageable.getPageSize(), pageable.getSort());
 
         if (categoryId != null && tagNames != null) {
             List<Long> templateIds = filterTemplatesBy(tagNames);
             Page<Template> templatePage =
-                    templateRepository.searchBy(memberId, topic, categoryId, templateIds, pageable);
+                    templateRepository.searchBy(memberId, keyword, categoryId, templateIds, pageable);
             return makeTemplatesResponseBy(templatePage);
         }
         if (categoryId != null && tagNames == null) {
-            Page<Template> templatePage = templateRepository.searchBy(memberId, topic, categoryId, pageable);
+            Page<Template> templatePage = templateRepository.searchBy(memberId, keyword, categoryId, pageable);
             return makeTemplatesResponseBy(templatePage);
         }
         if (categoryId == null && tagNames != null) {
             List<Long> templateIds = filterTemplatesBy(tagNames);
-            Page<Template> templatePage = templateRepository.searchBy(memberId, topic, templateIds, pageable);
+            Page<Template> templatePage = templateRepository.searchBy(memberId, keyword, templateIds, pageable);
             return makeTemplatesResponseBy(templatePage);
         }
-        Page<Template> templatePage = templateRepository.searchBy(memberId, topic, pageable);
+        Page<Template> templatePage = templateRepository.searchBy(memberId, keyword, pageable);
         return makeTemplatesResponseBy(templatePage);
     }
 
diff --git a/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java b/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
index ba9c3a053..4f73f6062 100644
--- a/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
+++ b/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
@@ -83,21 +83,21 @@ private CreateTemplateRequest makeTemplateRequest(String title) {
     }
 
     private void saveDefault15Templates(Member member, Category category) {
-        saveTemplate(makeTemplateRequest("hello topic 1"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 2"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 3"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 4"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 5"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 6"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 7"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 8"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 9"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 10"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 11"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 12"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 13"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 14"), member, category);
-        saveTemplate(makeTemplateRequest("hello topic 15"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 1"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 2"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 3"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 4"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 5"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 6"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 7"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 8"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 9"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 10"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 11"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 12"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 13"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 14"), member, category);
+        saveTemplate(makeTemplateRequest("hello keyword 15"), member, category);
 
         tagRepository.save(new Tag("tag1"));
         tagRepository.save(new Tag("tag2"));
@@ -143,22 +143,22 @@ private void saveTemplateBySnippetContent(String templateTitle, String firstCont
 
     @Nested
     @DisplayName("템플릿 토픽 검색")
-    class searchContainTopic {
+    class searchContainKeyword {
         @Test
         @DisplayName("템플릿 토픽 검색 성공 : 템플릿 제목에 포함")
-        void findAllTemplatesTitleContainTopicSuccess() {
+        void findAllTemplatesTitleContainKeywordSuccess() {
             //given
             MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
             Member member = memberRepository.fetchById(memberDto.id());
             Category category = categoryRepository.save(new Category("category", member));
             saveTemplate(makeTemplateRequest("hello"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic"), member, category);
-            saveTemplate(makeTemplateRequest("topic hello"), member, category);
-            saveTemplate(makeTemplateRequest("hello topic !"), member, category);
+            saveTemplate(makeTemplateRequest("hello keyword"), member, category);
+            saveTemplate(makeTemplateRequest("keyword hello"), member, category);
+            saveTemplate(makeTemplateRequest("hello keyword !"), member, category);
 
             //when
             FindAllTemplatesResponse templates = templateService.findAllBy(
-                    member.getId(), "topic", null, null, PageRequest.of(1, 3)
+                    member.getId(), "keyword", null, null, PageRequest.of(1, 3)
             );
 
             //then
@@ -167,7 +167,7 @@ void findAllTemplatesTitleContainTopicSuccess() {
 
         @Test
         @DisplayName("템플릿 토픽 검색 성공 : 탬플릿 내에 스니펫 파일명 중 하나라도 포함")
-        void findAllSnippetFilenameContainTopicSuccess() {
+        void findAllSnippetFilenameContainKeywordSuccess() {
             //given
             MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
             Member member = memberRepository.fetchById(memberDto.id());
@@ -187,7 +187,7 @@ void findAllSnippetFilenameContainTopicSuccess() {
 
         @Test
         @DisplayName("템플릿 토픽 검색 성공 : 탬플릿 내에 스니펫 코드 중 하나라도 포함")
-        void findAllSnippetContentContainTopicSuccess() {
+        void findAllSnippetContentContainKeywordSuccess() {
             //given
             MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
             Member member = memberRepository.fetchById(memberDto.id());
@@ -207,7 +207,7 @@ void findAllSnippetContentContainTopicSuccess() {
 
         @Test
         @DisplayName("템플릿 토픽 검색 성공 : 탬플릿 설명에 포함")
-        void findAllDescriptionContainTopicSuccess() {
+        void findAllDescriptionContainKeywordSuccess() {
             //given
             MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
             Member member = memberRepository.fetchById(memberDto.id());
@@ -252,7 +252,7 @@ void findAllFirstPageSuccess() {
 
         @Test
         @DisplayName("템플릿 토픽 검색 성공 : 페이징 성공")
-        void findAllContainTopicPaging() {
+        void findAllContainKeywordPaging() {
             //given
             MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
             Member member = memberRepository.fetchById(memberDto.id());
@@ -261,13 +261,13 @@ void findAllContainTopicPaging() {
 
             //when
             FindAllTemplatesResponse templates = templateService.findAllBy(
-                    member.getId(), "topic", null, null, PageRequest.of(2, 5)
+                    member.getId(), "keyword", null, null, PageRequest.of(2, 5)
             );
 
             //then
             List<String> titles = templates.templates().stream().map(ItemResponse::title).toList();
-            assertThat(titles).containsExactly("hello topic 6", "hello topic 7", "hello topic 8", "hello topic 9",
-                    "hello topic 10");
+            assertThat(titles).containsExactly("hello keyword 6", "hello keyword 7", "hello keyword 8", "hello keyword 9",
+                    "hello keyword 10");
         }
     }
 

From c67f9e1c36a843a39f3cf0de8b79fed3691c151d Mon Sep 17 00:00:00 2001
From: kyum-q <109158497+kyum-q@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:55:19 +0900
Subject: [PATCH 08/12] =?UTF-8?q?refactor(service):=20tag=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=20=EC=8B=9C=20=EC=9D=B4=EB=A6=84=20=EB=8C=80=EC=8B=A0?=
 =?UTF-8?q?=20id=EB=A5=BC=20=EB=B0=9B=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SpringDocTemplateController.java          |  2 +-
 .../controller/TemplateController.java        |  4 +-
 .../template/repository/TagRepository.java    |  2 +-
 .../template/service/TemplateService.java     | 16 ++++----
 .../service/TemplateServiceSearchTest.java    | 38 ++++++++++---------
 5 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
index 42b353953..6ccc99086 100644
--- a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
@@ -56,7 +56,7 @@ ResponseEntity<FindAllTemplatesResponse> getTemplates(
             Long memberId,
             String keyword,
             Long categoryId,
-            List<String> tags,
+            List<Long> tagIds,
             Pageable pageable
     );
 
diff --git a/backend/src/main/java/codezap/template/controller/TemplateController.java b/backend/src/main/java/codezap/template/controller/TemplateController.java
index 7f1216810..bcc97a40c 100644
--- a/backend/src/main/java/codezap/template/controller/TemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/TemplateController.java
@@ -52,11 +52,11 @@ public ResponseEntity<FindAllTemplatesResponse> getTemplates(
             @RequestParam Long memberId,
             @RequestParam("keyword") String keyword,
             @RequestParam(required = false) Long categoryId,
-            @RequestParam(required = false) List<String> tags,
+            @RequestParam(required = false) List<Long> tagIds,
             @PageableDefault(size = 20, page = 1) Pageable pageable
     ) {
         FindAllTemplatesResponse response =
-                templateService.findAllBy(memberId, keyword, categoryId, tags, pageable);
+                templateService.findAllBy(memberId, keyword, categoryId, tagIds, pageable);
         return ResponseEntity.ok(response);
     }
 
diff --git a/backend/src/main/java/codezap/template/repository/TagRepository.java b/backend/src/main/java/codezap/template/repository/TagRepository.java
index 8ff7f3b85..0a31fe0cd 100644
--- a/backend/src/main/java/codezap/template/repository/TagRepository.java
+++ b/backend/src/main/java/codezap/template/repository/TagRepository.java
@@ -20,5 +20,5 @@ default Tag fetchById(Long id) {
 
     Optional<Tag> findByName(String name);
 
-    List<Tag> findByNameIn(List<String> tagNames);
+    List<Tag> findByIdIn(List<Long> tagIds);
 }
diff --git a/backend/src/main/java/codezap/template/service/TemplateService.java b/backend/src/main/java/codezap/template/service/TemplateService.java
index 22ab6bcf5..f9e339a7f 100644
--- a/backend/src/main/java/codezap/template/service/TemplateService.java
+++ b/backend/src/main/java/codezap/template/service/TemplateService.java
@@ -140,24 +140,24 @@ public FindAllTemplatesResponse findAllBy(
             long memberId,
             String keyword,
             Long categoryId,
-            List<String> tagNames,
+            List<Long> tagIds,
             Pageable pageable
     ) {
         keyword = "%" + keyword + "%";
         pageable = PageRequest.of(pageable.getPageNumber() - 1, pageable.getPageSize(), pageable.getSort());
 
-        if (categoryId != null && tagNames != null) {
-            List<Long> templateIds = filterTemplatesBy(tagNames);
+        if (categoryId != null && tagIds != null) {
+            List<Long> templateIds = filterTemplatesBy(tagIds);
             Page<Template> templatePage =
                     templateRepository.searchBy(memberId, keyword, categoryId, templateIds, pageable);
             return makeTemplatesResponseBy(templatePage);
         }
-        if (categoryId != null && tagNames == null) {
+        if (categoryId != null && tagIds == null) {
             Page<Template> templatePage = templateRepository.searchBy(memberId, keyword, categoryId, pageable);
             return makeTemplatesResponseBy(templatePage);
         }
-        if (categoryId == null && tagNames != null) {
-            List<Long> templateIds = filterTemplatesBy(tagNames);
+        if (categoryId == null && tagIds != null) {
+            List<Long> templateIds = filterTemplatesBy(tagIds);
             Page<Template> templatePage = templateRepository.searchBy(memberId, keyword, templateIds, pageable);
             return makeTemplatesResponseBy(templatePage);
         }
@@ -165,8 +165,8 @@ public FindAllTemplatesResponse findAllBy(
         return makeTemplatesResponseBy(templatePage);
     }
 
-    private List<Long> filterTemplatesBy(List<String> tagNames) {
-        List<Tag> tags = tagRepository.findByNameIn(tagNames);
+    private List<Long> filterTemplatesBy(List<Long> tagIds) {
+        List<Tag> tags = tagRepository.findByIdIn(tagIds);
         List<TemplateTag> templateTags = templateTagRepository.findByTagIn(tags);
         return templateTags.stream()
                 .map(TemplateTag::getTemplate)
diff --git a/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java b/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
index 4f73f6062..fc3c729bf 100644
--- a/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
+++ b/backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
@@ -76,12 +76,6 @@ void setting() {
         RestAssured.port = port;
     }
 
-    private CreateTemplateRequest makeTemplateRequest(String title) {
-        return new CreateTemplateRequest(title, "description",
-                List.of(new CreateSnippetRequest("filename1", "content1", 1),
-                        new CreateSnippetRequest("filename2", "content2", 2)), 1L, List.of("tag1", "tag2"));
-    }
-
     private void saveDefault15Templates(Member member, Category category) {
         saveTemplate(makeTemplateRequest("hello keyword 1"), member, category);
         saveTemplate(makeTemplateRequest("hello keyword 2"), member, category);
@@ -98,9 +92,14 @@ private void saveDefault15Templates(Member member, Category category) {
         saveTemplate(makeTemplateRequest("hello keyword 13"), member, category);
         saveTemplate(makeTemplateRequest("hello keyword 14"), member, category);
         saveTemplate(makeTemplateRequest("hello keyword 15"), member, category);
+    }
 
-        tagRepository.save(new Tag("tag1"));
-        tagRepository.save(new Tag("tag2"));
+    private CreateTemplateRequest makeTemplateRequest(String title) {
+        return new CreateTemplateRequest(title, "description",
+                List.of(new CreateSnippetRequest("filename1", "content1", 1),
+                        new CreateSnippetRequest("filename2", "content2", 2)),
+                1L,
+                List.of());
     }
 
     private Template saveTemplate(CreateTemplateRequest createTemplateRequest, Member member, Category category) {
@@ -343,19 +342,20 @@ void findBySingleTagPageSuccess() {
             MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
             Member member = memberRepository.fetchById(memberDto.id());
             Category category1 = categoryRepository.save(new Category("category1", member));
-            Category category2 = categoryRepository.save(new Category("category2", member));
+            tagRepository.save(new Tag("tag1"));
+            tagRepository.save(new Tag("tag2"));
+            saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category1);
-            saveDefault15Templates(member, category2);
             for (long i = 1L; i <= 30L; i++) {
                 templateTagRepository.save(
                         new TemplateTag(templateRepository.fetchById(i), tagRepository.fetchById((i % 2) + 1)));
             }
             FindAllTemplatesResponse allBy = templateService.findAllBy(
-                    member.getId(), "", null, List.of("tag1"), DEFAULT_PAGING_REQUEST
+                    member.getId(), "", null, List.of(1L), DEFAULT_PAGING_REQUEST
             );
 
             assertAll(() -> assertThat(allBy.templates()).hasSize(15),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 0), // 테그
+                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() % 2 == 0), // 태그
                     () -> assertThat(allBy.totalElements()).isEqualTo(15));
         }
 
@@ -366,20 +366,22 @@ void findByMultipleTagPageSuccess() {
             Member member = memberRepository.fetchById(memberDto.id());
             Category category1 = categoryRepository.save(new Category("category1", member));
             Category category2 = categoryRepository.save(new Category("category2", member));
+            tagRepository.save(new Tag("tag1"));
+            tagRepository.save(new Tag("tag2"));
+            tagRepository.save(new Tag("tag3"));
             saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category2);
             for (long i = 1L; i <= 30L; i++) {
                 templateTagRepository.save(
-                        new TemplateTag(templateRepository.fetchById(i), tagRepository.fetchById((i / 15) + 1)));
+                        new TemplateTag(templateRepository.fetchById(i), tagRepository.fetchById((i % 3) + 1)));
             }
 
             FindAllTemplatesResponse allBy = templateService.findAllBy(
-                    member.getId(), "", null, List.of("tag1", "tag2"), DEFAULT_PAGING_REQUEST
+                    member.getId(), "", null, List.of(1L, 2L), DEFAULT_PAGING_REQUEST
             );
 
             assertAll(() -> assertThat(allBy.templates()).hasSize(20),
-                    () -> assertThat(allBy.templates()).allMatch(template -> template.id() < 21),
-                    () -> assertThat(allBy.totalElements()).isEqualTo(30));
+                    () -> assertThat(allBy.totalElements()).isEqualTo(20));
         }
 
         @Test
@@ -391,12 +393,14 @@ void findByCategoryAndSingleTagPageSuccess() {
             Category category2 = categoryRepository.save(new Category("category2", member));
             saveDefault15Templates(member, category1);
             saveDefault15Templates(member, category2);
+            tagRepository.save(new Tag("tag1"));
+            tagRepository.save(new Tag("tag2"));
             for (long i = 1L; i <= 30L; i++) {
                 templateTagRepository.save(
                         new TemplateTag(templateRepository.fetchById(i), tagRepository.fetchById((i % 2) + 1)));
             }
             FindAllTemplatesResponse allBy = templateService.findAllBy(
-                    member.getId(), "", category1.getId(), List.of("tag1"), DEFAULT_PAGING_REQUEST
+                    member.getId(), "", category1.getId(), List.of(1L), DEFAULT_PAGING_REQUEST
             );
 
             assertAll(() -> assertThat(allBy.templates()).hasSize(7),

From a923e9395efc3810d53cbc799502316bf88da1b7 Mon Sep 17 00:00:00 2001
From: kyum-q <109158497+kyum-q@users.noreply.github.com>
Date: Wed, 7 Aug 2024 17:12:22 +0900
Subject: [PATCH 09/12] =?UTF-8?q?docs:=20=ED=85=9C=ED=94=8C=EB=A6=BF=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=20=EA=B8=B0=EB=8A=A5=20=EB=AC=B8=EC=84=9C?=
 =?UTF-8?q?=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SpringDocTemplateController.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
index 6ccc99086..80c1513c6 100644
--- a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java
@@ -43,9 +43,16 @@ public interface SpringDocTemplateController {
     })
     ResponseEntity<Void> create(CreateTemplateRequest createTemplateRequest, MemberDto memberDto);
 
-    @Operation(summary = "템플릿 목록 조회", description = """
-            조건에 맞는 모든 템플릿을 조회합니다.
-            필터링 조건은 작성자 Id, 카테고리 Id, 태그 목록을 사용할 수 있습니다.
+    @Operation(summary = "템플릿 검색", description = """
+            필터링 조건에 맞는 모든 템플릿을 조회합니다.
+            - 필터링 조건
+              - 멤버 ID
+              - 검색 키워드 (템플릿 제목, 템플릿 설명, 스니펫 파일명, 소스 코드)
+              - 카테고리 ID
+              - 태그 ID
+            - 정렬 방식
+              - 최신순 (createdAt,asc)
+              - 오래된순 (createdAt,desc)
             조회 조건으로 페이지 인덱스, 한 페이지에 들어갈 최대 템플릿의 개수를 변경할 수 있습니다.
             페이지 인덱스는 1, 템플릿 개수는 20개가 기본 값입니다.
             """)

From bfcfd782e9725ee3da585eef486bba90b936fc6a Mon Sep 17 00:00:00 2001
From: kyum-q <109158497+kyum-q@users.noreply.github.com>
Date: Wed, 7 Aug 2024 17:13:15 +0900
Subject: [PATCH 10/12] =?UTF-8?q?refactor(template):=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20=EC=BB=A8=EB=B2=A4=EC=85=98=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/repository/TemplateRepository.java   | 15 ---------------
 .../codezap/template/service/TemplateService.java |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/codezap/template/repository/TemplateRepository.java b/backend/src/main/java/codezap/template/repository/TemplateRepository.java
index 54e208063..7c504960d 100644
--- a/backend/src/main/java/codezap/template/repository/TemplateRepository.java
+++ b/backend/src/main/java/codezap/template/repository/TemplateRepository.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -98,18 +97,4 @@ Page<Template> searchBy(
             Pageable pageable
     );
 
-    Page<Template> findBy(Pageable pageable);
-
-    Page<Template> findByCategoryId(Pageable pageable, Long categoryId);
-
-    Page<Template> findByIdIn(PageRequest pageRequest, List<Long> templateIds);
-
-    Page<Template> findByIdInAndCategoryId(PageRequest pageRequest, List<Long> templateIds, Long categoryId);
-
-    long countByCategoryId(Long categoryId);
-
-    long countByIdInAndCategoryId(List<Long> templateIds, Long categoryId);
-
-    long countByIdIn(List<Long> templateIds);
-
 }
diff --git a/backend/src/main/java/codezap/template/service/TemplateService.java b/backend/src/main/java/codezap/template/service/TemplateService.java
index f9e339a7f..d6ff48adf 100644
--- a/backend/src/main/java/codezap/template/service/TemplateService.java
+++ b/backend/src/main/java/codezap/template/service/TemplateService.java
@@ -152,11 +152,11 @@ public FindAllTemplatesResponse findAllBy(
                     templateRepository.searchBy(memberId, keyword, categoryId, templateIds, pageable);
             return makeTemplatesResponseBy(templatePage);
         }
-        if (categoryId != null && tagIds == null) {
+        if (categoryId != null) {
             Page<Template> templatePage = templateRepository.searchBy(memberId, keyword, categoryId, pageable);
             return makeTemplatesResponseBy(templatePage);
         }
-        if (categoryId == null && tagIds != null) {
+        if (tagIds != null) {
             List<Long> templateIds = filterTemplatesBy(tagIds);
             Page<Template> templatePage = templateRepository.searchBy(memberId, keyword, templateIds, pageable);
             return makeTemplatesResponseBy(templatePage);

From 596a6894aa8f029c6d79307b4158ee4d65e32e67 Mon Sep 17 00:00:00 2001
From: zangsu <zangsu_@naver.com>
Date: Wed, 7 Aug 2024 17:22:44 +0900
Subject: [PATCH 11/12] =?UTF-8?q?test(controller):=20API=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=EC=97=90=20=EB=94=B0=EB=A5=B8=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codezap/template/controller/TemplateControllerTest.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/test/java/codezap/template/controller/TemplateControllerTest.java b/backend/src/test/java/codezap/template/controller/TemplateControllerTest.java
index 1fd20b547..f7f07e0aa 100644
--- a/backend/src/test/java/codezap/template/controller/TemplateControllerTest.java
+++ b/backend/src/test/java/codezap/template/controller/TemplateControllerTest.java
@@ -203,6 +203,8 @@ void findAllTemplatesSuccess() {
         // when & then
         RestAssured.given().log().all()
                 .cookie("Authorization", cookie)
+                .params("memberId", 1,
+                        "keyword", "")
                 .get("/templates")
                 .then().log().all()
                 .statusCode(200)

From d562097a14a22597e6faab05783cdd1728d2da36 Mon Sep 17 00:00:00 2001
From: zangsu <zangsu_@naver.com>
Date: Wed, 7 Aug 2024 17:23:11 +0900
Subject: [PATCH 12/12] =?UTF-8?q?refactor(controller):=20=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=EC=97=86=EB=8A=94=20annotation=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/codezap/template/controller/TemplateController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/codezap/template/controller/TemplateController.java b/backend/src/main/java/codezap/template/controller/TemplateController.java
index bcc97a40c..216abf45f 100644
--- a/backend/src/main/java/codezap/template/controller/TemplateController.java
+++ b/backend/src/main/java/codezap/template/controller/TemplateController.java
@@ -50,7 +50,7 @@ public ResponseEntity<Void> create(
     public ResponseEntity<FindAllTemplatesResponse> getTemplates(
             @BasicAuthentication MemberDto memberDto,
             @RequestParam Long memberId,
-            @RequestParam("keyword") String keyword,
+            @RequestParam String keyword,
             @RequestParam(required = false) Long categoryId,
             @RequestParam(required = false) List<Long> tagIds,
             @PageableDefault(size = 20, page = 1) Pageable pageable