Merge pull request #48 from rhkr8521/feat/#add-return-memo-with-comment,like

[FEAT] 내가 좋아요 누른 메모, 댓글 작성한 메모 리스트 반환 구현

Author: rhkr8521

src/main/java/com/rhkr8521/mapping/api/comment/repository/CommentRepository.java

@@ -3,6 +3,8 @@
 import com.rhkr8521.mapping.api.comment.entity.Comment;
 import com.rhkr8521.mapping.api.memo.entity.Memo;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -11,4 +13,7 @@ public interface CommentRepository extends JpaRepository<Comment, Long> {
 
     List<Comment> findByMemoId(Long memoId);  // 특정 메모의 댓글 찾기
     void deleteAllByMemoId(Long memoId);
+
+    @Query("SELECT DISTINCT c.memo FROM Comment c WHERE c.member.id = :userId")
+    List<Memo> findDistinctMemoByMemberId(@Param("userId") Long userId);
 }

src/main/java/com/rhkr8521/mapping/api/memo/controller/MemoController.java

@@ -264,6 +264,36 @@ public ResponseEntity<ApiResponse<Void>> toggleHate(
         return ApiResponse.success_only(SuccessStatus.TOGGLE_HATE_SUCCESS);
     }
 
+    @Operation(
+            summary = "내가 댓글 작성한 메모 목록 조회 API",
+            description = "내가 댓글 작성한 메모 목록을 조회합니다."
+    )
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "전체 메모 조회 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "해당 메모를 찾을 수 없습니다."),
+    })
+    @GetMapping("/commented")
+    public ResponseEntity<ApiResponse<List<MemoListResponseDTO>>> getMemosWithMyComments(@AuthenticationPrincipal UserDetails userDetails) {
+
+        List<MemoListResponseDTO> memos = memoService.getMemosWithMyComments(userDetails);
+        return ApiResponse.success(SuccessStatus.SEND_TOTAL_MEMO_SUCCESS, memos);
+    }
+
+    @Operation(
+            summary = "내가 좋아요 누른 메모 목록 조회 API",
+            description = "내가 댓글 작성한 메모 목록을 조회합니다."
+    )
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "전체 메모 조회 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "해당 메모를 찾을 수 없습니다."),
+    })
+    @GetMapping("/liked")
+    public ResponseEntity<ApiResponse<List<MemoListResponseDTO>>> getMemosILiked(@AuthenticationPrincipal UserDetails userDetails) {
+
+        List<MemoListResponseDTO> memos =memoService.getMemosILiked(userDetails);
+        return ApiResponse.success(SuccessStatus.SEND_TOTAL_MEMO_SUCCESS, memos);
+    }
+
     private boolean isImageFile(MultipartFile file) {
         // 허용되는 이미지 MIME 타입
         String contentType = file.getContentType();

src/main/java/com/rhkr8521/mapping/api/memo/dto/MemoListResponseDTO.java

@@ -0,0 +1,20 @@
+package com.rhkr8521.mapping.api.memo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+public class MemoListResponseDTO {
+    private Long id;          // 메모 ID
+    private String title;     // 제목
+    private String content;   // 내용
+    private String category;  // 카테고리
+    private long likeCnt;     // 좋아요 개수
+    private long hateCnt;     // 싫어요 개수
+    private List<String> images; // 이미지 목록
+}

src/main/java/com/rhkr8521/mapping/api/memo/repository/MemoLikeRepository.java

@@ -1,13 +1,20 @@
 package com.rhkr8521.mapping.api.memo.repository;
 
+import com.rhkr8521.mapping.api.memo.entity.Memo;
 import com.rhkr8521.mapping.api.memo.entity.MemoLike;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface MemoLikeRepository extends JpaRepository<MemoLike, Long> {
     Optional<MemoLike> findByMemoIdAndMemberId(Long memoId, Long memberId);
     void deleteAllByMemoId(Long memoId);
+
+    @Query("SELECT ml.memo FROM MemoLike ml WHERE ml.member.id = :userId")
+    List<Memo> findMemosByMemberId(@Param("userId") Long userId);
 }

src/main/java/com/rhkr8521/mapping/api/memo/repository/MemoRepository.java

@@ -22,4 +22,5 @@ List<Memo> findMemosWithinRadius(@Param("lat") double lat,
                                      @Param("km") double km);
 
     List<Memo> findMemosByMemberId(Long memberId);
+
 }

src/main/java/com/rhkr8521/mapping/api/memo/service/MemoService.java

@@ -382,4 +382,49 @@ public void toggleHate(Long memoId, Long userId) {
         memoRepository.save(memo);
     }
 
+    // 내가 댓글 작성한 메모 목록 조회
+    @Transactional(readOnly = true)
+    public List<MemoListResponseDTO> getMemosWithMyComments(UserDetails userDetails) {
+        Long userId = memberRepository.findByEmail(userDetails.getUsername())
+                .orElseThrow(() -> new NotFoundException(ErrorStatus.USER_NOTFOUND_EXCEPTION.getMessage()))
+                .getId();
+
+        List<Memo> memos = commentRepository.findDistinctMemoByMemberId(userId);
+
+        return memos.stream()
+                .map(this::convertToDTO)
+                .collect(Collectors.toList());
+    }
+
+    // 내가 좋아요 누른 메모 목록 조회
+    @Transactional(readOnly = true)
+    public List<MemoListResponseDTO> getMemosILiked(UserDetails userDetails) {
+        Long userId = memberRepository.findByEmail(userDetails.getUsername())
+                .orElseThrow(() -> new NotFoundException(ErrorStatus.USER_NOTFOUND_EXCEPTION.getMessage()))
+                .getId();
+
+        List<Memo> likedMemos = memoLikeRepository.findMemosByMemberId(userId);
+
+        return likedMemos.stream()
+                .map(this::convertToDTO)
+                .collect(Collectors.toList());
+    }
+
+    // Memo -> MemoListResponseDTO 변환
+    private MemoListResponseDTO convertToDTO(Memo memo) {
+        List<String> imageUrls = memo.getImages().stream()
+                .map(MemoImage::getImageUrl)
+                .collect(Collectors.toList());
+
+        return MemoListResponseDTO.builder()
+                .id(memo.getId())
+                .title(memo.getTitle())
+                .content(memo.getContent())
+                .category(memo.getCategory())
+                .likeCnt(memo.getLikeCnt())
+                .hateCnt(memo.getHateCnt())
+                .images(imageUrls)
+                .build();
+    }
+
 }