Corrige les parenthèses dans la tsquery

betagouv · Oct 21, 2024 · 11736d6 · 11736d6
1 parent 6e9cce5
commit 11736d6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/app/services/UserGroupService.scala b/app/services/UserGroupService.scala
@@ -261,12 +261,7 @@ class UserGroupService @Inject() (
     Future(
       Try(
         db.withConnection { implicit connection =>
-          val query =
-            StringHelper
-              .commonStringInputNormalization(searchQuery)
-              .replace(' ', '+')
-              .replace('@', '+')
-              .replace('.', '+') + ":*"
+          val query = UserService.toStarTsquery(searchQuery)
           SQL(s"""SELECT $fieldsInSelect
                   FROM "user_group"
                   WHERE (

diff --git a/app/services/UserService.scala b/app/services/UserService.scala
@@ -21,6 +21,20 @@ import scala.concurrent.Future
 import scala.util.Try
 import views.editMyGroups.UserInfos
 
+object UserService {
+
+  def toStarTsquery(searchQuery: String): String =
+    StringHelper
+      .commonStringInputNormalization(searchQuery)
+      .replace(' ', '+')
+      .replace('(', '+')
+      .replace(')', '+')
+      .replace(':', '+')
+      .replace('@', '+') // emails are considered single tokens
+      .replace('.', '+') + ":*"
+
+}
+
 @Singleton
 class UserService @Inject() (
     config: AppConfig,
@@ -283,12 +297,7 @@ class UserService @Inject() (
     Future(
       Try(
         db.withConnection { implicit connection =>
-          val query =
-            StringHelper
-              .commonStringInputNormalization(searchQuery)
-              .replace(' ', '+')
-              .replace('@', '+') // emails are considered single tokens
-              .replace('.', '+') + ":*"
+          val query = UserService.toStarTsquery(searchQuery)
           SQL(s"""SELECT $fieldsInSelect
                   FROM "user"
                   WHERE (