Skip to content

[FEAT] 지금 뜨는 글 API 썸네일 반환 값 추가 #509

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
ljy1348 merged 5 commits into from
May 19, 2026
Merged

[FEAT] 지금 뜨는 글 API 썸네일 반환 값 추가 #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ef9385
[REFACTOR] 피드의 공개, 숨김 여부를 애플리케이션 단에서 파싱하지 않고, 쿼리 조건에서 걸러지도록 수정
GiJungPark May 16, 2026
2ceac51
[FEAT] 소설 ID를 기준으로 장르까지 조회하는 쿼리 추가
GiJungPark May 16, 2026
a6fe378
[FEAT] NovelIds로 장르를 포함한 Novel 리스트를 조회하는 서비스 로직 작성
GiJungPark May 16, 2026
a605be9
[REFACTOR] 지금 뜨는 글 API에 썸네일 및 깃발 반환하도록 수정
GiJungPark May 16, 2026
4e2f29b
[FEAT] 인기 있는 피드 조회 개수의 책임을 외부 API 호출자로 변경
GiJungPark May 19, 2026
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
59 changes: 38 additions & 21 deletions src/main/java/org/websoso/WSSServer/application/FeedFindApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@

import static org.websoso.WSSServer.exception.error.CustomAvatarError.AVATAR_NOT_FOUND;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;

import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Slice;
Expand Down Expand Up @@ -135,30 +131,51 @@ private FeedInfo createFeedInfo(Feed feed, User user) {
}

