[Fix/#286] article 전체 카테고리 반영 SQL 수정 (#287)

fix: article 전체 카테고리 반영 SQL 수정
YAPP-Github · Aug 3, 2024 · 373fa96 · 373fa96
1 parent 9b111d9
commit 373fa96
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/api-repo/src/main/kotlin/com/few/api/repo/dao/article/ArticleViewCountDao.kt b/api-repo/src/main/kotlin/com/few/api/repo/dao/article/ArticleViewCountDao.kt
@@ -5,6 +5,7 @@ import com.few.api.repo.dao.article.query.ArticleViewCountQuery
 import com.few.api.repo.dao.article.query.SelectArticlesOrderByViewsQuery
 import com.few.api.repo.dao.article.query.SelectRankByViewsQuery
 import com.few.api.repo.dao.article.record.SelectArticleViewsRecord
+import com.few.data.common.code.CategoryType
 import jooq.jooq_dsl.tables.ArticleViewCount.ARTICLE_VIEW_COUNT
 import org.jooq.DSLContext
 import org.jooq.impl.DSL.*
@@ -76,15 +77,15 @@ class ArticleViewCountDao(
             field("article_view_count_offset_tb.article_id").`as`(SelectArticleViewsRecord::articleId.name),
             field("article_view_count_offset_tb.view_count").`as`(SelectArticleViewsRecord::views.name)
         ).from(
-            select()
+            dslContext.select()
                 .from(ARTICLE_VIEW_COUNT)
                 .where(ARTICLE_VIEW_COUNT.DELETED_AT.isNull)
                 .orderBy(ARTICLE_VIEW_COUNT.VIEW_COUNT.desc(), ARTICLE_VIEW_COUNT.ARTICLE_ID.desc())
                 .limit(query.offset, Long.MAX_VALUE)
                 .asTable("article_view_count_offset_tb")
         ).where(
-            when (query.category) {
-                (null) -> noCondition()
+            when {
+                (query.category == CategoryType.All) -> noCondition()
                 else -> field("article_view_count_offset_tb.category_cd").eq(query.category.code)
             }
         ).limit(11)

diff --git a/...epo/src/main/kotlin/com/few/api/repo/dao/article/query/SelectArticlesOrderByViewsQuery.kt b/...epo/src/main/kotlin/com/few/api/repo/dao/article/query/SelectArticlesOrderByViewsQuery.kt
@@ -4,5 +4,5 @@ import com.few.data.common.code.CategoryType
 
 data class SelectArticlesOrderByViewsQuery(
     val offset: Long,
-    val category: CategoryType?,
+    val category: CategoryType,
 )
diff --git a/api/src/main/kotlin/com/few/api/domain/article/usecase/ReadArticlesUseCase.kt b/api/src/main/kotlin/com/few/api/domain/article/usecase/ReadArticlesUseCase.kt
@@ -38,7 +38,7 @@ class ReadArticlesUseCase(
         val articleViewsRecords: MutableList<SelectArticleViewsRecord> = articleViewCountDao.selectArticlesOrderByViews(
             SelectArticlesOrderByViewsQuery(
                 offset,
-                CategoryType.fromCode(useCaseIn.categoryCd)
+                CategoryType.fromCode(useCaseIn.categoryCd) ?: CategoryType.All
             )
         ).toMutableList()