refactor: 인기 동영상 추천 관련 수정

f-lab-edu · Jul 29, 2024 · 134b0b6 · 134b0b6
1 parent a68ef3a
commit 134b0b6
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 11 deletions.
diff --git a/mitube-app/build.gradle b/mitube-app/build.gradle
@@ -7,6 +7,7 @@ dependencies {
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'net.nurigo:sdk:4.3.0' // sms 서비스
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.mysql:mysql-connector-j'
     compileOnly 'org.projectlombok:lombok'

diff --git a/mitube-app/src/main/java/com/misim/MitubeAppApplication.java b/mitube-app/src/main/java/com/misim/MitubeAppApplication.java
@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class MitubeAppApplication {
 
     public static void main(String[] args) {

diff --git a/mitube-app/src/main/java/com/misim/entity/ViewIncreaseRequest.java b/mitube-app/src/main/java/com/misim/entity/ViewIncreaseRequest.java
@@ -0,0 +1,33 @@
+package com.misim.entity;
+
+import com.misim.util.TimeUtil;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import java.time.LocalDateTime;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@Table(name = "view_increase_requests")
+@NoArgsConstructor
+public class ViewIncreaseRequest {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Long videoId;
+
+    private LocalDateTime requestDateTime;
+
+    @Builder
+    public ViewIncreaseRequest(Long videoId) {
+        this.videoId = videoId;
+        this.requestDateTime = TimeUtil.getNow();
+    }
+}
diff --git a/mitube-app/src/main/java/com/misim/repository/ViewIncreaseRequestRepository.java b/mitube-app/src/main/java/com/misim/repository/ViewIncreaseRequestRepository.java
@@ -0,0 +1,18 @@
+package com.misim.repository;
+
+import com.misim.entity.ViewIncreaseRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ViewIncreaseRequestRepository extends JpaRepository<ViewIncreaseRequest, Long> {
+
+    @Query("SELECT v.videoId, COUNT(*) as requestCount FROM ViewIncreaseRequest v where v.requestDateTime > :oneWeekAgo GROUP BY v.videoId ORDER BY requestCount DESC LIMIT 10")
+    List<Object[]> findTopIncreaseAmountVideoIds(@Param("oneWeekAgo") LocalDateTime oneWeekAgo);
+
+    void deleteByRequestDateTimeBefore(LocalDateTime oneWeekAgo);
+}
diff --git a/mitube-app/src/main/java/com/misim/service/AsyncService.java b/mitube-app/src/main/java/com/misim/service/AsyncService.java
@@ -1,8 +1,10 @@
 package com.misim.service;
 
 import com.misim.entity.Video;
+import com.misim.entity.ViewIncreaseRequest;
 import com.misim.entity.WatchingInfo;
 import com.misim.repository.VideoRepository;
+import com.misim.repository.ViewIncreaseRequestRepository;
 import com.misim.repository.WatchingInfoRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Async;
@@ -14,12 +16,17 @@ public class AsyncService {
 
     private final VideoRepository videoRepository;
     private final WatchingInfoRepository watchingInfoRepository;
+    private final ViewIncreaseRequestRepository viewIncreaseRequestRepository;
 
     @Async
     public void startWatchingVideo(Video video, WatchingInfo watchingInfo) {
         videoRepository.save(video);
         if (watchingInfo.getId() == null) {
             watchingInfoRepository.save(watchingInfo);
         }
+        viewIncreaseRequestRepository.save(ViewIncreaseRequest.builder()
+            .videoId(video.getId())
+            .build()
+        );
     }
 }
diff --git a/mitube-app/src/main/java/com/misim/service/HomeService.java b/mitube-app/src/main/java/com/misim/service/HomeService.java
@@ -15,7 +15,7 @@ public HomeResponse getHome(Long userId) {
 
         return HomeResponse.builder()
             .categoryList(VideoCategory.getCategoryList())
-            .hotVideoList(null)//videoService.getHotVideos())
+            .hotVideoList(videoService.getHotVideos())
             .newVideoList(videoService.getNewVideos())
             .watchingVideoList(videoService.getWatchingVideos(userId))
             .subscribingChannelNewVideoList(videoService.getSubscribingChannelNewVideos(userId))

diff --git a/mitube-app/src/main/java/com/misim/service/VideoService.java b/mitube-app/src/main/java/com/misim/service/VideoService.java
@@ -47,6 +47,7 @@ public class VideoService {
     private final SubscriptionRepository subscriptionRepository;
     private final AsyncService asyncService;
     private final ReactionService reactionService;
+    private final ViewIncreaseRequestService viewIncreaseRequestService;
 
     public String uploadVideos(MultipartFile file) {
 
@@ -189,16 +190,14 @@ public List<VideoResponse> getNewVideos() {
         return VideoResponse.convertVideos(videos);
     }
 
-//    public List<VideoResponse> getHotVideos() {
-//
-//        Set<View> viewSet = viewRepository.findHotTen();
-//
-//        List<Long> videoIds = viewSet.stream().map(View::getVideoId).toList();
-//
-//        List<Video> videos = videoRepository.findAllById(videoIds);
-//
-//        return VideoResponse.convertVideos(videos);
-//    }
+    public List<VideoResponse> getHotVideos() {
+
+        List<Long> videoIds = viewIncreaseRequestService.getTopIncreasesForLastWeek();
+
+        List<Video> videos = videoRepository.findAllById(videoIds);
+
+        return VideoResponse.convertVideos(videos);
+    }
 
     public List<VideoResponse> getWatchingVideos(Long userId) {
 

diff --git a/mitube-app/src/main/java/com/misim/service/ViewIncreaseRequestService.java b/mitube-app/src/main/java/com/misim/service/ViewIncreaseRequestService.java
@@ -0,0 +1,32 @@
+package com.misim.service;
+
+import com.misim.repository.ViewIncreaseRequestRepository;
+import com.misim.util.TimeUtil;
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class ViewIncreaseRequestService {
+
+    private final ViewIncreaseRequestRepository viewIncreaseRequestRepository;
+
+    public List<Long> getTopIncreasesForLastWeek() {
+        LocalDateTime oneWeekAgo = TimeUtil.getNow().minusDays(7);
+        List<Object[]> result = viewIncreaseRequestRepository.findTopIncreaseAmountVideoIds(oneWeekAgo);
+        return result.stream()
+            .map(row -> ((Number) row[0]).longValue())
+            .toList();
+    }
+
+    @Scheduled(fixedRate = 3600000) // 1시간 간격으로 실행
+    @Transactional
+    public void cleanOldRecords() {
+        LocalDateTime oneWeekAgo = TimeUtil.getNow().minusDays(7).plusMinutes(1);
+        viewIncreaseRequestRepository.deleteByRequestDateTimeBefore(oneWeekAgo);
+    }
+}