Add number of mangas in category to data class

Makes it possible to display the size of a category to the user
Suwayomi · Mar 12, 2023 · be75f87 · be75f87
1 parent ec1d65f
commit be75f87
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt
@@ -100,7 +100,7 @@ object Category {
     const val DEFAULT_CATEGORY_NAME = "Default"
     private fun addDefaultIfNecessary(categories: List<CategoryDataClass>): List<CategoryDataClass> =
         if (MangaTable.select { (MangaTable.inLibrary eq true) and (MangaTable.defaultCategory eq true) }.isNotEmpty()) {
-            listOf(CategoryDataClass(DEFAULT_CATEGORY_ID, 0, DEFAULT_CATEGORY_NAME, true)) + categories
+            listOf(CategoryDataClass(DEFAULT_CATEGORY_ID, 0, DEFAULT_CATEGORY_NAME, true, 0)) + categories
         } else {
             categories
         }
@@ -123,6 +123,14 @@ object Category {
         }
     }
 
+    fun getCategorySize(categoryId: Int): Int {
+        return transaction {
+            CategoryMangaTable.select {
+                CategoryMangaTable.category eq categoryId
+            }.count().toInt()
+        }
+    }
+
     fun getCategoryMetaMap(categoryId: Int): Map<String, String> {
         return transaction {
             CategoryMetaTable.select { CategoryMetaTable.ref eq categoryId }

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/CategoryDataClass.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/CategoryDataClass.kt
@@ -12,5 +12,6 @@ data class CategoryDataClass(
     val order: Int,
     val name: String,
     val default: Boolean,
+    val size: Int,
     val meta: Map<String, String> = emptyMap()
 )
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt
@@ -23,5 +23,6 @@ fun CategoryTable.toDataClass(categoryEntry: ResultRow) = CategoryDataClass(
     categoryEntry[order],
     categoryEntry[name],
     categoryEntry[isDefault],
+    Category.getCategorySize(categoryEntry[id].value),
     Category.getCategoryMetaMap(categoryEntry[id].value)
 )