Merge pull request #81 from GD-YD/refactor/Post-Sorting-API

자유게시글, 질문글 목록 정렬 방식과 베스트글 리펙토링

Author: csb0710

GD-YD-BE-Config

@@ -29,6 +29,7 @@
 public class PostController {
     private final PostCommandService postCommandService;
     private final PostQueryService postQueryService;
+    private static final String DEFAULT_CRITERIA = "createdAt";
 
     @Operation(summary = "Post 생성 API", description = "Post를 생성하는 API")
     @PostMapping
@@ -48,24 +49,28 @@ public ResponseEntity<PageResponse<GetPostSummaryResponse>> getPostList(
             @RequestParam(value = "criteria", defaultValue = "createdAt") String criteria
     ) {
         Pageable pageable = switch (criteria) {
-            case "likeCount" -> PageRequest.of(page, size, Sort.by("likeCount", "createdAt").descending());
-            default -> PageRequest.of(page, size, Sort.by("createdAt"));
+            case "likeCount" -> PageRequest.of(page, size, Sort.by(criteria, DEFAULT_CRITERIA).descending());
+            default -> PageRequest.of(page, size, Sort.by(DEFAULT_CRITERIA).descending());
         };
         PageResponse<GetPostSummaryResponse> response = postQueryService.getPostList(pageable);
         return ResponseEntity.ok(response);
     }
 
     @Operation(summary = "인기 Post 조회 API", description = "특정 기간 내 인기 게시글 n개를 불러오는 API")
+    @Parameter(name = "page", description = "페이지 번호")
     @Parameter(name = "size", description = "인기글 개수")
     @Parameter(name = "period", description = "인기글 기준 기간 (주 단위: 값이 1일 경우 1주일 내)")
+    @Parameter(name = "like", description = "인기글 기준 좋아요 수")
     @GetMapping("/best")
     public ResponseEntity<PageResponse<GetPostSummaryResponse>> getBestPostList(
+            @RequestParam(value = "page", defaultValue = "0") int page,
             @RequestParam(value = "size", defaultValue = "20") int size,
-            @RequestParam(value = "period", defaultValue = "1") int period
+            @RequestParam(value = "period", defaultValue = "1") int period,
+            @RequestParam(value = "like", defaultValue = "10") int like
     ) {
         LocalDateTime weeksAgo = LocalDateTime.now().minusWeeks(period);
-        Pageable pageable = PageRequest.of(0, size, Sort.by("likeCount", "createdAt").descending());
-        PageResponse<GetPostSummaryResponse> response = postQueryService.getBestPostList(weeksAgo, pageable);
+        Pageable pageable = PageRequest.of(page, size, Sort.by(DEFAULT_CRITERIA).descending());
+        PageResponse<GetPostSummaryResponse> response = postQueryService.getBestPostList(like, weeksAgo, pageable);
         return ResponseEntity.ok(response);
     }
 

gd-yd-api/src/main/java/com/gdyd/gdydapi/controller/board/PostController.java

@@ -30,6 +30,7 @@
 public class MentoringController {
     private final MentoringCommandService mentoringCommandService;
     private final MentoringQueryService mentoringQueryService;
+    private static final String DEFAULT_CRITERIA = "createdAt";
 
     @Operation(summary = "고등학생 질문 등록 API", description = "고등학생이 질문을 등록하는 API")
     @PostMapping("/high-school-student-question")
@@ -62,24 +63,28 @@ public ResponseEntity<PageResponse<HighSchoolStudentQuestionResponse>> getHighSc
             @RequestParam(value = "criteria", defaultValue = "createdAt") String criteria
     ) {
         Pageable pageable = switch (criteria) {
-            case "likeCount" -> PageRequest.of(page, size, Sort.by("likeCount", "createdAt").descending());
-            default -> PageRequest.of(page, size, Sort.by("createdAt"));
+            case "likeCount" -> PageRequest.of(page, size, Sort.by(criteria, DEFAULT_CRITERIA).descending());
+            default -> PageRequest.of(page, size, Sort.by(DEFAULT_CRITERIA).descending());
         };
         PageResponse<HighSchoolStudentQuestionResponse> response = mentoringQueryService.getHighSchoolStudentQuestions(pageable);
         return ResponseEntity.ok(response);
     }
 
     @Operation(summary = "인기 질문글 조회 API", description = "특정 기간 내 인기 질문글 n개를 불러오는 API")
+    @Parameter(name = "page", description = "페이지 번호")
     @Parameter(name = "size", description = "인기글 개수")
     @Parameter(name = "period", description = "인기글 기준 기간 (주 단위: 값이 1일 경우 1주일 내)")
+    @Parameter(name = "like", description = "인기글 기준 좋아요 수")
     @GetMapping("/high-school-student-questions/best")
     public ResponseEntity<PageResponse<HighSchoolStudentQuestionResponse>> getBestHighSchoolStudentQuestionList(
+            @RequestParam(value = "page", defaultValue = "0") int page,
             @RequestParam(value = "size", defaultValue = "20") int size,
-            @RequestParam(value = "period", defaultValue = "1") int period
+            @RequestParam(value = "period", defaultValue = "1") int period,
+            @RequestParam(value = "like", defaultValue = "10") Long like
     ) {
         LocalDateTime weeksAgo = LocalDateTime.now().minusWeeks(period);
-        Pageable pageable = PageRequest.of(0, size, Sort.by("likeCount", "createdAt").descending());
-        PageResponse<HighSchoolStudentQuestionResponse> response = mentoringQueryService.getBestHighSchoolStudentQuestions(weeksAgo, pageable);
+        Pageable pageable = PageRequest.of(page, size, Sort.by(DEFAULT_CRITERIA).descending());
+        PageResponse<HighSchoolStudentQuestionResponse> response = mentoringQueryService.getBestHighSchoolStudentQuestions(like, weeksAgo, pageable);
         return ResponseEntity.ok(response);
     }
 

gd-yd-api/src/main/java/com/gdyd/gdydapi/controller/mentoring/MentoringController.java

@@ -30,8 +30,8 @@ public GetPostResponse getPostAndCommentsByPostId(Long postId) {
         return GetPostResponse.from(post);
     }
 
-    public PageResponse<GetPostSummaryResponse> getBestPostList(LocalDateTime weeksAgo, Pageable pageable) {
-        List<Post> posts = postService.findAllByCreatedAtIsAfter(weeksAgo, pageable);
+    public PageResponse<GetPostSummaryResponse> getBestPostList(int like, LocalDateTime weeksAgo, Pageable pageable) {
+        List<Post> posts = postService.findByLikeCountGreaterThanEqualAndCreatedAtAfter(like, weeksAgo, pageable);
         return PageResponse.of(posts.stream().map(GetPostSummaryResponse::from).toList());
     }
 }

gd-yd-api/src/main/java/com/gdyd/gdydapi/service/board/PostQueryService.java

@@ -36,8 +36,8 @@ public PageResponse<HighSchoolStudentQuestionResponse> getHighSchoolStudentQuest
         return PageResponse.of(pages.getContent().stream().map(HighSchoolStudentQuestionResponse::from).toList());
     }
 
