feat: 친구 삭제/닉네임 부분 검색 추가 (#249)

kmw10693 · web-flow · commit fdd764bf1744 · 2025-05-19T11:39:41.000+09:00
* bug: EnableScheduling 제거

* bug: 젠킨스 실행 오류 해결

* bug: 젠킨스 실행 오류 해결

* feat: 친구 보낸 요청 API 추가

* feat: 친구 삭제/닉네임 검색 추가
diff --git a/src/main/java/ku_rum/backend/domain/friend/application/FriendManageService.java b/src/main/java/ku_rum/backend/domain/friend/application/FriendManageService.java
@@ -63,4 +63,19 @@ public void deleteSentRequest(final FriendRequest friendSendRequest) {
         friendRepository.delete(friend);
     }
 
+    public void deleteFriend(Long targetUserId) {
+        User currentUser = userUtil.getUser();
+        User targetUser = userQueryService.getUserById(targetUserId);
+
+        boolean isFriend = friendRepository.existsByFromUserAndToUserAndStatus(currentUser, targetUser, FriendStatus.ACCEPT) ||
+                friendRepository.existsByFromUserAndToUserAndStatus(targetUser, currentUser, FriendStatus.ACCEPT);
+
+        if (!isFriend) {
+            throw new GlobalException(NO_FRIEND_REQUEST);
+        }
+
+        friendRepository.deleteByFromUserAndToUser(currentUser, targetUser);
+        friendRepository.deleteByFromUserAndToUser(targetUser, currentUser);
+    }
+
 }
diff --git a/src/main/java/ku_rum/backend/domain/friend/application/FriendQueryService.java b/src/main/java/ku_rum/backend/domain/friend/application/FriendQueryService.java
@@ -4,9 +4,11 @@
 import ku_rum.backend.domain.friend.domain.repository.FriendRepository;
 import ku_rum.backend.domain.friend.domain.vo.FriendStatus;
 import ku_rum.backend.domain.friend.dto.response.FriendListResponse;
+import ku_rum.backend.domain.friend.dto.response.FriendSearchResponse;
 import ku_rum.backend.domain.friend.dto.response.ReceivedFriendResponse;
 import ku_rum.backend.domain.friend.dto.response.SentFriendResponse;
 import ku_rum.backend.domain.user.domain.User;
+import ku_rum.backend.domain.user.domain.repository.UserRepository;
 import ku_rum.backend.global.utill.UserUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -22,6 +24,7 @@
 public class FriendQueryService {
 
     private final FriendRepository friendRepository;
+    private final UserRepository userRepository;
     private final UserUtil userUtil;
 
     // 친구 목록 조회
@@ -48,16 +51,43 @@ public List<ReceivedFriendResponse> getReceivedPendingRequests() {
     }
 
     public List<SentFriendResponse> getSentPendingRequests() {
-            User currentUser = userUtil.getUser();
-            List<Friend> sentRequests = friendRepository.findByFromUserAndStatus(currentUser, FriendStatus.PENDING);
-
-            return sentRequests.stream()
-                    .map(req -> new SentFriendResponse(
-                            req.getId(),
-                            req.getToUser().getId(),
-                            req.getToUser().getNickname(),
-                            req.getToUser().getImageUrl()
-                    ))
-                    .toList();
-        }
+        User currentUser = userUtil.getUser();
+        List<Friend> sentRequests = friendRepository.findByFromUserAndStatus(currentUser, FriendStatus.PENDING);
+
+        return sentRequests.stream()
+                .map(req -> new SentFriendResponse(
+                        req.getId(),
+                        req.getToUser().getId(),
+                        req.getToUser().getNickname(),
+                        req.getToUser().getImageUrl()
+                ))
+                .toList();
+    }
+
+    public List<FriendSearchResponse> searchByNickname(final String nickname) {
+        User currentUser = userUtil.getUser();
+        List<User> matchedUsers = userRepository.findByNicknameContainingIgnoreCase(nickname).stream()
+                .filter(user -> !user.getId().equals(currentUser.getId()))
+                .toList();
+
+        List<Long> targetUserIds = matchedUsers.stream()
+                .map(User::getId)
+                .collect(Collectors.toList());
+
+        // 1. 친구 요청을 보낸 사용자 ID 리스트 (PENDING)
+        List<Long> sentRequestUserIds = friendRepository.findToUserIdsByFromUserAndStatus(currentUser.getId(), targetUserIds, FriendStatus.PENDING);
+
+        // 2. 친구인 사용자 ID 리스트 (ACCEPTED 양방향)
+        List<Long> friendUserIds = friendRepository.findFriendUserIds(currentUser.getId(), targetUserIds, FriendStatus.ACCEPT);
+
+        return matchedUsers.stream()
+                .map(user -> new FriendSearchResponse(
+                        user.getId(),
+                        user.getNickname(),
+                        user.getImageUrl(),
+                        sentRequestUserIds.contains(user.getId()),
+                        friendUserIds.contains(user.getId())
+                ))
+                .collect(Collectors.toList());
+    }
 }
