feat(CollectionController): add keyword search functionality for user collections

Author: LiggMax

flow-client/src/main/java/com/ligg/flowclient/controller/CollectionController.java

@@ -36,6 +36,7 @@ public class CollectionController {
      *
      * @param subjectType 条目大类，默认 2（动画）
      * @param type        收藏状态，默认 2（看过）
+     * @param keyword     条目名称关键字，可匹配原名或中文名
      * @param limit       每页条数，默认 20
      * @param offset      偏移量，默认 0
      */
@@ -44,13 +45,14 @@ public Result<UserCollectionsVo> getMeCollections(
             @RequestAttribute(AuthorizationInterceptor.ACCESS_TOKEN_REQUEST_ATTRIBUTE) String flowAccessToken,
             @RequestParam(defaultValue = "2") int subjectType,
             @RequestParam(defaultValue = "2") int type,
+            @RequestParam(required = false) String keyword,
             @RequestParam(defaultValue = "20") int limit,
             @RequestParam(defaultValue = "0") int offset) {
         Long userId = jwtTokenService.validateAccessToken(flowAccessToken);
         UserOauthEntity bangumiOauth = bangumiOAuthTokenService.findBangumiOauth(userId);
         String bangumiAccessToken = bangumiOauth != null ? bangumiOauth.getAccessToken() : null;
         UserCollectionsVo vo = userBgmCollectionService.listMyCollections(
-                bangumiAccessToken, userId, subjectType, type, limit, offset);
+                bangumiAccessToken, userId, subjectType, type, keyword, limit, offset);
         return Result.success(ResponseCode.SUCCESS, vo);
     }
 

flow-client/src/main/java/com/ligg/flowclient/mapper/UserBgmCollectionMapper.java

@@ -14,11 +14,13 @@ public interface UserBgmCollectionMapper extends BaseMapper<UserBgmCollectionEnt
 
     long countByUserFilter(@Param("userId") Long userId,
                            @Param("type") int type,
-                           @Param("subjectType") int subjectType);
+                           @Param("subjectType") int subjectType,
+                           @Param("keyword") String keyword);
 
     List<UserBgmCollectionRow> selectPageByUserFilter(@Param("userId") Long userId,
                                                       @Param("type") int type,
                                                       @Param("subjectType") int subjectType,
+                                                      @Param("keyword") String keyword,
                                                       @Param("limit") int limit,
                                                       @Param("offset") int offset);
 

flow-client/src/main/java/com/ligg/flowclient/service/UserBgmCollectionService.java

