fix: commit conflict

Team-B1ND · Aug 22, 2024 · e4d39b3 · e4d39b3
1 parent b1a2044
commit e4d39b3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...odam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/MemberQueryUseCase.java b/...odam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/MemberQueryUseCase.java
@@ -52,11 +52,10 @@ public ResponseData<List<MemberInfoRes>> getDeactivateMembers() {
     }
 
     @Cacheable(value = "members-cache", key = "'activeMembers'")
-    public ResponseData<List<MemberInfoRes>> getAll() {
-        return ResponseData.ok("모든 멤버 정보 조회 성공", memberRepository.findByStatusOrderByStudent(ActiveStatus.ACTIVE)
-                .parallelStream()
+    public List<MemberInfoRes> getAll() {
+        return memberRepository.findByStatusOrderByStudent(ActiveStatus.ACTIVE).parallelStream()
                 .map(this::getMemberInfo)
-                .toList());
+                .toList();
     }
 
     private MemberInfoRes getMemberInfo(Member member) {