[FEAT] 오늘 인기작 조회 기능 구현

src/main/java/org/websoso/WSSServer/WssServerApplication.java

@@ -2,11 +2,13 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @SpringBootApplication
 public class WssServerApplication {
 
  public static void main(String[] args) {
  SpringApplication.run(WssServerApplication.class, args);
  }
-}
+}

src/main/java/org/websoso/WSSServer/config/SecurityConfig.java

@@ -29,7 +29,8 @@ public class SecurityConfig {
  "/actuator/health",
  "/novels/{novelId}",
  "/novels/{novelId}/info",
- "/soso-picks"
+ "/soso-picks",
+ "/novels/popular"
  };
 
  @Bean

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

@@ -15,6 +15,7 @@
 import org.websoso.WSSServer.domain.User;
 import org.websoso.WSSServer.dto.novel.NovelGetResponseBasic;
 import org.websoso.WSSServer.dto.novel.NovelGetResponseInfoTab;
+import org.websoso.WSSServer.dto.popularNovel.PopularNovelsGetResponse;
 import org.websoso.WSSServer.service.NovelService;
 import org.websoso.WSSServer.service.UserService;
 
@@ -70,4 +71,11 @@ public ResponseEntity<Void> unregisterAsInterest(Principal principal,
  .build();
  }
 
+ @GetMapping("/popular")
+ public ResponseEntity<PopularNovelsGetResponse> getTodayPopularNovels(Principal principal) {
+ //TODO 차단 관계에 있는 유저의 피드글 처리
+ return ResponseEntity
+ .status(OK)
+ .body(novelService.getTodayPopularNovels());
+ }
 }

src/main/java/org/websoso/WSSServer/domain/RecentUserNovel.java → src/main/java/org/websoso/WSSServer/domain/PopularNovel.java

@@ -14,14 +14,21 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class RecentUserNovel extends BaseEntity {
+public class PopularNovel extends BaseEntity {
 
  @Id
  @GeneratedValue(strategy = IDENTITY)
  @Column(nullable = false)
- private Long recentUserNovelId;
+ private Long popularNovelId;
 
  @Column(nullable = false)
  private Long novelId;
 
+ private PopularNovel(Long novelId) {
+ this.novelId = novelId;
+ }
+
+ public static PopularNovel from(Long novelId) {
+ return new PopularNovel(novelId);
+ }
 }

src/main/java/org/websoso/WSSServer/dto/popularNovel/PopularNovelGetResponse.java

@@ -0,0 +1,36 @@
+package org.websoso.WSSServer.dto.popularNovel;
+
+import org.websoso.WSSServer.domain.Avatar;
+import org.websoso.WSSServer.domain.Feed;
+import org.websoso.WSSServer.domain.Novel;
+
+public record PopularNovelGetResponse(
+ Long novelId,
+ String title,
+ String novelImage,
+ String avatarImage,
+ String nickname,
+ String feedContent
+) {
+
+ public static PopularNovelGetResponse of(Novel novel, Avatar avatar, Feed feed) {
+ if (avatar == null && feed == null) {
+ return new PopularNovelGetResponse(
+ novel.getNovelId(),
+ novel.getTitle(),
+ novel.getNovelImage(),
+ null,
+ null,
+ novel.getNovelDescription()
+ );
+ }
+ return new PopularNovelGetResponse(
+ novel.getNovelId(),
+ novel.getTitle(),
+ novel.getNovelImage(),
+ avatar.getAvatarImage(),
+ feed.getUser().getNickname(),
+ feed.getFeedContent()
+ );
+ }
+}

src/main/java/org/websoso/WSSServer/dto/popularNovel/PopularNovelsGetResponse.java

@@ -0,0 +1,8 @@
+package org.websoso.WSSServer.dto.popularNovel;
+
+import java.util.List;
+
+public record PopularNovelsGetResponse(
+ List<PopularNovelGetResponse> popularNovels
+) {
+}

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

@@ -0,0 +1,9 @@
+package org.websoso.WSSServer.repository;
+
+import java.util.List;
+import org.websoso.WSSServer.domain.Feed;
+
+public interface FeedCustomRepository {
+
+ List<Feed> findPopularFeedsByNovelIds(List<Long> novelIds);
+}

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

@@ -0,0 +1,34 @@
+package org.websoso.WSSServer.repository;
+
+
+import static org.websoso.WSSServer.domain.QFeed.feed;
+import static org.websoso.WSSServer.domain.QLike.like;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import org.websoso.WSSServer.domain.Feed;
+
+@Repository
+@RequiredArgsConstructor
+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());
+ }
+}

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

