diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt index a3fec73bf..fac0fb0c9 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt @@ -122,7 +122,7 @@ class BookController( when { page.sort.isSorted -> page.sort !searchTerm.isNullOrBlank() -> Sort.by("relevance") - else -> Sort.by(Sort.Order.asc("metadata.title")) + else -> Sort.unsorted() } val pageRequest = diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt index 21c18ebeb..38092e439 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt @@ -144,7 +144,7 @@ class SeriesController( when { page.sort.isSorted -> page.sort !searchTerm.isNullOrBlank() -> Sort.by("relevance") - else -> Sort.by(Sort.Order.asc("metadata.titleSort")) + else -> Sort.unsorted() } val pageRequest = diff --git a/komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/BookControllerTest.kt b/komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/BookControllerTest.kt index 54172d7bd..429bcd61c 100644 --- a/komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/BookControllerTest.kt +++ b/komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/BookControllerTest.kt @@ -177,7 +177,7 @@ class BookControllerTest( mockMvc.get("/api/v1/books/${book15.id}").andExpect { status { isForbidden() } } mockMvc.get("/api/v1/books/${book.id}").andExpect { status { isForbidden() } } - mockMvc.get("/api/v1/books") + mockMvc.get("/api/v1/books?sort=metadata.title") .andExpect { status { isOk() } jsonPath("$.content.length()") { value(2) } @@ -235,7 +235,7 @@ class BookControllerTest( mockMvc.get("/api/v1/books/${book10.id}").andExpect { status { isForbidden() } } mockMvc.get("/api/v1/books/${book15.id}").andExpect { status { isForbidden() } } - mockMvc.get("/api/v1/books") + mockMvc.get("/api/v1/books?sort=metadata.title") .andExpect { status { isOk() } jsonPath("$.content.length()") { value(2) } @@ -293,7 +293,7 @@ class BookControllerTest( mockMvc.get("/api/v1/books/${bookAdult.id}").andExpect { status { isForbidden() } } mockMvc.get("/api/v1/books/${book.id}").andExpect { status { isForbidden() } } - mockMvc.get("/api/v1/books") + mockMvc.get("/api/v1/books?sort=metadata.title") .andExpect { status { isOk() } jsonPath("$.content.length()") { value(2) } @@ -351,7 +351,7 @@ class BookControllerTest( mockMvc.get("/api/v1/books/${bookAdult.id}").andExpect { status { isOk() } } mockMvc.get("/api/v1/books/${book.id}").andExpect { status { isOk() } } - mockMvc.get("/api/v1/books") + mockMvc.get("/api/v1/books?sort=metadata.title") .andExpect { status { isOk() } jsonPath("$.content.length()") { value(2) } @@ -409,7 +409,7 @@ class BookControllerTest( mockMvc.get("/api/v1/books/${bookAdult.id}").andExpect { status { isForbidden() } } mockMvc.get("/api/v1/books/${book.id}").andExpect { status { isForbidden() } } - mockMvc.get("/api/v1/books") + mockMvc.get("/api/v1/books?sort=metadata.title") .andExpect { status { isOk() } jsonPath("$.content.length()") { value(2) } diff --git a/komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/SeriesControllerTest.kt b/komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/SeriesControllerTest.kt index b3da3df6f..1879fa6cf 100644 --- a/komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/SeriesControllerTest.kt +++ b/komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/SeriesControllerTest.kt @@ -290,7 +290,7 @@ class SeriesControllerTest( mockMvc.get("/api/v1/series/${series15.id}").andExpect { status { isForbidden() } } mockMvc.get("/api/v1/series/${series.id}").andExpect { status { isForbidden() } } - mockMvc.get("/api/v1/series") + mockMvc.get("/api/v1/series?sort=metadata.titleSort") .andExpect { status { isOk() } jsonPath("$.content.length()") { value(2) } @@ -344,7 +344,7 @@ class SeriesControllerTest( mockMvc.get("/api/v1/series/${series16.id}").andExpect { status { isForbidden() } } mockMvc.get("/api/v1/series/${series18.id}").andExpect { status { isForbidden() } } - mockMvc.get("/api/v1/series") + mockMvc.get("/api/v1/series?sort=metadata.titleSort") .andExpect { status { isOk() } jsonPath("$.content.length()") { value(2) } @@ -398,7 +398,7 @@ class SeriesControllerTest( mockMvc.get("/api/v1/series/${seriesAdult.id}").andExpect { status { isForbidden() } } mockMvc.get("/api/v1/series/${series.id}").andExpect { status { isForbidden() } } - mockMvc.get("/api/v1/series") + mockMvc.get("/api/v1/series?sort=metadata.titleSort") .andExpect { status { isOk() } jsonPath("$.content.length()") { value(2) } @@ -452,7 +452,7 @@ class SeriesControllerTest( mockMvc.get("/api/v1/series/${seriesAdult.id}").andExpect { status { isOk() } } mockMvc.get("/api/v1/series/${series.id}").andExpect { status { isOk() } } - mockMvc.get("/api/v1/series") + mockMvc.get("/api/v1/series?sort=metadata.titleSort") .andExpect { status { isOk() } jsonPath("$.content.length()") { value(2) } @@ -506,7 +506,7 @@ class SeriesControllerTest( mockMvc.get("/api/v1/series/${seriesAdult.id}").andExpect { status { isForbidden() } } mockMvc.get("/api/v1/series/${series.id}").andExpect { status { isForbidden() } } - mockMvc.get("/api/v1/series") + mockMvc.get("/api/v1/series?sort=metadata.titleSort") .andExpect { status { isOk() } jsonPath("$.content.length()") { value(2) }