diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/AuthenticationActivityDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/AuthenticationActivityDao.kt index 14235498b..45b0588c9 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/AuthenticationActivityDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/AuthenticationActivityDao.kt @@ -64,7 +64,7 @@ class AuthenticationActivityDao( .fetchInto(aa) .map { it.toDomain() } - val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() + val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted() return PageImpl( items, if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDao.kt index 0ebab4ceb..3b7067f4f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDao.kt @@ -128,7 +128,7 @@ class BookDao( .fetchInto(b) .map { it.toDomain() } - val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() + val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted() return PageImpl( items, if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDtoDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDtoDao.kt index a72e638f6..5e34ad555 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDtoDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDtoDao.kt @@ -131,7 +131,7 @@ class BookDtoDao( .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .fetchAndMap() - val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() + val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted() return PageImpl( dtos, if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadListDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadListDao.kt index 4690dfac2..61237da20 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadListDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadListDao.kt @@ -69,7 +69,7 @@ class ReadListDao( .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .fetchAndMap(null) - val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() + val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted() return PageImpl( items, if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) @@ -108,7 +108,7 @@ class ReadListDao( .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .fetchAndMap(filterOnLibraryIds) - val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() + val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted() return PageImpl( items, if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesCollectionDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesCollectionDao.kt index ea1a21fa6..7d13958ff 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesCollectionDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesCollectionDao.kt @@ -68,7 +68,7 @@ class SeriesCollectionDao( .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .fetchAndMap(null) - val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() + val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted() return PageImpl( items, if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) @@ -107,7 +107,7 @@ class SeriesCollectionDao( .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .fetchAndMap(filterOnLibraryIds) - val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() + val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted() return PageImpl( items, if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt index d7957350d..99f3a614d 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt @@ -200,7 +200,7 @@ class SeriesDtoDao( .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .fetchAndMap() - val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() + val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted() return PageImpl( dtos, if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)