Merge pull request #171 from pknu-wap/fix/찐찐찐막

Fix/찐찐찐막
pknu-wap · Nov 29, 2023 · cd4d400 · cd4d400
2 parents c95cb54 + 83768f7
commit cd4d400
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 71 deletions.
diff --git a/server/src/main/java/com/project/Glog/controller/PostController.java b/server/src/main/java/com/project/Glog/controller/PostController.java
@@ -155,9 +155,9 @@ public ResponseEntity<PostPreviewDtos> searchPost(@RequestParam(defaultValue = "
     }
 
     @GetMapping("/search/category")
-    public ResponseEntity<PostPreviewDtos> searchContentsByCategory(@RequestParam Long categoryId) {
+    public ResponseEntity<PostPreviewDtos> searchContentsByCategory(@RequestParam Long categoryId, @RequestParam int page) {
         //content 내용을 포함한 게시글의 리스트를 생성한다.
-        PostPreviewDtos postPreviewDtos = postService.searchPostsByCategory(categoryId);
+        PostPreviewDtos postPreviewDtos = postService.searchPostsByCategory(categoryId, page);
 
         return new ResponseEntity<>(postPreviewDtos, HttpStatus.OK);
     }

diff --git a/server/src/main/java/com/project/Glog/repository/PostRepository.java b/server/src/main/java/com/project/Glog/repository/PostRepository.java
@@ -35,8 +35,8 @@ public interface PostRepository extends JpaRepository<Post,Long> {
 
     List<Post> findAllByTitleContaining(String title);
     List<Post> findAllByUser(User user);
-    List<Post> findAllByCategory(Category category);
-    List<Post> findAllByContentContaining(String contnt);
+    Page<Post> findPostsByCategory(Category category, Pageable pageable);
+    List<Post> findAllByContentContaining(String content);
 
 
 

diff --git a/server/src/main/java/com/project/Glog/service/PostService.java b/server/src/main/java/com/project/Glog/service/PostService.java
@@ -312,11 +312,12 @@ public String clickLike(UserPrincipal userPrincipal, Long postId) {
         }
     }
 
-    public PostPreviewDtos searchPostsByCategory(Long categoryId) {
+    public PostPreviewDtos searchPostsByCategory(Long categoryId, int page) {
         Category category = categoryRepository.findByCategoryId(categoryId);
-        List<Post> posts = postRepository.findAllByCategory(category);
+        PageRequest pageRequest = PageRequest.of(page, 8,  Sort.by("id").descending());
+        Page<Post> posts = postRepository.findPostsByCategory(category, pageRequest);
 
-        return new PostPreviewDtos(posts, posts.size());
+        return new PostPreviewDtos(posts.getContent(), -1);
     }
 
     private void setPostHashtag(Post post, List<String> hashtagList) {

diff --git a/server/src/main/resources/data.sql b/server/src/main/resources/data.sql