diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/repository/MembershipRepository.java b/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/repository/MembershipRepository.java index 9d5b9bc3..ee848592 100644 --- a/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/repository/MembershipRepository.java +++ b/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/repository/MembershipRepository.java @@ -14,13 +14,16 @@ public interface MembershipRepository extends JpaRepository { boolean existsByMemberAndSpace(Member member, Space space); - Page findAllByMemberAndAuthority(Member member, Authority authority, Pageable pageable); - Page findAllByMemberAndAuthorityIsNot(Member member, Authority authority, Pageable pageable); - Page findAllByMember(Member member, Pageable pageable); + Page findAllByMemberAndAuthorityOrderById(Member member, Authority authority, Pageable pageable); + Page findAllByMemberAndAuthorityIsNotOrderById(Member member, Authority authority, Pageable pageable); + Page findAllByMemberOrderById(Member member, Pageable pageable); List findAllByMemberAndAuthority(Member member, Authority authority); + List findAllByMemberAndAuthorityOrderById(Member member, Authority authority); List findAllByMemberAndAuthorityIsNot(Member member, Authority authority); + List findAllByMemberAndAuthorityIsNotOrderById(Member member, Authority authority); List findAllByMember(Member member); + List findAllByMemberOrderById(Member member); boolean existsByMemberAndSpaceAndAuthorityIsNot(Member member, Space space, Authority authority); @@ -29,8 +32,12 @@ public interface MembershipRepository extends JpaRepository Optional findByMemberAndSpace(Member member, Space space); List findAllBySpaceAndAuthority(Space space, Authority authority); + List findAllBySpaceAndAuthorityOrderById(Space space, Authority authority); List findAllBySpaceAndAuthorityIsNot(Space space, Authority authority); + List findAllBySpaceAndAuthorityIsNotOrderById(Space space, Authority authority); long countBySpaceAndAuthority(Space space, Authority authority); + + } diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/service/MembershipService.java b/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/service/MembershipService.java index d296384a..f30a8dbb 100644 --- a/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/service/MembershipService.java +++ b/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/service/MembershipService.java @@ -60,11 +60,11 @@ public Membership findByMemberAndSpace(Member member, Space space) { */ public Page findByMember(Member member, String state, Pageable pageable) { if (state.equalsIgnoreCase("PENDING")) { - return membershipRepository.findAllByMemberAndAuthority(member, Authority.PENDING, pageable); + return membershipRepository.findAllByMemberAndAuthorityOrderById(member, Authority.PENDING, pageable); } else if (state.equalsIgnoreCase("JOINED")) { - return membershipRepository.findAllByMemberAndAuthorityIsNot(member, Authority.PENDING, pageable); + return membershipRepository.findAllByMemberAndAuthorityIsNotOrderById(member, Authority.PENDING, pageable); } else { - return membershipRepository.findAllByMember(member, pageable); + return membershipRepository.findAllByMemberOrderById(member, pageable); } } @@ -76,11 +76,12 @@ public Page findByMember(Member member, String state, Pageable pagea */ public List findByMember(Member member, String state) { if (state.equalsIgnoreCase("PENDING")) { - return membershipRepository.findAllByMemberAndAuthority(member, Authority.PENDING); + return membershipRepository.findAllByMemberAndAuthorityOrderById(member, Authority.PENDING); } else if (state.equalsIgnoreCase("JOINED")) { - return membershipRepository.findAllByMemberAndAuthorityIsNot(member, Authority.PENDING); + return membershipRepository.findAllByMemberAndAuthorityIsNotOrderById(member, Authority.PENDING); } else { - return membershipRepository.findAllByMember(member); + List memberships = membershipRepository.findAllByMemberOrderById(member); + return memberships; } } @@ -90,7 +91,7 @@ public List findByMember(Member member, String state) { * @return 해당 스페이스에 속한 초대 상태(PENDING)인 멤버십 목록 */ public List findInvitationsBySpace(Space space) { - return membershipRepository.findAllBySpaceAndAuthority(space, Authority.PENDING); + return membershipRepository.findAllBySpaceAndAuthorityOrderById(space, Authority.PENDING); } /** @@ -99,7 +100,7 @@ public List findInvitationsBySpace(Space space) { * @return 해당 스페이스에 속한 가입 상태(JOINED)인 멤버십 목록 */ public List findMembersBySpace(Space space) { - return membershipRepository.findAllBySpaceAndAuthorityIsNot(space, Authority.PENDING); + return membershipRepository.findAllBySpaceAndAuthorityIsNotOrderById(space, Authority.PENDING); } // ======================== 권한 조회 ======================== //