Merge branch 'dev' into test

Kkokkomu · Sep 12, 2024 · 819f6d1 · 819f6d1
2 parents 5a3df39 + 133c2f8
commit 819f6d1
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/main/java/com/kkokkomu/short_news/news/repository/NewsRepository.java b/src/main/java/com/kkokkomu/short_news/news/repository/NewsRepository.java
@@ -121,13 +121,13 @@ Page<News> findFirstPageByCategoryOrderByIdDesc(
     SELECT n.* FROM news n
     LEFT JOIN comment c ON n.id = c.news_id
     LEFT JOIN news_reaction r ON n.id = r.news_id
-    WHERE (n.viewCnt * :viewWeight + COUNT(c.id) * :commentWeight + COUNT(r.id) * :reactionWeight + n.sharedCnt * :shareWeight +
-    TIMESTAMPDIFF(DAY, n.createdAt, CURRENT_TIMESTAMP) * :dateWeight) < :cursorScore
-    OR ((n.viewCnt * :viewWeight + COUNT(c.id) * :commentWeight + COUNT(r.id) * :reactionWeight + n.sharedCnt * :shareWeight +
-    TIMESTAMPDIFF(DAY, n.createdAt, CURRENT_TIMESTAMP) * :dateWeight) = :cursorScore AND n.id < :cursorId)
+    WHERE (n.view_cnt * :viewWeight + COUNT(c.id) * :commentWeight + COUNT(r.id) * :reactionWeight + n.shared_cnt * :shareWeight +
+    TIMESTAMPDIFF(DAY, n.created_at, CURRENT_TIMESTAMP) * :dateWeight) < :cursorScore
+    OR ((n.view_cnt * :viewWeight + COUNT(c.id) * :commentWeight + COUNT(r.id) * :reactionWeight + n.shared_cnt * :shareWeight +
+    TIMESTAMPDIFF(DAY, n.created_at, CURRENT_TIMESTAMP) * :dateWeight) = :cursorScore AND n.id < :cursorId)
     GROUP BY n.id
-    ORDER BY (n.viewCnt * :viewWeight + COUNT(c.id) * :commentWeight + COUNT(r.id) * :reactionWeight + n.sharedCnt * :shareWeight +
-    TIMESTAMPDIFF(DAY, n.createdAt, CURRENT_TIMESTAMP) * :dateWeight) DESC, n.id DESC
+    ORDER BY (n.view_cnt * :viewWeight + COUNT(c.id) * :commentWeight + COUNT(r.id) * :reactionWeight + n.shared_cnt * :shareWeight +
+    TIMESTAMPDIFF(DAY, n.created_at, CURRENT_TIMESTAMP) * :dateWeight) DESC, n.id DESC
     """, nativeQuery = true)
     Page<News> findByPopularityLessThan(
             @Param("viewWeight") double viewWeight,
@@ -146,8 +146,8 @@ Page<News> findByPopularityLessThan(
     LEFT JOIN comment c ON n.id = c.news_id
     LEFT JOIN news_reaction r ON n.id = r.news_id
     GROUP BY n.id
-    ORDER BY (n.viewCnt * :viewWeight + COUNT(c.id) * :commentWeight + COUNT(r.id) * :reactionWeight + n.sharedCnt * :shareWeight +
-    TIMESTAMPDIFF(DAY, n.createdAt, CURRENT_TIMESTAMP) * :dateWeight) DESC, n.id DESC
+    ORDER BY (n.view_cnt * :viewWeight + COUNT(c.id) * :commentWeight + COUNT(r.id) * :reactionWeight + n.shared_cnt * :shareWeight +
+    TIMESTAMPDIFF(DAY, n.created_at, CURRENT_TIMESTAMP) * :dateWeight) DESC, n.id DESC
     """, nativeQuery = true)
     Page<News> findFirstPageByPopularity(
             @Param("viewWeight") double viewWeight,