[#31] 기간별 인기 피드

src/main/java/com/stoury/config/batch/BatchConfig.java

@@ -1,8 +1,12 @@
 package com.stoury.config.batch;
 
+import com.stoury.domain.Feed;
 import com.stoury.repository.FeedRepository;
+import com.stoury.repository.LikeRepository;
 import com.stoury.repository.RankingRepository;
 import com.stoury.utils.CacheKeys;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceContext;
 import lombok.RequiredArgsConstructor;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
@@ -11,15 +15,22 @@
 import org.springframework.batch.core.job.flow.Flow;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.builder.StepBuilder;
+import org.springframework.batch.item.ItemProcessor;
+import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.item.database.JpaPagingItemReader;
+import org.springframework.batch.item.database.builder.JpaPagingItemReaderBuilder;
 import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.util.Pair;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.transaction.PlatformTransactionManager;
 
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 
 @Configuration
@@ -29,6 +40,7 @@ public class BatchConfig {
     Pageable pageable = PageRequest.of(0, 10);
     private final FeedRepository feedRepository;
     private final RankingRepository rankingRepository;
+    private final EntityManagerFactory entityManagerFactory;
 
     @Bean
     public Step stepUpdatePopularDomesticCities(JobRepository jobRepository, PlatformTransactionManager tm) {
@@ -69,4 +81,131 @@ public Job jobUpdatePopularSpots(JobRepository jobRepository, PlatformTransactio
                 .end()
                 .build();
     }
+
+    @Bean
+    public JpaPagingItemReader<Feed> feedReader() {
+        return new JpaPagingItemReaderBuilder<Feed>()
+                .name("feedReader")
+                .pageSize(100)
+                .entityManagerFactory(entityManagerFactory)
+                .queryString("select f from Feed f")
+                .build();
+    }
+
+    @Bean
+    public ItemProcessor<Feed, Pair<String, Long>> dailyFeedProcessor(LikeRepository likeRepository) {
+        return feedProcessor(likeRepository, ChronoUnit.DAYS);
+    }
+
+    @Bean
+    public ItemProcessor<Feed, Pair<String, Long>> weeklyFeedProcessor(LikeRepository likeRepository) {
+        return feedProcessor(likeRepository, ChronoUnit.WEEKS);
+    }
+
+    @Bean
+    public ItemProcessor<Feed, Pair<String, Long>> monthlyFeedProcessor(LikeRepository likeRepository) {
+        return feedProcessor(likeRepository, ChronoUnit.MONTHS);
+    }
+
+    public ItemProcessor<Feed, Pair<String, Long>> feedProcessor(LikeRepository likeRepository, ChronoUnit chronoUnit) {
+        return feed -> {
+            String feedId = feed.getId().toString();
+
+            if (!likeRepository.existsByFeedId(feedId)) {
+                return Pair.of(feedId, 0L);
+            }
+            long currentLikes = likeRepository.getCountByFeedId(feedId);
+            long prevLikes = likeRepository.getCountSnapshotByFeed(feedId, chronoUnit);
+
+            return Pair.of(feedId, currentLikes - prevLikes);
+        };
+    }
+
+    @Bean
+    public ItemWriter<Pair<String, Long>> dailyFeedWriter() {
+        return feedWriter(ChronoUnit.DAYS);
+    }
+
+    @Bean
+    public ItemWriter<Pair<String, Long>> weeklyFeedWriter() {
+        return feedWriter(ChronoUnit.WEEKS);
+    }
+
+    @Bean
+    public ItemWriter<Pair<String, Long>> monthlyFeedWriter() {
+        return feedWriter(ChronoUnit.MONTHS);
+    }
+
+    public ItemWriter<Pair<String, Long>> feedWriter(ChronoUnit chronoUnit) {
+        return list -> {
+            for (Pair<String, Long> pair : list) {
+                String feedId = pair.getFirst();
+                Long likeIncrease = pair.getSecond();
+
+                if (likeIncrease > 0) {
+                    rankingRepository.saveHotFeed(feedId, likeIncrease, chronoUnit);
+                }
+            }
+        };
+    }
+
+    @Bean
+    public Step stepDailyFeed(JobRepository jobRepository, PlatformTransactionManager tm,
+                              ThreadPoolTaskExecutor taskExecutor, LikeRepository likeRepository) {
+        return new StepBuilder("stepDailyFeed", jobRepository)
+                .<Feed, Pair<String, Long>>chunk(100, tm)
+                .reader(feedReader())
+                .processor(dailyFeedProcessor(likeRepository))
+                .writer(dailyFeedWriter())
+                .taskExecutor(taskExecutor)
+                .build();
+    }
+
+    @Bean
+    public Step stepWeeklyFeed(JobRepository jobRepository, PlatformTransactionManager tm,
+                              ThreadPoolTaskExecutor taskExecutor, LikeRepository likeRepository) {
+        return new StepBuilder("stepWeeklyFeed", jobRepository)
+                .<Feed, Pair<String, Long>>chunk(100, tm)
+                .reader(feedReader())
+                .processor(weeklyFeedProcessor(likeRepository))
+                .writer(weeklyFeedWriter())
+                .taskExecutor(taskExecutor)
+                .build();
+    }
+
+    @Bean
+    public Step stepMonthlyFeed(JobRepository jobRepository, PlatformTransactionManager tm,
+                              ThreadPoolTaskExecutor taskExecutor, LikeRepository likeRepository) {
+        return new StepBuilder("stepMonthlyFeed", jobRepository)
+                .<Feed, Pair<String, Long>>chunk(100, tm)
+                .reader(feedReader())
+                .processor(monthlyFeedProcessor(likeRepository))
+                .writer(monthlyFeedWriter())
+                .taskExecutor(taskExecutor)
+                .build();
+    }
+
+    @Bean
+    public Job jobDailyFeed(JobRepository jobRepository, PlatformTransactionManager tm,
+                            ThreadPoolTaskExecutor taskExecutor, LikeRepository likeRepository) {
+        return new JobBuilder("jobDailyFeed", jobRepository)
+                .start(stepDailyFeed(jobRepository, tm, taskExecutor, likeRepository))
+                .build();
+    }
+
+    @Bean
+    public Job jobWeeklyFeed(JobRepository jobRepository, PlatformTransactionManager tm,
+                            ThreadPoolTaskExecutor taskExecutor, LikeRepository likeRepository) {
+        return new JobBuilder("jobWeeklyFeed", jobRepository)
+                .start(stepWeeklyFeed(jobRepository, tm, taskExecutor, likeRepository))
+                .build();
+    }
+
+    @Bean
+    public Job jobMonthlyFeed(JobRepository jobRepository, PlatformTransactionManager tm,
+                            ThreadPoolTaskExecutor taskExecutor, LikeRepository likeRepository) {
+        return new JobBuilder("jobMonthlyFeed", jobRepository)
+                .start(stepMonthlyFeed(jobRepository, tm, taskExecutor, likeRepository))
+                .build();
+    }
 }

src/main/java/com/stoury/config/security/SecurityConfig.java

@@ -34,8 +34,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http, HandlerMapping
                         .requestMatchers(new MvcRequestMatcher.Builder(introspector).pattern(HttpMethod.GET, "/feeds/member/**")).permitAll()
                         .requestMatchers(new MvcRequestMatcher.Builder(introspector).pattern(HttpMethod.GET, "/feeds/tag/**")).permitAll()
                         .requestMatchers(new MvcRequestMatcher.Builder(introspector).pattern(HttpMethod.GET, "/feeds/popular/*")).permitAll()
-                        .requestMatchers(new MvcRequestMatcher.Builder(introspector).pattern(HttpMethod.GET, "/feeds/*")).permitAll()
                         .requestMatchers(new MvcRequestMatcher.Builder(introspector).pattern(HttpMethod.GET, "/comments/**")).permitAll()
+                        .requestMatchers(new MvcRequestMatcher.Builder(introspector).pattern(HttpMethod.GET, "/rank/**")).permitAll()
                         .anyRequest().authenticated())
                 .exceptionHandling(exHandler -> exHandler
                         .authenticationEntryPoint((request, response, authException) -> response

src/main/java/com/stoury/controller/CommentController.java

@@ -11,6 +11,10 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor

src/main/java/com/stoury/controller/FeedController.java

@@ -8,7 +8,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -46,16 +45,6 @@ public List<FeedResponse> getFeedsOfMember(@PathVariable Long memberId,
         return feedService.getFeedsOfMemberId(memberId, orderThan);
     }
 
-    @GetMapping("/feeds/popular/abroad-spots")
-    public List<String> getPopularAbroadSpots() {
-        return feedService.getPopularAbroadSpots();
-    }
-
-    @GetMapping("/feeds/popular/domestic-spots")
-    public List<String> getPopularDomesticSpots() {
-        return feedService.getPopularDomesticSpots();
-    }
-
     @PutMapping("/feeds/{feedId}")
     public FeedResponse updateFeed(@PathVariable Long feedId, @RequestBody FeedUpdateRequest feedUpdateRequest) {
         return feedService.updateFeed(feedId, feedUpdateRequest);

src/main/java/com/stoury/controller/RankingController.java

@@ -0,0 +1,41 @@
+package com.stoury.controller;
+
+import com.stoury.dto.feed.FeedResponse;
+import com.stoury.service.RankingService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class RankingController {
+    private final RankingService rankingService;
+
+    @GetMapping("/rank/abroad-spots")
+    public List<String> getPopularAbroadSpots() {
+        return rankingService.getPopularAbroadSpots();
+    }
+
+    @GetMapping("/rank/domestic-spots")
+    public List<String> getPopularDomesticSpots() {
+        return rankingService.getPopularDomesticSpots();
+    }
+
+    @GetMapping("/rank/daily-hot-feeds")
+    public List<FeedResponse> getDailyHotFeeds() {
+        return rankingService.getHotFeeds(ChronoUnit.DAYS);
+    }
+
+    @GetMapping("/rank/weekly-hot-feeds")
+    public List<FeedResponse> getWeeklyHotFeeds() {
+        return rankingService.getHotFeeds(ChronoUnit.WEEKS);
+    }
+
+    @GetMapping("/rank/monthly-hot-feeds")
+    public List<FeedResponse> getMonthlyHotFeeds() {
+        return rankingService.getHotFeeds(ChronoUnit.MONTHS);
+    }
+}

src/main/java/com/stoury/domain/Feed.java

@@ -31,7 +31,7 @@ public class Feed {
     @CreatedDate
     private LocalDateTime createdAt;
 
-    @JoinTable(joinColumns = @JoinColumn(name = "FEED_ID"))
+    @JoinColumn(name = "FEED_ID")
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
     private List<GraphicContent> graphicContents = new ArrayList<>();
 
@@ -45,7 +45,9 @@ public class Feed {
     private Double longitude;
 
     @ManyToMany(fetch = FetchType.LAZY)
-    @JoinTable(joinColumns = @JoinColumn(name = "FEED_ID"),
+    @JoinTable(
+            name = "FEED_TAG",
+            joinColumns = @JoinColumn(name = "FEED_ID"),
             inverseJoinColumns = @JoinColumn(name = "TAG_ID"))
     private List<Tag> tags = new ArrayList<>();