템플릿 단건 조회/ 템플릿 삭제/ 태그 조회 성능 개선

backend/src/main/java/codezap/category/domain/Category.java

@@ -2,9 +2,11 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.Index;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
@@ -24,12 +26,11 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 @Table(
-        uniqueConstraints = {
-                @UniqueConstraint(
-                        name = "name_with_member",
-                        columnNames = {"member_id", "name"}
-                )
-        }
+        uniqueConstraints = @UniqueConstraint(
+                name = "name_with_member",
+                columnNames = {"member_id", "name"}
+        ),
+        indexes = @Index(name = "idx_member_id", columnList = "member_id")
 )
 @Getter
 @EqualsAndHashCode(of = "id", callSuper = false)
@@ -41,7 +42,7 @@ public class Category extends BaseTimeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @ManyToOne(optional = false)
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
     private Member member;
 
     @Column(nullable = false)

backend/src/main/java/codezap/likes/domain/Likes.java

@@ -1,6 +1,7 @@
 package codezap.likes.domain;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -29,6 +30,6 @@ public class Likes extends BaseTimeEntity {
     @ManyToOne(optional = false)
     private Template template;
 
-    @ManyToOne(optional = false)
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
     private Member member;
 }

backend/src/main/java/codezap/tag/repository/TemplateTagJpaRepository.java

@@ -3,15 +3,23 @@
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
+import codezap.tag.domain.Tag;
 import codezap.template.domain.Template;
 import codezap.template.domain.TemplateTag;
 
 @SuppressWarnings("unused")
 public interface TemplateTagJpaRepository extends TemplateTagRepository, JpaRepository<TemplateTag, Long> {
 
-    List<TemplateTag> findAllByTemplate(Template template);
+    @Query("""
+            SELECT t
+            FROM Tag t
+            JOIN TemplateTag tt ON t.id = tt.id.tagId
+            WHERE tt.template = :template
+            """)
+    List<Tag> findAllTagsByTemplate(Template template);
 
     @Query("""
         SELECT tt, t
@@ -30,11 +38,18 @@ public interface TemplateTagJpaRepository extends TemplateTagRepository, JpaRepo
     List<TemplateTag> findAllByTemplateIdsIn(List<Long> templateIds);
 
     @Query("""
-            SELECT DISTINCT tt.id.tagId
-            FROM TemplateTag tt
-            WHERE tt.id.templateId IN :templateIds
-            """)
-    List<Long> findDistinctByTemplateIn(List<Long> templateIds);
+            SELECT DISTINCT t
+            FROM Tag t
+            WHERE t.id IN (
+                SELECT DISTINCT tt.id.tagId
+                FROM TemplateTag tt
+                WHERE tt.id.templateId IN
+                    (SELECT te.id FROM Template te WHERE te.member.id = :memberId)
+        )
+        """)
+    List<Tag> findAllTagDistinctByMemberId(Long memberId);
 
-    void deleteAllByTemplateId(Long id);
+    @Modifying(clearAutomatically = true)
+    @Query("DELETE FROM TemplateTag t WHERE t.template.id in :templateIds")
+    void deleteByTemplateIds(List<Long> templateIds);
 }

backend/src/main/java/codezap/tag/repository/TemplateTagRepository.java

@@ -2,13 +2,18 @@
 
 import java.util.List;
 
