Skip to content

[Hotfix] 스페이스 목록, 멤버 목록 조회 시 id 오름차순 정렬 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2025
Merged

[Hotfix] 스페이스 목록, 멤버 목록 조회 시 id 오름차순 정렬 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...va/org/tuna/zoopzoop/backend/domain/space/membership/repository/MembershipRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);


Copy link

Copilot AI Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove extra blank lines at the end of the file. Only one blank line should be present before the closing brace.

Suggested change

Copilot uses AI. Check for mistakes.
}
17 changes: 9 additions & 8 deletions ...ain/java/org/tuna/zoopzoop/backend/domain/space/membership/service/MembershipService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand All @@ -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;
Comment on lines +83 to +84
Copy link

Copilot AI Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary variable assignment. The method result can be returned directly: return membershipRepository.findAllByMemberOrderById(member);

Suggested change
List<Membership> memberships = membershipRepository.findAllByMemberOrderById(member);
return memberships;
return membershipRepository.findAllByMemberOrderById(member);

Copilot uses AI. Check for mistakes.
}
}

Expand All @@ -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);
}

/**
Expand All @@ -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);
}

// ======================== 권한 조회 ======================== //
Expand Down