Skip to content

오류 수정(userId순 정렬로 변경) #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2025
Merged

오류 수정(userId순 정렬로 변경) #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/main/java/com/example/log4u/domain/user/repository/UserRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@ public interface UserRepository extends JpaRepository<User, Long> {

@Query(value = """
SELECT u FROM User u
LEFT JOIN (SELECT f.targetId, COUNT(f) as followerCount
FROM Follow f
GROUP BY f.targetId) fc
ON u.userId = fc.targetId
WHERE (:nickname IS NULL OR LOWER(u.nickname) LIKE LOWER(CONCAT('%', :nickname, '%')))
AND u.userId < :cursorId
ORDER BY fc.followerCount DESC NULLS LAST, u.userId DESC
ORDER BY u.userId DESC
""")
Slice<User> searchUsersByCursor(
@Param("nickname") String nickname,
Expand Down
65 changes: 1 addition & 64 deletions src/test/java/com/example/log4u/domain/user/service/UserServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,70 +126,7 @@ void shouldThrowExceptionWhenUserNotFound() {
assertThrows(UserNotFoundException.class, () -> userService.getUserById(userId));
verify(userRepository).findById(userId);
}

@Test
@DisplayName("닉네임으로 유저를 검색하고 팔로워 수 높은 순으로 정렬해야 한다")
void shouldSearchUsersByNicknameAndSortByFollowerCount() {
// given
String nickname = "test";
Long cursorId = null;
int size = 10;

// 테스트용 유저 목록 생성
User user1 = UserFixture.createUserWithId(1L, "User1", "test1");
User user2 = UserFixture.createUserWithId(2L, "User2", "test2");
User user3 = UserFixture.createUserWithId(3L, "User3", "test3");

List<User> users = List.of(user1, user2, user3);
Slice<User> userSlice = new SliceImpl<>(users, PageRequest.of(0, size), false);

// Mock 설정
when(userRepository.searchUsersByCursor(
eq(nickname),
eq(Long.MAX_VALUE),
ArgumentMatchers.any(PageRequest.class)))
.thenReturn(userSlice);

// 각 유저의 팔로워/팔로잉 수 설정
when(followRepository.countByTargetId(1L)).thenReturn(10L);
when(followRepository.countByInitiatorId(1L)).thenReturn(5L);

when(followRepository.countByTargetId(2L)).thenReturn(20L);
when(followRepository.countByInitiatorId(2L)).thenReturn(15L);

when(followRepository.countByTargetId(3L)).thenReturn(30L);
when(followRepository.countByInitiatorId(3L)).thenReturn(25L);

// when
PageResponse<UserProfileResponseDto> result = userService.searchUsersByCursor(nickname, cursorId, size);

// then
assertNotNull(result);
assertEquals(3, result.list().size());

// 팔로워 수 확인
assertEquals(10L, result.list().get(0).followers());
assertEquals(20L, result.list().get(1).followers());
assertEquals(30L, result.list().get(2).followers());

// 팔로잉 수 확인
assertEquals(5L, result.list().get(0).followings());
assertEquals(15L, result.list().get(1).followings());
assertEquals(25L, result.list().get(2).followings());

// 다음 커서 확인
assertEquals(3L, result.pageInfo().nextCursor());

// 메서드 호출 확인
verify(userRepository).searchUsersByCursor(
eq(nickname),
eq(Long.MAX_VALUE),
ArgumentMatchers.any(PageRequest.class));

verify(followRepository, times(3)).countByTargetId(anyLong());
verify(followRepository, times(3)).countByInitiatorId(anyLong());
}


@Test
@DisplayName("검색 결과가 없으면 빈 리스트를 반환해야 한다")
void shouldReturnEmptyListWhenNoSearchResults() {
Expand Down