Short form api에 nextpage값 추가

Step3-kakao-tech-campus · Nov 6, 2023 · 8a71f6f · 8a71f6f
2 parents c1bbd04 + b93cc65
commit 8a71f6f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/...src/main/java/com/daggle/animory/domain/shortform/dto/response/CategoryShortFormPage.java b/...src/main/java/com/daggle/animory/domain/shortform/dto/response/CategoryShortFormPage.java
@@ -7,16 +7,19 @@
 public record CategoryShortFormPage(
 
     List<ShortFormDto> shortForms,
-    boolean hasNext
+    boolean hasNext,
+    Integer nextPage
 ) {
 
     public static CategoryShortFormPage of(final List<PetVideo> petVideos,
-                                           final boolean hasNext) {
+                                           final boolean hasNext,
+                                           final Integer nextPage) {
         return new CategoryShortFormPage(
             petVideos.stream()
                 .map(ShortFormDto::of)
                 .toList(),
-            hasNext
+            hasNext,
+            nextPage
         );
     }
 }

diff --git a/...ory/src/main/java/com/daggle/animory/domain/shortform/dto/response/HomeShortFormPage.java b/...ory/src/main/java/com/daggle/animory/domain/shortform/dto/response/HomeShortFormPage.java
@@ -6,16 +6,19 @@
 
 public record HomeShortFormPage(
     List<ShortFormDto> shortForms,
-    boolean hasNext
+    boolean hasNext,
+    Integer nextPage
 ) {
 
     public static HomeShortFormPage of(final List<PetVideo> petVideos,
-                                       final boolean hasNext) {
+                                       final boolean hasNext,
+                                       final Integer nextPage) {
         return new HomeShortFormPage(
             petVideos.stream()
                 .map(ShortFormDto::of)
                 .toList(),
-            hasNext
+            hasNext,
+            nextPage
         );
     }
 }
diff --git a/animory/src/main/java/com/daggle/animory/domain/shortform/service/ShortFormService.java b/animory/src/main/java/com/daggle/animory/domain/shortform/service/ShortFormService.java
@@ -28,26 +28,28 @@ public class ShortFormService {
     public HomeShortFormPage getHomeShortFormPage(final Pageable pageable) {
 
         // Fetch Join + Pageable 동시에 수행하는 경우 발생하는 문제(HHH000104) 해결을 위해 쿼리를 두 개로 분할하였습니다.
-        Slice<Integer> petVideoIdSlice = petVideoJpaRepository.findPetVideoIdsBy(pageable);
-        List<PetVideo> petVideos = petVideoJpqlRepository.findAllByIds(petVideoIdSlice.getContent());
+        final Slice<Integer> petVideoIdSlice = petVideoJpaRepository.findPetVideoIdsBy(pageable);
+        final List<PetVideo> petVideos = petVideoJpqlRepository.findAllByIds(petVideoIdSlice.getContent());
 
         // LikeCount DESC 순서로 조회하고, 반환된 페이지(Slice)를 랜덤으로 섞는다.
         return HomeShortFormPage.of(
             shuffleVideos(petVideos),
-            petVideoIdSlice.hasNext()
+            petVideoIdSlice.hasNext(),
+            getNextPage(petVideoIdSlice.hasNext(), pageable)
         );
     }
 
     public CategoryShortFormPage getCategoryShortFormPage(final ShortFormSearchCondition searchCondition,
                                                           final Pageable pageable) {
-        Slice<Integer> petVideoIds = petVideoJpqlRepository
+        final Slice<Integer> petVideoIds = petVideoJpqlRepository
             .findPetVideoIdsBy(searchCondition.type(), searchCondition.area(), pageable);
 
-        List<PetVideo> petVideos = petVideoJpqlRepository.findAllByIds(petVideoIds.getContent());
+        final List<PetVideo> petVideos = petVideoJpqlRepository.findAllByIds(petVideoIds.getContent());
 
         return CategoryShortFormPage.of(
             shuffleVideos(petVideos),
-            petVideoIds.hasNext()
+            petVideoIds.hasNext(),
+            getNextPage(petVideoIds.hasNext(), pageable)
         );
     }
 
@@ -56,4 +58,9 @@ private List<PetVideo> shuffleVideos(final List<PetVideo> petVideos) {
         Collections.shuffle(petVideos);
         return petVideos;
     }
+
+    private Integer getNextPage(final boolean hasNext,
+                                final Pageable pageable) {
+        return hasNext ? pageable.getPageNumber() + 1 : null;
+    }
 }