diff --git a/src/main/java/ku_rum/backend/domain/friend/domain/repository/FriendRepository.java b/src/main/java/ku_rum/backend/domain/friend/domain/repository/FriendRepository.java
@@ -4,6 +4,8 @@
 import ku_rum.backend.domain.friend.domain.vo.FriendStatus;
 import ku_rum.backend.domain.user.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -16,4 +18,22 @@ public interface FriendRepository extends JpaRepository<Friend, Long> {
     Optional<Friend> findByFromUserAndToUser(User fromUser, User toUser);
     List<Friend> findByToUserAndStatus(User toUser, FriendStatus status);
     List<Friend> findByFromUserAndStatus(User fromUser, FriendStatus status);
+
+    @Query("SELECT f.toUser.id FROM Friend f " +
+            "WHERE f.fromUser.id = :fromUserId AND f.toUser.id IN :targetUserIds AND f.status = :status")
+    List<Long> findToUserIdsByFromUserAndStatus(@Param("fromUserId") Long fromUserId,
+                                                @Param("targetUserIds") List<Long> targetUserIds,
+                                                @Param("status") FriendStatus status);
+
+    @Query("SELECT f.toUser.id FROM Friend f " +
+            "WHERE f.fromUser.id = :currentUserId AND f.toUser.id IN :targetUserIds AND f.status = :status " +
+            "UNION " +
+            "SELECT f.fromUser.id FROM Friend f " +
+            "WHERE f.toUser.id = :currentUserId AND f.fromUser.id IN :targetUserIds AND f.status = :status")
+    List<Long> findFriendUserIds(@Param("currentUserId") Long currentUserId,
+                                 @Param("targetUserIds") List<Long> targetUserIds,
+                                 @Param("status") FriendStatus status);
+
+    boolean existsByFromUserAndToUserAndStatus(User fromUser, User toUser, FriendStatus status);
+
 }
diff --git a/src/main/java/ku_rum/backend/domain/friend/dto/response/FriendSearchResponse.java b/src/main/java/ku_rum/backend/domain/friend/dto/response/FriendSearchResponse.java
@@ -0,0 +1,4 @@
+package ku_rum.backend.domain.friend.dto.response;
+
+public record FriendSearchResponse(Long userId, String nickname, String imageUrl, boolean requestSent, boolean isFriend) {
+}
diff --git a/src/main/java/ku_rum/backend/domain/friend/presentation/FriendManageController.java b/src/main/java/ku_rum/backend/domain/friend/presentation/FriendManageController.java
@@ -48,4 +48,13 @@ public BaseResponse<Void> deleteSentRequest(@RequestBody final FriendRequest Fri
         friendManageService.deleteSentRequest(FriendDeleteRequest);
         return BaseResponse.ok();
     }
+
+    /**
+     * 친구 삭제 API
+     */
+    @DeleteMapping("/{friendId}")
+    public BaseResponse<Void> deleteFriend(@PathVariable final Long friendId) {
+        friendManageService.deleteFriend(friendId);
+        return BaseResponse.ok();
+    }
 }
diff --git a/src/main/java/ku_rum/backend/domain/friend/presentation/FriendQueryController.java b/src/main/java/ku_rum/backend/domain/friend/presentation/FriendQueryController.java
@@ -2,12 +2,14 @@
 
 import ku_rum.backend.domain.friend.application.FriendQueryService;
 import ku_rum.backend.domain.friend.dto.response.FriendListResponse;
