Merge pull request #157 from Moongeul/feat/#155

[FEAT] 마이페이지 조회 기능 구현

Author: rhkr8521

src/main/java/com/core/book/api/article/repository/ArticleLikeRepository.java

@@ -19,7 +19,11 @@ public interface ArticleLikeRepository extends JpaRepository<ArticleLike, Long>
     Optional<ArticleLike> findByArticleIdAndMemberId(Long articleId, Long userId);
     List<ArticleLike> findByArticle(Article article);
 
-    @Query("SELECT al FROM ArticleLike al WHERE al.member = :member AND al.article.type IN :types")
+    @Query("SELECT al FROM ArticleLike al " +
+            "JOIN FETCH al.article a " +
+            "LEFT JOIN FETCH a.book " +
+            "WHERE al.member = :member " +
+            "AND a.type IN :types")
     Page<ArticleLike> findByMemberAndArticleTypeIn(@Param("member") Member member,
                                                    @Param("types") List<ArticleType> types,
                                                    Pageable pageable);

src/main/java/com/core/book/api/member/controller/MyPageController.java

@@ -58,4 +58,40 @@ public ResponseEntity<ApiResponse<ArticleListResponseDTO>> getUserCommentedArtic
         ArticleListResponseDTO response = myPageService.getUserCommentedArticles(userId, page, size, userDetails);
         return ApiResponse.success(SuccessStatus.GET_ARTICLE_LIST_SUCCESS, response);
     }
+
+    @Operation(summary = "내가 작성한 게시글 목록 조회 API",
+            description = "내가 작성한 Review, Phrase, QnA 게시글들을 조회합니다.")
+    @GetMapping("/my/articles")
+    public ResponseEntity<ApiResponse<ArticleListResponseDTO>> getMyArticles(
+            @RequestParam int page,
+            @RequestParam int size,
+            @AuthenticationPrincipal UserDetails userDetails
+    ) {
+        ArticleListResponseDTO response = myPageService.getMyArticles(page, size, userDetails);
+        return ApiResponse.success(SuccessStatus.GET_ARTICLE_LIST_SUCCESS, response);
+    }
+
+    @Operation(summary = "내가 좋아요한 게시글 목록 조회 API",
+            description = "내가 좋아요 한 Review, Phrase, QnA 게시글들을 조회합니다.")
+    @GetMapping("/my/liked-articles")
+    public ResponseEntity<ApiResponse<ArticleListResponseDTO>> getMyLikedArticles(
+            @RequestParam int page,
+            @RequestParam int size,
+            @AuthenticationPrincipal UserDetails userDetails
+    ) {
+        ArticleListResponseDTO response = myPageService.getMyLikedArticles(page, size, userDetails);
+        return ApiResponse.success(SuccessStatus.GET_ARTICLE_LIST_SUCCESS, response);
+    }
+
+    @Operation(summary = "내가 댓글을 남긴 게시글 목록 조회 API",
+            description = "내가 댓글을 남긴 Review, Phrase, QnA 게시글들을 조회합니다.")
+    @GetMapping("/my/commented-articles")
+    public ResponseEntity<ApiResponse<ArticleListResponseDTO>> getMyCommentedArticles(
+            @RequestParam int page,
+            @RequestParam int size,
+            @AuthenticationPrincipal UserDetails userDetails
+    ) {
+        ArticleListResponseDTO response = myPageService.getMyCommentedArticles(page, size, userDetails);
+        return ApiResponse.success(SuccessStatus.GET_ARTICLE_LIST_SUCCESS, response);
+    }
 }

src/main/java/com/core/book/api/member/service/MyPageService.java

@@ -142,4 +142,84 @@ public ArticleListResponseDTO getUserCommentedArticles(Long targetUserId, int pa
         return new ArticleListResponseDTO(dtos, isLast, page);
     }
 
