Merge pull request #90 from 0702Yoon/main

feat : 유저 전체 조회 (어드민 미포함)
developthreefeet · Aug 14, 2024 · b9273e0 · b9273e0
2 parents f7e20b1 + cf7706d
commit b9273e0
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberServiceImpl.java
@@ -264,6 +264,7 @@ public MemberInfoResponse changeMemberInfo(String username) {
     public List<MemberInfoResponse> inquireAllMemberInfo() {
         List<MemberInfoResponse> memberInfoResponseList = new ArrayList<>();
         for(Member member: memberLoader.getAllMember()){
+            if(distinguishUser(member.getAffiliations())){
             memberInfoResponseList.add(MemberInfoResponse
                 .builder()
                 .email(member.getEmail())
@@ -272,10 +273,20 @@ public List<MemberInfoResponse> inquireAllMemberInfo() {
                 .updateAt(member.getUpdateAt())
                 .affiliationListDto(getMemberAffiliationRoleList())
                 .build());
+            }
         }
         return memberInfoResponseList;
     }
 
+    private boolean distinguishUser(List<AffiliationMember> affiliations) {
+        for(AffiliationMember affiliationMember : affiliations){
+            if(!"ROLE_USER".equals(affiliationMember.getRole())){
+                return false;
+            }
+        }
+        return true;
+    }
+
 
     @Override
     public AffiliationListDto getMemberAffiliationRoleList() {