Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Refactor/#431] 이메일을 통한 아티클 조회 메인페이지 조회수 API에 포함되도록 쿼리 수정 #432

Merged
merged 7 commits into from
Dec 1, 2024
Merged

[Refactor/#431] 이메일을 통한 아티클 조회 메인페이지 조회수 API에 포함되도록 쿼리 수정 #432

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0dd647
refactor: 이메일을 통한 아티클 조회 메인페이지 조회수 API에 포함되도록 쿼리 수정
belljun3395 Oct 10, 2024
b56bc51
Merge branch 'dev' into refactor/#431_belljun3395
belljun3395 Oct 10, 2024
7259b40
refactor: 정렬 수정
belljun3395 Oct 10, 2024
e0a771c
Merge remote-tracking branch 'remote/refactor/#431_belljun3395' into …
belljun3395 Oct 10, 2024
5b199eb
refactor: 정렬 기준 수정
belljun3395 Oct 11, 2024
0874420
Merge branch 'dev' into refactor/#431_belljun3395
belljun3395 Oct 30, 2024
2514085
Merge branch 'dev' into refactor/#431_belljun3395
belljun3395 Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 105 additions & 18 deletions api-repo/src/main/kotlin/com/few/api/repo/dao/article/ArticleViewCountDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,57 @@
package com.few.api.repo.dao.article

import com.few.api.repo.dao.article.TempTable.ARTICLE_ID_COLUMN
import com.few.api.repo.dao.article.TempTable.ARTICLE_VIEW_COUNT_OFFSET_TABLE
import com.few.api.repo.dao.article.TempTable.ARTICLE_VIEW_COUNT_OFFSET_TABLE_ARTICLE_ID
import com.few.api.repo.dao.article.TempTable.ARTICLE_VIEW_COUNT_OFFSET_TABLE_CATEGORY_CD
import com.few.api.repo.dao.article.TempTable.ARTICLE_VIEW_COUNT_OFFSET_TABLE_VIEW_COUNT
import com.few.api.repo.dao.article.TempTable.EMAIL_VIEW_COUNT_TABLE
import com.few.api.repo.dao.article.TempTable.EMAIL_VIEW_COUNT_TABLE_ARTICLE_ID
import com.few.api.repo.dao.article.TempTable.EMAIL_VIEW_COUNT_TABLE_VIEW_COUNT
import com.few.api.repo.dao.article.TempTable.OFFSET_COLUMN
import com.few.api.repo.dao.article.TempTable.ROW_RANK_TABLE
import com.few.api.repo.dao.article.TempTable.ROW_RANK_TABLE_ARTICLE_ID
import com.few.api.repo.dao.article.TempTable.ROW_RANK_TABLE_OFFSET
import com.few.api.repo.dao.article.TempTable.TOTAL_VIEW_COUNT_TABLE
import com.few.api.repo.dao.article.TempTable.TOTAL_VIEW_COUNT_TABLE_ARTICLE_ID
import com.few.api.repo.dao.article.TempTable.TOTAL_VIEW_COUNT_TABLE_VIEW_COUNT
import com.few.api.repo.dao.article.TempTable.VIEW_COUNT_COLUMN
import com.few.api.repo.dao.article.command.ArticleViewCountCommand
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 jooq.jooq_dsl.tables.SendArticleEventHistory.SEND_ARTICLE_EVENT_HISTORY
import org.jooq.DSLContext
import org.jooq.impl.DSL.*
import org.springframework.stereotype.Repository

object TempTable {
const val ARTICLE_ID_COLUMN = "ARTICLE_ID"
const val VIEW_COUNT_COLUMN = "VIEW_COUNT"
const val OFFSET_COLUMN = "OFFSET"
const val CATEGORY_CD_COLUMN = "CATEGORY_CD"

const val ROW_RANK_TABLE = "row_rank_tb"
const val ROW_RANK_TABLE_ARTICLE_ID = "$ROW_RANK_TABLE.$ARTICLE_ID_COLUMN"
const val ROW_RANK_TABLE_OFFSET = "$ROW_RANK_TABLE.$OFFSET_COLUMN"

const val EMAIL_VIEW_COUNT_TABLE = "evc"
const val EMAIL_VIEW_COUNT_TABLE_ARTICLE_ID = "$EMAIL_VIEW_COUNT_TABLE.$ARTICLE_ID_COLUMN"
const val EMAIL_VIEW_COUNT_TABLE_VIEW_COUNT = "$EMAIL_VIEW_COUNT_TABLE.$VIEW_COUNT_COLUMN"

const val TOTAL_VIEW_COUNT_TABLE = "tvc"
const val TOTAL_VIEW_COUNT_TABLE_ARTICLE_ID = "$TOTAL_VIEW_COUNT_TABLE.$ARTICLE_ID_COLUMN"
const val TOTAL_VIEW_COUNT_TABLE_VIEW_COUNT = "$TOTAL_VIEW_COUNT_TABLE.$VIEW_COUNT_COLUMN"

const val ARTICLE_VIEW_COUNT_OFFSET_TABLE = "article_view_count_offset_tb"
const val ARTICLE_VIEW_COUNT_OFFSET_TABLE_ARTICLE_ID = "$ARTICLE_VIEW_COUNT_OFFSET_TABLE.$ARTICLE_ID_COLUMN"
const val ARTICLE_VIEW_COUNT_OFFSET_TABLE_VIEW_COUNT = "$ARTICLE_VIEW_COUNT_OFFSET_TABLE.$VIEW_COUNT_COLUMN"
const val ARTICLE_VIEW_COUNT_OFFSET_TABLE_CATEGORY_CD = "$ARTICLE_VIEW_COUNT_OFFSET_TABLE.$CATEGORY_CD_COLUMN"
}

@Repository
class ArticleViewCountDao(
private val dslContext: DSLContext,
Expand Down Expand Up @@ -53,18 +94,40 @@ class ArticleViewCountDao(
}

fun selectRankByViewsQuery(query: SelectRankByViewsQuery) = dslContext
.select(field("row_rank_tb.offset", Long::class.java))
.select(field(ROW_RANK_TABLE_OFFSET, Long::class.java))
.from(
dslContext.select(
ARTICLE_VIEW_COUNT.ARTICLE_ID,
field(TOTAL_VIEW_COUNT_TABLE_ARTICLE_ID, Long::class.java).`as`(ARTICLE_ID_COLUMN),
rowNumber().over(
orderBy(ARTICLE_VIEW_COUNT.VIEW_COUNT.desc(), ARTICLE_VIEW_COUNT.ARTICLE_ID.desc())
).`as`("offset")
).from(ARTICLE_VIEW_COUNT)
.where(ARTICLE_VIEW_COUNT.DELETED_AT.isNull)
.asTable("row_rank_tb")
)
.where(field("row_rank_tb.${ARTICLE_VIEW_COUNT.ARTICLE_ID.name}")!!.eq(query.articleId))
orderBy(
field(TOTAL_VIEW_COUNT_TABLE_VIEW_COUNT).desc(),
field(TOTAL_VIEW_COUNT_TABLE_ARTICLE_ID).desc()
)
).`as`(OFFSET_COLUMN)
).from(
dslContext.select(
ARTICLE_VIEW_COUNT.ARTICLE_ID,
ARTICLE_VIEW_COUNT.VIEW_COUNT.plus(
ifnull(field(EMAIL_VIEW_COUNT_TABLE_VIEW_COUNT, Long::class.java), 0)
).`as`(VIEW_COUNT_COLUMN)
).from(ARTICLE_VIEW_COUNT)
.leftJoin(
dslContext.select(
SEND_ARTICLE_EVENT_HISTORY.ARTICLE_ID,
count(SEND_ARTICLE_EVENT_HISTORY.ARTICLE_ID).`as`(VIEW_COUNT_COLUMN)
).from(
SEND_ARTICLE_EVENT_HISTORY
).groupBy(
SEND_ARTICLE_EVENT_HISTORY.ARTICLE_ID
).asTable(EMAIL_VIEW_COUNT_TABLE)
).on(
ARTICLE_VIEW_COUNT.ARTICLE_ID.eq(
field(EMAIL_VIEW_COUNT_TABLE_ARTICLE_ID, Long::class.java)
)
)
.asTable(TOTAL_VIEW_COUNT_TABLE)
).asTable(ROW_RANK_TABLE)
).where(field(ROW_RANK_TABLE_ARTICLE_ID).eq(query.articleId))
.query