+    // 내가 작성한 게시글 조회
+    public ArticleListResponseDTO getMyArticles(int page, int size, UserDetails userDetails) {
+
+        // 사용자 정보 조회
+        Member member = memberRepository.findByEmail(userDetails.getUsername())
+                .orElseThrow(() -> new NotFoundException(ErrorStatus.USER_NOTFOUND_EXCEPTION.getMessage()));
+        Long userId = member.getId();
+
+        Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
+        List<ArticleType> targetTypes = Arrays.asList(ArticleType.REVIEW, ArticleType.PHRASE, ArticleType.QNA);
+
+        // 게시글 조회
+        Page<Article> articlePage = articleRepository.findByUserIdAndTypes(userId, targetTypes, pageable);
+
+        List<ArticleListDTO> articles = articlePage.getContent().stream()
+                .map(a -> articleViewService.convertToListDTO(a, userDetails))
+                .collect(Collectors.toList());
+
+        return new ArticleListResponseDTO(articles, articlePage.isLast(), page);
+    }
+
+    // 내가 좋아요 누른 게시글 조회
+    public ArticleListResponseDTO getMyLikedArticles(int page, int size, UserDetails userDetails) {
+
+        // 사용자 정보 조회
+        Member member = memberRepository.findByEmail(userDetails.getUsername())
+                .orElseThrow(() -> new NotFoundException(ErrorStatus.USER_NOTFOUND_EXCEPTION.getMessage()));
+
+        Pageable pageable = PageRequest.of(page, size, Sort.by("article.createdAt").descending());
+        List<ArticleType> targetTypes = Arrays.asList(ArticleType.REVIEW, ArticleType.PHRASE, ArticleType.QNA);
+
+        // 내 좋아요 목록
+        Page<ArticleLike> likedPage = articleLikeRepository.findByMemberAndArticleTypeIn(member, targetTypes, pageable);
+
+        List<ArticleListDTO> articles = likedPage.getContent().stream()
+                .map(like -> articleViewService.convertToListDTO(like.getArticle(), userDetails))
+                .collect(Collectors.toList());
+
+        return new ArticleListResponseDTO(articles, likedPage.isLast(), page);
+    }
+
+    // 내가 댓글 단 게시글 조회
+    public ArticleListResponseDTO getMyCommentedArticles(int page, int size, UserDetails userDetails) {
+
+        // 사용자 정보 조회
+        Member member = memberRepository.findByEmail(userDetails.getUsername())
+                .orElseThrow(() -> new NotFoundException(ErrorStatus.USER_NOTFOUND_EXCEPTION.getMessage()));
+        Long userId = member.getId();
+
+        // Review와 Phrase 게시글은 Comment 엔티티 사용
+        List<ArticleType> reviewAndPhraseTypes = Arrays.asList(ArticleType.REVIEW, ArticleType.PHRASE);
+        List<Article> articlesFromComment =
+                commentRepository.findDistinctArticleByMemberIdAndArticleTypeIn(userId, reviewAndPhraseTypes);
+
+        // QnA 게시글은 QnaComment 엔티티 사용
+        List<Article> articlesFromQnaComment =
+                qnaCommentRepository.findDistinctQnaArticleByMemberId(userId);
+
+        // 두 리스트를 union 처리 (중복 제거)
+        Set<Article> unionSet = new HashSet<>();
+        unionSet.addAll(articlesFromComment);
+        unionSet.addAll(articlesFromQnaComment);
+
+        // unionSet을 List로 변환 후, Article의 생성일(createdAt) 내림차순 정렬
+        List<Article> combined = new ArrayList<>(unionSet);
+        combined.sort((a, b) -> b.getCreatedAt().compareTo(a.getCreatedAt()));
+
+        // 수동 페이징 처리
+        int start = page * size;
+        int end = Math.min(start + size, combined.size());
+        List<Article> subList = (start < combined.size()) ? combined.subList(start, end) : Collections.emptyList();
+
+        List<ArticleListDTO> dtos = subList.stream()
+                .map(a -> articleViewService.convertToListDTO(a, userDetails))
+                .collect(Collectors.toList());
+
+        boolean isLast = (end >= combined.size());
+        return new ArticleListResponseDTO(dtos, isLast, page);
+    }
+
 }