Skip to content

refactor: SearchService 쿼리 최적화 #159

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
2anizirong merged 1 commit into from
Aug 15, 2025
Merged

refactor: SearchService 쿼리 최적화 #159

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
16 changes: 12 additions & 4 deletions src/main/java/EatPic/spring/domain/card/repository/CardRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,10 @@ public interface CardRepository extends JpaRepository<Card, Long> {
@Query("""
SELECT DISTINCT c
FROM Card c
JOIN FETCH c.user u
LEFT JOIN FETCH c.cardHashtags ch
WHERE c.isDeleted = false
AND c.isShared = true
AND u.id <> :loginUserId
AND u.id NOT IN (
AND c.user.id <> :loginUserId
AND c.user.id NOT IN (
SELECT ub.blockedUser.id
FROM UserBlock ub
WHERE ub.user.id = :loginUserId
Expand Down Expand Up @@ -102,4 +100,14 @@ SELECT COUNT(c)
""")
Long countCardsByHashtag(@Param("hashtagId") Long hashtagId);

@Query("""
SELECT ch.hashtag.id, COUNT(ch.card.id)
FROM CardHashtag ch
WHERE ch.hashtag.id IN :hashtagIds
AND ch.card.isDeleted = false
AND ch.card.isShared = true
GROUP BY ch.hashtag.id
""")
List<Object[]> countCardsByHashtagIds(@Param("hashtagIds") List<Long> hashtagIds);

}
49 changes: 26 additions & 23 deletions src/main/java/EatPic/spring/domain/card/service/SearchServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,24 +127,8 @@ public SearchResponseDTO.GetHashtagListResponseDto getHashtagInAll(HttpServletRe
Pageable pageable = PageRequest.of(0, limit + 1, Sort.by("id").ascending());
Slice<Hashtag> hashtags = hashtagRepository.searchHashtagInAll("%" + query + "%", cursor, pageable);

List<SearchResponseDTO.GetHashtagResponseDto> result = hashtags.getContent().stream()
.map(hashtag -> CardConverter.toHashtagDto(
hashtag,
cardRepository.countCardsByHashtag(hashtag.getId())
))
.filter(dto -> dto.getCard_count() > 0) // 카드가 없는 해시태그는 제외
.toList();

if (result.isEmpty()) {
throw new ExceptionHandler(ErrorStatus._NO_RESULTS_FOUND);

}
boolean hasNext = hashtags.hasNext();
Long nextCursor = hasNext ? hashtags.getContent().get(hashtags.getContent().size() - 1).getId() : null;

return new SearchResponseDTO.GetHashtagListResponseDto(result, nextCursor, result.size(), hasNext);
return getGetHashtagListResponseDto(hashtags);
}

// 유저가 팔로우한 사용자인 경우에서 해시태그 검색
@Override
public SearchResponseDTO.GetHashtagListResponseDto getHashtagInFollow(HttpServletRequest request, String query, int limit, Long cursor) {
Expand All @@ -158,27 +142,34 @@ public SearchResponseDTO.GetHashtagListResponseDto getHashtagInFollow(HttpServle
}

Pageable pageable = PageRequest.of(0, limit + 1, Sort.by("id").ascending());

Slice<Hashtag> hashtags = hashtagRepository.searchHashtagInFollow(query, followingUserIds, cursor, pageable);

return getGetHashtagListResponseDto(hashtags);
}

private SearchResponseDTO.GetHashtagListResponseDto getGetHashtagListResponseDto(Slice<Hashtag> hashtags) {
List<Long> hashtagsIds = hashtags.stream().map(Hashtag::getId).toList();
Map<Long,Long> cardCountByHashtagMap = getMapCardCountByHashtag(hashtagsIds);

List<SearchResponseDTO.GetHashtagResponseDto> result = hashtags.getContent().stream()
.map(hashtag -> CardConverter.toHashtagDto(
hashtag,
cardRepository.countCardsByHashtag(hashtag.getId())
cardCountByHashtagMap.getOrDefault(hashtag.getId(),0L)
))
.filter(dto -> dto.getCard_count() > 0)
.filter(dto -> dto.getCard_count() > 0) // 카드가 없는 해시태그는 제외
.toList();

if (result.isEmpty()) {
throw new ExceptionHandler(ErrorStatus._NO_RESULTS_FOUND);
}

}
boolean hasNext = hashtags.hasNext();
Long nextCursor = hasNext ? hashtags.getContent().get(hashtags.getContent().size() - 1).getId() : null;

return new SearchResponseDTO.GetHashtagListResponseDto(result, nextCursor, result.size(), hasNext);
}


// 해시태그 선택 시 해당 해시태그가 포함된 픽카드 리스트 조회
@Override
public SearchResponseDTO.GetCardListResponseDto getCardsByHashtag(HttpServletRequest request, Long hashtagId, int limit, Long cursor) {
Expand All @@ -188,10 +179,14 @@ public SearchResponseDTO.GetCardListResponseDto getCardsByHashtag(HttpServletReq
Pageable pageable = PageRequest.of(0, limit + 1, Sort.by("id").ascending());
Slice<Card> cards = cardRepository.findCardsByHashtag(hashtagId, cursor, pageable);

List<Long> cardIds = cards.stream().map(Card::getId).toList();
Map<Long, Integer> commentCountMap = cardService.getCommentCountMap(cardIds);
Map<Long, Integer> reactionCountMap = cardService.getReactionCountMap(cardIds);

List<SearchResponseDTO.GetCardResponseDto> content = cards.getContent().stream()
.map(card -> {
int commentCount = commentRepository.countByCardId(card.getId());
int reactionCount = reactionRepository.countByCardId(card.getId());
int commentCount = commentCountMap.getOrDefault(card.getId(), 0);
int reactionCount = reactionCountMap.getOrDefault(card.getId(), 0);
return CardConverter.toCardResponseDto(card, commentCount, reactionCount);
})
.toList();
Expand All @@ -205,4 +200,12 @@ public SearchResponseDTO.GetCardListResponseDto getCardsByHashtag(HttpServletReq

return new SearchResponseDTO.GetCardListResponseDto(content, nextCursor, content.size(), hasNext);
}

private Map<Long, Long> getMapCardCountByHashtag(List<Long> hashtagIds){
List<Object[]> counts = cardRepository.countCardsByHashtagIds(hashtagIds);
return counts.stream().collect(Collectors.toMap(
row -> (Long) row[0], // hashtagId
row -> (Long) row[1] // count
));
}
}
Loading