+import ku_rum.backend.domain.friend.dto.response.FriendSearchResponse;
 import ku_rum.backend.domain.friend.dto.response.ReceivedFriendResponse;
 import ku_rum.backend.domain.friend.dto.response.SentFriendResponse;
 import ku_rum.backend.global.support.response.BaseResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -32,4 +34,9 @@ public BaseResponse<List<ReceivedFriendResponse>> getReceivedRequests() {
     public BaseResponse<List<SentFriendResponse>> getSentRequests() {
         return BaseResponse.ok(friendQueryService.getSentPendingRequests());
     }
+  
+    @GetMapping("/search")
+    public BaseResponse<List<FriendSearchResponse>> searchFriendByNickname(@RequestParam final String nickname) {
+        return BaseResponse.ok(friendQueryService.searchByNickname(nickname));
+    }
 }
diff --git a/src/main/java/ku_rum/backend/domain/user/domain/repository/UserRepository.java b/src/main/java/ku_rum/backend/domain/user/domain/repository/UserRepository.java
@@ -4,6 +4,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
@@ -25,4 +26,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findUserByLoginId(String loginId);
 
     Optional<User> findByOauthId(String oauthId);
+
+    List<User> findByNicknameContainingIgnoreCase(String nickname);
 }
diff --git a/src/main/java/ku_rum/backend/global/support/status/BaseExceptionResponseStatus.java b/src/main/java/ku_rum/backend/global/support/status/BaseExceptionResponseStatus.java
@@ -77,6 +77,7 @@ public enum BaseExceptionResponseStatus implements ResponseStatus {
     NO_PENDING_LIST(706, HttpStatus.BAD_REQUEST, "친구 요청에 목록이 없습니다."),
     NOT_EQUAL_TO_USER(707, HttpStatus.BAD_REQUEST, "보낸 요청과 친구가 일치하지 않습니다."),
     DUPLICATE_RESPONSE(708, HttpStatus.BAD_REQUEST, "이미 처리된 요청은 삭제할 수 없습니다."),
+    NO_FRIEND_REQUEST(709, HttpStatus.BAD_REQUEST, "해당 친구가 존재하지 않습니다"),
 
     /**
      * 800: Notice
diff --git a/src/test/java/ku_rum/backend/domain/friend/presentation/FriendManageControllerTest.java b/src/test/java/ku_rum/backend/domain/friend/presentation/FriendManageControllerTest.java
@@ -22,6 +22,8 @@
 import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
+
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -158,4 +160,35 @@ void deleteFriendRequest() throws Exception {
                                 .build())
                 ));
     }
+
+    @Test
+    @DisplayName("친구 삭제 API")
+    @WithMockUser
+    void deleteFriend() throws Exception {
+        Long friendId = 1L;
+
+        // friendManageService.deleteFriend(friendId)를 void로 호출하는 경우
+        doNothing().when(friendManageService).deleteFriend(friendId);
+
+        mockMvc.perform(delete("/api/v1/friends/{friendId}", friendId)
+                        .header("Authorization", "Bearer your.jwt.token"))
+                .andDo(print())
+                .andExpect(status().isOk())
+                .andExpectAll(RestDocsTestUtils.expectCommonSuccess())
+                .andDo(restDocs.document(
+                        resource(ResourceSnippetParameters.builder()
+                                .tag("친구 관련 API")
+                                .description("친구 삭제")
+                                .requestHeaders(
+                                        headerWithName("Authorization").description("발급 받은 액세스 토큰")
+                                )
+                                .pathParameters(
+                                        parameterWithName("friendId").description("삭제할 친구의 사용자 ID")
+                                )
+                                .responseFields(RestDocsFieldSnippets.COMMON_RESPONSE_FIELDS)
+                                .build())
+                ));
+
+    }
+
 }
diff --git a/src/test/java/ku_rum/backend/domain/friend/presentation/FriendQueryControllerTest.java b/src/test/java/ku_rum/backend/domain/friend/presentation/FriendQueryControllerTest.java
@@ -4,6 +4,7 @@
 import ku_rum.backend.config.RestDocsTestSupport;
 import ku_rum.backend.domain.friend.application.FriendQueryService;
 import ku_rum.backend.domain.friend.dto.response.FriendListResponse;
+import ku_rum.backend.domain.friend.dto.response.FriendSearchResponse;
 import ku_rum.backend.domain.friend.dto.response.ReceivedFriendResponse;
 import ku_rum.backend.domain.friend.dto.response.SentFriendResponse;
 import ku_rum.backend.global.batch.BatchScheduler;
@@ -27,6 +28,7 @@
 import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -125,7 +127,7 @@ void getReceivedFriendRequests() throws Exception {
     void getSentRequests() throws Exception {
         // given
         List<SentFriendResponse> mockResponse = List.of(
-                new SentFriendResponse(1L, 2L, "receiver1","image"),
+                new SentFriendResponse(1L, 2L, "receiver1", "image"),
                 new SentFriendResponse(2L, 3L, "receiver2", "image2")
         );
 
@@ -158,6 +160,48 @@ void getSentRequests() throws Exception {
                 ));
     }
 
+    @Test
+    @DisplayName("닉네임으로 친구 검색 API")
+    @WithMockUser
+    void searchFriendByNickname() throws Exception {
+        String nickname = "minu";
+
+        // Mock 응답 데이터
+        List<FriendSearchResponse> mockResponse = List.of(
+                new FriendSearchResponse(1L, "minu1", "https://img1.com", true, true),
+                new FriendSearchResponse(2L, "minu2", "https://img2.com", false, false)
+        );
+        when(friendQueryService.searchByNickname(nickname)).thenReturn(mockResponse);
+
+        mockMvc.perform(get("/api/v1/friends/search")
+                        .header("Authorization", "Bearer your.jwt.token")
+                        .param("nickname", nickname))
+                .andDo(print())
+                .andExpect(status().isOk())
+                .andExpectAll(RestDocsTestUtils.expectCommonSuccess())
+                .andDo(restDocs.document(
+                        resource(ResourceSnippetParameters.builder()
+                                .tag("친구 관련 API")
+                                .description("닉네임으로 친구 검색")
+                                .requestHeaders(
+                                        headerWithName("Authorization").description("발급 받은 액세스 토큰")
+                                )
+                                .queryParameters(
+                                        parameterWithName("nickname").description("검색할 닉네임 (부분일치)")
+                                )
+                                .responseFields(
+                                        RestDocsFieldSnippets.COMMON_RESPONSE_FIELDS
+                                )
+                                .responseFields(RestDocsFieldSnippets.withDataFields(List.of(
+                                        fieldWithPath("data[].userId").type(JsonFieldType.NUMBER).description("유저 ID"),
+                                        fieldWithPath("data[].nickname").type(JsonFieldType.STRING).description("유저 닉네임"),
+                                        fieldWithPath("data[].imageUrl").type(JsonFieldType.STRING).description("프로필 이미지 URL"),
+                                        fieldWithPath("data[].requestSent").type(JsonFieldType.BOOLEAN).description("친구 요청 보냈는지 여부"),
+                                        fieldWithPath("data[].isFriend").type(JsonFieldType.BOOLEAN).description("이미 친구인지 여부")
+                                )))
+                                .build())
+                ));
+    }
 
 
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package ku_rum.backend.domain.friend.dto.response;
++
 +public record FriendSearchResponse(Long userId, String nickname, String imageUrl, boolean requestSent, boolean isFriend) {
 +}
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,13 @@ public BaseResponse<Void> deleteSentRequest(@RequestBody final FriendRequest Fri`
`48`	`48`	`friendManageService.deleteSentRequest(FriendDeleteRequest);`
`49`	`49`	`return BaseResponse.ok();`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+ /**`
	`53`	`+ * 친구 삭제 API`
	`54`	`+ */`
	`55`	`+ @DeleteMapping("/{friendId}")`
	`56`	`+ public BaseResponse<Void> deleteFriend(@PathVariable final Long friendId) {`
	`57`	`+ friendManageService.deleteFriend(friendId);`
	`58`	`+ return BaseResponse.ok();`
	`59`	`+ }`
`51`	`60`	`}`