refactor(sort): Add secondary sort key startCount.desc() to trending

- Support multiple OrderSpecifiers in sort enums
- Bump version to 0.4.6

Author: gymynnym

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 
 group = "me.loghub"
 
-version = "0.4.5-SNAPSHOT"
+version = "0.4.6-SNAPSHOT"
 
 java { toolchain { languageVersion = JavaLanguageVersion.of(21) } }
 

src/main/kotlin/me/loghub/api/dto/article/ArticleSort.kt

@@ -5,7 +5,7 @@ import com.querydsl.core.types.dsl.Expressions
 import me.loghub.api.entity.article.QArticle
 import me.loghub.api.lib.hibernate.PGroongaHibernateFunction
 
-enum class ArticleSort(val order: OrderSpecifier<*>) {
+enum class ArticleSort(vararg val order: OrderSpecifier<*>) {
     latest(QArticle.article.createdAt.desc()),
     oldest(QArticle.article.createdAt.asc()),
     relevant(
@@ -15,5 +15,8 @@ enum class ArticleSort(val order: OrderSpecifier<*>) {
             QArticle.article.tableoid, QArticle.article.ctid,
         ).desc()
     ),
-    trending(QArticle.article.stats.trendingScore.desc());
+    trending(
+        QArticle.article.stats.trendingScore.desc(),
+        QArticle.article.stats.starCount.desc(),
+    );
 }

src/main/kotlin/me/loghub/api/dto/question/QuestionSort.kt

@@ -5,7 +5,7 @@ import com.querydsl.core.types.dsl.Expressions
 import me.loghub.api.entity.question.QQuestion
 import me.loghub.api.lib.hibernate.PGroongaHibernateFunction
 
-enum class QuestionSort(val order: OrderSpecifier<*>) {
+enum class QuestionSort(vararg val order: OrderSpecifier<*>) {
     latest(QQuestion.question.createdAt.desc()),
     oldest(QQuestion.question.createdAt.asc()),
     relevant(
@@ -15,5 +15,8 @@ enum class QuestionSort(val order: OrderSpecifier<*>) {
             QQuestion.question.tableoid, QQuestion.question.ctid,
         ).desc()
     ),
-    trending(QQuestion.question.stats.trendingScore.desc());
+    trending(
+        QQuestion.question.stats.trendingScore.desc(),
+        QQuestion.question.stats.starCount.desc(),
+    );
 }

src/main/kotlin/me/loghub/api/dto/series/SeriesSort.kt

@@ -5,7 +5,7 @@ import com.querydsl.core.types.dsl.Expressions
 import me.loghub.api.entity.series.QSeries
 import me.loghub.api.lib.hibernate.PGroongaHibernateFunction
 
-enum class SeriesSort(val order: OrderSpecifier<*>) {
+enum class SeriesSort(vararg val order: OrderSpecifier<*>) {
     latest(QSeries.series.createdAt.desc()),
     oldest(QSeries.series.createdAt.asc()),
     relevant(
@@ -15,5 +15,8 @@ enum class SeriesSort(val order: OrderSpecifier<*>) {
             QSeries.series.tableoid, QSeries.series.ctid,
         ).desc()
     ),
-    trending(QSeries.series.stats.trendingScore.desc());
+    trending(
+        QSeries.series.stats.trendingScore.desc(),
+        QSeries.series.stats.starCount.desc(),
+    );
 }

src/main/kotlin/me/loghub/api/repository/article/ArticleCustomRepository.kt

@@ -38,7 +38,7 @@ class ArticleCustomRepository(private val entityManager: EntityManager) {
             .from(article)
             .where(*conditions)
             .leftJoin(article.writer).fetchJoin()
-            .orderBy(resolvedSort.order)
+            .orderBy(*resolvedSort.order)
             .offset(pageable.offset)
             .limit(pageable.pageSize.toLong())
 

src/main/kotlin/me/loghub/api/repository/question/QuestionCustomRepository.kt

@@ -40,7 +40,7 @@ class QuestionCustomRepository(private val entityManager: EntityManager) {
             .from(question)
             .leftJoin(question.writer).fetchJoin()
             .where(*conditions)
-            .orderBy(resolvedSort.order)
+            .orderBy(*resolvedSort.order)
             .offset(pageable.offset)
             .limit(pageable.pageSize.toLong())
 

src/main/kotlin/me/loghub/api/repository/series/SeriesCustomRepository.kt

@@ -38,7 +38,7 @@ class SeriesCustomRepository(private val entityManager: EntityManager) {
             .from(series)
             .leftJoin(series.writer).fetchJoin()
             .where(*conditions)
-            .orderBy(resolvedSort.order)
+            .orderBy(*resolvedSort.order)
             .offset(pageable.offset)
             .limit(pageable.pageSize.toLong())