Merge pull request #146 from Team-Shaka/bug/135

🐛 Fix: 브리핑 목록 조회 순위 버그 해결
Team-Shaka · Jan 7, 2024 · 61d460f · 61d460f
2 parents cbfd0ee + 66ae90e
commit 61d460f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/briefing/briefing/application/strategy/BriefingV1QueryStrategy.java b/src/main/java/briefing/briefing/application/strategy/BriefingV1QueryStrategy.java
@@ -2,7 +2,6 @@
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -32,7 +31,6 @@ public List<Briefing> findBriefings(BriefingRequestParam.BriefingPreviewListPara
         if (briefingList.isEmpty()) {
             briefingList =
                     briefingRepository.findTop10ByTypeOrderByCreatedAtDesc(BriefingType.SOCIAL);
-            Collections.reverse(briefingList);
         }
         return briefingList;
     }

diff --git a/src/main/java/briefing/briefing/application/strategy/BriefingV2QueryStrategy.java b/src/main/java/briefing/briefing/application/strategy/BriefingV2QueryStrategy.java
@@ -2,7 +2,6 @@
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -34,7 +33,6 @@ public List<Briefing> findBriefings(BriefingRequestParam.BriefingPreviewListPara
         }
 
         briefingList = briefingRepository.findTop10ByTypeOrderByCreatedAtDesc(params.getType());
-        Collections.reverse(briefingList);
         return briefingList;
     }
 

diff --git a/src/main/java/briefing/briefing/domain/repository/BriefingCustomRepositoryImpl.java b/src/main/java/briefing/briefing/domain/repository/BriefingCustomRepositoryImpl.java
@@ -1,5 +1,6 @@
 package briefing.briefing.domain.repository;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -9,6 +10,9 @@
 import org.springframework.stereotype.Repository;
 
 import com.querydsl.core.Tuple;
+import com.querydsl.core.types.dsl.DateTemplate;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
 import briefing.briefing.domain.Briefing;
@@ -61,6 +65,11 @@ public List<Briefing> findTop10ByTypeOrderByCreatedAtDesc(BriefingType type) {
         QBriefing briefing = QBriefing.briefing;
         QScrap scrap = QScrap.scrap;
 
+        DateTimePath<LocalDateTime> dateTime = briefing.createdAt;
+        DateTemplate<LocalDate> date =
+                Expressions.dateTemplate(
+                        LocalDate.class, "DATE_FORMAT({0}, {1})", dateTime, "%Y-%m-%d");
+
         List<Tuple> results =
                 queryFactory
                         .select(briefing, scrap.count())
@@ -69,7 +78,7 @@ public List<Briefing> findTop10ByTypeOrderByCreatedAtDesc(BriefingType type) {
                         .on(scrap.briefing.eq(briefing))
                         .where(briefing.type.eq(type))
                         .groupBy(briefing)
-                        .orderBy(briefing.createdAt.desc())
+                        .orderBy(date.desc(), briefing.ranks.asc())
                         .limit(10)
                         .fetch();