ChwitKey#117 refactor : article search paging 리팩토링

Author: dangnak2

src/main/java/com/example/cherrypickserver/article/dto/assembler/ArticleAssembler.java

@@ -21,9 +21,9 @@ public class ArticleAssembler {
 
   public Pageable setSortType(Pageable pageable, String sortType) {
     SortType type = SortType.getSortTypeByName(sortType);
-    if(type == SortType.ASC) pageable = PageRequest.of(0, pageable.getPageSize(), Sort.by("uploadedAt").ascending());
-    else if(type == SortType.DESC) pageable = PageRequest.of(0, pageable.getPageSize(), Sort.by("uploadedAt").descending());
-    else if(type == SortType.LIKE) pageable = PageRequest.of(0, pageable.getPageSize(), Sort.by("likeCount").descending());
+    if(type == SortType.ASC) pageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by("uploadedAt").ascending());
+    else if(type == SortType.DESC) pageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by("uploadedAt").descending());
+    else if(type == SortType.LIKE) pageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by("likeCount").descending());
     else pageable = PageRequest.of(0, pageable.getPageSize());
     return pageable;
   }

src/main/java/com/example/cherrypickserver/article/presentation/ArticleController.java

@@ -16,6 +16,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -55,7 +56,7 @@ public ResponseCustom<DetailArticleRes> detailArticle(
   public ResponseCustom<Page<SearchArticleRes>> searchArticle(
           @Parameter(description = "검색어") @RequestParam String cond,
           @Parameter(description = "ASC(오름차순), DESC(내림차순), LIKE(인기순)")@RequestParam String sortType,
-          Pageable pageable
+          @PageableDefault(size = 10) Pageable pageable
   )
   {
     return ResponseCustom.OK(articleService.searchArticle(cond, sortType, pageable));
@@ -73,7 +74,7 @@ public ResponseCustom<Page<SearchArticleRes>> searchArticleByKeyword(
           @Parameter(description = "멤버 id") @IsLogin LoginStatus loginStatus,
           @Parameter(description = "ASC(오름차순), DESC(내림차순), LIKE(인기순)") @RequestParam String sortType,
           @Parameter(description = "멤버가 등록한 키워드") @RequestParam String keyword,
-          Pageable pageable
+          @PageableDefault(size = 10) Pageable pageable
   )
   {
     return ResponseCustom.OK(articleService.searchArticleByKeyword(loginStatus.getMemberId(), keyword, sortType, pageable));
@@ -91,7 +92,7 @@ public ResponseCustom<Page<SearchArticleRes>> searchArticleByIndustry(
           @Parameter(description = "멤버 id") @IsLogin LoginStatus loginStatus,
           @Parameter(description = "ASC(오름차순), DESC(내림차순), LIKE(인기순)") @RequestParam String sortType,
           @Parameter(description = "멤버가 등록한 직군") @RequestParam String industry,
-          Pageable pageable
+          @PageableDefault(size = 10) Pageable pageable
   )
   {
     return ResponseCustom.OK(articleService.searchArticleByIndustry(loginStatus.getMemberId(), industry, sortType, pageable));