feature: 팔로우/팔로잉 조회 시 키워드로 검색 가능하도록 변경

Author: InJunKangW

src/main/java/com/example/log4u/domain/follow/repository/FollowQuerydsl.java

@@ -29,19 +29,26 @@ private NumberPath<Long> getNumberPath(boolean isFollowTarget) {
 		return isFollowTarget ? follow.targetId : follow.initiatorId;
 	}
 
-	private BooleanBuilder getBooleanBuilder(boolean isFollowTarget, Long userId, Long cursorId) {
+	private BooleanBuilder getBooleanBuilder(boolean isFollowTarget, Long userId, Long cursorId, String keyword) {
 		BooleanBuilder builder = new BooleanBuilder();
-		builder.and(getNumberPath(isFollowTarget).eq(userId));
+		NumberPath<Long> numberPath = getNumberPath(isFollowTarget);
+
+		builder.and(numberPath.eq(userId));
 
 		if (cursorId != null) {
 			builder.and(follow.id.lt(cursorId));
 		}
 
+		if (keyword != null) {
+			builder.and(user.nickname.like(keyword));
+		}
+
 		return builder;
 	}
 
-	private List<UserThumbnailResponseDto> getContent(boolean isFollowTarget, Long userId, Long cursorId) {
-		BooleanBuilder builder = getBooleanBuilder(isFollowTarget, userId, cursorId);
+	private List<UserThumbnailResponseDto> getContent(boolean isFollowTarget, Long userId, Long cursorId,
+		String keyword) {
+		BooleanBuilder builder = getBooleanBuilder(isFollowTarget, userId, cursorId, keyword);
 
 		NumberPath<Long> numberPath = getNumberPath(isFollowTarget);
 
@@ -58,16 +65,18 @@ private List<UserThumbnailResponseDto> getContent(boolean isFollowTarget, Long u
 	}
 
 	//내 팔로워 아이디 슬라이스
-	public Slice<UserThumbnailResponseDto> getFollowerSliceByUserId(Long userId, Long cursorId, Pageable pageable) {
+	public Slice<UserThumbnailResponseDto> getFollowerSliceByUserId(Long userId, Long cursorId, String keyword,
+		Pageable pageable) {
 		boolean isFollowTarget = true;
-		List<UserThumbnailResponseDto> content = getContent(isFollowTarget, userId, cursorId);
+		List<UserThumbnailResponseDto> content = getContent(isFollowTarget, userId, cursorId, keyword);
 		return PageableUtil.checkAndCreateSlice(content, pageable);
 	}
 
 	// 내가 팔로잉하는 아이디 슬라이스
-	public Slice<UserThumbnailResponseDto> getFollowingSliceByUserId(Long userId, Long cursorId, Pageable pageable) {
+	public Slice<UserThumbnailResponseDto> getFollowingSliceByUserId(Long userId, Long cursorId, String keyword,
+		Pageable pageable) {
 		boolean isFollowTarget = false;
-		List<UserThumbnailResponseDto> content = getContent(isFollowTarget, userId, cursorId);
+		List<UserThumbnailResponseDto> content = getContent(isFollowTarget, userId, cursorId, keyword);
 		return PageableUtil.checkAndCreateSlice(content, pageable);
 	}
 }

src/main/java/com/example/log4u/domain/user/mypage/controller/MyPageController.java

@@ -43,19 +43,22 @@ public ResponseEntity<PageResponse<DiaryResponseDto>> getMyLikesPage(
 	@GetMapping("/users/me/followings")
 	public ResponseEntity<PageResponse<UserThumbnailResponseDto>> getMyFollowingPage(
 		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
-		@RequestParam(required = false) Long cursorId
+		@RequestParam(required = false) Long cursorId,
+		@RequestParam(required = false) String keyword
+
 	) {
 		long userId = customOAuth2User.getUserId();
-		return ResponseEntity.ok(myPageService.getMyFollowings(userId, cursorId));
+		return ResponseEntity.ok(myPageService.getMyFollowings(userId, cursorId, keyword));
 	}
 
 	@GetMapping("/users/me/followers")
 	public ResponseEntity<PageResponse<UserThumbnailResponseDto>> getMyFollowerPage(
 		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
-		@RequestParam(required = false) Long cursorId
+		@RequestParam(required = false) Long cursorId,
+		@RequestParam(required = false) String keyword
 	) {
 		long userId = customOAuth2User.getUserId();
-		return ResponseEntity.ok(myPageService.getMyFollowers(userId, cursorId));
+		return ResponseEntity.ok(myPageService.getMyFollowers(userId, cursorId, keyword));
 	}
 
 	@GetMapping("/users/me/subscriptions")

src/main/java/com/example/log4u/domain/user/mypage/service/MyPageService.java

@@ -44,10 +44,11 @@ public PageResponse<DiaryResponseDto> getLikeDiariesByCursor(Long userId, Long c
 	}
 
 	@Transactional(readOnly = true)
-	public PageResponse<UserThumbnailResponseDto> getMyFollowers(Long userId, Long cursorId) {
+	public PageResponse<UserThumbnailResponseDto> getMyFollowers(Long userId, Long cursorId, String keyword) {
 		Slice<UserThumbnailResponseDto> slice = followQuerydsl.getFollowerSliceByUserId(
 			userId,
 			cursorId,
+			keyword,
 			PageRequest.of(0, defaultPageSize));
 
 		Long nextCursor = !slice.isEmpty() ? slice.getContent().getLast().userId() : null;
@@ -56,10 +57,11 @@ public PageResponse<UserThumbnailResponseDto> getMyFollowers(Long userId, Long c
 	}
 
 	@Transactional(readOnly = true)
-	public PageResponse<UserThumbnailResponseDto> getMyFollowings(Long userId, Long cursorId) {
+	public PageResponse<UserThumbnailResponseDto> getMyFollowings(Long userId, Long cursorId, String keyword) {
 		Slice<UserThumbnailResponseDto> slice = followQuerydsl.getFollowingSliceByUserId(
 			userId,
 			cursorId,
+			keyword,
 			PageRequest.of(0, defaultPageSize));
 
 		Long nextCursor = !slice.isEmpty() ? slice.getContent().getLast().userId() : null;

src/test/java/com/example/log4u/domain/user/mypage/service/MyPageServiceTest.java

@@ -94,10 +94,10 @@ void getLikeDiariesByCursor_returnsCorrectData() {
 	void getMyFollowers_returnsCorrectData() {
 		var slice = new SliceImpl<>(List.of(new UserThumbnailResponseDto(userId, "nick", "image")));
 
-		when(followQuerydsl.getFollowerSliceByUserId(eq(userId), eq(cursorId), any(PageRequest.class)))
+		when(followQuerydsl.getFollowerSliceByUserId(eq(userId), eq(cursorId), any(), any(PageRequest.class)))
 			.thenReturn(slice);
 
-		PageResponse<UserThumbnailResponseDto> result = myPageService.getMyFollowers(userId, cursorId);
+		PageResponse<UserThumbnailResponseDto> result = myPageService.getMyFollowers(userId, cursorId, null);
 
 		assertThat(result).isNotNull();
 	}
@@ -107,10 +107,10 @@ void getMyFollowers_returnsCorrectData() {
 	void getMyFollowings_returnsCorrectData() {
 		var slice = new SliceImpl<>(List.of(new UserThumbnailResponseDto(userId, "nick", "image")));
 
-		when(followQuerydsl.getFollowingSliceByUserId(eq(userId), eq(cursorId), any(PageRequest.class)))
+		when(followQuerydsl.getFollowingSliceByUserId(eq(userId), eq(cursorId), any(), any(PageRequest.class)))
 			.thenReturn(slice);
 
-		PageResponse<UserThumbnailResponseDto> result = myPageService.getMyFollowings(userId, cursorId);
+		PageResponse<UserThumbnailResponseDto> result = myPageService.getMyFollowings(userId, cursorId, null);
 
 		assertThat(result).isNotNull();
 	}