[FIX] 작품 미연결 피드 조회 및 소소피드 전체 조회시 피드 작성자의 별점 조회

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

@@ -30,7 +30,8 @@ public record FeedInfo(
         String thumbnailUrl,
         Integer imageCount,
         String genreName,
-        Float userNovelRating
+        Float userNovelRating,
+        Float feedWriterNovelRating
 ) {
     public static FeedInfo of(Feed feed, UserBasicInfo userBasicInfo, Novel novel, Boolean isLiked,
                               List<String> relevantCategories, Boolean isMyFeed, String thumbnailUrl,
@@ -40,6 +41,7 @@ public static FeedInfo of(Feed feed, UserBasicInfo userBasicInfo, Novel novel, B
         Float novelRating = null;
         String genreName = null;
         Float userNovelRating = null;
+        Float feedWriterNovelRating = null;
 
         if (novel != null) {
             List<UserNovel> userNovels = novel.getUserNovels().stream().filter(un -> un.getUserNovelRating() > 0.0)
@@ -51,6 +53,7 @@ public static FeedInfo of(Feed feed, UserBasicInfo userBasicInfo, Novel novel, B
                     novelRatingCount);
             genreName = getNovelGenreName(novel);
             userNovelRating = getUserNovelRating(novel, user);
+            feedWriterNovelRating = getFeedWriterNovelRating(novel, feed.getUser().getUserId());
         }
 
         return new FeedInfo(
@@ -75,7 +78,8 @@ public static FeedInfo of(Feed feed, UserBasicInfo userBasicInfo, Novel novel, B
                 thumbnailUrl,
                 imageCount,
                 genreName,
-                userNovelRating
+                userNovelRating,
+                feedWriterNovelRating
         );
     }
 
@@ -107,4 +111,17 @@ private static Float getUserNovelRating(Novel novel, User user) {
                 .orElse(null);
     }
 
+    private static Float getFeedWriterNovelRating(Novel novel, Long feedWriterId) {
+        if (novel == null) {
+            return null;
+        }
+
+        return novel.getUserNovels()
+                .stream()
+                .filter(userNovel -> userNovel.getUser().getUserId().equals(feedWriterId))
+                .findFirst()
+                .map(UserNovel::getUserNovelRating)
+                .orElse(null);
+    }
+
 }

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

@@ -28,7 +28,8 @@ public record UserFeedGetResponse(
         String genre,
         Float userNovelRating,
         String thumbnailUrl,
-        Integer imageCount
+        Integer imageCount,
+        Float feedWriterNovelRating
 ) {
 
     public static UserFeedGetResponse of(Feed feed, Novel novel, Long visitorId, String thumbnailUrl,
@@ -41,6 +42,7 @@ public static UserFeedGetResponse of(Feed feed, Novel novel, Long visitorId, Str
         List<String> relevantCategories = getFeedCategories(feed);
         String genreName = getNovelGenreName(novel);
         Float userNovelRating = getUserNovelRating(novel, visitorId);
+        Float feedWriterNovelRating = getFeedWriterNovelRating(novel, feed.getUser().getUserId());
 
         return new UserFeedGetResponse(
                 feed.getFeedId(),
@@ -63,7 +65,8 @@ public static UserFeedGetResponse of(Feed feed, Novel novel, Long visitorId, Str
                 genreName,
                 userNovelRating,
                 thumbnailUrl,
-                imageCount
+                imageCount,
+                feedWriterNovelRating
         );
     }
 
@@ -134,4 +137,17 @@ private static Float getUserNovelRating(Novel novel, Long visitorId) {
                 .map(UserNovel::getUserNovelRating)
                 .orElse(null);
     }
+
+    private static Float getFeedWriterNovelRating(Novel novel, Long feedWriterId) {
+        if (novel == null) {
+            return null;
+        }
+
+        return novel.getUserNovels()
+                .stream()
+                .filter(userNovel -> userNovel.getUser().getUserId().equals(feedWriterId))
+                .findFirst()
+                .map(UserNovel::getUserNovelRating)
+                .orElse(null);
+    }
 }

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

@@ -155,7 +155,7 @@ private BooleanExpression checkPopularFeed() {
     }
 
     private BooleanExpression checkGenres(List<Genre> genres) {
-        if (genres != null && !genres.isEmpty()) {
+        if (genres != null && !genres.isEmpty() && feed.novelId != null) {
             return genre.in(genres);
         }
         return null;