fix : 스페이스, 사용자 목록 반환 시 항상 id 오름차순 정렬 (#94)

Co-authored-by: EpicFn <[email protected]>

Author: EpicFn

src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/repository/MembershipRepository.java

@@ -14,13 +14,16 @@
 public interface MembershipRepository extends JpaRepository<Membership, Integer> {
     boolean existsByMemberAndSpace(Member member, Space space);
 
-    Page<Membership> findAllByMemberAndAuthority(Member member, Authority authority, Pageable pageable);
-    Page<Membership> findAllByMemberAndAuthorityIsNot(Member member, Authority authority, Pageable pageable);
-    Page<Membership> findAllByMember(Member member, Pageable pageable);
+    Page<Membership> findAllByMemberAndAuthorityOrderById(Member member, Authority authority, Pageable pageable);
+    Page<Membership> findAllByMemberAndAuthorityIsNotOrderById(Member member, Authority authority, Pageable pageable);
+    Page<Membership> findAllByMemberOrderById(Member member, Pageable pageable);
 
     List<Membership> findAllByMemberAndAuthority(Member member, Authority authority);
+    List<Membership> findAllByMemberAndAuthorityOrderById(Member member, Authority authority);
     List<Membership> findAllByMemberAndAuthorityIsNot(Member member, Authority authority);
+    List<Membership> findAllByMemberAndAuthorityIsNotOrderById(Member member, Authority authority);
     List<Membership> findAllByMember(Member member);
+    List<Membership> findAllByMemberOrderById(Member member);
 
     boolean existsByMemberAndSpaceAndAuthorityIsNot(Member member, Space space, Authority authority);
 
@@ -29,8 +32,12 @@ public interface MembershipRepository extends JpaRepository<Membership, Integer>
     Optional<Membership> findByMemberAndSpace(Member member, Space space);
 
     List<Membership> findAllBySpaceAndAuthority(Space space, Authority authority);
+    List<Membership> findAllBySpaceAndAuthorityOrderById(Space space, Authority authority);
 
     List<Membership> findAllBySpaceAndAuthorityIsNot(Space space, Authority authority);
+    List<Membership> findAllBySpaceAndAuthorityIsNotOrderById(Space space, Authority authority);
 
     long countBySpaceAndAuthority(Space space, Authority authority);
+
+
 }

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<Membership> 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<Membership> findByMember(Member member, String state, Pageable pagea
      */
     public List<Membership> 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<Membership> memberships = membershipRepository.findAllByMemberOrderById(member);
+            return memberships;
         }
     }
 
@@ -90,7 +91,7 @@ public List<Membership> findByMember(Member member, String state) {
      * @return 해당 스페이스에 속한 초대 상태(PENDING)인 멤버십 목록
      */
     public List<Membership> findInvitationsBySpace(Space space) {
-        return membershipRepository.findAllBySpaceAndAuthority(space, Authority.PENDING);
+        return membershipRepository.findAllBySpaceAndAuthorityOrderById(space, Authority.PENDING);
     }
 
     /**
@@ -99,7 +100,7 @@ public List<Membership> findInvitationsBySpace(Space space) {
      * @return 해당 스페이스에 속한 가입 상태(JOINED)인 멤버십 목록
      */
     public List<Membership> findMembersBySpace(Space space) {
-        return membershipRepository.findAllBySpaceAndAuthorityIsNot(space, Authority.PENDING);
+        return membershipRepository.findAllBySpaceAndAuthorityIsNotOrderById(space, Authority.PENDING);
     }
 
     // ======================== 권한 조회 ======================== //