feat(server): show last read time in history list

FishHawk · Jun 25, 2024 · ed6fe63 · ed6fe63
1 parent af0eada
commit ed6fe63
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/server/src/main/kotlin/infra/web/repository/WebNovelReadHistoryRepository.kt b/server/src/main/kotlin/infra/web/repository/WebNovelReadHistoryRepository.kt
@@ -15,6 +15,8 @@ import infra.web.WebNovelListItem
 import infra.web.WebNovelReadHistoryDbModel
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.datetime.Clock
+import kotlinx.datetime.Instant
+import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
 import org.bson.types.ObjectId
 
@@ -31,10 +33,16 @@ class WebNovelReadHistoryRepository(
         page: Int,
         pageSize: Int,
     ): Page<WebNovelListItem> {
+        @Serializable
+        data class WebNovelAndHistory(
+            @Contextual val createAt: Instant,
+            val novel: WebNovel,
+        )
+
         @Serializable
         data class PageModel(
             val total: Int = 0,
-            val items: List<WebNovel>,
+            val items: List<WebNovelAndHistory>,
         )
 
         val doc = userReadHistoryWebCollection
@@ -56,7 +64,6 @@ class WebNovelReadHistoryRepository(
                             /* as = */ "novel"
                         ),
                         unwind("\$novel"),
-                        replaceRoot("\$novel"),
                     )
                 ),
                 project(
@@ -71,7 +78,7 @@ class WebNovelReadHistoryRepository(
             emptyPage()
         } else {
             Page(
-                items = doc.items.map { it.toOutline() },
+                items = doc.items.map { it.novel.toOutline().copy(lastReadAt = it.createAt) },
                 total = doc.total.toLong(),
                 pageSize = pageSize,
             )