Update GroupApply

WinningBean · May 11, 2020 · 00fbcc0 · 00fbcc0
1 parent 6bae63b
commit 00fbcc0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/src/main/java/com/fairy_pitt/recordary/endpoint/group/GroupApplyController.java b/src/main/java/com/fairy_pitt/recordary/endpoint/group/GroupApplyController.java
@@ -43,13 +43,13 @@ public Boolean applyDelete(@RequestBody GroupMemberRequestDto id){
     }
 
     @GetMapping("findGroupApply/{userCd}")
-    public List<GroupResponseDto> findGroupAppliesToUser(@PathVariable Long userCd){
+    public List<GroupApplyResponseDto> findGroupAppliesToUser(@PathVariable Long userCd){
 
         return groupApplyService.findGroupAppliesToUser(userCd);
     }
 
     @GetMapping("findUserApply/{groupCd}")
-    public List<UserResponseDto> findUserAppliesToGroup(@PathVariable Long groupCd)
+    public List<GroupApplyResponseDto> findUserAppliesToGroup(@PathVariable Long groupCd)
     {
         return groupApplyService.findUserAppliesToGroup(groupCd);
     }

diff --git a/src/main/java/com/fairy_pitt/recordary/endpoint/group/service/GroupApplyService.java b/src/main/java/com/fairy_pitt/recordary/endpoint/group/service/GroupApplyService.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -49,29 +50,20 @@ public void delete (GroupMemberRequestDto requestDto) {
     }
 
     @Transactional(readOnly = true)
-    public List<GroupResponseDto> findGroupAppliesToUser(Long userId){
+    public List<GroupApplyResponseDto> findGroupAppliesToUser(Long userId){
         UserEntity user = userService.findEntity(userId);
-        List<GroupApplyEntity> groupApplyEntities = groupApplyRepository.findAllByUserFKAndAndApplyState(user,1);
-        List<GroupResponseDto> groupResponseDto = new ArrayList<>();
+     return groupApplyRepository.findAllByUserFKAndAndApplyState(user,1).stream()
+                .map(GroupApplyResponseDto :: new)
+                .collect(Collectors.toList());
 
-        for (GroupApplyEntity groupApplyEntity : groupApplyEntities){
-            GroupResponseDto responseDto = new GroupResponseDto(groupApplyEntity.getGroupFK());
-            groupResponseDto.add(responseDto);
-        }
-        return groupResponseDto;
     }
 
     @Transactional(readOnly = true)
-    public List<UserResponseDto> findUserAppliesToGroup(Long groupCd){
+    public List<GroupApplyResponseDto> findUserAppliesToGroup(Long groupCd){
         GroupEntity group = groupRepository.findByGroupCd(groupCd);
-        List<GroupApplyEntity> groupApplyEntities = groupApplyRepository.findAllByGroupFKAndApplyState(group,2);
-        List<UserResponseDto> userResponseDto = new ArrayList<>();
-
-        for (GroupApplyEntity groupApplyEntity : groupApplyEntities){
-            UserResponseDto responseDto = new UserResponseDto(groupApplyEntity.getUserFK());
-            userResponseDto.add(responseDto);
-        }
-        return userResponseDto;
+        return groupApplyRepository.findAllByGroupFKAndApplyState(group,2).stream()
+                .map(GroupApplyResponseDto :: new)
+                .collect(Collectors.toList());
     }
 
     private Boolean checkApply(Long groupCd, Long userCd)