-    public PageResponse<HighSchoolStudentQuestionResponse> getBestHighSchoolStudentQuestions(LocalDateTime weeksAgo, Pageable pageable) {
-        List<HighSchoolStudentQuestion> questions = highSchoolStudentQuestionService.findAllByCreatedAtIsAfter(weeksAgo, pageable);
+    public PageResponse<HighSchoolStudentQuestionResponse> getBestHighSchoolStudentQuestions(Long like, LocalDateTime weeksAgo, Pageable pageable) {
+        List<HighSchoolStudentQuestion> questions = highSchoolStudentQuestionService.findByLikeCountGreaterThanEqualAndCreatedAtAfter(like, weeksAgo, pageable);
         return PageResponse.of(questions.stream().map(HighSchoolStudentQuestionResponse::from).toList());
     }
 

gd-yd-api/src/main/java/com/gdyd/gdydapi/service/mentoring/MentoringQueryService.java

@@ -11,5 +11,5 @@
 public interface PostRepository extends JpaRepository<Post, Long> {
     Optional<Post> findByIdAndMemberId(Long postId, Long memberId);
 
-    List<Post> findAllByCreatedAtIsAfter(LocalDateTime weeksAgo, Pageable pageable);
+    List<Post> findByLikeCountGreaterThanEqualAndCreatedAtAfter(int like, LocalDateTime weeksAgo, Pageable pageable);
 }

gd-yd-core/src/main/java/com/gdyd/gdydcore/repository/board/PostRepository.java

@@ -27,4 +27,6 @@ List<HighSchoolStudentQuestion> findTopQuestionsByTag(
             @Param("universityGradeTag") Grade universityGradeTag,
             @Param("cutoffDate") LocalDateTime cutoffDate,
             Pageable pageable);
+
+    List<HighSchoolStudentQuestion> findByLikeCountGreaterThanEqualAndCreatedAtAfter(Long like, LocalDateTime weeksAgo, Pageable pageable);
 }

gd-yd-core/src/main/java/com/gdyd/gdydcore/repository/mentoring/HighSchoolStudentQuestionRepository.java

@@ -38,8 +38,8 @@ public Post getPostByIdAndMemberId(Long postId, Long memberId) {
                 .orElseThrow(() -> new BusinessException(ErrorCode.UNAUTHORIZED_MEMBER));
     }
 
-    public List<Post> findAllByCreatedAtIsAfter(LocalDateTime weeksAgo, Pageable pageable) {
-        return postRepository.findAllByCreatedAtIsAfter(weeksAgo, pageable);
+    public List<Post> findByLikeCountGreaterThanEqualAndCreatedAtAfter(int like, LocalDateTime weeksAgo, Pageable pageable) {
+        return postRepository.findByLikeCountGreaterThanEqualAndCreatedAtAfter(like, weeksAgo, pageable);
     }
 
     @Transactional

gd-yd-core/src/main/java/com/gdyd/gdydcore/service/board/PostService.java

@@ -30,8 +30,8 @@ public Page<HighSchoolStudentQuestion> findHighSchoolStudentQuestionByPagination
         return highSchoolStudentQuestionRepository.findAll(pageable);
     }
 
-    public List<HighSchoolStudentQuestion> findAllByCreatedAtIsAfter(LocalDateTime weeksAgo, Pageable pageable) {
-        return highSchoolStudentQuestionRepository.findAllByCreatedAtIsAfter(weeksAgo, pageable);
+    public List<HighSchoolStudentQuestion> findByLikeCountGreaterThanEqualAndCreatedAtAfter(Long like, LocalDateTime weeksAgo, Pageable pageable) {
+        return highSchoolStudentQuestionRepository.findByLikeCountGreaterThanEqualAndCreatedAtAfter(like, weeksAgo, pageable);
     }
 
     public List<HighSchoolStudentQuestion> findTopQuestionsByScore(String universityNameTag, UniversityMajorCategory universityMajorTag, Grade universityGradeTag, LocalDateTime cutoffDate, Pageable pageable) {