feat: show favored and last read time in web novel list

FishHawk · Jun 23, 2024 · 2333c8c · 2333c8c
1 parent b06d255
commit 2333c8c
Show file tree

Hide file tree

Showing 15 changed files with 199 additions and 121 deletions.
diff --git a/server/src/main/kotlin/api/RouteWebNovel.kt b/server/src/main/kotlin/api/RouteWebNovel.kt
@@ -319,6 +319,7 @@ class WebNovelApi(
 
         return metadataRepo
             .search(
+                userId = user?.id,
                 userQuery = queryString,
                 filterProvider = filterProviderParsed,
                 filterType = filterType,
@@ -385,7 +386,7 @@ class WebNovelApi(
     )
 
     private suspend fun buildNovelDto(
-        novel: WebNovelMetadata,
+        novel: WebNovel,
         user: User?,
     ): NovelDto {
         val dto = NovelDto(

diff --git a/server/src/main/kotlin/api/model/WebNovel.kt b/server/src/main/kotlin/api/model/WebNovel.kt
@@ -1,7 +1,7 @@
 package api.model
 
 import infra.web.WebNovelAttention
-import infra.web.WebNovelMetadataListItem
+import infra.web.WebNovelListItem
 import infra.web.WebNovelType
 import kotlinx.serialization.Serializable
 
@@ -15,6 +15,10 @@ data class WebNovelOutlineDto(
     val attentions: List<WebNovelAttention>,
     val keywords: List<String>,
     val extra: String?,
+    //
+    val favored: String?,
+    val lastReadAt: Long?,
+    //
     val total: Long,
     val jp: Long,
     val baidu: Long,
@@ -24,7 +28,7 @@ data class WebNovelOutlineDto(
     val updateAt: Long?,
 )
 
-fun WebNovelMetadataListItem.asDto() =
+fun WebNovelListItem.asDto() =
     WebNovelOutlineDto(
         providerId = providerId,
         novelId = novelId,
@@ -34,6 +38,8 @@ fun WebNovelMetadataListItem.asDto() =
         attentions = attentions,
         keywords = keywords,
         extra = extra,
+        favored = favored,
+        lastReadAt = lastReadAt?.epochSeconds,
         total = total,
         jp = jp,
         baidu = baidu,

diff --git a/server/src/main/kotlin/infra/web/WebNovel.kt b/server/src/main/kotlin/infra/web/WebNovel.kt
@@ -49,7 +49,7 @@ enum class WebNovelType {
 }
 
 @Serializable
-data class WebNovelMetadataListItem(
+data class WebNovelListItem(
     val providerId: String,
     @SerialName("bookId")
     val novelId: String,
@@ -58,6 +58,10 @@ data class WebNovelMetadataListItem(
     val type: WebNovelType?,
     val attentions: List<WebNovelAttention>,
     val keywords: List<String>,
+    //
+    val favored: String? = null,
+    @Contextual val lastReadAt: Instant? = null,
+    //
     val total: Long = 0,
     val jp: Long = 0,
     val baidu: Long = 0,
@@ -69,7 +73,7 @@ data class WebNovelMetadataListItem(
 )
 
 @Serializable
-class WebNovelMetadata(
+class WebNovel(
     @Contextual @SerialName("_id") val id: ObjectId,
     val providerId: String,
     @SerialName("bookId")
@@ -104,8 +108,8 @@ class WebNovelMetadata(
     companion object {
         fun byId(providerId: String, novelId: String): Bson =
             and(
-                eq(WebNovelMetadata::providerId.field(), providerId),
-                eq(WebNovelMetadata::novelId.field(), novelId),
+                eq(WebNovel::providerId.field(), providerId),
+                eq(WebNovel::novelId.field(), novelId),
             )
     }
 }

diff --git a/server/src/main/kotlin/infra/web/datasource/WebNovelEsDataSource.kt b/server/src/main/kotlin/infra/web/datasource/WebNovelEsDataSource.kt
@@ -172,7 +172,7 @@ class WebNovelEsDataSource(
     }
 
     suspend fun syncNovel(
-        novel: WebNovelMetadata,
+        novel: WebNovel,
     ) {
         es.indexDocument(
             id = "${novel.providerId}.${novel.novelId}",
@@ -197,7 +197,7 @@ class WebNovelEsDataSource(
     }
 
     suspend fun syncVisited(
-        novel: WebNovelMetadata,
+        novel: WebNovel,
     ) {
         es.updateDocument(
             id = "${novel.providerId}.${novel.novelId}",

diff --git a/server/src/main/kotlin/infra/web/repository/WebNovelChapterRepository.kt b/server/src/main/kotlin/infra/web/repository/WebNovelChapterRepository.kt
@@ -11,7 +11,7 @@ import infra.common.Glossary
 import infra.common.TranslatorId
 import infra.web.WebNovelChapter
 import infra.web.WebNovelChapterTranslationState
-import infra.web.WebNovelMetadata
+import infra.web.WebNovel
 import infra.web.datasource.WebNovelHttpDataSource
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.toList
@@ -23,7 +23,7 @@ class WebNovelChapterRepository(
     mongo: MongoClient,
 ) {
     private val webNovelMetadataCollection =
-        mongo.database.getCollection<WebNovelMetadata>(
+        mongo.database.getCollection<WebNovel>(
             MongoCollectionNames.WEB_NOVEL,
         )
     private val webNovelChapterCollection =
@@ -216,17 +216,17 @@ class WebNovelChapterRepository(
                 )
             )
         val zhProperty = when (translatorId) {
-            TranslatorId.Baidu -> WebNovelMetadata::baidu
-            TranslatorId.Youdao -> WebNovelMetadata::youdao
-            TranslatorId.Gpt -> WebNovelMetadata::gpt
-            TranslatorId.Sakura -> WebNovelMetadata::sakura
+            TranslatorId.Baidu -> WebNovel::baidu
+            TranslatorId.Youdao -> WebNovel::youdao
+            TranslatorId.Gpt -> WebNovel::gpt
+            TranslatorId.Sakura -> WebNovel::sakura
         }
         webNovelMetadataCollection
             .updateOne(
-                WebNovelMetadata.byId(providerId, novelId),
+                WebNovel.byId(providerId, novelId),
                 combine(
                     set(zhProperty.field(), zh),
-                    set(WebNovelMetadata::changeAt.field(), Clock.System.now()),
+                    set(WebNovel::changeAt.field(), Clock.System.now()),
                 ),
             )
         return zh
@@ -240,10 +240,10 @@ class WebNovelChapterRepository(
             .countDocuments(WebNovelChapter.byNovelId(providerId, novelId))
         webNovelMetadataCollection
             .updateOne(
-                WebNovelMetadata.byId(providerId, novelId),
+                WebNovel.byId(providerId, novelId),
                 combine(
-                    set(WebNovelMetadata::jp.field(), jp),
-                    set(WebNovelMetadata::changeAt.field(), Clock.System.now()),
+                    set(WebNovel::jp.field(), jp),
+                    set(WebNovel::changeAt.field(), Clock.System.now()),
                 ),
             )
     }

diff --git a/server/src/main/kotlin/infra/web/repository/WebNovelFavoredRepository.kt b/server/src/main/kotlin/infra/web/repository/WebNovelFavoredRepository.kt
@@ -12,8 +12,8 @@ import infra.common.FavoredNovelListSort
 import infra.common.Page
 import infra.common.emptyPage
 import infra.web.WebNovelFavoriteDbModel
-import infra.web.WebNovelMetadata
-import infra.web.WebNovelMetadataListItem
+import infra.web.WebNovel
+import infra.web.WebNovelListItem
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
@@ -47,11 +47,11 @@ class WebNovelFavoredRepository(
         page: Int,
         pageSize: Int,
         sort: FavoredNovelListSort,
-    ): Page<WebNovelMetadataListItem> {
+    ): Page<WebNovelListItem> {
         @Serializable
         data class PageModel(
             val total: Int = 0,
-            val items: List<WebNovelMetadata>,
+            val items: List<WebNovel>,
         )
 
         val sortProperty = when (sort) {
@@ -79,7 +79,7 @@ class WebNovelFavoredRepository(
                         lookup(
                             /* from = */ MongoCollectionNames.WEB_NOVEL,
                             /* localField = */ WebNovelFavoriteDbModel::novelId.field(),
-                            /* foreignField = */ WebNovelMetadata::id.field(),
+                            /* foreignField = */ WebNovel::id.field(),
                             /* as = */ "novel"
                         ),
                         unwind("\$novel"),

diff --git a/server/src/main/kotlin/infra/web/repository/WebNovelFileRepository.kt b/server/src/main/kotlin/infra/web/repository/WebNovelFileRepository.kt
@@ -7,7 +7,7 @@ import infra.common.NovelFileTranslationsMode
 import infra.common.NovelFileType
 import infra.common.TranslatorId
 import infra.web.WebNovelChapter
-import infra.web.WebNovelMetadata
+import infra.web.WebNovel
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.datetime.toKotlinInstant
 import util.serialName
@@ -21,7 +21,7 @@ class WebNovelFileRepository(
     mongo: MongoClient,
 ) {
     private val webNovelMetadataCollection =
-        mongo.database.getCollection<WebNovelMetadata>(
+        mongo.database.getCollection<WebNovel>(
             MongoCollectionNames.WEB_NOVEL,
         )
     private val webNovelChapterCollection =
@@ -40,7 +40,7 @@ class WebNovelFileRepository(
         type: NovelFileType,
     ): String? {
         val novel = webNovelMetadataCollection
-            .find(WebNovelMetadata.byId(providerId, novelId))
+            .find(WebNovel.byId(providerId, novelId))
             .firstOrNull()
             ?: return null