Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public Slice<Feed> findRecommendedFeedsByCategoryLabel(Category category, Long l
List<Feed> results = jpaQueryFactory
.select(feedCategory.feed)
.from(feedCategory)
.join(feedCategory.feed, feed)
.join(novel).on(feed.novelId.eq(novel.novelId))
.join(novelGenre).on(novel.eq(novelGenre.novel))
.join(genre).on(novelGenre.genre.eq(genre))
.leftJoin(feedCategory.feed, feed)
.leftJoin(novel).on(feed.novelId.eq(novel.novelId))
.leftJoin(novelGenre).on(novel.eq(novelGenre.novel))
.leftJoin(genre).on(novelGenre.genre.eq(genre))
.where(
ltFeedId(lastFeedId),
checkCategory(category),
Expand Down Expand Up @@ -87,7 +87,7 @@ private BooleanExpression checkBlocking(Long userId) {

private BooleanExpression checkGenres(List<Genre> genres) {
if (genres != null && !genres.isEmpty()) {
return genre.in(genres);
return genre.in(genres).or(feed.novelId.isNull());
}
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ private OrderSpecifier<?> checkSortCriteria(SortCriteria sortCriteria) {
public Slice<Feed> findRecommendedFeeds(Long lastFeedId, Long userId, PageRequest pageRequest, List<Genre> genres) {
List<Feed> feeds = jpaQueryFactory
.selectFrom(feed)
.join(novel).on(feed.novelId.eq(novel.novelId))
.join(novelGenre).on(novel.eq(novelGenre.novel))
.join(genre).on(novelGenre.genre.eq(genre))
.leftJoin(novel).on(feed.novelId.eq(novel.novelId))
.leftJoin(novelGenre).on(novel.eq(novelGenre.novel))
.leftJoin(genre).on(novelGenre.genre.eq(genre))
.where(
ltFeedId(lastFeedId),
checkPopularFeed(),
Expand Down
Loading