fix(api): sort series properly ignoring case

closes #85
gotson · Feb 5, 2020 · 16dfe91 · 16dfe91
1 parent 8f08ce8
commit 16dfe91
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/SeriesController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/SeriesController.kt
@@ -62,7 +62,7 @@ class SeriesController(
     val pageRequest = PageRequest.of(
       page.pageNumber,
       page.pageSize,
-      if (page.sort.isSorted) page.sort
+      if (page.sort.isSorted) Sort.by(page.sort.map { it.ignoreCase() }.toList())
       else Sort.by(Sort.Order.asc("metadata.titleSort").ignoreCase())
     )
 

diff --git a/komga/src/test/kotlin/org/gotson/komga/interfaces/rest/SeriesControllerTest.kt b/komga/src/test/kotlin/org/gotson/komga/interfaces/rest/SeriesControllerTest.kt
@@ -7,6 +7,7 @@ import org.gotson.komga.domain.model.makeLibrary
 import org.gotson.komga.domain.model.makeSeries
 import org.gotson.komga.domain.persistence.LibraryRepository
 import org.gotson.komga.domain.persistence.SeriesRepository
+import org.hamcrest.Matchers
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeAll
@@ -80,6 +81,24 @@ class SeriesControllerTest(
           jsonPath("$.content[1].metadata.title") { value("Beta") }
         }
     }
+
+    @Test
+    @WithMockCustomUser
+    fun `given series when requesting via api then series are sorted insensitive of case`() {
+      val series = listOf("a", "b", "B", "C").map { makeSeries(it).also { it.library = library } }
+      seriesRepository.saveAll(series)
+
+      mockMvc.get("/api/v1/series") {
+        param("sort", "metadata.titleSort,asc")
+      }
+        .andExpect {
+          status { isOk }
+          jsonPath("$.content[0].metadata.title") { value("a") }
+          jsonPath("$.content[1].metadata.title") { value(Matchers.equalToIgnoringCase("b")) }
+          jsonPath("$.content[2].metadata.title") { value(Matchers.equalToIgnoringCase("b")) }
+          jsonPath("$.content[3].metadata.title") { value("C") }
+        }
+    }
   }
 
   @Nested