Merge pull request #6417 from ita-social-projects/bug-friends-not-fri…

…ends-yet fix bug with search people with symbols
ita-social-projects · Sep 27, 2023 · b95f10f · b95f10f
2 parents e570412 + b0c1bc4
commit b95f10f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/dao/src/main/java/greencity/repository/UserRepo.java b/dao/src/main/java/greencity/repository/UserRepo.java
@@ -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);
 
     /**
@@ -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);
-}
+}