Skip to content

[FIX] 피드 조회 결과가 빈 리스트로 나오는 문제 #512

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
GiJungPark merged 1 commit into from
May 30, 2026
Merged

[FIX] 피드 조회 결과가 빈 리스트로 나오는 문제 #512

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
1 change: 1 addition & 0 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 @@ -95,6 +95,7 @@ public FeedsGetResponse getFeeds(User user, Long lastFeedId, int size,
Slice<Feed> feeds = findFeedsByCategoryLabel(lastFeedId, userIdOrNull,
PageRequest.of(DEFAULT_PAGE_NUMBER, size), feedGetOption, genres);

// TODO: feed -> feed.isVisibleTo(userIdOrNull) 해당 필터링 로직은 필요 없음
List<FeedInfo> feedGetResponses = feeds.getContent().stream().filter(feed -> feed.isVisibleTo(userIdOrNull))
.map(feed -> createFeedInfo(feed, user)).toList();

Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/websoso/WSSServer/feed/repository/FeedCustomRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ public Slice<Feed> findRecommendedFeeds(Long lastFeedId, Long userId, PageReques
checkPopularFeed(),
checkGenresAndNovels(genres, true),
checkBlocking(userId),
checkHidden()
checkHidden(),
checkVisible(userId)
)
.limit(pageRequest.getPageSize() + 1)
.orderBy(feed.feedId.desc())
Expand All @@ -181,7 +182,8 @@ public Slice<Feed> findInterestedNovelFeeds(Long lastFeedId, Long userId, PageRe
ltFeedId(lastFeedId),
checkBlocking(userId),
checkHidden(),
checkInterestedNovels(userId)
checkInterestedNovels(userId),
checkVisible(userId)
)
.limit(pageRequest.getPageSize() + 1)
.orderBy(feed.feedId.desc())
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/websoso/WSSServer/feed/repository/FeedRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public interface FeedRepository extends JpaRepository<Feed, Long>, FeedCustomRep
@Query(value = "SELECT f FROM Feed f WHERE "
+ "(:lastFeedId = 0 OR f.feedId < :lastFeedId) "
+ "AND f.isHidden = false "
+ "AND (f.isPublic = true OR f.user.userId = :userId)"
+ "AND (:userId IS NULL "
+ "OR f.user.userId NOT IN (SELECT b.blockedId FROM Block b WHERE b.blockingId = :userId)) "
+ "ORDER BY f.feedId DESC")
Expand All @@ -29,6 +30,7 @@ public interface FeedRepository extends JpaRepository<Feed, Long>, FeedCustomRep
+ "(:lastFeedId = 0 OR f.feedId < :lastFeedId) "
+ "AND f.novelId = :novelId "
+ "AND f.isHidden = false "
+ "AND (f.isPublic = true OR f.user.userId = :userId)"
+ "AND (:userId IS NULL "
+ "OR f.user.userId NOT IN (SELECT b.blockedId FROM Block b WHERE b.blockingId = :userId)) "
+ "ORDER BY f.feedId DESC")
Expand Down
Loading