Optimize content archive controller

src/main/java/run/halo/app/repository/PostRepository.java

@@ -10,6 +10,7 @@ import run.halo.app.model.enums.PostStatus;
 import run.halo.app.repository.base.BasePostRepository;
 
 import java.util.Date;
+import java.util.Optional;
 
 
 /**
@@ -27,8 +28,11 @@ public interface PostRepository extends BasePostRepository<Post>, JpaSpecificati
     Long countLike();
 
     @NonNull
-    Page<Post> findAllByStatusAndCreateTimeBefore(PostStatus status, Date createTime, @NonNull Pageable pageable);
+    Page<Post> findAllByStatusAndCreateTimeBefore(@NonNull PostStatus status, @NonNull Date createTime, @NonNull Pageable pageable);
 
     @NonNull
-    Page<Post> findAllByStatusAndCreateTimeAfter(PostStatus status, Date createTime, @NonNull Pageable pageable);
+    Page<Post> findAllByStatusAndCreateTimeAfter(@NonNull PostStatus status, @NonNull Date createTime, @NonNull Pageable pageable);
+
+    @NonNull
+    Optional<Post> getByUrlAndStatus(@NonNull String url, @NonNull PostStatus status);
 }

src/main/java/run/halo/app/service/PostService.java

@@ -139,6 +139,16 @@ public interface PostService extends CrudService<Post, Integer> {
     @NonNull
     Post getByUrl(@NonNull String url);
 
+    /**
+     * Gets post by post status and url.
+     *
+     * @param status post status must not be null
+     * @param url    post url must not be blank
+     * @return post info
+     */
+    @NonNull
+    Post getBy(@NonNull PostStatus status, @NonNull String url);
+
     /**
      * Get post detail vo by post id.
      *
@@ -196,22 +206,6 @@ public interface PostService extends CrudService<Post, Integer> {
     @NonNull
     Page<PostListVO> convertToListVo(@NonNull Page<Post> postPage);
 
-    /**
-     * Get pre post by current post date.
-     * @param date date
-     * @return post
-     */
-    @NonNull
-    Post getPrePostOfNullable(@NonNull Date date);
-
-    /**
-     * Get next post by current post date.
-     * @param date date
-     * @return post
-     */
-    @NonNull
-    Post getNextPostOfNullable(@NonNull Date date);
-
     /**
      * Lists all posts by post status.
      *

src/main/java/run/halo/app/service/impl/PostServiceImpl.java

@@ -258,6 +258,16 @@ public class PostServiceImpl extends AbstractCrudService<Post, Integer> implemen
         return postRepository.getByUrl(url).orElseThrow(() -> new NotFoundException("The post does not exist").setErrorData(url));
     }
 
+    @Override
+    public Post getBy(PostStatus status, String url) {
+        Assert.notNull(status, "Post status must not be null");
+        Assert.hasText(url, "Post url must not be blank");
+
+        Optional<Post> postOptional = postRepository.getByUrlAndStatus(url, status);
+
+        return postOptional.orElseThrow(() -> new NotFoundException("The post with status " + status + " and url " + url + "was not existed").setErrorData(url));
+    }
+
     @Override
     public PostDetailVO getDetailVoBy(Integer postId) {
         Assert.notNull(postId, "post id must not be null");
@@ -363,16 +373,6 @@ public class PostServiceImpl extends AbstractCrudService<Post, Integer> implemen
         return super.removeById(postId);
     }
 
-    @Override
-    public Post getPrePostOfNullable(Date date) {
-        return getPrePost(date).orElse(null);
-    }
-
-    @Override
-    public Post getNextPostOfNullable(Date date) {
-        return getNextPost(date).orElse(null);
-    }
-
     @Override
     public Page<PostSimpleOutputDTO> convertToSimpleDto(@NonNull Page<Post> postPage) {
         Assert.notNull(postPage, "Post page must not be null");
@@ -469,7 +469,7 @@ public class PostServiceImpl extends AbstractCrudService<Post, Integer> implemen
             return Optional.empty();
         }
 
-        return Optional.of(nextPostPage.getContent().get(nextPostPage.getContent().size()-1));
+        return Optional.of(nextPostPage.getContent().get(0));
     }
 
     /**

src/main/java/run/halo/app/web/controller/content/ContentArchiveController.java

@@ -23,7 +23,7 @@ import java.util.List;
  * @date : 2019-03-17
  */
 @Controller
-@RequestMapping(value = "/archives")
+@RequestMapping(value = "archives")
 public class ContentArchiveController {
 
     private final PostService postService;
@@ -57,33 +57,21 @@ public class ContentArchiveController {
      * @param model   model
      * @return template path: theme/{theme}/post.ftl
      */
-    @GetMapping(value = "{url}")
+    @GetMapping("{url}")
-    public String post(@PathVariable String url,
+    public String post(@PathVariable("url") String url,
                        @RequestParam(value = "cp", defaultValue = "1") Integer cp,
                        HttpServletRequest request,
                        Model model) {
-        final Post post = postService.getByUrl(url);
+        Post post = postService.getBy(PostStatus.PUBLISHED, url);
-        if (null == post || !post.getStatus().equals(PostStatus.PUBLISHED)) {
-            return "redirect:/404";
-        }
-
-        final Date publishTime = post.getCreateTime();
-        final Post nextPost = postService.getNextPostOfNullable(publishTime);
-        final Post prePost = postService.getPrePostOfNullable(publishTime);
-
-        if (null != prePost) {
-            model.addAttribute("prePost", prePost);
-        }
-        if (null != nextPost) {
-            model.addAttribute("nextPost", nextPost);
-        }
 
+        postService.getNextPost(post.getCreateTime()).ifPresent(nextPost -> model.addAttribute("nextPost", nextPost));
+        postService.getPrePost(post.getCreateTime()).ifPresent(prePost -> model.addAttribute("prePost", prePost));
 
         List<Category> categories = postCategoryService.listCategoryBy(post.getId());
         List<Tag> tags = postTagService.listTagsBy(post.getId());
 
         model.addAttribute("is_post", true);
-        model.addAttribute("post",post);
+        model.addAttribute("post", post);
         model.addAttribute("categories", categories);
         model.addAttribute("tags", tags);
         return themeService.render("post");