✨ Feature: 기본 카테고리를 우선 정렬하도록 수정 (#100)

Team-Zzangdol · Jun 3, 2024 · 32c3547 · 32c3547
1 parent 5e3e1d2
commit 32c3547
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/moodoodle-domain/build.gradle b/moodoodle-domain/build.gradle
@@ -1,4 +1,6 @@
 dependencies {
+    implementation project(':moodoodle-common')
+
     // spring boot
     implementation 'org.springframework.boot:spring-boot-starter'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/moodoodle-domain/src/main/java/zzangdol/scrap/dao/querydsl/CategoryQueryRepositoryImpl.java b/moodoodle-domain/src/main/java/zzangdol/scrap/dao/querydsl/CategoryQueryRepositoryImpl.java
@@ -5,10 +5,12 @@
 import static zzangdol.scrap.domain.QScrap.scrap;
 import static zzangdol.scrap.domain.QScrapCategory.scrapCategory;
 
+import com.querydsl.core.types.dsl.CaseBuilder;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
+import zzangdol.constant.Constants;
 import zzangdol.scrap.domain.Category;
 import zzangdol.user.domain.User;
 
@@ -25,7 +27,12 @@ public List<Category> findCategoriesByUserOrderByLatestScrapCategory(User user)
                 .leftJoin(scrapCategory.scrap, scrap)
                 .where(category.user.eq(user))
                 .groupBy(category.id)
-                .orderBy(scrapCategory.createdAt.max().desc().nullsLast())
+                .orderBy(
+                        new CaseBuilder()
+                                .when(category.name.eq(Constants.DEFAULT_CATEGORY_NAME)).then(0)
+                                .otherwise(1).asc(),
+                        scrapCategory.createdAt.max().desc().nullsLast()
+                )
                 .fetch();
     }