Merge pull request #389 from Team-WSS/fix/#388

Author: sansan20535

src/main/java/org/websoso/WSSServer/dto/feed/UserFeedsGetResponse.java

@@ -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);
     }

src/main/java/org/websoso/WSSServer/repository/FeedCustomRepository.java

@@ -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);
 }

src/main/java/org/websoso/WSSServer/repository/FeedCustomRepositoryImpl.java

@@ -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;

src/main/java/org/websoso/WSSServer/service/FeedService.java

@@ -496,7 +496,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);
         }