[FIX] ArticleController list, search 통합

HealthSenior · Jun 18, 2024 · efd0157 · efd0157
1 parent 344c4fb
commit efd0157
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/src/main/java/out4ider/healthsenior/controller/ArticleController.java b/src/main/java/out4ider/healthsenior/controller/ArticleController.java
@@ -26,8 +26,8 @@ public void createArticle(@RequestParam String title, @RequestParam String conte
         articleService.saveArticle(title, content, images, principal.getName());
     }
     @GetMapping("/list")
-    public List<ArticleResponseDto> getArticleList(@RequestParam(defaultValue = "0") int page) throws IOException {
-        return articleService.getArticles(page);
+    public List<ArticleResponseDto> getArticleList(@RequestParam(defaultValue = "") String keyword, @RequestParam(defaultValue = "0") int page) throws IOException {
+        return articleService.getArticles(keyword, page);
     }
 
     @GetMapping("/mylist")
@@ -36,11 +36,6 @@ public List<ArticleResponseDto> getMyArticleList(@RequestParam(defaultValue = "0
         return articleService.getMyArticles(seniorUser.getUserId(), page);
     }
 
-    @GetMapping("/search")
-    public List<ArticleResponseDto> searchArticleList(@RequestParam String keyword, @RequestParam(defaultValue = "0") int page) throws IOException {
-        return articleService.searchArticles(keyword,page);
-    }
-
     @DeleteMapping("/delete/{id}")
     public void deleteArticle(@PathVariable Long id, Principal principal) throws IOException {
         articleService.deleteArticleById(id, principal.getName());

diff --git a/src/main/java/out4ider/healthsenior/service/ArticleService.java b/src/main/java/out4ider/healthsenior/service/ArticleService.java
@@ -67,13 +67,7 @@ public void saveArticle(String title, String content, List<MultipartFile> images
         }
     }
 
-    public List<ArticleResponseDto> getArticles(int page) throws IOException {
-        Pageable pageable = PageRequest.of(page, 10, Sort.by("createdAt").descending());
-        List<Article> articles = articleRepository.findAll(pageable).getContent();
-        return getArticleResponseDtos(articles);
-    }
-
-    public List<ArticleResponseDto> searchArticles(String keyword, int page) throws IOException {
+    public List<ArticleResponseDto> getArticles(String keyword, int page) throws IOException {
         Pageable pageable = PageRequest.of(page, 10, Sort.by("createdAt").descending());
         List<Article> articles = articleRepository.findAllByTitleOrContent(keyword, pageable).getContent();
         return getArticleResponseDtos(articles);