diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt index cb5c6c77..d02be1ec 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt @@ -128,7 +128,8 @@ class ContentSeriesQueryRepositoryImpl( runCatching { SeriesPublishedDaysOfWeek.valueOf(trimmed) }.getOrNull() } } - .toSet() + .sortedBy { it.ordinal } + .toCollection(LinkedHashSet()) } override fun getSeriesTotalCount( @@ -276,7 +277,7 @@ class ContentSeriesQueryRepositoryImpl( val isNewFlag = isNewCase.max() val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val publishedDaysConcat = Expressions.stringTemplate( - "group_concat(distinct {0} order by {0} separator ',')", + "function('group_concat', {0})", seriesPublishedDay ) @@ -452,7 +453,7 @@ class ContentSeriesQueryRepositoryImpl( val isNewFlag = isNewCase.max() val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val publishedDaysConcat = Expressions.stringTemplate( - "group_concat(distinct {0} order by {0} separator ',')", + "function('group_concat', {0})", seriesPublishedDay ) val latestReleaseDate = audioContent.releaseDate.max() @@ -624,7 +625,7 @@ class ContentSeriesQueryRepositoryImpl( val isNewFlag = isNewCase.max() val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val publishedDaysConcat = Expressions.stringTemplate( - "group_concat(distinct {0} order by {0} separator ',')", + "function('group_concat', {0})", seriesPublishedDay ) @@ -734,7 +735,7 @@ class ContentSeriesQueryRepositoryImpl( val isNewFlag = isNewCase.max() val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val publishedDaysConcat = Expressions.stringTemplate( - "group_concat(distinct {0} order by {0} separator ',')", + "function('group_concat', {0})", seriesPublishedDay ) @@ -932,7 +933,7 @@ class ContentSeriesQueryRepositoryImpl( val minCurationOrder = audioContentCurationItem.orders.min() val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val publishedDaysConcat = Expressions.stringTemplate( - "group_concat(distinct {0} order by {0} separator ',')", + "function('group_concat', {0})", seriesPublishedDay ) @@ -1054,7 +1055,7 @@ class ContentSeriesQueryRepositoryImpl( val isNewFlag = isNewCase.max() val seriesPublishedDay = Expressions.enumPath(SeriesPublishedDaysOfWeek::class.java, "seriesPublishedDay") val publishedDaysConcat = Expressions.stringTemplate( - "group_concat(distinct {0} order by {0} separator ',')", + "function('group_concat', {0})", seriesPublishedDay )