diff --git a/src/main/java/org/websoso/WSSServer/application/FeedFindApplication.java b/src/main/java/org/websoso/WSSServer/application/FeedFindApplication.java index 47bcd3e1..a951e640 100644 --- a/src/main/java/org/websoso/WSSServer/application/FeedFindApplication.java +++ b/src/main/java/org/websoso/WSSServer/application/FeedFindApplication.java @@ -2,13 +2,9 @@ import static org.websoso.WSSServer.exception.error.CustomAvatarError.AVATAR_NOT_FOUND; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; + import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Slice; @@ -135,30 +131,51 @@ private FeedInfo createFeedInfo(Feed feed, User user) { } @Transactional(readOnly = true) - public PopularFeedsGetResponse getPopularFeeds(User user) { - Long currentUserId = Optional.ofNullable(user).map(User::getUserId).orElse(null); - - List popularFeeds = Optional.ofNullable(user).map(u -> findPopularFeedsWithUser(u.getUserId())) - .orElseGet(this::findPopularFeedsWithoutUser); + public PopularFeedsGetResponse getPopularFeeds(User user, int size) { + List popularFeeds = Optional.ofNullable(user) + .map(u -> findPopularFeedsWithUser(u.getUserId(), size)) + .orElseGet(() -> findPopularFeedsWithoutUser(size)); + + List novelIds = popularFeeds.stream() + .map(f -> f.getFeed().getNovelId()) + .filter(Objects::nonNull) + .distinct() + .toList(); + + Map novelMap = novelServiceImpl.getNovelsWithGenresByIds(novelIds).stream() + .collect(Collectors.toMap(Novel::getNovelId, novel -> novel)); - List popularFeedGetResponses = mapToPopularFeedGetResponseList(popularFeeds, - currentUserId); + List popularFeedGetResponses = mapToPopularFeedGetResponseList(popularFeeds, novelMap); - return new PopularFeedsGetResponse(popularFeedGetResponses); + return PopularFeedsGetResponse.of(popularFeedGetResponses); } - private List findPopularFeedsWithUser(Long userId) { - return feedServiceImpl.findPopularFeedsWithUser(userId); + private List findPopularFeedsWithUser(Long userId, int size) { + return feedServiceImpl.findPopularFeedsWithUser(userId, size); } - private List findPopularFeedsWithoutUser() { - return feedServiceImpl.findPopularFeedsWithoutUser(); + private List findPopularFeedsWithoutUser(int size) { + return feedServiceImpl.findPopularFeedsWithoutUser(size); } private static List mapToPopularFeedGetResponseList(List popularFeeds, - Long currentUserId) { - return popularFeeds.stream().filter(pf -> pf.getFeed().isVisibleTo(currentUserId)) - .map(PopularFeedGetResponse::of).toList(); + Map novelMap) { + return popularFeeds.stream() + .map(popularFeed -> { + Novel novel = novelMap.get(popularFeed.getFeed().getNovelId()); + String novelImage = Optional.ofNullable(novel).map(Novel::getNovelImage).orElse(null); + String novelGenreImage = Optional.ofNullable(novel) + .flatMap(FeedFindApplication::getFirstNovelGenreImage) + .orElse(null); + + return PopularFeedGetResponse.of(popularFeed, novelImage, novelGenreImage); + }).toList(); + } + + private static Optional getFirstNovelGenreImage(Novel novel) { + return novel.getNovelGenres().stream() + .findFirst() + .map(novelGenre -> novelGenre.getGenre().getGenreImage()); } @Transactional(readOnly = true) diff --git a/src/main/java/org/websoso/WSSServer/dto/popularFeed/PopularFeedGetResponse.java b/src/main/java/org/websoso/WSSServer/dto/popularFeed/PopularFeedGetResponse.java index 600f0864..e6ab00fb 100644 --- a/src/main/java/org/websoso/WSSServer/dto/popularFeed/PopularFeedGetResponse.java +++ b/src/main/java/org/websoso/WSSServer/dto/popularFeed/PopularFeedGetResponse.java @@ -8,17 +8,21 @@ public record PopularFeedGetResponse( Integer likeCount, Integer commentCount, Boolean isSpoiler, - Boolean isPublic + Boolean isPublic, + String novelImage, + String novelGenreImage ) { - public static PopularFeedGetResponse of(PopularFeed popularFeed) { + public static PopularFeedGetResponse of(PopularFeed popularFeed, String novelImage, String novelGenreImage) { return new PopularFeedGetResponse( popularFeed.getFeed().getFeedId(), popularFeed.getFeed().getFeedContent(), popularFeed.getFeed().getLikes().size(), popularFeed.getFeed().getComments().size(), popularFeed.getFeed().getIsSpoiler(), - popularFeed.getFeed().getIsPublic() + popularFeed.getFeed().getIsPublic(), + novelImage, + novelGenreImage ); } } diff --git a/src/main/java/org/websoso/WSSServer/feed/controller/FeedController.java b/src/main/java/org/websoso/WSSServer/feed/controller/FeedController.java index fcce0644..e724125f 100644 --- a/src/main/java/org/websoso/WSSServer/feed/controller/FeedController.java +++ b/src/main/java/org/websoso/WSSServer/feed/controller/FeedController.java @@ -112,10 +112,11 @@ public ResponseEntity unLikeFeed(@AuthenticationPrincipal User user, } @GetMapping("/popular") - public ResponseEntity getPopularFeeds(@AuthenticationPrincipal User user) { + public ResponseEntity getPopularFeeds(@AuthenticationPrincipal User user, + @RequestParam(name = "size", defaultValue = "9") int size) { return ResponseEntity .status(OK) - .body(feedFindApplication.getPopularFeeds(user)); + .body(feedFindApplication.getPopularFeeds(user, size)); } @GetMapping("/interest") diff --git a/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedCustomRepository.java b/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedCustomRepository.java index 646476b3..72aad00f 100644 --- a/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedCustomRepository.java +++ b/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedCustomRepository.java @@ -5,5 +5,7 @@ public interface PopularFeedCustomRepository { - List findTodayPopularFeeds(Long userId); + List findTodayPopularFeeds(Long userId, int size); + + List findOrderByPopularFeedIdDesc(int size); } diff --git a/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedCustomRepositoryImpl.java b/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedCustomRepositoryImpl.java index 07857ea4..a4f1388f 100644 --- a/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedCustomRepositoryImpl.java +++ b/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedCustomRepositoryImpl.java @@ -1,12 +1,16 @@ package org.websoso.WSSServer.feed.repository; +import static org.websoso.WSSServer.feed.domain.QFeed.feed; import static org.websoso.WSSServer.feed.domain.QPopularFeed.popularFeed; import static org.websoso.WSSServer.user.domain.QBlock.block; +import static org.websoso.WSSServer.user.domain.QUser.user; import com.querydsl.jpa.impl.JPAQueryFactory; + import java.util.List; import java.util.stream.Stream; + import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; import org.websoso.WSSServer.feed.domain.PopularFeed; @@ -18,7 +22,7 @@ public class PopularFeedCustomRepositoryImpl implements PopularFeedCustomReposit private final JPAQueryFactory jpaQueryFactory; @Override - public List findTodayPopularFeeds(Long userId) { + public List findTodayPopularFeeds(Long userId, int size) { List blockingIds = jpaQueryFactory .select(block.blockedId) .from(block) @@ -37,9 +41,25 @@ public List findTodayPopularFeeds(Long userId) { return jpaQueryFactory .selectFrom(popularFeed) - .where(popularFeed.feed.user.userId.notIn(blockIds)) + .join(popularFeed.feed, feed) + .join(feed.user, user) + .where(user.userId.notIn(blockIds), + popularFeed.feed.isPublic.isTrue(), + popularFeed.feed.isHidden.isFalse()) + .orderBy(popularFeed.popularFeedId.desc()) + .limit(size) + .fetch(); + } + + @Override + public List findOrderByPopularFeedIdDesc(int size) { + return jpaQueryFactory + .selectFrom(popularFeed) + .join(popularFeed.feed, feed) + .where(feed.isPublic.isTrue(), + feed.isHidden.isFalse()) .orderBy(popularFeed.popularFeedId.desc()) - .limit(9) + .limit(size) .fetch(); } } diff --git a/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedRepository.java b/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedRepository.java index e2fd2e9c..b8caaebc 100644 --- a/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedRepository.java +++ b/src/main/java/org/websoso/WSSServer/feed/repository/PopularFeedRepository.java @@ -11,5 +11,4 @@ public interface PopularFeedRepository extends JpaRepository, Boolean existsByFeed(Feed feed); - List findTop9ByOrderByPopularFeedIdDesc(); } diff --git a/src/main/java/org/websoso/WSSServer/feed/service/FeedServiceImpl.java b/src/main/java/org/websoso/WSSServer/feed/service/FeedServiceImpl.java index 5d95b42d..56db0be1 100644 --- a/src/main/java/org/websoso/WSSServer/feed/service/FeedServiceImpl.java +++ b/src/main/java/org/websoso/WSSServer/feed/service/FeedServiceImpl.java @@ -6,7 +6,6 @@ import java.util.Comparator; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import java.util.stream.Stream; import lombok.RequiredArgsConstructor; @@ -90,13 +89,13 @@ public Optional findThumbnailFeedImageByFeedId(Long feedId) { } @Transactional(readOnly = true) - public List findPopularFeedsWithUser(Long userId) { - return popularFeedRepository.findTodayPopularFeeds(userId); + public List findPopularFeedsWithUser(Long userId, int size) { + return popularFeedRepository.findTodayPopularFeeds(userId, size); } @Transactional(readOnly = true) - public List findPopularFeedsWithoutUser() { - return popularFeedRepository.findTop9ByOrderByPopularFeedIdDesc(); + public List findPopularFeedsWithoutUser(int size) { + return popularFeedRepository.findOrderByPopularFeedIdDesc(size); } @Transactional(readOnly = true) diff --git a/src/main/java/org/websoso/WSSServer/feed/service/PopularFeedService.java b/src/main/java/org/websoso/WSSServer/feed/service/PopularFeedService.java deleted file mode 100644 index abf3a54e..00000000 --- a/src/main/java/org/websoso/WSSServer/feed/service/PopularFeedService.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.websoso.WSSServer.feed.service; - -import java.util.List; -import java.util.Optional; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.websoso.WSSServer.user.domain.User; -import org.websoso.WSSServer.dto.popularFeed.PopularFeedGetResponse; -import org.websoso.WSSServer.dto.popularFeed.PopularFeedsGetResponse; -import org.websoso.WSSServer.feed.domain.PopularFeed; -import org.websoso.WSSServer.feed.repository.PopularFeedRepository; - -@Service -@RequiredArgsConstructor -@Transactional -public class PopularFeedService { - - private final PopularFeedRepository popularFeedRepository; - - @Transactional(readOnly = true) - public PopularFeedsGetResponse getPopularFeeds(User user) { - Long currentUserId = Optional.ofNullable(user).map(User::getUserId).orElse(null); - - List popularFeeds = Optional.ofNullable(user).map(u -> findPopularFeedsWithUser(u.getUserId())) - .orElseGet(this::findPopularFeedsWithoutUser); - - List popularFeedGetResponses = mapToPopularFeedGetResponseList(popularFeeds, - currentUserId); - - return new PopularFeedsGetResponse(popularFeedGetResponses); - } - - private List findPopularFeedsWithUser(Long userId) { - return popularFeedRepository.findTodayPopularFeeds(userId); - } - - private List findPopularFeedsWithoutUser() { - return popularFeedRepository.findTop9ByOrderByPopularFeedIdDesc(); - } - - private static List mapToPopularFeedGetResponseList(List popularFeeds, - Long currentUserId) { - return popularFeeds.stream().filter(pf -> pf.getFeed().isVisibleTo(currentUserId)) - .map(PopularFeedGetResponse::of).toList(); - } -} diff --git a/src/main/java/org/websoso/WSSServer/novel/repository/NovelCustomRepository.java b/src/main/java/org/websoso/WSSServer/novel/repository/NovelCustomRepository.java index c69c58aa..a5a65963 100644 --- a/src/main/java/org/websoso/WSSServer/novel/repository/NovelCustomRepository.java +++ b/src/main/java/org/websoso/WSSServer/novel/repository/NovelCustomRepository.java @@ -14,4 +14,6 @@ public interface NovelCustomRepository { Page findFilteredNovels(Pageable pageable, List genres, Boolean isCompleted, Float novelRatingStart, Float novelRatingEnd, List keywords); List findAutocompleteNovels(String searchQuery, int limitSize); + + List findAllByNovelIdInWithGenres(List novelIds); } diff --git a/src/main/java/org/websoso/WSSServer/novel/repository/NovelCustomRepositoryImpl.java b/src/main/java/org/websoso/WSSServer/novel/repository/NovelCustomRepositoryImpl.java index 64de1814..a745d0b6 100644 --- a/src/main/java/org/websoso/WSSServer/novel/repository/NovelCustomRepositoryImpl.java +++ b/src/main/java/org/websoso/WSSServer/novel/repository/NovelCustomRepositoryImpl.java @@ -1,5 +1,6 @@ package org.websoso.WSSServer.novel.repository; +import static org.websoso.WSSServer.domain.QGenre.genre; import static org.websoso.WSSServer.domain.common.ReadStatus.WATCHED; import static org.websoso.WSSServer.domain.common.ReadStatus.WATCHING; import static org.websoso.WSSServer.library.domain.QUserNovel.userNovel; @@ -103,8 +104,6 @@ public Page findFilteredNovels(Pageable pageable, List genres, Boo @Override public List findAutocompleteNovels(String searchQuery, int limitSize) { - - return jpaQueryFactory .selectFrom(novel) .leftJoin(novel.userNovels, userNovel) @@ -115,6 +114,17 @@ public List findAutocompleteNovels(String searchQuery, int limitSize) { .fetch(); } + @Override + public List findAllByNovelIdInWithGenres(List novelIds) { + return jpaQueryFactory + .selectDistinct(novel) + .from(novel) + .leftJoin(novel.novelGenres, novelGenre).fetchJoin() + .leftJoin(novelGenre.genre, genre).fetchJoin() + .where(novel.novelId.in(novelIds)) + .fetch(); + } + private BooleanExpression titleContainsQuery(String searchQuery) { return getCleanedString(novel.title).containsIgnoreCase(searchQuery); } diff --git a/src/main/java/org/websoso/WSSServer/novel/service/NovelServiceImpl.java b/src/main/java/org/websoso/WSSServer/novel/service/NovelServiceImpl.java index f5ef11ea..92cea1f7 100644 --- a/src/main/java/org/websoso/WSSServer/novel/service/NovelServiceImpl.java +++ b/src/main/java/org/websoso/WSSServer/novel/service/NovelServiceImpl.java @@ -2,8 +2,6 @@ import static org.websoso.WSSServer.exception.error.CustomNovelError.NOVEL_NOT_FOUND; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; @@ -11,7 +9,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.websoso.WSSServer.domain.Genre; -import org.websoso.WSSServer.novel.domain.PopularNovel; import org.websoso.WSSServer.dto.platform.PlatformGetResponse; import org.websoso.WSSServer.exception.exception.CustomNovelException; import org.websoso.WSSServer.library.domain.Keyword; @@ -20,7 +17,6 @@ import org.websoso.WSSServer.novel.repository.NovelGenreRepository; import org.websoso.WSSServer.novel.repository.NovelPlatformRepository; import org.websoso.WSSServer.novel.repository.NovelRepository; -import org.websoso.WSSServer.novel.repository.PopularNovelRepository; @Service @RequiredArgsConstructor @@ -37,6 +33,15 @@ public Novel getNovelOrException(Long novelId) { "novel with the given id is not found")); } + @Transactional(readOnly = true) + public List getNovelsWithGenresByIds(List novelIds) { + if (novelIds == null || novelIds.isEmpty()) { + return List.of(); + } + + return novelRepository.findAllByNovelIdInWithGenres(novelIds); + } + public Page searchNovels(PageRequest pageRequest, String searchQuery) { return novelRepository.findSearchedNovels(pageRequest, searchQuery); }