@Transactional(readOnly = true)
public PopularFeedsGetResponse getPopularFeeds(User user) {
Long currentUserId = Optional.ofNullable(user).map(User::getUserId).orElse(null);

List<PopularFeed> popularFeeds = Optional.ofNullable(user).map(u -> findPopularFeedsWithUser(u.getUserId()))
.orElseGet(this::findPopularFeedsWithoutUser);
public PopularFeedsGetResponse getPopularFeeds(User user, int size) {
List<PopularFeed> popularFeeds = Optional.ofNullable(user)
.map(u -> findPopularFeedsWithUser(u.getUserId(), size))
.orElseGet(() -> findPopularFeedsWithoutUser(size));

List<Long> novelIds = popularFeeds.stream()
.map(f -> f.getFeed().getNovelId())
.filter(Objects::nonNull)
.distinct()
.toList();

Map<Long, Novel> novelMap = novelServiceImpl.getNovelsWithGenresByIds(novelIds).stream()
.collect(Collectors.toMap(Novel::getNovelId, novel -> novel));

List<PopularFeedGetResponse> popularFeedGetResponses = mapToPopularFeedGetResponseList(popularFeeds,
currentUserId);
List<PopularFeedGetResponse> popularFeedGetResponses = mapToPopularFeedGetResponseList(popularFeeds, novelMap);

return new PopularFeedsGetResponse(popularFeedGetResponses);
return PopularFeedsGetResponse.of(popularFeedGetResponses);
}

private List<PopularFeed> findPopularFeedsWithUser(Long userId) {
return feedServiceImpl.findPopularFeedsWithUser(userId);
private List<PopularFeed> findPopularFeedsWithUser(Long userId, int size) {
return feedServiceImpl.findPopularFeedsWithUser(userId, size);
}

private List<PopularFeed> findPopularFeedsWithoutUser() {
return feedServiceImpl.findPopularFeedsWithoutUser();
private List<PopularFeed> findPopularFeedsWithoutUser(int size) {
return feedServiceImpl.findPopularFeedsWithoutUser(size);
}

private static List<PopularFeedGetResponse> mapToPopularFeedGetResponseList(List<PopularFeed> popularFeeds,
Long currentUserId) {
return popularFeeds.stream().filter(pf -> pf.getFeed().isVisibleTo(currentUserId))
.map(PopularFeedGetResponse::of).toList();
Map<Long, Novel> novelMap) {
return popularFeeds.stream()
.map(popularFeed -> {
Novel novel = novelMap.get(popularFeed.getFeed().getNovelId());
String novelImage = Optional.ofNullable(novel).map(Novel::getNovelImage).orElse(null);
String novelGenreImage = Optional.ofNullable(novel)
.flatMap(FeedFindApplication::getFirstNovelGenreImage)
.orElse(null);

return PopularFeedGetResponse.of(popularFeed, novelImage, novelGenreImage);
}).toList();
}

private static Optional<String> getFirstNovelGenreImage(Novel novel) {
return novel.getNovelGenres().stream()
.findFirst()
.map(novelGenre -> novelGenre.getGenre().getGenreImage());
}

@Transactional(readOnly = true)
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/org/websoso/WSSServer/dto/popularFeed/PopularFeedGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,21 @@ public record PopularFeedGetResponse(
Integer likeCount,
Integer commentCount,
Boolean isSpoiler,
Boolean isPublic
Boolean isPublic,
String novelImage,
String novelGenreImage
) {

public static PopularFeedGetResponse of(PopularFeed popularFeed) {
public static PopularFeedGetResponse of(PopularFeed popularFeed, String novelImage, String novelGenreImage) {
return new PopularFeedGetResponse(
popularFeed.getFeed().getFeedId(),
popularFeed.getFeed().getFeedContent(),
popularFeed.getFeed().getLikes().size(),
popularFeed.getFeed().getComments().size(),
popularFeed.getFeed().getIsSpoiler(),
popularFeed.getFeed().getIsPublic()
popularFeed.getFeed().getIsPublic(),
novelImage,
novelGenreImage
);
}
}
5 changes: 3 additions & 2 deletions src/main/java/org/websoso/WSSServer/feed/controller/FeedController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,11 @@ public ResponseEntity<Void> unLikeFeed(@AuthenticationPrincipal User user,
}

@GetMapping("/popular")
public ResponseEntity<PopularFeedsGetResponse> getPopularFeeds(@AuthenticationPrincipal User user) {
public ResponseEntity<PopularFeedsGetResponse> getPopularFeeds(@AuthenticationPrincipal User user,
@RequestParam(name = "size", defaultValue = "9") int size) {
return ResponseEntity
.status(OK)
.body(feedFindApplication.getPopularFeeds(user));
.body(feedFindApplication.getPopularFeeds(user, size));
}

@GetMapping("/interest")
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedCustomRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@

public interface PopularFeedCustomRepository {

List<PopularFeed> findTodayPopularFeeds(Long userId);
List<PopularFeed> findTodayPopularFeeds(Long userId, int size);

List<PopularFeed> findOrderByPopularFeedIdDesc(int size);
}
26 changes: 23 additions & 3 deletions src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedCustomRepositoryImpl.java
View file
Open in desktop

@ljy1348 ljy1348 May 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p3 : limit 갯수를 하드코딩 하는것보다는 변수로 박고 기본값을 9로 두는게 좋지 않을까 합니다!

@GiJungPark GiJungPark May 17, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

좋습니다~
그러면 해당 정책을 관리해야할 레이어는 API라고 보시나요?

@ljy1348 ljy1348 May 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵!

Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
package org.websoso.WSSServer.feed.repository;

import static org.websoso.WSSServer.feed.domain.QFeed.feed;
import static org.websoso.WSSServer.feed.domain.QPopularFeed.popularFeed;
import static org.websoso.WSSServer.user.domain.QBlock.block;
import static org.websoso.WSSServer.user.domain.QUser.user;


import com.querydsl.jpa.impl.JPAQueryFactory;

import java.util.List;
import java.util.stream.Stream;

import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import org.websoso.WSSServer.feed.domain.PopularFeed;
Expand All @@ -18,7 +22,7 @@ public class PopularFeedCustomRepositoryImpl implements PopularFeedCustomReposit
private final JPAQueryFactory jpaQueryFactory;

@Override
public List<PopularFeed> findTodayPopularFeeds(Long userId) {
public List<PopularFeed> findTodayPopularFeeds(Long userId, int size) {
List<Long> blockingIds = jpaQueryFactory
.select(block.blockedId)
.from(block)
Expand All @@ -37,9 +41,25 @@ public List<PopularFeed> findTodayPopularFeeds(Long userId) {

return jpaQueryFactory
.selectFrom(popularFeed)
.where(popularFeed.feed.user.userId.notIn(blockIds))
.join(popularFeed.feed, feed)
.join(feed.user, user)
.where(user.userId.notIn(blockIds),
popularFeed.feed.isPublic.isTrue(),
popularFeed.feed.isHidden.isFalse())
.orderBy(popularFeed.popularFeedId.desc())
.limit(size)
.fetch();
}

@Override
public List<PopularFeed> findOrderByPopularFeedIdDesc(int size) {
return jpaQueryFactory
.selectFrom(popularFeed)
.join(popularFeed.feed, feed)
.where(feed.isPublic.isTrue(),
feed.isHidden.isFalse())
.orderBy(popularFeed.popularFeedId.desc())
.limit(9)
.limit(size)
.fetch();
}
}
1 change: 0 additions & 1 deletion src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ public interface PopularFeedRepository extends JpaRepository<PopularFeed, Long>,

Boolean existsByFeed(Feed feed);

List<PopularFeed> findTop9ByOrderByPopularFeedIdDesc();
}
9 changes: 4 additions & 5 deletions src/main/java/org/websoso/WSSServer/feed/service/FeedServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import lombok.RequiredArgsConstructor;
Expand Down Expand Up @@ -90,13 +89,13 @@ public Optional<FeedImage> findThumbnailFeedImageByFeedId(Long feedId) {
}

@Transactional(readOnly = true)
public List<PopularFeed> findPopularFeedsWithUser(Long userId) {
return popularFeedRepository.findTodayPopularFeeds(userId);
public List<PopularFeed> findPopularFeedsWithUser(Long userId, int size) {
return popularFeedRepository.findTodayPopularFeeds(userId, size);
}

@Transactional(readOnly = true)
public List<PopularFeed> findPopularFeedsWithoutUser() {
return popularFeedRepository.findTop9ByOrderByPopularFeedIdDesc();
public List<PopularFeed> findPopularFeedsWithoutUser(int size) {
return popularFeedRepository.findOrderByPopularFeedIdDesc(size);
}

@Transactional(readOnly = true)
Expand Down
47 changes: 0 additions & 47 deletions src/main/java/org/websoso/WSSServer/feed/service/PopularFeedService.java
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions src/main/java/org/websoso/WSSServer/novel/repository/NovelCustomRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ public interface NovelCustomRepository {
Page<Novel> findFilteredNovels(Pageable pageable, List<Genre> genres, Boolean isCompleted, Float novelRatingStart, Float novelRatingEnd, List<Keyword> keywords);

List<Novel> findAutocompleteNovels(String searchQuery, int limitSize);

List<Novel> findAllByNovelIdInWithGenres(List<Long> novelIds);
}
14 changes: 12 additions & 2 deletions src/main/java/org/websoso/WSSServer/novel/repository/NovelCustomRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.websoso.WSSServer.novel.repository;

import static org.websoso.WSSServer.domain.QGenre.genre;
import static org.websoso.WSSServer.domain.common.ReadStatus.WATCHED;
import static org.websoso.WSSServer.domain.common.ReadStatus.WATCHING;
import static org.websoso.WSSServer.library.domain.QUserNovel.userNovel;
Expand Down Expand Up @@ -103,8 +104,6 @@ public Page<Novel> findFilteredNovels(Pageable pageable, List<Genre> genres, Boo

@Override
public List<Novel> findAutocompleteNovels(String searchQuery, int limitSize) {


return jpaQueryFactory
.selectFrom(novel)
.leftJoin(novel.userNovels, userNovel)
Expand All @@ -115,6 +114,17 @@ public List<Novel> findAutocompleteNovels(String searchQuery, int limitSize) {
.fetch();
}

@Override
public List<Novel> findAllByNovelIdInWithGenres(List<Long> novelIds) {
return jpaQueryFactory
.selectDistinct(novel)
.from(novel)
.leftJoin(novel.novelGenres, novelGenre).fetchJoin()
.leftJoin(novelGenre.genre, genre).fetchJoin()
.where(novel.novelId.in(novelIds))
.fetch();
}

private BooleanExpression titleContainsQuery(String searchQuery) {
return getCleanedString(novel.title).containsIgnoreCase(searchQuery);
}
Expand Down
13 changes: 9 additions & 4 deletions src/main/java/org/websoso/WSSServer/novel/service/NovelServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@

import static org.websoso.WSSServer.exception.error.CustomNovelError.NOVEL_NOT_FOUND;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import lombok.RequiredArgsConstructor;
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.websoso.WSSServer.domain.Genre;
import org.websoso.WSSServer.novel.domain.PopularNovel;
import org.websoso.WSSServer.dto.platform.PlatformGetResponse;
import org.websoso.WSSServer.exception.exception.CustomNovelException;
import org.websoso.WSSServer.library.domain.Keyword;
Expand All @@ -20,7 +17,6 @@
import org.websoso.WSSServer.novel.repository.NovelGenreRepository;
import org.websoso.WSSServer.novel.repository.NovelPlatformRepository;
import org.websoso.WSSServer.novel.repository.NovelRepository;
import org.websoso.WSSServer.novel.repository.PopularNovelRepository;

@Service
@RequiredArgsConstructor
Expand All @@ -37,6 +33,15 @@ public Novel getNovelOrException(Long novelId) {
"novel with the given id is not found"));
}

@Transactional(readOnly = true)
public List<Novel> getNovelsWithGenresByIds(List<Long> novelIds) {
if (novelIds == null || novelIds.isEmpty()) {
return List.of();
}

return novelRepository.findAllByNovelIdInWithGenres(novelIds);
}

public Page<Novel> searchNovels(PageRequest pageRequest, String searchQuery) {
return novelRepository.findSearchedNovels(pageRequest, searchQuery);
}
Expand Down
Loading