Skip to content

Commit 84f701c

Browse files
authored
add ChapterCount to manga object in categoryMangas endpoint (#349)
* adds ChapterCount to the Manga returned when accessing the array of Manga is a category * removed a conflicting expresssion
1 parent 047f8c1 commit 84f701c

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt

+8-1
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,19 @@ object CategoryManga {
7070
.slice(ChapterTable.id.count())
7171
.select { (MangaTable.id eq ChapterTable.manga) and (ChapterTable.isDownloaded eq true) }
7272
)
73+
val chapterCountExpression = wrapAsExpression<Long>(
74+
ChapterTable
75+
.slice(ChapterTable.id.count())
76+
.select { (MangaTable.id eq ChapterTable.manga) }
77+
)
7378

74-
val selectedColumns = MangaTable.columns + unreadExpression + downloadExpression
79+
val selectedColumns = MangaTable.columns + unreadExpression + downloadExpression + chapterCountExpression
80+
7581
val transform: (ResultRow) -> MangaDataClass = {
7682
val dataClass = MangaTable.toDataClass(it)
7783
dataClass.unreadCount = it[unreadExpression]?.toInt()
7884
dataClass.downloadCount = it[downloadExpression]?.toInt()
85+
dataClass.chapterCount = it[chapterCountExpression]?.toInt()
7986
dataClass
8087
}
8188

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ data class MangaDataClass(
3636

3737
val freshData: Boolean = false,
3838
var unreadCount: Int? = null,
39-
var downloadCount: Int? = null
39+
var downloadCount: Int? = null,
40+
var chapterCount: Int? = null
4041
)
4142

4243
data class PagedMangaListDataClass(

0 commit comments

Comments
 (0)