Api-v1.0.2-2

Gosrock · Mar 7, 2023 · 2146799 · 2146799
2 parents 93bb530 + bd6a2dd
commit 2146799
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/...src/main/java/band/gosrock/domain/domains/event/repository/EventCustomRepositoryImpl.java b/...src/main/java/band/gosrock/domain/domains/event/repository/EventCustomRepositoryImpl.java
@@ -29,7 +29,7 @@ public Slice<Event> querySliceEventsByHostIdIn(List<Long> hostIds, Pageable page
                 queryFactory
                         .selectFrom(event)
                         .where(hostIdIn(hostIds))
-                        .orderBy(event.id.desc())
+                        .orderBy(statusDesc(), createdAtDesc())
                         .offset(pageable.getOffset())
                         .limit(pageable.getPageSize() + 1)
                         .fetch();
@@ -41,8 +41,8 @@ public Slice<Event> querySliceEventsByStatus(EventStatus status, Pageable pageab
         List<Event> events =
                 queryFactory
                         .selectFrom(event)
-                        .where(eqStatusOpen())
-                        .orderBy(createdAtDesc())
+                        .where(statusEq(status))
+                        .orderBy(statusDesc(), startAtAsc())
                         .offset(pageable.getOffset())
                         .limit(pageable.getPageSize() + 1)
                         .fetch();
@@ -54,8 +54,8 @@ public Slice<Event> querySliceEventsByKeyword(String keyword, Pageable pageable)
         List<Event> events =
                 queryFactory
                         .selectFrom(event)
-                        .where(eqStatusOpen().and(nameContains(keyword)))
-                        .orderBy(createdAtDesc())
+                        .where(nameContains(keyword))
+                        .orderBy(statusDesc(), startAtAsc())
                         .offset(pageable.getOffset())
                         .limit(pageable.getPageSize() + 1)
                         .fetch();
@@ -75,6 +75,10 @@ private BooleanExpression eqStatusOpen() {
         return event.status.eq(OPEN);
     }
 
+    private BooleanExpression statusEq(EventStatus status) {
+        return event.status.eq(status);
+    }
+
     private BooleanExpression notEqClosed() {
         return event.status.eq(CLOSED).not();
     }
@@ -87,6 +91,14 @@ private OrderSpecifier<LocalDateTime> createdAtDesc() {
         return event.createdAt.desc();
     }
 
+    private OrderSpecifier<LocalDateTime> startAtAsc() {
+        return event.eventBasic.startAt.asc();
+    }
+
+    private OrderSpecifier<EventStatus> statusDesc() {
+        return event.status.desc();
+    }
+
     private BooleanExpression endAtBefore(LocalDateTime time) {
         DateTemplate<LocalDateTime> eventEndAtTemplate =
                 Expressions.dateTemplate(