feat(page): add page params to apis

Signed-off-by: ZheNing Hu <adlternative@gamil.com>

Author: ZheNing Hu

src/main/java/com/adlternative/tinyhacknews/controller/NewsController.java

@@ -5,7 +5,7 @@
 import com.adlternative.tinyhacknews.entity.SubmitNewsInputDTO;
 import com.adlternative.tinyhacknews.service.CommentService;
 import com.adlternative.tinyhacknews.service.NewsService;
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -85,10 +85,12 @@ public void deleteNews(
    * @return
    */
   @GetMapping("/{id}/comments")
-  public List<CommentData> getComments(
-      @PathVariable(name = "id") Long newsId, @RequestParam(name = "user_id") Long userId) {
-    // TODO: 添加分页参数
-    return commentService.getComments(newsId, userId);
+  public IPage<CommentData> getComments(
+      @PathVariable(name = "id") Long newsId,
+      @RequestParam(name = "user_id") Long userId,
+      @RequestParam(name = "page_num", defaultValue = "1") Long pageNum,
+      @RequestParam(name = "page_size", defaultValue = "10") Long pageSize) {
+    return commentService.getComments(newsId, userId, pageNum, pageSize);
   }
 
   /**
@@ -98,9 +100,11 @@ public List<CommentData> getComments(
    * @return
    */
   @GetMapping("/all")
-  public List<NewsData> getAllNews(@RequestParam(name = "user_id") Long userId) {
-    // TODO: 添加分页参数
-    return newsService.getAllNews(userId);
+  public IPage<NewsData> getAllNews(
+      @RequestParam(name = "user_id") Long userId,
+      @RequestParam(name = "page_num", defaultValue = "1") Long pageNum,
+      @RequestParam(name = "page_size", defaultValue = "10") Long pageSize) {
+    return newsService.getAllNews(userId, pageNum, pageSize);
   }
 
   private final NewsService newsService;

src/main/java/com/adlternative/tinyhacknews/controller/UsersController.java

@@ -18,8 +18,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/api/v1/users")
 @RequiredArgsConstructor
@@ -69,7 +67,7 @@ public UserInfo getUserInfoByUserName(@RequestParam(name = "name") String name)
    */
   @PutMapping
   public UserInfo updateUserInfo(
-          @RequestParam(name = "id") Long id, @RequestBody UpdateUserInfoDTO updateUserInfoDTO) {
+      @RequestParam(name = "id") Long id, @RequestBody UpdateUserInfoDTO updateUserInfoDTO) {
     return userService.updateUserInfo(id, updateUserInfoDTO);
   }
 
@@ -89,8 +87,10 @@ public void deleteUser(@RequestParam(name = "id") Long id) {
    * @param id
    */
   @GetMapping("/{id}/news")
-  public List<NewsData> getAllNewsOfUser(@PathVariable(name = "id") Long id) {
-    // TODO: 添加分页逻辑
-    return newsService.getAllNewsOfUser(id);
+  public IPage<NewsData> getAllNewsOfUser(
+      @PathVariable(name = "id") Long id,
+      @RequestParam(name = "page_num", defaultValue = "1") Long pageNum,
+      @RequestParam(name = "page_size", defaultValue = "10") Long pageSize) {
+    return newsService.getAllNewsOfUser(id, pageNum, pageSize);
   }
 }

src/main/java/com/adlternative/tinyhacknews/service/CommentService.java

@@ -3,6 +3,7 @@
 import com.adlternative.tinyhacknews.entity.CommentData;
 import com.adlternative.tinyhacknews.entity.SubmitCommentInputDTO;
 import com.adlternative.tinyhacknews.entity.UpdateCommentInputDTO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 public interface CommentService {
@@ -48,7 +49,7 @@ public interface CommentService {
    * @param userId
    * @return
    */
-  List<CommentData> getComments(Long newsId, Long userId);
+  IPage<CommentData> getComments(Long newsId, Long userId, Long pageNum, Long pageSize);
 
   List<CommentData> getSubComments(Long commentId, Long userId);
 }

src/main/java/com/adlternative/tinyhacknews/service/NewsService.java

@@ -2,7 +2,7 @@
 
 import com.adlternative.tinyhacknews.entity.NewsData;
 import com.adlternative.tinyhacknews.entity.SubmitNewsInputDTO;
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 public interface NewsService {
 
@@ -48,13 +48,13 @@ public interface NewsService {
    * @param userId
    * @return
    */
-  List<NewsData> getAllNewsOfUser(Long userId);
+  IPage<NewsData> getAllNewsOfUser(Long userId, Long pageNum, Long pageSize);
 
   /**
    * 获取所有新闻
    *
    * @param userId
    * @return
    */
-  List<NewsData> getAllNews(Long userId);
+  IPage<NewsData> getAllNews(Long userId, Long pageNum, Long pageSize);
 }

src/main/java/com/adlternative/tinyhacknews/service/impl/CommentServiceImpl.java

@@ -18,6 +18,8 @@
 import com.adlternative.tinyhacknews.mapper.UsersMapper;
 import com.adlternative.tinyhacknews.service.CommentService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
@@ -197,16 +199,18 @@ public CommentData getComment(Long id, Long userId) {
   }
 
   @Override
-  public List<CommentData> getComments(Long newsId, Long userId) {
+  public IPage<CommentData> getComments(Long newsId, Long userId, Long pageNum, Long pageSize) {
     // TODO: userId 用于权限检查
 
     // 证明新闻存在
     News news =
         Optional.ofNullable(newsMapper.selectById(newsId))
             .orElseThrow(() -> new NewsNotFoundException("News not found for id: " + newsId));
     // TODO: 一条 sql, join 一下就好
-    return commentMapper.selectByNewsId(news.getId()).stream()
-        .map(
+    return commentMapper
+        .selectPage(
+            new Page<>(pageNum, pageSize), new QueryWrapper<Comments>().eq("news_id", news.getId()))
+        .convert(
             comment -> {
               Users user =
                   Optional.ofNullable(userMapper.selectById(comment.getAuthorId()))
@@ -215,8 +219,7 @@ public List<CommentData> getComments(Long newsId, Long userId) {
                               new UserNotFoundException(
                                   "User not found for id: " + comment.getAuthorId()));
               return CommentData.convertFrom(comment, user);
-            })
-        .collect(Collectors.toList());
+            });
   }
 
   @Override

src/main/java/com/adlternative/tinyhacknews/service/impl/NewsServiceImpl.java

@@ -14,11 +14,11 @@
 import com.adlternative.tinyhacknews.mapper.UsersMapper;
 import com.adlternative.tinyhacknews.service.NewsService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -134,23 +134,24 @@ public NewsData changeNews(Long id, Long userId, SubmitNewsInputDTO submitNewsIn
   }
 
   @Override
-  public List<NewsData> getAllNewsOfUser(Long userId) {
+  public IPage<NewsData> getAllNewsOfUser(Long userId, Long pageNum, Long pageSize) {
     Users user =
         Optional.ofNullable(userMapper.selectById(userId))
             .orElseThrow(() -> new UserNotFoundException("Failed to get user, user not found"));
-    return newsMapper.selectByAuthorId(userId).stream()
-        .map(singleNew -> NewsData.convertFromNews(singleNew, user))
-        .collect(Collectors.toList());
+    return newsMapper
+        .selectPage(new Page<>(pageNum, pageSize), new QueryWrapper<News>().eq("author_id", userId))
+        .convert(singleNew -> NewsData.convertFromNews(singleNew, user));
   }
 
   @Override
-  public List<NewsData> getAllNews(Long userId) {
+  public IPage<NewsData> getAllNews(Long userId, Long pageNum, Long pageSize) {
     Users user =
         Optional.ofNullable(userMapper.selectById(userId))
             .orElseThrow(() -> new UserNotFoundException("Failed to get user, user not found"));
-    return newsMapper.selectAll().stream()
-        .map(singleNew -> NewsData.convertFromNews(singleNew, user))
-        .collect(Collectors.toList());
+
+    return newsMapper
+        .selectPage(new Page<>(pageNum, pageSize), new QueryWrapper<>())
+        .convert(singleNew -> NewsData.convertFromNews(singleNew, user));
   }
 
   private final NewsMapper newsMapper;

src/main/java/com/adlternative/tinyhacknews/web/MybatisPlusConfig.java

@@ -0,0 +1,22 @@
+package com.adlternative.tinyhacknews.web;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@MapperScan("com.adlternative.tinyhacknews.mapper")
+public class MybatisPlusConfig {
+
+  /** 添加分页插件 */
+  @Bean
+  public MybatisPlusInterceptor mybatisPlusInterceptor() {
+    MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+    interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+
+    return interceptor;
+  }
+}