Skip to content

[improve/#227] 북마크 목록 조회 API에 조회수, 섬네일URL, 북마크 여부 추가 #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dimo-2562 merged 1 commit into from
Jan 31, 2026
Merged

[improve/#227] 북마크 목록 조회 API에 조회수, 섬네일URL, 북마크 여부 추가 #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main/java/com/techfork/domain/activity/dto/BookmarkDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
package com.techfork.domain.activity.dto;

import lombok.Builder;

import java.time.LocalDateTime;
import java.util.List;

@Builder
public record BookmarkDto(
Long bookmarkId,
Long postId,
String title,
String shortSummary,
String url,
String companyName,
String logoUrl,
LocalDateTime publishedAt
LocalDateTime publishedAt,
String thumbnailUrl,
Long viewCount,
List<String> keywords,
Boolean isBookmarked
) {
}
3 changes: 2 additions & 1 deletion src/main/java/com/techfork/domain/activity/repository/ScrabPostRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ public interface ScrabPostRepository extends JpaRepository<ScrabPost, Long> {

@Query("""
SELECT new com.techfork.domain.activity.dto.BookmarkDto(
s.id, p.id, p.title, p.url, t.companyName, t.logoUrl, p.publishedAt
s.id, p.id, p.title, p.shortSummary, p.url, t.companyName, t.logoUrl,
p.publishedAt, p.thumbnailUrl, p.viewCount, null, true
)
FROM ScrabPost s
JOIN s.post p
Expand Down
44 changes: 43 additions & 1 deletion src/main/java/com/techfork/domain/activity/service/ActivityQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
import com.techfork.domain.activity.dto.BookmarkDto;
import com.techfork.domain.activity.dto.BookmarkListResponse;
import com.techfork.domain.activity.repository.ScrabPostRepository;
import com.techfork.domain.post.dto.PostInfoDto;
import com.techfork.domain.post.entity.PostKeyword;
import com.techfork.domain.post.repository.PostKeywordRepository;
import com.techfork.domain.user.entity.User;
import com.techfork.domain.user.exception.UserErrorCode;
import com.techfork.domain.user.repository.UserRepository;
Expand All @@ -14,7 +17,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.awt.print.Book;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Slf4j
@Service
Expand All @@ -24,6 +30,7 @@ public class ActivityQueryService {

private final UserRepository userRepository;
private final ScrabPostRepository scrabPostRepository;
private final PostKeywordRepository postKeywordRepository;
private final ActivityConverter activityConverter;

public BookmarkListResponse getBookmarks(Long userId, Long lastBookmarkId, int size) {
Expand All @@ -32,7 +39,42 @@ public BookmarkListResponse getBookmarks(Long userId, Long lastBookmarkId, int s

PageRequest pageRequest = PageRequest.of(0, size + 1);
List<BookmarkDto> bookmarks = scrabPostRepository.findBookmarksWithCursor(user, lastBookmarkId, pageRequest);
List<BookmarkDto> bookmarksWithKeywords = attachKeywordsToPostInfoList(bookmarks);

return activityConverter.toBookmarkListResponse(bookmarks, size);
return activityConverter.toBookmarkListResponse(bookmarksWithKeywords, size);
}

private List<BookmarkDto> attachKeywordsToPostInfoList(List<BookmarkDto> bookmarks) {
if (bookmarks.isEmpty()) {
return bookmarks;
}

List<Long> postIds = bookmarks.stream()
.map(BookmarkDto::postId)
.toList();

Map<Long, List<String>> keywordMap = postKeywordRepository.findByPostIdIn(postIds)
.stream()
.collect(Collectors.groupingBy(
pk -> pk.getPost().getId(),
Collectors.mapping(PostKeyword::getKeyword, Collectors.toList())
));

return bookmarks.stream()
.map(post -> BookmarkDto.builder()
.bookmarkId(post.bookmarkId())
.postId(post.postId())
.title(post.title())
.shortSummary(post.shortSummary())
.url(post.url())
.companyName(post.companyName())
.logoUrl(post.logoUrl())
.publishedAt(post.publishedAt())
.thumbnailUrl(post.thumbnailUrl())
.viewCount(post.viewCount())
.keywords(keywordMap.getOrDefault(post.postId(), List.of()))
.isBookmarked(post.isBookmarked())
.build())
.toList();
}
}
23 changes: 22 additions & 1 deletion src/test/java/com/techfork/domain/activity/controller/ActivityControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ void setUp() {
.title("테스트 게시글 1")
.fullContent("게시글 1의 전체 내용입니다.")
.plainContent("게시글 1의 내용")
.summary("게시글 1의 요약")
.shortSummary("게시글 1의 짧은 요약")
.company("테스트회사")
.logoUrl("https://test.com/logo.png")
.thumbnailUrl("https://test.com/thumb1.png")
.url("https://test.com/post/1")
.publishedAt(LocalDateTime.now().minusDays(1))
.crawledAt(LocalDateTime.now())
Expand All @@ -113,7 +117,11 @@ void setUp() {
.title("테스트 게시글 2")
.fullContent("게시글 2의 전체 내용입니다.")
.plainContent("게시글 2의 내용")
.summary("게시글 2의 요약")
.shortSummary("게시글 2의 짧은 요약")
.company("테스트회사")
.logoUrl("https://test.com/logo.png")
.thumbnailUrl("https://test.com/thumb2.png")
.url("https://test.com/post/2")
.publishedAt(LocalDateTime.now().minusDays(2))
.crawledAt(LocalDateTime.now())
Expand Down Expand Up @@ -413,7 +421,20 @@ void getBookmarks_Success_Multiple() throws Exception {
.andExpect(jsonPath("$.isSuccess").value(true))
.andExpect(jsonPath("$.data.bookmarks").isArray())
.andExpect(jsonPath("$.data.bookmarks.length()").value(2))
.andExpect(jsonPath("$.data.hasNext").value(false));
.andExpect(jsonPath("$.data.hasNext").value(false))
// 첫 번째 북마크 DTO 전체 필드 검증 (최신순이므로 bookmark2)
.andExpect(jsonPath("$.data.bookmarks[0].bookmarkId").value(bookmark2.getId()))
.andExpect(jsonPath("$.data.bookmarks[0].postId").value(testPost2.getId()))
.andExpect(jsonPath("$.data.bookmarks[0].title").value("테스트 게시글 2"))
.andExpect(jsonPath("$.data.bookmarks[0].shortSummary").value("게시글 2의 짧은 요약"))
.andExpect(jsonPath("$.data.bookmarks[0].url").value("https://test.com/post/2"))
.andExpect(jsonPath("$.data.bookmarks[0].companyName").value("테스트회사"))
.andExpect(jsonPath("$.data.bookmarks[0].logoUrl").value("https://test.com/logo.png"))
.andExpect(jsonPath("$.data.bookmarks[0].publishedAt").exists())
.andExpect(jsonPath("$.data.bookmarks[0].thumbnailUrl").value("https://test.com/thumb2.png"))
.andExpect(jsonPath("$.data.bookmarks[0].viewCount").value(0))
.andExpect(jsonPath("$.data.bookmarks[0].keywords").isArray())
.andExpect(jsonPath("$.data.bookmarks[0].isBookmarked").value(true));
}

@Test
Expand Down
Loading
Loading