default sort series by name ignoring case

gotson · Aug 21, 2019 · 0435122 · 0435122
1 parent 43daabd
commit 0435122
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/web/SerieController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/web/SerieController.kt
@@ -38,13 +38,20 @@ class SerieController(
       searchTerm: String?,
 
       page: Pageable
-  ): Page<SerieDto> =
-      if (!searchTerm.isNullOrEmpty()) {
-        val spec = Serie::name.likeLower("%$searchTerm%")
-        serieRepository.findAll(spec, page)
-      } else {
-        serieRepository.findAll(page)
-      }.map { it.toDto() }
+  ): Page<SerieDto> {
+    val pageRequest = PageRequest.of(
+        page.pageNumber,
+        page.pageSize,
+        if (page.sort.isSorted) page.sort
+        else Sort.by(Sort.Order.asc("name").ignoreCase())
+    )
+    return if (!searchTerm.isNullOrEmpty()) {
+      val spec = Serie::name.likeLower("%$searchTerm%")
+      serieRepository.findAll(spec, pageRequest)
+    } else {
+      serieRepository.findAll(pageRequest)
+    }.map { it.toDto() }
+  }
 
   @GetMapping("/latest")
   fun getLatestSeries(