@@ -9,7 +9,14 @@ public interface UserBgmCollectionService {
      * 查询当前登录用户已同步到本地的 Bangumi 收藏列表。
      * accessToken 可能为null
      */
-    UserCollectionsVo listMyCollections(String accessToken, long userId, int subjectType, int type, int limit, int offset);
+    UserCollectionsVo listMyCollections(
+            String accessToken,
+            long userId,
+            int subjectType,
+            int type,
+            String keyword,
+            int limit,
+            int offset);
 
     /**
      * 更新当前用户对条目的 Bangumi 收藏，并同步写入本地 {@code user_bgm_collection}。

flow-client/src/main/java/com/ligg/flowclient/service/impl/UserBgmCollectionServiceImpl.java

@@ -48,23 +48,31 @@ public class UserBgmCollectionServiceImpl implements UserBgmCollectionService {
     private final ImageBackfillService imageBackfillService;
 
     @Override
-    public UserCollectionsVo listMyCollections(String accessToken, long userId, int subjectType, int type, int limit, int offset) {
+    public UserCollectionsVo listMyCollections(
+            String accessToken,
+            long userId,
+            int subjectType,
+            int type,
+            String keyword,
+            int limit,
+            int offset) {
         UserCollectionsVo vo = new UserCollectionsVo();
         if (limit <= 0) {
             vo.setData(Collections.emptyList());
             vo.setTotal(0);
             return vo;
         }
 
-        long total = userBgmCollectionMapper.countByUserFilter(userId, type, subjectType);
+        String normalizedKeyword = StringUtils.hasText(keyword) ? keyword.trim() : null;
+        long total = userBgmCollectionMapper.countByUserFilter(userId, type, subjectType, normalizedKeyword);
         vo.setTotal((int) total);
         if (total == 0) {
             vo.setData(Collections.emptyList());
             return vo;
         }
 
         List<UserBgmCollectionRow> rows = userBgmCollectionMapper.selectPageByUserFilter(
-                userId, type, subjectType, limit, offset);
+                userId, type, subjectType, normalizedKeyword, limit, offset);
 
         List<UserCollectionsDto.Item> items = new ArrayList<>(rows.size());
         for (UserBgmCollectionRow row : rows) {

flow-client/src/main/resources/mapper/UserBgmCollectionMapper.xml

@@ -6,11 +6,20 @@
         WHERE c.user_id = #{userId}
           AND c.type = #{type}
           AND c.subject_type = #{subjectType}
+        <if test="keyword != null and keyword != ''">
+          AND (
+              s.name LIKE CONCAT('%', #{keyword}, '%')
+              OR s.name_cn LIKE CONCAT('%', #{keyword}, '%')
+          )
+        </if>
     </sql>
 
     <select id="countByUserFilter" resultType="long">
         SELECT COUNT(*)
         FROM user_bgm_collection c
+        <if test="keyword != null and keyword != ''">
+                 LEFT JOIN bangumi_subject s ON s.id = c.subject_id
+        </if>
         <include refid="userFilterWhere"/>
     </select>
 

…t/controller/FlowUserControllerTest.java …controller/CollectionControllerTest.javaflow-client/src/test/java/com/ligg/flowclient/controller/FlowUserControllerTest.java renamed to flow-client/src/test/java/com/ligg/flowclient/controller/CollectionControllerTest.java flow-client/src/test/java/com/ligg/flowclient/controller/FlowUserControllerTest.java renamed to flow-client/src/test/java/com/ligg/flowclient/controller/CollectionControllerTest.java

@@ -3,12 +3,11 @@
 import com.ligg.common.response.Result;
 import com.ligg.common.statuenum.ResponseCode;
 import com.ligg.common.vo.bangumi.UserCollectionsVo;
+import com.ligg.common.entity.UserOauthEntity;
 import com.ligg.flowclient.service.BangumiOAuthTokenService;
 import com.ligg.flowclient.service.JwtTokenService;
 import com.ligg.flowclient.service.UserBgmCollectionService;
 import com.ligg.flowclient.service.UserBgmCollectionSyncService;
-import com.ligg.flowclient.service.UserEpisodeWatchService;
-import com.ligg.flowclient.service.UserService;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -21,10 +20,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class FlowUserControllerTest {
-
-    @org.mockito.Mock
-    private UserService userService;
+class CollectionControllerTest {
 
     @org.mockito.Mock
     private UserBgmCollectionService userBgmCollectionService;
@@ -38,27 +34,45 @@ class FlowUserControllerTest {
     @org.mockito.Mock
     private JwtTokenService jwtTokenService;
 
-    @org.mockito.Mock
-    private UserEpisodeWatchService userEpisodeWatchService;
-
     @Test
     void getMeCollections_allowsMissingBangumiOauth() {
-        FlowUserController controller = new FlowUserController(
-                userService,
-                userBgmCollectionService,
-                bangumiOAuthTokenService,
-                userBgmCollectionSyncService,
+        CollectionController controller = new CollectionController(
                 jwtTokenService,
-                userEpisodeWatchService);
+                bangumiOAuthTokenService,
+                userBgmCollectionService,
+                userBgmCollectionSyncService);
         UserCollectionsVo collections = new UserCollectionsVo();
         when(jwtTokenService.validateAccessToken("flow-token")).thenReturn(10L);
         when(bangumiOAuthTokenService.findBangumiOauth(10L)).thenReturn(null);
-        when(userBgmCollectionService.listMyCollections(null, 10L, 2, 2, 20, 0)).thenReturn(collections);
+        when(userBgmCollectionService.listMyCollections(null, 10L, 2, 2, null, 20, 0)).thenReturn(collections);
+
+        Result<UserCollectionsVo> result = controller.getMeCollections("flow-token", 2, 2, null, 20, 0);
+
+        assertEquals(ResponseCode.SUCCESS.getCode(), result.getCode());
+        assertSame(collections, result.getData());
+        verify(userBgmCollectionService).listMyCollections(isNull(), eq(10L), eq(2), eq(2), isNull(), eq(20), eq(0));
+    }
+
+    @Test
+    void getMeCollections_passesKeyword() {
+        CollectionController controller = new CollectionController(
+                jwtTokenService,
+                bangumiOAuthTokenService,
+                userBgmCollectionService,
+                userBgmCollectionSyncService);
+        UserOauthEntity oauth = new UserOauthEntity();
+        oauth.setAccessToken("bangumi-token");
+        UserCollectionsVo collections = new UserCollectionsVo();
+        when(jwtTokenService.validateAccessToken("flow-token")).thenReturn(10L);
+        when(bangumiOAuthTokenService.findBangumiOauth(10L)).thenReturn(oauth);
+        when(userBgmCollectionService.listMyCollections(
+                "bangumi-token", 10L, 2, 2, "葬送", 20, 0)).thenReturn(collections);
 
-        Result<UserCollectionsVo> result = controller.getMeCollections("flow-token", 2, 2, 20, 0);
+        Result<UserCollectionsVo> result = controller.getMeCollections("flow-token", 2, 2, "葬送", 20, 0);
 
         assertEquals(ResponseCode.SUCCESS.getCode(), result.getCode());
         assertSame(collections, result.getData());
-        verify(userBgmCollectionService).listMyCollections(isNull(), eq(10L), eq(2), eq(2), eq(20), eq(0));
+        verify(userBgmCollectionService).listMyCollections(
+                eq("bangumi-token"), eq(10L), eq(2), eq(2), eq("葬送"), eq(20), eq(0));
     }
 }