+import codezap.tag.domain.Tag;
 import codezap.template.domain.Template;
 import codezap.template.domain.TemplateTag;
 
 public interface TemplateTagRepository {
 
     List<TemplateTag> findAllByTemplate(Template template);
 
+    List<Tag> findAllTagsByTemplate(Template template);
+
+    List<Tag> findAllTagDistinctByMemberId(Long memberId);
+
     List<TemplateTag> findAllByTemplateId(Long templateId);
 
     List<Long> findDistinctByTemplateIn(List<Long> templateIds);
@@ -19,5 +24,7 @@ public interface TemplateTagRepository {
 
     <S extends TemplateTag> List<S> saveAll(Iterable<S> entities);
 
-    void deleteAllByTemplateId(Long id);
+    void deleteAllByTemplateId(Long templateId);
+
+    void deleteByTemplateIds(List<Long> templateIds);
 }

backend/src/main/java/codezap/tag/service/TagService.java

@@ -12,15 +12,13 @@
 import codezap.tag.repository.TemplateTagRepository;
 import codezap.template.domain.Template;
 import codezap.template.domain.TemplateTag;
-import codezap.template.repository.TemplateRepository;
 import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
 public class TagService {
 
     private final TagRepository tagRepository;
-    private final TemplateRepository templateRepository;
     private final TemplateTagRepository templateTagRepository;
 
     @Transactional
@@ -47,9 +45,7 @@ public void createTags(Template template, List<String> tagNames) {
     }
 
     public List<Tag> findAllByTemplate(Template template) {
-        return templateTagRepository.findAllByTemplate(template).stream()
-                .map(TemplateTag::getTag)
-                .toList();
+        return templateTagRepository.findAllTagsByTemplate(template);
     }
 
     public List<Tag> findAllByTemplateId(Long templateId) {
@@ -64,11 +60,9 @@ public List<TemplateTag> getAllTemplateTagsByTemplates(List<Template> templates)
     }
 
     public FindAllTagsResponse findAllByMemberId(Long memberId) {
-        List<Template> templates = templateRepository.findByMemberId(memberId);
-        List<Long> templateIds = templates.stream().map(Template::getId).toList();
-        List<Long> templateTagIds = templateTagRepository.findDistinctByTemplateIn(templateIds);
-        return new FindAllTagsResponse(templateTagIds.stream()
-                .map(id -> FindTagResponse.from(tagRepository.fetchById(id)))
+        List<Tag> tags = templateTagRepository.findAllTagDistinctByMemberId(memberId);
+        return new FindAllTagsResponse(tags.stream()
+                .map(FindTagResponse::from)
                 .toList());
     }
 
@@ -79,7 +73,7 @@ public void updateTags(Template template, List<String> tags) {
     }
 
     @Transactional
-    public void deleteByIds(List<Long> templateIds) {
-        templateIds.forEach(templateTagRepository::deleteAllByTemplateId);
+    public void deleteAllByTemplateIds(List<Long> templateIds) {
+        templateTagRepository.deleteByTemplateIds(templateIds);
     }
 }

backend/src/main/java/codezap/template/repository/SourceCodeJpaRepository.java

@@ -4,6 +4,8 @@
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.http.HttpStatus;
 
 import codezap.global.exception.CodeZapException;
@@ -31,5 +33,7 @@ default SourceCode fetchByTemplateAndOrdinal(Template template, int ordinal) {
 
     int countByTemplate(Template template);
 
-    void deleteByTemplateId(Long id);
+    @Modifying(clearAutomatically = true)
+    @Query("DELETE FROM SourceCode s WHERE s.template.id in :templateIds")
+    void deleteByTemplateIds(List<Long> templateIds);
 }

backend/src/main/java/codezap/template/repository/SourceCodeRepository.java

@@ -25,5 +25,5 @@ public interface SourceCodeRepository {
 
     void deleteById(Long id);
 
-    void deleteByTemplateId(Long id);
+    void deleteByTemplateIds(List<Long> templateIds);
 }

backend/src/main/java/codezap/template/repository/ThumbnailJpaRepository.java

@@ -4,6 +4,7 @@
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.http.HttpStatus;
 
@@ -29,6 +30,11 @@ default Thumbnail fetchByTemplate(Template template) {
         """)
     Optional<Thumbnail> findByTemplate(Template template);
 
+
+    @Modifying(clearAutomatically = true)
+    @Query("DELETE FROM Thumbnail t WHERE t.template.id in :templateIds")
+    void deleteByTemplateIds(List<Long> templateIds);
+
     @Query("""
             SELECT t, sc
             FROM Thumbnail t
@@ -38,4 +44,5 @@ default Thumbnail fetchByTemplate(Template template) {
     List<Thumbnail> findAllByTemplateIn(List<Long> templateIds);
 
     void deleteByTemplateId(Long id);
+
 }

backend/src/main/java/codezap/template/repository/ThumbnailRepository.java

@@ -18,5 +18,5 @@ public interface ThumbnailRepository {
 
     Thumbnail save(Thumbnail thumbnail);
 
-    void deleteByTemplateId(Long id);
+    void deleteByTemplateIds(List<Long> ids);
 }

backend/src/main/java/codezap/template/service/SourceCodeService.java

@@ -99,7 +99,7 @@ private void validateSourceCodesCount(Template template, UpdateTemplateRequest u
     }
 
     @Transactional
-    public void deleteByIds(List<Long> templateIds) {
-        templateIds.forEach(sourceCodeRepository::deleteByTemplateId);
+    public void deleteByTemplateIds(List<Long> templateIds) {
+        sourceCodeRepository.deleteByTemplateIds(templateIds);
     }
 }

backend/src/main/java/codezap/template/service/ThumbnailService.java

@@ -41,6 +41,6 @@ public ExploreTemplatesResponse findAll() {
 
     @Transactional
     public void deleteByTemplateIds(List<Long> templateIds) {
-        templateIds.forEach(thumbnailRepository::deleteByTemplateId);
+        thumbnailRepository.deleteByTemplateIds(templateIds);
     }
 }

backend/src/main/java/codezap/template/service/facade/TemplateApplicationService.java

@@ -142,8 +142,8 @@ public void update(Member member, Long templateId, UpdateTemplateRequest updateT
     @Transactional
     public void deleteByMemberAndIds(Member member, List<Long> ids) {
         thumbnailService.deleteByTemplateIds(ids);
-        sourceCodeService.deleteByIds(ids);
-        tagService.deleteByIds(ids);
+        sourceCodeService.deleteByTemplateIds(ids);
+        tagService.deleteAllByTemplateIds(ids);
         templateService.deleteByMemberAndIds(member, ids);
     }
 }

backend/src/main/resources/db/migration/V4__create_idx_member_id_on_category.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_member_id ON category(member_id);

backend/src/test/java/codezap/tag/repository/TemplateTagJpaRepositoryTest.java

@@ -51,24 +51,24 @@ void setUp() {
     }
 
     @Test
-    @DisplayName("Template 을 이용한 TemplateTag 목록 조회 성공")
-    void findAllByTemplateTest() {
+    @DisplayName("Template 을 이용한 Tag 목록 조회 성공")
+    void findAllTagsByTemplateTest() {
         //given
         Template template = templateRepository.save(createNthTemplate(member, category, 1));
 
         Tag tag1 = tagRepository.save(new Tag("tag1"));
         Tag tag2 = tagRepository.save(new Tag("tag2"));
         Tag tag3 = tagRepository.save(new Tag("tag3"));
 
-        TemplateTag templateTag1 = templateTagRepository.save(new TemplateTag(template, tag1));
-        TemplateTag templateTag2 = templateTagRepository.save(new TemplateTag(template, tag2));
+        templateTagRepository.save(new TemplateTag(template, tag1));
+        templateTagRepository.save(new TemplateTag(template, tag2));
 
         //when
-        List<TemplateTag> templateTags = templateTagRepository.findAllByTemplate(template);
+        List<Tag> tags = templateTagRepository.findAllTagsByTemplate(template);
 
         //then
-        assertThat(templateTags).containsExactly(templateTag1, templateTag2)
-                .doesNotContain(new TemplateTag(template, tag3));
+        assertThat(tags).containsExactly(tag1, tag2)
+                .doesNotContain(tag3);
     }
 
 
@@ -126,8 +126,9 @@ class FindDistinctByTemplateIn {
         @DisplayName("태그 목록 조회 성공 : 정상적으로 태그 목록 조회")
         void testFindDistinctByTemplateIn() {
             // given
+            Member otherMember = memberRepository.save(MemberFixture.getSecondMember());
             Template template1 = templateRepository.save(createNthTemplate(member, category, 1));
-            Template template2 = templateRepository.save(createNthTemplate(member, category, 2));
+            Template template2 = templateRepository.save(createNthTemplate(otherMember, category, 2));
             Template template3 = templateRepository.save(createNthTemplate(member, category, 3));
 
             Tag tag1 = tagRepository.save(new Tag("tag1"));
@@ -140,18 +141,16 @@ void testFindDistinctByTemplateIn() {
             templateTagRepository.save(new TemplateTag(template3, tag3));
 
             // when
-            List<Long> result = templateTagRepository.findDistinctByTemplateIn(
-                    List.of(template1.getId(), template3.getId())
-            );
+            List<Tag> result = templateTagRepository.findAllTagDistinctByMemberId(member.getId());
 
             // then
             assertThat(result).hasSize(2)
-                    .containsExactly(tag1.getId(), tag3.getId())
-                    .doesNotContain(tag2.getId());
+                    .containsExactly(tag1, tag3)
+                    .doesNotContain(tag2);
         }
 
         @Test
-        @DisplayName("태그 목록 조회 성공 : 존재하지 않는 템플릿 id를 사용하면 예외가 터지지 않고 해당 id 값이 무시된다.")
+        @DisplayName("태그 목록 조회 성공 : 존재하지 않는 멤버 id를 사용하면 예외가 터지지 않고 해당 id 값이 무시된다.")
         void notExistTemplateIdTest() {
             long notExistTemplateId = 100L;
 
@@ -160,9 +159,9 @@ void notExistTemplateIdTest() {
                             .isInstanceOf(CodeZapException.class)
                             .hasMessageContaining("템플릿이 존재하지 않습니다."),
                     () -> assertThatCode(() ->
-                            templateTagRepository.findDistinctByTemplateIn(List.of(notExistTemplateId)))
+                            templateTagRepository.findAllTagDistinctByMemberId(notExistTemplateId))
                             .doesNotThrowAnyException(),
-                    () -> assertThat(templateTagRepository.findDistinctByTemplateIn(List.of(notExistTemplateId)))
+                    () -> assertThat(templateTagRepository.findAllTagDistinctByMemberId(notExistTemplateId))
                             .isEmpty()
             );
         }