Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-21 07:56:57 +01:00
Code Issues Projects Releases Wiki Activity

fix(api): publisher and authors were not sorted lowercase

Browse source
This commit is contained in:
Gauthier Roebroeck 2021-06-10 14:56:00 +08:00
parent f49786a957
commit 78c6d23295
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReferentialDao.kt
View file

@ -38,7 +38,7 @@ class ReferentialDao(
.apply { filterOnLibraryIds?.let { leftJoin(b).on(a.BOOK_ID.eq(b.ID)) } }
.where(a.NAME.containsIgnoreCase(search))
.apply { filterOnLibraryIds?.let { and(b.LIBRARY_ID.`in`(it)) } }
.orderBy(a.NAME, a.ROLE)
.orderBy(lower(a.NAME), a.ROLE)
.fetchInto(a)
.map { it.toDomain() }
@ -49,7 +49,7 @@ class ReferentialDao(
.where(bmaa.NAME.containsIgnoreCase(search))
.and(s.LIBRARY_ID.eq(libraryId))
.apply { filterOnLibraryIds?.let { and(s.LIBRARY_ID.`in`(it)) } }
.orderBy(bmaa.NAME, bmaa.ROLE)
.orderBy(lower(bmaa.NAME), bmaa.ROLE)
.fetchInto(bmaa)
.map { it.toDomain() }
@ -61,7 +61,7 @@ class ReferentialDao(
.where(bmaa.NAME.containsIgnoreCase(search))
.and(cs.COLLECTION_ID.eq(collectionId))
.apply { filterOnLibraryIds?.let { and(s.LIBRARY_ID.`in`(it)) } }
.orderBy(bmaa.NAME, bmaa.ROLE)
.orderBy(lower(bmaa.NAME), bmaa.ROLE)
.fetchInto(bmaa)
.map { it.toDomain() }
@ -72,7 +72,7 @@ class ReferentialDao(
.where(bmaa.NAME.containsIgnoreCase(search))
.and(bmaa.SERIES_ID.eq(seriesId))
.apply { filterOnLibraryIds?.let { and(s.LIBRARY_ID.`in`(it)) } }
.orderBy(bmaa.NAME, bmaa.ROLE)
.orderBy(lower(bmaa.NAME), bmaa.ROLE)
.fetchInto(bmaa)
.map { it.toDomain() }
@ -124,7 +124,7 @@ class ReferentialDao(
val count = dsl.fetchCount(query)
val items = query
.orderBy(bmaa.NAME, bmaa.ROLE)
.orderBy(lower(bmaa.NAME), bmaa.ROLE)
.apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) }
.fetchInto(a)
.map { it.toDomain() }
@ -301,7 +301,7 @@ class ReferentialDao(
.apply { filterOnLibraryIds?.let { leftJoin(s).on(sd.SERIES_ID.eq(s.ID)) } }
.where(sd.PUBLISHER.ne(""))
.apply { filterOnLibraryIds?.let { and(s.LIBRARY_ID.`in`(it)) } }
.orderBy(sd.PUBLISHER)
.orderBy(lower(sd.PUBLISHER))
.fetchSet(sd.PUBLISHER)
override fun findAllPublishersByLibrary(libraryId: String, filterOnLibraryIds: Collection<String>?): Set<String> =
@ -311,7 +311,7 @@ class ReferentialDao(
.where(sd.PUBLISHER.ne(""))
.and(s.LIBRARY_ID.eq(libraryId))
.apply { filterOnLibraryIds?.let { and(s.LIBRARY_ID.`in`(it)) } }
.orderBy(sd.PUBLISHER)
.orderBy(lower(sd.PUBLISHER))
.fetchSet(sd.PUBLISHER)
override fun findAllPublishersByCollection(collectionId: String, filterOnLibraryIds: Collection<String>?): Set<String> =
@ -322,7 +322,7 @@ class ReferentialDao(
.where(sd.PUBLISHER.ne(""))
.and(cs.COLLECTION_ID.eq(collectionId))
.apply { filterOnLibraryIds?.let { and(s.LIBRARY_ID.`in`(it)) } }
.orderBy(sd.PUBLISHER)
.orderBy(lower(sd.PUBLISHER))
.fetchSet(sd.PUBLISHER)
override fun findAllAgeRatings(filterOnLibraryIds: Collection<String>?): Set<Int> =