Skip to content

Commit f2e808e

Browse files
authored
Merge pull request #69 from Gathering-Organization/be/feat/admin
[fix] 유저 목록 List 반환 (admin 전용)
2 parents b345e89 + 2bb2f1f commit f2e808e

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

Gathering_be/src/main/java/com/Gathering_be/controller/AdminController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import com.Gathering_be.service.AdminService;
1111
import lombok.RequiredArgsConstructor;
1212
import org.springframework.data.domain.Page;
13-
import org.springframework.data.domain.Pageable;
14-
import org.springframework.data.web.PageableDefault;
1513
import org.springframework.http.ResponseEntity;
1614
import org.springframework.security.access.prepost.PreAuthorize;
1715
import org.springframework.web.bind.annotation.*;
1816

17+
import java.util.List;
18+
1919
@RestController
2020
@RequiredArgsConstructor
2121
@RequestMapping("/api/admin")
@@ -24,8 +24,8 @@ public class AdminController {
2424

2525
@GetMapping("/members")
2626
@PreAuthorize("hasRole('ADMIN')")
27-
public ResponseEntity<ResultResponse> findMembers(@PageableDefault(size = 10) Pageable pageable) {
28-
Page<MemberInfoForAdminResponse> members = adminService.findMembers(pageable);
27+
public ResponseEntity<ResultResponse> getMembers() {
28+
List<MemberInfoForAdminResponse> members = adminService.getMembers();
2929
return ResponseEntity.ok(ResultResponse.of(ResultCode.MEMBER_READ_SUCCESS, members));
3030
}
3131

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package com.Gathering_be.repository;
22

33
import com.Gathering_be.domain.Profile;
4-
import org.springframework.data.domain.Page;
5-
import org.springframework.data.domain.Pageable;
64
import org.springframework.data.jpa.repository.JpaRepository;
75
import org.springframework.data.jpa.repository.Query;
8-
import org.springframework.data.repository.query.Param;
96
import org.springframework.stereotype.Repository;
107

118
import java.util.List;
@@ -18,7 +15,6 @@ public interface ProfileRepository extends JpaRepository<Profile, Long> {
1815
Optional<Profile> findByNickname(String nickname);
1916
boolean existsByNickname(String nickname);
2017
List<Profile> findAllByNicknameIn(Set<String> nicknames);
21-
@Query(value = "SELECT p FROM Profile p JOIN FETCH p.member m",
22-
countQuery = "SELECT COUNT(p) FROM Profile p")
23-
Page<Profile> findAllWithMember(Pageable pageable);
18+
@Query(value = "SELECT p FROM Profile p JOIN FETCH p.member m")
19+
List<Profile> findAllWithMember();
2420
}

Gathering_be/src/main/java/com/Gathering_be/service/AdminService.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ public class AdminService {
3232
private final ProfileRepository profileRepository;
3333
private final ProjectRepository projectRepository;
3434

35-
public Page<MemberInfoForAdminResponse> findMembers(Pageable pageable) {
36-
Page<Profile> profiles = profileRepository.findAllWithMember(pageable);
37-
return profiles.map(MemberInfoForAdminResponse::from);
35+
public List<MemberInfoForAdminResponse> getMembers() {
36+
List<Profile> profiles = profileRepository.findAllWithMember();
37+
return profiles.stream()
38+
.map(MemberInfoForAdminResponse::from)
39+
.collect(Collectors.toList());
3840
}
3941

4042
public void changeMemberRole(Long memberId, Role newRole) {

0 commit comments

Comments
 (0)