test #388

Merged
klaus merged 15 commits from test into main 2026-02-13 09:14:20 +00:00
Showing only changes of commit 43c5a8e8cb - Show all commits

View File

@@ -128,7 +128,8 @@ class ContentSeriesQueryRepositoryImpl(
runCatching { SeriesPublishedDaysOfWeek.valueOf(trimmed) }.getOrNull() runCatching { SeriesPublishedDaysOfWeek.valueOf(trimmed) }.getOrNull()
} }
} }
.toSet() .sortedBy { it.ordinal }
.toCollection(LinkedHashSet())
} }
override fun getSeriesTotalCount( override fun getSeriesTotalCount(
@@ -276,7 +277,7 @@ class ContentSeriesQueryRepositoryImpl(
val isNewFlag = isNewCase.max() val isNewFlag = isNewCase.max()
val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay")
val publishedDaysConcat = Expressions.stringTemplate( val publishedDaysConcat = Expressions.stringTemplate(
"group_concat(distinct {0} order by {0} separator ',')", "function('group_concat', {0})",
seriesPublishedDay seriesPublishedDay
) )
@@ -452,7 +453,7 @@ class ContentSeriesQueryRepositoryImpl(
val isNewFlag = isNewCase.max() val isNewFlag = isNewCase.max()
val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay")
val publishedDaysConcat = Expressions.stringTemplate( val publishedDaysConcat = Expressions.stringTemplate(
"group_concat(distinct {0} order by {0} separator ',')", "function('group_concat', {0})",
seriesPublishedDay seriesPublishedDay
) )
val latestReleaseDate = audioContent.releaseDate.max() val latestReleaseDate = audioContent.releaseDate.max()
@@ -624,7 +625,7 @@ class ContentSeriesQueryRepositoryImpl(
val isNewFlag = isNewCase.max() val isNewFlag = isNewCase.max()
val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay")
val publishedDaysConcat = Expressions.stringTemplate( val publishedDaysConcat = Expressions.stringTemplate(
"group_concat(distinct {0} order by {0} separator ',')", "function('group_concat', {0})",
seriesPublishedDay seriesPublishedDay
) )
@@ -734,7 +735,7 @@ class ContentSeriesQueryRepositoryImpl(
val isNewFlag = isNewCase.max() val isNewFlag = isNewCase.max()
val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay")
val publishedDaysConcat = Expressions.stringTemplate( val publishedDaysConcat = Expressions.stringTemplate(
"group_concat(distinct {0} order by {0} separator ',')", "function('group_concat', {0})",
seriesPublishedDay seriesPublishedDay
) )
@@ -932,7 +933,7 @@ class ContentSeriesQueryRepositoryImpl(
val minCurationOrder = audioContentCurationItem.orders.min() val minCurationOrder = audioContentCurationItem.orders.min()
val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay")
val publishedDaysConcat = Expressions.stringTemplate( val publishedDaysConcat = Expressions.stringTemplate(
"group_concat(distinct {0} order by {0} separator ',')", "function('group_concat', {0})",
seriesPublishedDay seriesPublishedDay
) )
@@ -1054,7 +1055,7 @@ class ContentSeriesQueryRepositoryImpl(
val isNewFlag = isNewCase.max() val isNewFlag = isNewCase.max()
val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay")
val publishedDaysConcat = Expressions.stringTemplate( val publishedDaysConcat = Expressions.stringTemplate(
"group_concat(distinct {0} order by {0} separator ',')", "function('group_concat', {0})",
seriesPublishedDay seriesPublishedDay
) )