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 @@ -4,11 +4,11 @@

public record UserFeedsGetResponse(
Boolean isLoadable,
int feedsCount,
long feedsCount,
List<UserFeedGetResponse> feeds
) {

public static UserFeedsGetResponse of(Boolean isLoadable, int feedsCount,
public static UserFeedsGetResponse of(Boolean isLoadable, long feedsCount,
List<UserFeedGetResponse> userFeedGetResponses) {
return new UserFeedsGetResponse(isLoadable, feedsCount, userFeedGetResponses);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ List<Feed> findFeedsByNoOffsetPagination(User owner, Long lastFeedId, int size,
Long visitorId);

Slice<Feed> findRecommendedFeeds(Long lastFeedId, Long userId, PageRequest pageRequest, List<Genre> genres);

Long countVisibleFeeds(User owner, Long lastFeedId, Boolean isVisible,
Boolean isUnVisible, List<Genre> genres,
Long visitorId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,26 @@ public Optional<FeedImage> findThumbnailFeedImageByFeedId(long feedId) {
.fetchOne());
}

@Override
public Long countVisibleFeeds(User owner, Long lastFeedId, Boolean isVisible,
Boolean isUnVisible, List<Genre> genres,
Long visitorId) {
return jpaQueryFactory
.select(feed.count())
.from(feed)
.leftJoin(novel).on(feed.novelId.eq(novel.novelId))
.leftJoin(novelGenre).on(novel.eq(novelGenre.novel))
.leftJoin(genre).on(novelGenre.genre.eq(genre))
.where(
feed.user.eq(owner),
ltFeedId(lastFeedId),
checkVisible(visitorId),
checkPublic(isVisible, isUnVisible),
checkGenres(genres)
)
.fetchOne();
}

private BooleanExpression ltFeedId(Long lastFeedId) {
if (lastFeedId == NO_CURSOR) {
return null;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/websoso/WSSServer/service/FeedService.java
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,8 @@ public UserFeedsGetResponse getUserFeeds(User visitor, Long ownerId, Long lastFe

// TODO Slice의 hasNext()로 판단하도록 수정
Boolean isLoadable = visibleFeeds.size() == size;
int feedsCount = visibleFeeds.size();
long feedsCount = feedRepository.countVisibleFeeds(owner, lastFeedId, isVisible,
isUnVisible, genres, visitorId);

return UserFeedsGetResponse.of(isLoadable, feedsCount, userFeedGetResponseList);
}
Expand Down
Loading