fun selectArticlesOrderByViews(query: SelectArticlesOrderByViewsQuery): List<SelectArticleViewsRecord> {
Expand All @@ -74,19 +137,43 @@ class ArticleViewCountDao(

fun selectArticlesOrderByViewsQuery(query: SelectArticlesOrderByViewsQuery) = dslContext
.select(
field("article_view_count_offset_tb.article_id").`as`(SelectArticleViewsRecord::articleId.name),
field("article_view_count_offset_tb.view_count").`as`(SelectArticleViewsRecord::views.name)
field(ARTICLE_VIEW_COUNT_OFFSET_TABLE_ARTICLE_ID).`as`(SelectArticleViewsRecord::articleId.name),
field(ARTICLE_VIEW_COUNT_OFFSET_TABLE_VIEW_COUNT).`as`(SelectArticleViewsRecord::views.name)
).from(
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")
dslContext.select(
ARTICLE_VIEW_COUNT.ARTICLE_ID,
ARTICLE_VIEW_COUNT.VIEW_COUNT.plus(
ifnull(field(EMAIL_VIEW_COUNT_TABLE_VIEW_COUNT, Long::class.java), 0)
).`as`(VIEW_COUNT_COLUMN),
ARTICLE_VIEW_COUNT.CATEGORY_CD
).from(ARTICLE_VIEW_COUNT)
.leftJoin(
dslContext.select(
SEND_ARTICLE_EVENT_HISTORY.ARTICLE_ID,
count(SEND_ARTICLE_EVENT_HISTORY.ARTICLE_ID).`as`(VIEW_COUNT_COLUMN)
).from(
SEND_ARTICLE_EVENT_HISTORY
).groupBy(
SEND_ARTICLE_EVENT_HISTORY.ARTICLE_ID
).asTable(
EMAIL_VIEW_COUNT_TABLE
)
).on(
ARTICLE_VIEW_COUNT.ARTICLE_ID.eq(
field(
EMAIL_VIEW_COUNT_TABLE_ARTICLE_ID,
Long::class.java
)
)
).orderBy(
field(VIEW_COUNT_COLUMN, Long::class.java).desc(),
ARTICLE_VIEW_COUNT.ARTICLE_ID.desc()
).limit(query.offset, Long.MAX_VALUE)
.asTable(ARTICLE_VIEW_COUNT_OFFSET_TABLE)
).where(
when {
(query.category == CategoryType.All) -> noCondition()
else -> field("article_view_count_offset_tb.category_cd").eq(query.category.code)
else -> field(ARTICLE_VIEW_COUNT_OFFSET_TABLE_CATEGORY_CD).eq(query.category.code)
}
).limit(11)
.query
Expand Down
Loading