Skip to content

Commit

Permalink
feat(api): search series by language
Browse files Browse the repository at this point in the history
  • Loading branch information
gotson committed Aug 24, 2020
1 parent 115ad42 commit 723d7c1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ open class SeriesSearch(
val collectionIds: Collection<Long>? = null,
val searchTerm: String? = null,
val metadataStatus: Collection<SeriesMetadata.Status>? = null,
val publishers: Collection<String>? = null
val publishers: Collection<String>? = null,
val languages: Collection<String>? = null
)

class SeriesSearchWithReadProgress(
Expand All @@ -14,5 +15,6 @@ class SeriesSearchWithReadProgress(
searchTerm: String? = null,
metadataStatus: Collection<SeriesMetadata.Status>? = null,
publishers: Collection<String>? = null,
languages: Collection<String>? = null,
val readStatus: Collection<ReadStatus>? = null
) : SeriesSearch(libraryIds, collectionIds, searchTerm, metadataStatus, publishers)
) : SeriesSearch(libraryIds, collectionIds, searchTerm, metadataStatus, publishers, languages)
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ class SeriesDtoDao(
searchTerm?.let { c = c.and(d.TITLE.containsIgnoreCase(it)) }
metadataStatus?.let { c = c.and(d.STATUS.`in`(it)) }
publishers?.let { publishers -> c = c.and(lower(d.PUBLISHER).`in`(publishers.map { it.toLowerCase() })) }
languages?.let { languages -> c = c.and(lower(d.LANGUAGE).`in`(languages.map { it.toLowerCase() })) }

return c
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class SeriesController(
@RequestParam(name = "status", required = false) metadataStatus: List<SeriesMetadata.Status>?,
@RequestParam(name = "read_status", required = false) readStatus: List<ReadStatus>?,
@RequestParam(name = "publisher", required = false) publishers: List<String>?,
@RequestParam(name = "language", required = false) languages: List<String>?,
@RequestParam(name = "unpaged", required = false) unpaged: Boolean = false,
@Parameter(hidden = true) page: Pageable
): Page<SeriesDto> {
Expand All @@ -99,7 +100,8 @@ class SeriesController(
searchTerm = searchTerm,
metadataStatus = metadataStatus,
readStatus = readStatus,
publishers = publishers
publishers = publishers,
languages = languages
)

return seriesDtoRepository.findAll(seriesSearch, principal.user.id, pageRequest)
Expand Down

0 comments on commit 723d7c1

Please sign in to comment.