develop [develop] 검색 로직 수정

team-yello · Feb 16, 2024 · 357b696 · 357b696
1 parent a8bb63e
commit 357b696
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/yello/server/domain/friend/service/FriendService.java b/src/main/java/com/yello/server/domain/friend/service/FriendService.java
@@ -120,6 +120,7 @@ public SearchFriendResponse searchFriend(Long userId, Pageable pageable,
         final User user = userRepository.getById(userId);
         final String groupName = user.getGroup().getGroupName();
         List<String> uuidList = Arrays.asList(YELLO_FEMALE, YELLO_MALE);
+        List<User> friends = new ArrayList<>();
 
         List<User> friendList = new ArrayList<>();
 
@@ -132,13 +133,12 @@ public SearchFriendResponse searchFriend(Long userId, Pageable pageable,
                     userRepository.findAllByGroupContainingName(groupName, keyword, uuidList));
             friendList.addAll(
                     userRepository.findAllByOtherGroupContainingName(groupName, keyword, uuidList));
-
+            friendList.addAll(userRepository.findAllByGroupNameContainingAndFriendListNotContaining(keyword, uuidList, friendList));
         } else {
             friendList.addAll(
                     userRepository.findAllByGroupContainingYelloId(groupName, keyword, uuidList));
             friendList.addAll(
                     userRepository.findAllByOtherGroupContainingYelloId(groupName, keyword, uuidList));
-            friendList.addAll(userRepository.findAllByGroupNameContainingAndFriendListNotContaining(keyword, uuidList, friendList));
         }
 
         List<SearchFriendVO> pageList = PaginationFactory.getPage(friendList, pageable)