Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-20 23:45:11 +01:00
Code Issues Projects Releases Wiki Activity

restore backward compatibility of ready_only parameter in /series/{id}/books when media_status is not present

Browse source
This commit is contained in:
Gauthier Roebroeck 2019-12-31 10:02:59 +08:00
parent 12126a2ed7
commit bff3e3e549
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
komga/src/main/kotlin/org/gotson/komga/interfaces/web/rest/SeriesController.kt
View file

@ -164,8 +164,8 @@ class SeriesController(
fun getAllBooksBySeries(
@AuthenticationPrincipal principal: KomgaPrincipal,
@PathVariable(name = "seriesId") id: Long,
@RequestParam(name = "ready_only", defaultValue = "true")
readyFilter: Boolean,
// deprecated, to remove once Tachiyomi update has been published
@RequestParam(name = "ready_only", defaultValue = "true") readyFilter: Boolean,
@RequestParam(name = "media_status", required = false) mediaStatus: List<Media.Status>?,
page: Pageable
): Page<BookDto> {
@ -180,10 +180,10 @@ class SeriesController(
else Sort.by(Sort.Order.asc("number"))
)
return if (!mediaStatus.isNullOrEmpty()) {
bookRepository.findAllByMediaStatusInAndSeriesId(mediaStatus, id, pageRequest)
} else {
bookRepository.findAllBySeriesId(id, pageRequest)
return when {
!mediaStatus.isNullOrEmpty() -> bookRepository.findAllByMediaStatusInAndSeriesId(mediaStatus, id, pageRequest)
readyFilter -> bookRepository.findAllByMediaStatusInAndSeriesId(listOf(Media.Status.READY), id, pageRequest)
else -> bookRepository.findAllBySeriesId(id, pageRequest)
}.map { it.toDto(includeFullUrl = principal.user.isAdmin()) }
}
}

4
komga/src/test/kotlin/org/gotson/komga/interfaces/web/rest/BookControllerTest.kt
View file

@ -301,7 +301,7 @@ class BookControllerTest(
mockMvc.get("/api/v1/books/latest")
.andExpect(validation)
mockMvc.get("/api/v1/series/${series.id}/books")
mockMvc.get("/api/v1/series/${series.id}/books?media_status=UNKNOWN")
.andExpect(validation)
mockMvc.get("/api/v1/books/${series.books.first().id}")
@ -332,7 +332,7 @@ class BookControllerTest(
mockMvc.get("/api/v1/books/latest")
.andExpect(validation)
mockMvc.get("/api/v1/series/${series.id}/books")
mockMvc.get("/api/v1/series/${series.id}/books?media_status=UNKNOWN")
.andExpect(validation)
mockMvc.get("/api/v1/books/${series.books.first().id}")

4
komga/src/test/kotlin/org/gotson/komga/interfaces/web/rest/SeriesControllerTest.kt
View file

@ -75,7 +75,7 @@ class SeriesControllerTest(
series.books = series.books.toMutableList().also { it.add(makeBook("2")) }
seriesRepository.save(series)
mockMvc.get("/api/v1/series/${series.id}/books")
mockMvc.get("/api/v1/series/${series.id}/books?media_status=UNKNOWN")
.andExpect {
status { isOk }
jsonPath("$.content[0].name") { value("1") }
@ -96,7 +96,7 @@ class SeriesControllerTest(
series.books = series.books.toMutableList().also { it.add(makeBook("2")) }
seriesRepository.save(series)
mockMvc.get("/api/v1/series/${series.id}/books")
mockMvc.get("/api/v1/series/${series.id}/books?media_status=UNKNOWN")
.andExpect {
status { isOk }
jsonPath("$.content[0].name") { value("1") }