Skip to content

Refactor: 검색 시 nickname, nameId으로 모두 검색 가능 #181

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
2anizirong merged 2 commits into from
Aug 20, 2025
Merged

Refactor: 검색 시 nickname, nameId으로 모두 검색 가능 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d89d65f
Refactor: 검색 시 nickname, nameId으로 모두 검색 가능
2anizirong Aug 20, 2025
f32713e
Refactor: 쿼리 수정
2anizirong Aug 20, 2025
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
4 changes: 2 additions & 2 deletions src/main/java/EatPic/spring/domain/card/controller/SearchController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public ApiResponse<SearchResponseDTO.GetCardListResponseDto> getAllUsersInSearch
return ApiResponse.onSuccess(result); // 리턴 부분 제대로 작동하는지 확인하기!
}

@Operation(summary = "검색 범위가 전체인 경우에서 계정 검색", description = "전체 - 계정 검색 api (nameId로 검색합니다.)")
@Operation(summary = "검색 범위가 전체인 경우에서 계정 검색", description = "전체 - 계정 검색 api (nickname, nameId으로 검색합니다.)")
@GetMapping("/all/account")
public ApiResponse<SearchResponseDTO.GetAccountListResponseDto> searchAccountInAll(
HttpServletRequest request,
Expand All @@ -44,7 +44,7 @@ public ApiResponse<SearchResponseDTO.GetAccountListResponseDto> searchAccountInA
return ApiResponse.onSuccess(result); // 리턴 부분 제대로 작동하는지 확인하기!
}

@Operation(summary = "검색범위가 유저가 팔로우한 사용자인 경우에서 계정 검색", description = "팔로우 - 계정 검색 api (nickname으로 검색)")
@Operation(summary = "검색범위가 유저가 팔로우한 사용자인 경우에서 계정 검색", description = "팔로우 - 계정 검색 api (nickname, nameId으로 검색합니다.)")
@GetMapping("/user-follow/account")
public ApiResponse<SearchResponseDTO.GetAccountListResponseDto> searchAccountInFollow(
HttpServletRequest request,
Expand Down
48 changes: 40 additions & 8 deletions src/main/java/EatPic/spring/domain/user/repository/UserRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,57 @@ public interface UserRepository extends JpaRepository<User,Long> {
User findUserById(Long id);

@Query("""
SELECT u FROM User u
WHERE (u.nameId LIKE %:query%)
AND (:cursor IS NULL OR u.id > :cursor)
ORDER BY u.id ASC
""")
SELECT u
FROM User u
WHERE (LOWER(u.nameId) LIKE LOWER(CONCAT(:query, '%'))
OR LOWER(u.nickname) LIKE LOWER(CONCAT(:query, '%')))
AND (:cursor IS NULL OR u.id > :cursor)
ORDER BY u.id ASC
""")
Slice<User> searchAccountInAll(@Param("query") String query,
@Param("cursor") Long cursor, Pageable pageable);
@Param("cursor") Long cursor,
Pageable pageable);

@Query("""
SELECT u
FROM User u
JOIN UserFollow uf ON u.id = uf.targetUser.id
WHERE uf.user.id = :loginUserId
AND (:cursor IS NULL OR u.id > :cursor)
AND u.nickname LIKE %:query%
AND (LOWER(u.nameId) LIKE LOWER(CONCAT(:query, '%'))
OR LOWER(u.nickname) LIKE LOWER(CONCAT(:query, '%')))
ORDER BY u.id ASC
""")
Slice<User> searchAccountInFollow(@Param("query") String query,
@Param("cursor") Long cursor, Pageable pageable, @Param("loginUserId") Long userId);
@Param("cursor") Long cursor,
Pageable pageable,
@Param("loginUserId") Long userId);


// @Query("""
// SELECT u FROM User u
// WHERE (u.nameId LIKE %:query% OR u.nickname LIKE %:query%)
// AND (:cursor IS NULL OR u.id > :cursor)
// ORDER BY u.id ASC
//""")
// Slice<User> searchAccountInAll(@Param("query") String query,
// @Param("cursor") Long cursor, Pageable pageable);
//
//
// @Query("""
// SELECT u
// FROM User u
// JOIN UserFollow uf ON u.id = uf.targetUser.id
// WHERE uf.user.id = :loginUserId
// AND (:cursor IS NULL OR u.id > :cursor)
// AND (u.nameId LIKE %:query% OR u.nickname LIKE %:query%)
// ORDER BY u.id ASC
//""")
// Slice<User> searchAccountInFollow(@Param("query") String query,
// @Param("cursor") Long cursor,
// Pageable pageable,
// @Param("loginUserId") Long userId);


@Query("""
SELECT u
Expand Down
Loading