[REFACTOR] 오늘의 발견 API 리팩토링

src/main/java/org/websoso/WSSServer/controller/NovelController.java

@@ -114,10 +114,12 @@ public ResponseEntity<Void> unregisterAsInterest(Principal principal,
 
     @GetMapping("/popular")
     public ResponseEntity<PopularNovelsGetResponse> getTodayPopularNovels(Principal principal) {
-        //TODO 차단 관계에 있는 유저의 피드글 처리
+        User user = principal == null
+                ? null
+                : userService.getUserOrException(Long.valueOf(principal.getName()));
         return ResponseEntity
                 .status(OK)
-                .body(novelService.getTodayPopularNovels());
+                .body(novelService.getTodayPopularNovels(user));
     }
 
     @GetMapping("/taste")

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

@@ -1,12 +1,13 @@
 package org.websoso.WSSServer.repository;
 
 import java.util.List;
+import java.util.Map;
 import org.websoso.WSSServer.domain.Feed;
 import org.websoso.WSSServer.domain.User;
 
 public interface FeedCustomRepository {
 
-    List<Feed> findPopularFeedsByNovelIds(List<Long> novelIds);
+    Map<Long, Feed> findPopularFeedsByNovelIds(User user, List<Long> novelIds);
 
     List<Feed> findFeedsByNoOffsetPagination(User owner, Long lastFeedId, int size);
 }

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

@@ -1,13 +1,16 @@
 package org.websoso.WSSServer.repository;
 
-
+import static org.websoso.WSSServer.domain.QBlock.block;
 import static org.websoso.WSSServer.domain.QFeed.feed;
 import static org.websoso.WSSServer.domain.QLike.like;
 
+import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
+import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
@@ -21,17 +24,31 @@ public class FeedCustomRepositoryImpl implements FeedCustomRepository {
     private final JPAQueryFactory jpaQueryFactory;
 
     @Override
-    public List<Feed> findPopularFeedsByNovelIds(List<Long> novelIds) {
-        return novelIds.stream()
-                .map(novelId -> jpaQueryFactory
-                        .selectFrom(feed)
-                        .leftJoin(feed.likes, like)
-                        .where(feed.novelId.eq(novelId))
-                        .groupBy(feed.feedId)
-                        .orderBy(like.count().desc())
-                        .fetchFirst())
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+    public Map<Long, Feed> findPopularFeedsByNovelIds(User user, List<Long> novelIds) {
+        if (novelIds.isEmpty()) {
+            return Collections.emptyMap();
+        }
+
+        List<Long> blockedUserIds = (user != null) ? jpaQueryFactory.select(block.blockedId).from(block)
+                .where(block.blockingId.eq(user.getUserId())).fetch() : Collections.emptyList();
+
+        List<Tuple> results = jpaQueryFactory
+                .select(feed, like.count())
+                .from(feed)
+                .leftJoin(feed.likes, like)
+                .where(feed.novelId.in(novelIds).and(feed.user.userId.notIn(blockedUserIds)))
+                .groupBy(feed.feedId)
+                .orderBy(like.count().desc())
+                .fetch();
+
+        return results
+                .stream()
+                .map(tuple -> tuple.get(feed))
+                .collect(Collectors.toMap(
+                        Feed::getNovelId,
+                        Function.identity(),
+                        (existing, replacement) -> existing
+                ));
     }
 
     @Override

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

@@ -352,13 +352,11 @@ private NovelGetResponsePreview convertToDTO(Novel novel) {
     }
 
     @Transactional(readOnly = true)
-    public PopularNovelsGetResponse getTodayPopularNovels() {
+    public PopularNovelsGetResponse getTodayPopularNovels(User user) {
         List<Long> novelIdsFromPopularNovel = getNovelIdsFromPopularNovel();
         List<Long> selectedNovelIdsFromPopularNovel = getSelectedNovelIdsFromPopularNovel(novelIdsFromPopularNovel);
         List<Novel> popularNovels = getSelectedPopularNovels(selectedNovelIdsFromPopularNovel);
-        List<Feed> popularFeedsFromPopularNovels = getPopularFeedsFromPopularNovels(selectedNovelIdsFromPopularNovel);
-
-        Map<Long, Feed> feedMap = createFeedMap(popularFeedsFromPopularNovels);
+        Map<Long, Feed> feedMap = getPopularFeedsFromPopularNovels(user, selectedNovelIdsFromPopularNovel);
         Map<Byte, Avatar> avatarMap = createAvatarMap(feedMap);
 
         return createPopularNovelsGetResponse(popularNovels, feedMap, avatarMap);
@@ -382,13 +380,8 @@ private List<Novel> getSelectedPopularNovels(List<Long> selectedPopularNovelIds)
         return novelRepository.findAllById(selectedPopularNovelIds);
     }
 
-    private List<Feed> getPopularFeedsFromPopularNovels(List<Long> selectedPopularNovelIds) {
-        return feedRepository.findPopularFeedsByNovelIds(selectedPopularNovelIds);
-    }
-
-    private static Map<Long, Feed> createFeedMap(List<Feed> popularFeedsFromPopularNovels) {
-        return popularFeedsFromPopularNovels.stream()
-                .collect(Collectors.toMap(Feed::getNovelId, feed -> feed));
+    private Map<Long, Feed> getPopularFeedsFromPopularNovels(User user, List<Long> selectedPopularNovelIds) {
+        return feedRepository.findPopularFeedsByNovelIds(user, selectedPopularNovelIds);
     }
 
     private Map<Byte, Avatar> createAvatarMap(Map<Long, Feed> feedMap) {