Merge pull request #109 from freeMates/20250602_#105_기능추가_즐겨찾기_public인_즐겨찾기_리스트_가져오기

public인 즐겨찾기 리스트 가져오기

Author: daye200

src/main/java/jombi/freemates/controller/BookmarkController.java

@@ -16,8 +16,10 @@
 import jombi.freemates.service.BookmarkService;
 import jombi.freemates.util.docs.ApiChangeLog;
 import jombi.freemates.util.docs.ApiChangeLogs;
+import lombok.Builder.Default;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -121,12 +123,55 @@ public ResponseEntity<BookmarkResponse> create(
         """
   )
   @GetMapping("/mylist")
-  public List<BookmarkResponse> list(
+  public List<BookmarkResponse> getMyBookmarks(
       @AuthenticationPrincipal CustomUserDetails customUserDetails
   ) {
-    return bookmarkService.listByMember(customUserDetails);
+    return bookmarkService.getMyBookmarks(customUserDetails);
   }
 
+  @ApiChangeLogs({
+      @ApiChangeLog(
+          date = "2025-06-02",
+          author = Author.LEEDAYE,
+          issueNumber = 105,
+          description = "public/private 즐겨찾기 목록 가져오기"
+      )
+  })
+  @Operation(
+      summary = "즐겨찾기 목록 가져오기",
+      description = """
+        ## 인증(JWT): **필요**
+        
+        ## 요청 파라미터
+        - **`page`**: 페이지 번호 (0부터 시작, 기본값: 0)
+        - **`size`**: 페이지 크기 (기본값: 10)
+        - **`visibility`**: 공개 여부 (ENUM: `PUBLIC`, `PRIVATE`, 선택적)
+
+        ## 반환값 (`Page<BookmarkResponse>`)
+        - **`content`**: 즐겨찾기 목록
+        - **`totalElements`**: 전체 요소 수
+        - **`totalPages`**: 전체 페이지 수
+        - **`number`**: 현재 페이지 번호
+        - **`size`**: 페이지 크기
+        - **`sort`**: 정렬 정보
+        - **`numberOfElements`**: 현재 페이지의 요소 수
+        - **`empty`**: 현재 페이지가 비어있는지 여부
+
+        ## 에러코드
+        """
+  )
+  @GetMapping("/list")
+  public ResponseEntity<Page<BookmarkResponse>> getBookmarks(
+      @RequestParam(defaultValue = "0") int page,
+      @RequestParam(defaultValue = "10") int size,
+      @RequestParam(defaultValue = "PUBLIC") Visibility visibility
+  ) {
+    log.debug("page:{}, size:{}, visibility:{}", page, size, visibility);
+    Page<BookmarkResponse> bookmarks = bookmarkService.getBookmarks(page, size, visibility);
+    return ResponseEntity.ok(bookmarks);
+  }
+
+
 
   /**
    * 장소를 즐겨찾기에 추가하는 API입니다.

src/main/java/jombi/freemates/repository/BookmarkRepository.java

@@ -3,8 +3,11 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
+import jombi.freemates.model.constant.Visibility;
 import jombi.freemates.model.postgres.Bookmark;
 import jombi.freemates.model.postgres.Member;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -13,4 +16,6 @@ public interface BookmarkRepository extends JpaRepository<Bookmark, UUID> {
   List<Bookmark> findAllByMember(Member member);
 
   Optional<Bookmark> findByBookmarkIdAndMember(UUID bookmarkId, Member member);
+
+  Page<Bookmark> findByVisibility(Visibility visibility, Pageable pageable);
 }

src/main/java/jombi/freemates/service/BookmarkService.java

@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
+import jombi.freemates.model.constant.Visibility;
 import jombi.freemates.model.dto.BookmarkRequest;
 import jombi.freemates.model.dto.BookmarkResponse;
 import jombi.freemates.model.dto.CustomUserDetails;
@@ -19,6 +20,8 @@
 import jombi.freemates.util.exception.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -33,6 +36,10 @@ public class BookmarkService {
   private final BookmarkPlaceRepository bookmarkPlaceRepository;
   private final PlaceService placeService;
 
+  /**
+   * 즐겨찾기 생성
+   *
+   */
   @Transactional
   public BookmarkResponse create(
       CustomUserDetails customUserDetails,
@@ -64,34 +71,30 @@ public BookmarkResponse create(
     log.info("북마크 생성 완료 - ID: {}, 사용자: {}", b.getBookmarkId(), member.getNickname());
 
     // 응답 DTO 반환
-    return BookmarkResponse.builder()
-        .bookmarkId(b.getBookmarkId())
-        .memberId(member.getMemberId())
-        .nickname(member.getNickname())
-        .imageUrl(imageUrl)
-        .title(b.getTitle())
-        .description(b.getDescription())
-        .pinColor(b.getPinColor())
-        .visibility(b.getVisibility())
-        .build();
+    return convertToBookmarkResponse(b);
   }
 
+  /**
+   * 멤버 별 즐겨찾기 목록 조회
+   */
   @Transactional(readOnly = true)
-  public List<BookmarkResponse> listByMember(CustomUserDetails customUserDetails) {
+  public List<BookmarkResponse> getMyBookmarks(CustomUserDetails customUserDetails) {
     Member member = customUserDetails.getMember();
     return bookmarkRepository.findAllByMember(member).stream()
-        .map(b -> BookmarkResponse.builder()
-            .memberId(member.getMemberId())
-            .nickname(member.getNickname())
-            .imageUrl(b.getImageUrl())
-            .title(b.getTitle())
-            .description(b.getDescription())
-            .pinColor(b.getPinColor())
-            .visibility(b.getVisibility())
-            .build())
+        .map(this::convertToBookmarkResponse)
         .collect(Collectors.toList());
   }
 
+  /**
+   * 즐겨찾기 목록 조회 (페이징)
+   */
+  @Transactional(readOnly = true)
+  public Page<BookmarkResponse> getBookmarks(int page, int size, Visibility visibility) {
+    return bookmarkRepository
+        .findByVisibility(visibility, PageRequest.of(page, size))
+        .map(this::convertToBookmarkResponse);
+  }
+
   @Transactional
   public void addPlaceToBookmark(
       CustomUserDetails customUserDetails,
@@ -158,4 +161,17 @@ public List<PlaceDto> getPlacesByBookmarkId(UUID bookmarkId) {
         .collect(Collectors.toList());
   }
 
+  public BookmarkResponse convertToBookmarkResponse(Bookmark bookmark) {
+    return BookmarkResponse.builder()
+        .bookmarkId(bookmark.getBookmarkId())
+        .memberId(bookmark.getMember().getMemberId())
+        .nickname(bookmark.getMember().getNickname())
+        .imageUrl(bookmark.getImageUrl())
+        .title(bookmark.getTitle())
+        .description(bookmark.getDescription())
+        .pinColor(bookmark.getPinColor())
+        .visibility(bookmark.getVisibility())
+        .build();
+  }
+
 }