fix:독립 영화 asc로 반환하기로 변경

Central-MakeUs · Jan 29, 2024 · d78cd55 · d78cd55
1 parent cf35f9c
commit d78cd55
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/Api/src/main/java/com/example/api/screening/service/ScreeningUploadUseCase.java b/Api/src/main/java/com/example/api/screening/service/ScreeningUploadUseCase.java
@@ -36,7 +36,7 @@ public String uploadImage(MultipartFile file) throws IOException {
     public Screening execute(PostScreeningRequest request) {
         Long userId = SecurityUtil.getCurrentUserId();
         validateExecution(userId);
-        System.out.println(request.getHostName());
+
         final HostInfo hostInfo = HostInfo.of(
                 request.getHostName(),
                 request.getHostPhoneNumber(),
@@ -55,7 +55,7 @@ public Screening execute(PostScreeningRequest request) {
                 request.isHasAgreed(),
                 request.getCategory()
         );
-        System.out.print("finished");
+
         Screening screen = screeningAdaptor.save(newScreening);
         process(screen,userId);
 

diff --git a/Domain/src/main/java/com/example/domains/diverseMovie/adaptor/DiverseMovieAdaptor.java b/Domain/src/main/java/com/example/domains/diverseMovie/adaptor/DiverseMovieAdaptor.java
@@ -8,6 +8,9 @@
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.WeekFields;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -24,17 +27,23 @@ public void save(DiverseMovie diverseMovie) {
     }
 
     public List<DiverseMovieResponseDto> findTop5ByOrderByCreatedAtDesc() {
+        LocalDateTime now = LocalDateTime.now();
+
+        // Get the start and end of the current week
+        LocalDateTime startOfWeek = LocalDate.now().with(WeekFields.ISO.dayOfWeek(), 1).atStartOfDay();
+        LocalDateTime endOfWeek = now;
+
         return jpaQueryFactory
                 .select(new QDiverseMovieResponseDto(
                         diverseMovie.id,
                         diverseMovie.movieTitle,
                         diverseMovie.movieImgUrl,
                         diverseMovie.movieRank
-                        )) // Change "SomeRank" to your actual rank logic
+                ))
                 .from(diverseMovie)
-                .orderBy(diverseMovie.createdAt.desc())
+                .where(diverseMovie.createdAt.between(startOfWeek, endOfWeek)) // Filter movies created within the current week
+                .orderBy(diverseMovie.createdAt.asc())
                 .limit(5)
                 .fetch();
     }
-
 }
diff --git a/...c/main/java/com/example/domains/recommendedPopcorn/adaptor/RecommendedPopcornAdaptor.java b/...c/main/java/com/example/domains/recommendedPopcorn/adaptor/RecommendedPopcornAdaptor.java
@@ -16,6 +16,7 @@
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
 
 @Adaptor
 @RequiredArgsConstructor
@@ -83,7 +84,7 @@ public Set<Long> generate(List<RecommendedPopcorn> thisWeekList) {
         Set<Long> arr = new HashSet<>();
         Random random = new Random();
         while (arr.size()!=3) {
-            Long randomIndex = random.nextLong(thisWeekList.get(0).getId(),recommendedPopcornRepository.findAll().size()+1);
+            long randomIndex = ThreadLocalRandom.current().nextLong(thisWeekList.get(0).getId(), recommendedPopcornRepository.findAll().size() + 1);
             arr.add(randomIndex);
         }
         return arr;