feat(web): support multiple local novel favored (#89)

Co-authored-by: FishHawk <[email protected]>
FishHawk · Jun 22, 2024 · 0a551ed · 0a551ed
1 parent 1f160ff
commit 0a551ed
Show file tree

Hide file tree

Showing 31 changed files with 427 additions and 249 deletions.
diff --git a/server/src/main/kotlin/api/RouteUserFavoredWeb.kt b/server/src/main/kotlin/api/RouteUserFavoredWeb.kt
@@ -131,21 +131,21 @@ class UserFavoredWebApi(
     suspend fun createFavored(
         user: User,
         title: String,
-    ) {
+    ): String {
         if (title.length > 20) throwBadRequest("收藏夹标题至多为20个字符")
 
         val (favoredWeb) = userFavoredRepo.getFavoredList(user.id)!!
         if (favoredWeb.size >= 10) throwBadRequest("收藏夹最多只能创建10个")
 
+        val newFavoredWeb = favoredWeb.toMutableList()
+        val id = UUID.randomUUID().toString()
+        newFavoredWeb.add(UserFavored(id = id, title = title))
+
         userFavoredRepo.updateFavoredWeb(
             userId = user.id,
-            favored = favoredWeb + listOf(
-                UserFavored(
-                    id = UUID.randomUUID().toString(),
-                    title = title,
-                )
-            )
+            favored = newFavoredWeb,
         )
+        return id
     }
 
     suspend fun updateFavored(

diff --git a/server/src/main/kotlin/api/RouteUserFavoredWenku.kt b/server/src/main/kotlin/api/RouteUserFavoredWenku.kt
@@ -128,21 +128,21 @@ class UserFavoredWenkuApi(
     suspend fun createFavored(
         user: User,
         title: String,
-    ) {
+    ): String {
         if (title.length > 20) throwBadRequest("收藏夹标题至多为20个字符")
 
         val (_, favoredWenku) = userFavoredRepo.getFavoredList(user.id)!!
         if (favoredWenku.size >= 10) throwBadRequest("收藏夹最多只能创建10个")
 
+        val newFavoredWenku = favoredWenku.toMutableList()
+        val id = UUID.randomUUID().toString()
+        newFavoredWenku.add(UserFavored(id = id, title = title))
+
         userFavoredRepo.updateFavoredWenku(
             userId = user.id,
-            favored = favoredWenku + listOf(
-                UserFavored(
-                    id = UUID.randomUUID().toString(),
-                    title = title,
-                )
-            )
+            favored = newFavoredWenku,
         )
+        return id
     }
 
     suspend fun updateFavored(

diff --git a/server/src/main/kotlin/api/RouteWebNovel.kt b/server/src/main/kotlin/api/RouteWebNovel.kt
@@ -10,7 +10,6 @@ import infra.common.*
 import infra.oplog.Operation
 import infra.oplog.OperationHistoryRepository
 import infra.user.User
-import infra.user.UserFavored
 import infra.user.UserFavoredRepository
 import infra.web.*
 import infra.web.datasource.providers.NovelIdShouldBeReplacedException
@@ -377,7 +376,6 @@ class WebNovelApi(
         val visited: Long,
         val syncAt: Long,
         val favored: String?,
-        val favoredList: List<UserFavored>,
         val lastReadChapterId: String?,
         val jp: Long,
         val baidu: Long,
@@ -407,7 +405,6 @@ class WebNovelApi(
             visited = novel.visited,
             syncAt = novel.syncAt.epochSeconds,
             favored = null,
-            favoredList = emptyList(),
             lastReadChapterId = null,
             jp = novel.jp,
             baidu = novel.baidu,
@@ -419,14 +416,11 @@ class WebNovelApi(
             dto
         } else {
             val novelId = novel.id.toHexString()
-            val favoredList = userFavoredRepo.getFavoredList(user.id)!!.favoredWeb
             val favored = favoredRepo
                 .getFavoredId(user.id, novelId)
-                .takeIf { favored -> favoredList.any { it.id == favored } }
             val history = historyRepo.getReaderHistory(user.id, novelId)
             dto.copy(
                 favored = favored,
-                favoredList = favoredList,
                 lastReadChapterId = history?.chapterId,
             )
         }

diff --git a/server/src/main/kotlin/api/RouteWenkuNovel.kt b/server/src/main/kotlin/api/RouteWenkuNovel.kt
@@ -10,7 +10,6 @@ import infra.common.TranslatorId
 import infra.oplog.Operation
 import infra.oplog.OperationHistoryRepository
 import infra.user.User
-import infra.user.UserFavored
 import infra.user.UserFavoredRepository
 import infra.user.UserRole
 import infra.wenku.WenkuNovelFilter
@@ -291,7 +290,6 @@ class WenkuNovelApi(
         val volumes: List<WenkuNovelVolume>,
         val visited: Long,
         val favored: String?,
-        val favoredList: List<UserFavored>,
         val volumeZh: List<String>,
         val volumeJp: List<WenkuNovelVolumeJp>,
     )
@@ -337,21 +335,17 @@ class WenkuNovelApi(
             glossary = metadata.glossary,
             visited = metadata.visited,
             favored = null,
-            favoredList = emptyList(),
             volumeZh = volumes.zh,
             volumeJp = volumes.jp,
         )
 
         return if (user == null) {
             dto
         } else {
-            val favoredList = userFavoredRepo.getFavoredList(user.id)!!.favoredWenku
             val favored = favoredRepo
                 .getFavoredId(user.id, novelId)
-                .takeIf { favored -> favoredList.any { it.id == favored } }
             dto.copy(
                 favored = favored,
-                favoredList = favoredList,
             )
         }
     }

diff --git a/web/src/data/api/UserRepository.ts b/web/src/data/api/UserRepository.ts
@@ -1,5 +1,5 @@
 import { Page } from '@/model/Page';
-import { FavoredList, UserOutline, UserRole } from '@/model/User';
+import { UserOutline, UserRole } from '@/model/User';
 import { WebNovelOutlineDto } from '@/model/WebNovel';
 import { WenkuNovelOutlineDto } from '@/model/WenkuNovel';
 
@@ -23,17 +23,6 @@ const updateReadHistoryWeb = (
 const deleteReadHistoryWeb = (providerId: string, novelId: string) =>
   client.delete(`user/read-history/${providerId}/${novelId}`);
 
-const listFavored = () => client.get('user/favored').json<FavoredList>();
-
-const createFavoredWeb = (json: { title: string }) =>
-  client.post(`user/favored-web`, { json });
-
-const updateFavoredWeb = (favoredId: string, json: { title: string }) =>
-  client.put(`user/favored-web/${favoredId}`, { json });
-
-const deleteFavoredWeb = (favoredId: string) =>
-  client.delete(`user/favored-web/${favoredId}`);
-
 const listFavoredWebNovel = (
   favoredId: string,
   searchParams: {
@@ -46,27 +35,6 @@ const listFavoredWebNovel = (
     .get(`user/favored-web/${favoredId}`, { searchParams })
     .json<Page<WebNovelOutlineDto>>();
 
-const favoriteWebNovel = (
-  favoredId: string,
-  providerId: string,
-  novelId: string,
-) => client.put(`user/favored-web/${favoredId}/${providerId}/${novelId}`);
-
-const unfavoriteWebNovel = (
-  favoredId: string,
-  providerId: string,
-  novelId: string,
-) => client.delete(`user/favored-web/${favoredId}/${providerId}/${novelId}`);
-
-const createFavoredWenku = (json: { title: string }) =>
-  client.post(`user/favored-wenku`, { json });
-
-const updateFavoredWenku = (favoredId: string, json: { title: string }) =>
-  client.put(`user/favored-wenku/${favoredId}`, { json });
-
-const deleteFavoredWenku = (favoredId: string) =>
-  client.delete(`user/favored-wenku/${favoredId}`);
-
 const listFavoredWenkuNovel = (
   favoredId: string,
   searchParams: {
@@ -79,32 +47,13 @@ const listFavoredWenkuNovel = (
     .get(`user/favored-wenku/${favoredId}`, { searchParams })
     .json<Page<WenkuNovelOutlineDto>>();
 
-const favoriteWenkuNovel = (favoredId: string, novelId: string) =>
-  client.put(`user/favored-wenku/${favoredId}/${novelId}`);
-
-const unfavoriteWenkuNovel = (favoredId: string, novelId: string) =>
-  client.delete(`user/favored-wenku/${favoredId}/${novelId}`);
-
 export const UserRepository = {
   listUser,
   //
   listReadHistoryWeb,
   updateReadHistoryWeb,
   deleteReadHistoryWeb,
   //
-  listFavored,
-  //
-  createFavoredWeb,
-  updateFavoredWeb,
-  deleteFavoredWeb,
   listFavoredWebNovel,
-  favoriteWebNovel,
-  unfavoriteWebNovel,
-  //
-  createFavoredWenku,
-  updateFavoredWenku,
-  deleteFavoredWenku,
   listFavoredWenkuNovel,
-  favoriteWenkuNovel,
-  unfavoriteWenkuNovel,
 };
diff --git a/web/src/data/favored/Favored.ts b/web/src/data/favored/Favored.ts
@@ -0,0 +1,10 @@
+export interface Favored {
+  id: string;
+  title: string;
+}
+
+export interface FavoredList {
+  web: Favored[];
+  wenku: Favored[];
+  local: Favored[];
+}
diff --git a/web/src/data/favored/FavoredApi.ts b/web/src/data/favored/FavoredApi.ts
@@ -0,0 +1,65 @@
+import { client } from '@/data/api/client';
+
+import { Favored } from './Favored';
+
+interface FavoredList {
+  favoredWeb: Favored[];
+  favoredWenku: Favored[];
+}
+const listFavored = () => client.get('user/favored').json<FavoredList>();
+
+//
+
+const createFavoredWeb = (json: { title: string }) =>
+  client.post(`user/favored-web`, { json }).text();
+
+const updateFavoredWeb = (favoredId: string, json: { title: string }) =>
+  client.put(`user/favored-web/${favoredId}`, { json });
+
+const deleteFavoredWeb = (favoredId: string) =>
+  client.delete(`user/favored-web/${favoredId}`);
+
+const favoriteWebNovel = (
+  favoredId: string,
+  providerId: string,
+  novelId: string,
+) => client.put(`user/favored-web/${favoredId}/${providerId}/${novelId}`);
+
+const unfavoriteWebNovel = (
+  favoredId: string,
+  providerId: string,
+  novelId: string,
+) => client.delete(`user/favored-web/${favoredId}/${providerId}/${novelId}`);
+
+//
+
+const createFavoredWenku = (json: { title: string }) =>
+  client.post(`user/favored-wenku`, { json }).text();
+
+const updateFavoredWenku = (favoredId: string, json: { title: string }) =>
+  client.put(`user/favored-wenku/${favoredId}`, { json });
+
+const deleteFavoredWenku = (favoredId: string) =>
+  client.delete(`user/favored-wenku/${favoredId}`);
+
+const favoriteWenkuNovel = (favoredId: string, novelId: string) =>
+  client.put(`user/favored-wenku/${favoredId}/${novelId}`);
+
+const unfavoriteWenkuNovel = (favoredId: string, novelId: string) =>
+  client.delete(`user/favored-wenku/${favoredId}/${novelId}`);
+
+export const FavoredApi = {
+  listFavored,
+  //
+  createFavoredWeb,
+  updateFavoredWeb,
+  deleteFavoredWeb,
+  favoriteWebNovel,
+  unfavoriteWebNovel,
+  //
+  createFavoredWenku,
+  updateFavoredWenku,
+  deleteFavoredWenku,
+  favoriteWenkuNovel,
+  unfavoriteWenkuNovel,
+};