@@ -5,7 +5,8 @@
 import org.websoso.WSSServer.domain.Feed;
 
 @Repository
-public interface FeedRepository extends JpaRepository<Feed, Long> {
+public interface FeedRepository extends JpaRepository<Feed, Long>, FeedCustomRepository {
 
  Integer countByNovelId(Long novelId);
+
 }

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

@@ -0,0 +1,10 @@
+package org.websoso.WSSServer.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import org.websoso.WSSServer.domain.PopularNovel;
+
+@Repository
+public interface PopularNovelRepository extends JpaRepository<PopularNovel, Long> {
+
+}

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

@@ -0,0 +1,9 @@
+package org.websoso.WSSServer.repository;
+
+import java.util.List;
+import org.springframework.data.domain.Pageable;
+
+public interface UserNovelCustomRepository {
+
+ List<Long> findTodayPopularNovelsId(Pageable pageable);
+}

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

@@ -0,0 +1,36 @@
+package org.websoso.WSSServer.repository;
+
+import static org.websoso.WSSServer.domain.QUserNovel.userNovel;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.time.LocalDate;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+import org.websoso.WSSServer.domain.common.ReadStatus;
+
+@Repository
+@RequiredArgsConstructor
+public class UserNovelCustomRepositoryImpl implements UserNovelCustomRepository {
+
+ private final JPAQueryFactory jpaQueryFactory;
+
+ @Override
+ public List<Long> findTodayPopularNovelsId(Pageable pageable) {
+ LocalDate sevenDaysAgo = LocalDate.now().minusDays(7);
+
+ return jpaQueryFactory
+ .select(userNovel.novel.novelId)
+ .from(userNovel)
+ .where(userNovel.status.eq(ReadStatus.WATCHING)
+ .or(userNovel.status.eq(ReadStatus.WATCHED))
+ .or(userNovel.isInterest.isTrue())
+ .and(userNovel.createdDate.after(sevenDaysAgo.atStartOfDay())))
+ .groupBy(userNovel.novel.novelId)
+ .orderBy(userNovel.count().desc())
+ .offset(pageable.getOffset())
+ .limit(pageable.getPageSize())
+ .fetch();
+ }
+}

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

@@ -10,7 +10,7 @@
 import org.websoso.WSSServer.domain.common.ReadStatus;
 
 @Repository
-public interface UserNovelRepository extends JpaRepository<UserNovel, Long> {
+public interface UserNovelRepository extends JpaRepository<UserNovel, Long>, UserNovelCustomRepository {
 
  Optional<UserNovel> findByNovelAndUser(Novel novel, User user);
 
@@ -22,5 +22,4 @@ public interface UserNovelRepository extends JpaRepository<UserNovel, Long> {
  Float sumUserNovelRatingByNovel(Novel novel);
 
  Integer countByNovelAndUserNovelRatingNot(Novel novel, float ratingToExclude);
-
 }

src/main/java/org/websoso/WSSServer/scheduler/NovelScheduler.java

@@ -0,0 +1,34 @@
+package org.websoso.WSSServer.scheduler;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.websoso.WSSServer.domain.PopularNovel;
+import org.websoso.WSSServer.repository.PopularNovelRepository;
+import org.websoso.WSSServer.repository.UserNovelRepository;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class NovelScheduler {
+
+ private final UserNovelRepository userNovelRepository;
+ private final PopularNovelRepository popularNovelRepository;
+
+ @Scheduled(cron = "0 0 0 * * ?")
+ public void updatePopularNovels() {
+ List<PopularNovel> yesterdayScheduledPopularNovels = popularNovelRepository.findAll();
+
+ List<Long> topNovelIds = userNovelRepository.findTodayPopularNovelsId(PageRequest.of(0, 30));
+ List<PopularNovel> popularNovels = topNovelIds.stream()
+ .map(PopularNovel::from)
+ .collect(Collectors.toList());
+
+ popularNovelRepository.saveAll(popularNovels);
+ popularNovelRepository.deleteAll(yesterdayScheduledPopularNovels);
+ }
+}

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

@@ -13,13 +13,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.websoso.WSSServer.domain.Avatar;
+import org.websoso.WSSServer.domain.Feed;
 import org.websoso.WSSServer.domain.Keyword;
 import org.websoso.WSSServer.domain.Novel;
 import org.websoso.WSSServer.domain.NovelGenre;
+import org.websoso.WSSServer.domain.PopularNovel;
 import org.websoso.WSSServer.domain.User;
 import org.websoso.WSSServer.domain.UserNovel;
 import org.websoso.WSSServer.domain.UserNovelKeyword;
@@ -28,12 +32,16 @@
 import org.websoso.WSSServer.dto.novel.NovelGetResponseBasic;
 import org.websoso.WSSServer.dto.novel.NovelGetResponseInfoTab;
 import org.websoso.WSSServer.dto.platform.PlatformGetResponse;
+import org.websoso.WSSServer.dto.popularNovel.PopularNovelGetResponse;
+import org.websoso.WSSServer.dto.popularNovel.PopularNovelsGetResponse;
 import org.websoso.WSSServer.exception.exception.CustomNovelException;
 import org.websoso.WSSServer.exception.exception.CustomUserNovelException;
+import org.websoso.WSSServer.repository.AvatarRepository;
 import org.websoso.WSSServer.repository.FeedRepository;
 import org.websoso.WSSServer.repository.NovelGenreRepository;
 import org.websoso.WSSServer.repository.NovelPlatformRepository;
 import org.websoso.WSSServer.repository.NovelRepository;
+import org.websoso.WSSServer.repository.PopularNovelRepository;
 import org.websoso.WSSServer.repository.UserNovelAttractivePointRepository;
 import org.websoso.WSSServer.repository.UserNovelKeywordRepository;
 import org.websoso.WSSServer.repository.UserNovelRepository;
@@ -54,6 +62,8 @@ public class NovelService {
  private final FeedRepository feedRepository;
  private final NovelGenreRepository novelGenreRepository;
  private final UserNovelKeywordRepository userNovelKeywordRepository;
+ private final PopularNovelRepository popularNovelRepository;
+ private final AvatarRepository avatarRepository;
 
  @Transactional(readOnly = true)
  public Novel getNovelOrException(Long novelId) {
@@ -227,4 +237,70 @@ private List<KeywordCountGetResponse> getKeywords(Novel novel) {
  .collect(Collectors.toList());
  }
 
+ @Transactional(readOnly = true)
+ public PopularNovelsGetResponse getTodayPopularNovels() {
+ List<Long> popularNovelIds = getPopularNovelIds();
+ List<Long> selectedPopularNovelIds = getSelectedPopularNovelIds(popularNovelIds);
+ List<Novel> popularNovels = getSelectedPopularNovels(selectedPopularNovelIds);
+ List<Feed> popularFeedsFromPopularNovels = getPopularFeedsFromPopularNovels(selectedPopularNovelIds);
+
+ Map<Long, Feed> feedMap = createFeedMap(popularFeedsFromPopularNovels);
+ Map<Byte, Avatar> avatarMap = createAvatarMap(feedMap);
+
+ return createPopularNovelsGetResponse(popularNovels, feedMap, avatarMap);
+ }
+
+ private List<Long> getPopularNovelIds() {
+ return new ArrayList<>(popularNovelRepository.findAll()
+ .stream()
+ .map(PopularNovel::getNovelId)
+ .toList());
+ }
+
+ private static List<Long> getSelectedPopularNovelIds(List<Long> popularNovelIds) {
+ Collections.shuffle(popularNovelIds);
+ return popularNovelIds.size() > 10
+ ? popularNovelIds.subList(0, 10)
+ : popularNovelIds;
+ }
+
+ 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<Byte, Avatar> createAvatarMap(Map<Long, Feed> feedMap) {
+ Set<Byte> avatarIds = feedMap.values()
+ .stream()
+ .map(feed -> feed.getUser().getAvatarId())
+ .collect(Collectors.toSet());
+
+ List<Avatar> avatars = avatarRepository.findAllById(avatarIds);
+ return avatars.stream()
+ .collect(Collectors.toMap(Avatar::getAvatarId, avatar -> avatar));
+ }
+
+ private static PopularNovelsGetResponse createPopularNovelsGetResponse(List<Novel> popularNovels,
+ Map<Long, Feed> feedMap,
+ Map<Byte, Avatar> avatarMap) {
+ List<PopularNovelGetResponse> popularNovelResponses = popularNovels.stream()
+ .map(novel -> {
+ Feed feed = feedMap.get(novel.getNovelId());
+ if (feed == null) {
+ return PopularNovelGetResponse.of(novel, null, null);
+ }
+ Avatar avatar = avatarMap.get(feed.getUser().getAvatarId());
+ return PopularNovelGetResponse.of(novel, avatar, feed);
+ })
+ .toList();
+ return new PopularNovelsGetResponse(popularNovelResponses);
+ }
 }