Merge pull request #55 from FlouD-2024/mypage

feat: add previous field in friendPageInfo
FlouD-2024 · Mar 17, 2024 · 163d00b · 163d00b
2 parents c189915 + 8280f5d
commit 163d00b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/floud/demo/dto/mypage/MypageFriendListResponseDto.java b/src/main/java/floud/demo/dto/mypage/MypageFriendListResponseDto.java
@@ -13,5 +13,5 @@
 public class MypageFriendListResponseDto {
     private List<MyWaiting> waitingList;
     private List<MyFriend> myFriendList;
-    private PageInfo frinedPageInfo;
+    private PageInfo pageInfo;
 }
diff --git a/src/main/java/floud/demo/service/MyPageService.java b/src/main/java/floud/demo/service/MyPageService.java
@@ -29,7 +29,6 @@ public class MyPageService {
     private final UsersRepository usersRepository;
     private final GoalRepository goalRepository;
     private final FriendshipRepository friendshipRepository;
-    private final AlarmRepository alarmRepository;
     private final CommunityRepository communityRepository;
 
 
@@ -183,7 +182,7 @@ private MypageFriendListResponseDto findFriends(Pageable pageable, Users me){
         return MypageFriendListResponseDto.builder()
                 .waitingList(myWaitingList)
                 .myFriendList(myFriendList)
-                .frinedPageInfo(setFriendPageInfo(acceptedFriends))
+                .pageInfo(setFriendPageInfo(acceptedFriends))
                 .build();
     }
 
@@ -220,7 +219,7 @@ private PageInfo setPageInfo(Page<Community> postPage){
         return PageInfo.builder()
                 .last(!postPage.hasNext())
                 .previous(postPage.hasPrevious())
-                .nowPage(postPage.getNumber()+1)
+                .nowPage(postPage.getNumber())
                 .totalPages(postPage.getTotalPages())
                 .totalElements(postPage.getTotalElements())
                 .build();
@@ -229,6 +228,7 @@ private PageInfo setPageInfo(Page<Community> postPage){
     private PageInfo setFriendPageInfo(Page<Friendship> friendshipPage){
         return PageInfo.builder()
                 .last(!friendshipPage.hasNext())
+                .previous(friendshipPage.hasPrevious())
                 .nowPage(friendshipPage.getNumber())
                 .totalPages(friendshipPage.getTotalPages())
                 .totalElements(friendshipPage.getTotalElements())