Skip to content
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

fix bug with search people with symbols #6417

Merged
merged 1 commit into from
Sep 27, 2023
Merged

fix bug with search people with symbols #6417

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
5 changes: 3 additions & 2 deletions dao/src/main/java/greencity/repository/UserRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,8 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
+ " SELECT user_id AS id FROM users_friends WHERE friend_id = :userId AND status = 'FRIEND' "
+ " UNION "
+ " SELECT friend_id AS id FROM users_friends WHERE user_id = :userId AND status = 'FRIEND' "
+ ") AND LOWER(u.name) LIKE LOWER(CONCAT('%', :filteringName, '%')) ")
+ ") AND LOWER(u.name) LIKE LOWER(CONCAT('%', REPLACE(REPLACE(REPLACE(REPLACE(:filteringName, '&', '\\&'), "
+ "'%', '\\%'), '_', '\\_'), '#', '\\#'), '%')) ")
Page<User> getAllUsersExceptMainUserAndFriends(Long userId, String filteringName, Pageable pageable);

/**
Expand Down Expand Up @@ -316,4 +317,4 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
+ " SELECT friend_id AS id FROM users_friends WHERE user_id = :userId AND status = 'FRIEND' "
+ ") AND LOWER(u.name) LIKE LOWER(CONCAT('%', :filteringName, '%'))")
Page<User> findAllFriendsOfUser(Long userId, String filteringName, Pageable pageable);
}
}