Merge pull request '시리즈 상세 - 콘텐츠 리스트 두번째 정렬 조건 추가' (#219) from test into main
Reviewed-on: #219
This commit is contained in:
commit
ba692a1195
|
@ -59,10 +59,10 @@ class ContentSeriesContentQueryRepositoryImpl(
|
||||||
.and(audioContent.isActive.isTrue)
|
.and(audioContent.isActive.isTrue)
|
||||||
.and(audioContent.duration.isNotNull)
|
.and(audioContent.duration.isNotNull)
|
||||||
|
|
||||||
var orderBy = audioContent.releaseDate.desc()
|
var sortOrders = listOf(audioContent.releaseDate.desc(), audioContent.id.desc())
|
||||||
|
|
||||||
if (sortType == SeriesSortType.OLDEST) {
|
if (sortType == SeriesSortType.OLDEST) {
|
||||||
orderBy = audioContent.releaseDate.asc()
|
sortOrders = listOf(audioContent.releaseDate.asc(), audioContent.id.asc())
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isAdult) {
|
if (!isAdult) {
|
||||||
|
@ -98,7 +98,7 @@ class ContentSeriesContentQueryRepositoryImpl(
|
||||||
.innerJoin(seriesContent.series, series)
|
.innerJoin(seriesContent.series, series)
|
||||||
.innerJoin(seriesContent.content, audioContent)
|
.innerJoin(seriesContent.content, audioContent)
|
||||||
.where(where)
|
.where(where)
|
||||||
.orderBy(orderBy)
|
.orderBy(*sortOrders.toTypedArray())
|
||||||
.offset(offset)
|
.offset(offset)
|
||||||
.limit(limit)
|
.limit(limit)
|
||||||
.fetch()
|
.fetch()
|
||||||
|
|
Loading…
Reference in New Issue