Merge pull request #54 from FlouD-2024/mypage

Feat: PageInfo 필드 추가
FlouD-2024 · Mar 17, 2024 · c189915 · c189915
2 parents a9a656f + c6f7c40
commit c189915
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/src/main/java/floud/demo/dto/PageInfo.java b/src/main/java/floud/demo/dto/PageInfo.java
@@ -9,5 +9,6 @@ public class PageInfo {
     private Integer nowPage;
     private Integer totalPages;
     private Long totalElements;
+    private Boolean previous;
     private Boolean last;
 }
diff --git a/src/main/java/floud/demo/service/CommunityService.java b/src/main/java/floud/demo/service/CommunityService.java
@@ -126,12 +126,13 @@ private List<Post> setPostList(Page<Community> communityPage){
                 .toList();
     }
 
-    private PageInfo setPageInfo(Page<Community> postPage){
+    private PageInfo setPageInfo(Page<Community> communityPage){
         return PageInfo.builder()
-                .last(!postPage.hasNext())
-                .nowPage(postPage.getNumber())
-                .totalPages(postPage.getTotalPages())
-                .totalElements(postPage.getTotalElements())
+                .last(!communityPage.hasNext())
+                .previous(communityPage.hasPrevious())
+                .nowPage(communityPage.getNumber())
+                .totalPages(communityPage.getTotalPages())
+                .totalElements(communityPage.getTotalElements())
                 .build();
     }
 

diff --git a/src/main/java/floud/demo/service/FriendshipService.java b/src/main/java/floud/demo/service/FriendshipService.java
@@ -216,12 +216,13 @@ public List<FriendshipDto> findFriendInfo(Users me, LocalDate date, Page<Friends
         return myfriendsInfo;
     }
 
-    private PageInfo setPageInfo(Page<Friendship> postPage){
+    private PageInfo setPageInfo(Page<Friendship> friendshipPage){
         return PageInfo.builder()
-                .last(!postPage.hasNext())
-                .nowPage(postPage.getNumber())
-                .totalPages(postPage.getTotalPages())
-                .totalElements(postPage.getTotalElements())
+                .last(!friendshipPage.hasNext())
+                .previous(friendshipPage.hasPrevious())
+                .nowPage(friendshipPage.getNumber())
+                .totalPages(friendshipPage.getTotalPages())
+                .totalElements(friendshipPage.getTotalElements())
                 .build();
     }
 }
diff --git a/src/main/java/floud/demo/service/MyPageService.java b/src/main/java/floud/demo/service/MyPageService.java
@@ -219,7 +219,8 @@ private Users getFriend(Friendship friendship, Users me) {
     private PageInfo setPageInfo(Page<Community> postPage){
         return PageInfo.builder()
                 .last(!postPage.hasNext())
-                .nowPage(postPage.getNumber())
+                .previous(postPage.hasPrevious())
+                .nowPage(postPage.getNumber()+1)
                 .totalPages(postPage.getTotalPages())
                 .totalElements(postPage.getTotalElements())
                 .build();