refactor: querydsl 쿼리 최적화

Author: juny0955

build.gradle

@@ -19,6 +19,14 @@ configurations {
     }
 }
 
+sourceSets {
+    main {
+        java {
+            srcDirs += 'build/generated/sources/annotationProcessor/java/main'
+        }
+    }
+}
+
 repositories {
     mavenCentral()
 }
@@ -29,16 +37,32 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+    // AWS SES
     implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
     implementation 'com.amazonaws:aws-java-sdk-ses:1.12.472'
+
+    // Use Parse
     implementation 'org.apache.httpcomponents.client5:httpclient5:5.4.3'
     implementation 'org.seleniumhq.selenium:selenium-java:4.31.0'
     implementation 'org.jsoup:jsoup:1.18.3'
     implementation 'com.rometools:rome:2.1.0'
+
+    // Spring Security
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
+
+    // 기본 내장 tomcat 제외
+    implementation('org.springframework.boot:spring-boot-starter-web') {
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
+    }
+    implementation 'org.springframework.boot:spring-boot-starter-undertow'
+
+    // OpenFeign Fork QueryDsl
     implementation 'io.github.openfeign.querydsl:querydsl-jpa:6.11'
-    implementation 'io.github.openfeign.querydsl:querydsl-apt:6.11'
+    annotationProcessor "io.github.openfeign.querydsl:querydsl-apt:6.11:jpa"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
 
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
@@ -51,12 +75,6 @@ dependencies {
     runtimeOnly 'com.mysql:mysql-connector-j'
     runtimeOnly 'com.h2database:h2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-
-    implementation('org.springframework.boot:spring-boot-starter-web') {
-        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
-    }
-    implementation 'org.springframework.boot:spring-boot-starter-undertow'
-
 }
 
 tasks.named('test') {

src/main/java/com/davcatch/devcatch/common/config/QueryDslConfig.java

@@ -0,0 +1,21 @@
+package com.davcatch.devcatch.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+
+@Configuration
+public class QueryDslConfig {
+
+	@PersistenceContext
+	private EntityManager entityManager;
+
+	@Bean
+	public JPAQueryFactory jpaQueryFactory() {
+		return new JPAQueryFactory(entityManager);
+	}
+}

src/main/java/com/davcatch/devcatch/repository/article/ArticleRepository.java

@@ -1,65 +1,17 @@
 package com.davcatch.devcatch.repository.article;
 
-import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
 import com.davcatch.devcatch.domain.article.Article;
-import com.davcatch.devcatch.domain.tag.TagType;
 
-public interface ArticleRepository extends JpaRepository<Article, Long> {
-
-	@Query(value = "select * from article a "
-		+ "where source_id = :sourceId "
-		+ "order by published_at desc "
-		+ "limit 1 ", nativeQuery = true)
-	Optional<Article> findLastPublishedArticle(Long sourceId);
-
-	@EntityGraph(attributePaths = {"source", "articleTags", "articleTags.tag"})
-	@Query("select a from Article a "
-		+ "where a.isSent = false ")
-	List<Article> findSendArticles();
-
-	@EntityGraph(attributePaths = {"source"})
-	@Query("select a from Article a "
-		+ "order by a.publishedAt desc")
-	List<Article> findNewArticlesTOP6(Pageable pageable);
-
-	@EntityGraph(attributePaths = {"source"})
-	@Query("select distinct a from Article a "
-		+ "left join a.articleTags at "
-		+ "left join at.tag t "
-		+ "where (:keyword is null or lower(a.title) like lower(concat(:keyword, '%'))) "
-		+ "and (:tag is null or t.tagType = :tag) "
-		+ "order by a.publishedAt desc")
-	Page<Article> findArticlesList(Pageable pageable, String keyword, TagType tag);
-
-	@Query("select a from Article a "
-		+ "order by a.publishedAt desc")
-	List<Article> findDashboardList(Pageable pageable);
+public interface ArticleRepository extends JpaRepository<Article, Long>, ArticleRepositoryCustom {
 
 	@Query("select a.link from Article a where a.link in :links")
 	Set<String> findExistsLinks(Set<String> links);
 
 	@Query("select count(a.id) from Article a ")
 	int findTotalArticleSize();
-
-	@EntityGraph(attributePaths = {"source"})
-	@Query("select a from Article a where a.id = :articleId")
-	Optional<Article> findArticleDetail(Long articleId);
-
-	@EntityGraph(attributePaths = {"source"})
-	@Query("select distinct a from Article a "
-		+ "join a.articleTags at "
-		+ "join at.tag t "
-		+ "where a.id != :articleId "
-		+ "and t.tagType in :tagTypes "
-		+ "order by a.publishedAt desc ")
-	List<Article> findRelatedArticles(Long articleId, List<TagType> tagTypes, Pageable pageable);
 }

src/main/java/com/davcatch/devcatch/repository/article/ArticleRepositoryCustom.java

@@ -0,0 +1,67 @@
+package com.davcatch.devcatch.repository.article;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import com.davcatch.devcatch.domain.article.Article;
+import com.davcatch.devcatch.domain.tag.TagType;
+import com.davcatch.devcatch.web.controller.article.response.ArticleDetailResponse;
+import com.davcatch.devcatch.web.controller.article.response.ArticleResponse;
+
+public interface ArticleRepositoryCustom {
+
+	/**
+	 * 마지막 발행된 아티클 조회
+	 * @param sourceId 해당 소스 ID
+	 * @return 마지막 발행된 아티클
+	 */
+	Optional<Article> findLastPublishedArticle(Long sourceId);
+
+	/**
+	 * 사용자에게 알림 보낼 아티클 조회
+	 * @return 아티클 리스트
+	 */
+	List<Article> findSendArticles();
+
+	/**
+	 * 메인 페이지용 최신 아티클 조회
+	 * @return 아티클 리스트
+	 */
+	List<ArticleResponse> findNewArticlesTOP6();
+
+	/**
+	 * 아티클 검색
+	 * @param pageable 페이징 기본 10개
+	 * @param keyword 키워드
+	 * @param tag 태그
+	 * @return 아티클 리스트
+	 */
+	Page<ArticleResponse> findArticlesList(Pageable pageable, String keyword, TagType tag);
+
+	/**
+	 * 어드민 대시보드용 아티클 조회
+	 * @param pageable 페이징 기본 5개
+	 * @return 아티클 목록
+	 */
+	List<Article> findDashboardList(Pageable pageable);
+
+
+	/**
+	 * 아티클 상세 조회
+	 *
+	 * @param articleId 아티클 ID
+	 * @return 아티클 상세
+	 */
+	Optional<ArticleDetailResponse> findArticleDetail(Long articleId);
+
+	/**
+	 * 연관된 아티클 조회
+	 * @param articleId 해당 아티클 ID
+	 * @param tagTypes 해당 아티클 TagType 리스트
+	 * @return 연관 아티클 목록
+	 */
+	List<ArticleResponse> findRelatedArticles(Long articleId, List<TagType> tagTypes);
+}