fix: improve search endpoints

InseeFr · Dec 18, 2024 · 986d604 · 986d604
1 parent 03ee34f
commit 986d604
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 45 deletions.
diff --git a/...n/java/fr/insee/survey/datacollectionmanagement/contact/repository/ContactRepository.java b/...n/java/fr/insee/survey/datacollectionmanagement/contact/repository/ContactRepository.java
@@ -71,52 +71,18 @@ OR UPPER(first_name || ' ' || last_name) LIKE :param || '%'
     @Query(
             value = """
                                 SELECT
-                                    *
+                                    c.identifier as identifier,
+                                    c.email as email,
+                                    c.first_name as firstName,
+                                    c.last_name as lastName
                                 FROM
                                     contact c
                                 WHERE
                                     UPPER(c.last_name) LIKE :param || '%'
-                                UNION
-                                SELECT
-                                   *
-                                FROM
-                                    contact c
-                                WHERE
-                                    UPPER(first_name || ' ' || last_name) LIKE :param || '%'
-                                UNION
-                                SELECT
-                                    *
-                                FROM
-                                    contact c
-                                WHERE
-                                    UPPER(c.email) LIKE :param || '%' 
-                                UNION
-                                SELECT
-                                    *
-                                FROM
-                                    contact c
-                                WHERE
-                                    UPPER(c.identifier) LIKE :param || '%'
+                                    OR UPPER(first_name || ' ' || last_name) LIKE :param || '%'
+                                    OR UPPER(c.email) LIKE :param || '%'
+                                    OR UPPER(c.identifier) LIKE :param || '%'
                     """,
-            countQuery = """
-                    SELECT COUNT(*)
-                    FROM (
-                        SELECT 1
-                        FROM contact c
-                        WHERE UPPER(c.last_name) LIKE :param || '%'
-                        UNION
-                        SELECT 1
-                        FROM contact c
-                        WHERE UPPER(c.first_name || ' ' || c.last_name) LIKE :param || '%'
-                        UNION
-                        SELECT 1
-                        FROM contact c
-                        WHERE UPPER(c.email) LIKE :param || '%'
-                        UNION
-                        SELECT 1
-                        FROM contact c
-                        WHERE UPPER(c.identifier) LIKE :param || '%'
-                    ) AS count_query""",
             nativeQuery = true
     )
     Page<SearchContactDto> findByParam(String param, Pageable pageable);

diff --git a/...r/insee/survey/datacollectionmanagement/questioning/repository/QuestioningRepository.java b/...r/insee/survey/datacollectionmanagement/questioning/repository/QuestioningRepository.java
@@ -23,21 +23,21 @@ Questioning findByIdPartitioningAndSurveyUnitIdSu(String idPartitioning,
                     LEFT JOIN FETCH q.questioningEvents evt
                     LEFT JOIN FETCH q.questioningCommunications comm
                     JOIN FETCH q.surveyUnit su
-                WHERE UPPER(q.surveyUnit.idSu) = :searchParam
+                WHERE q.surveyUnit.idSu = :searchParam
                 UNION
                 SELECT q FROM Questioning q
                     LEFT JOIN FETCH q.questioningAccreditations acc
                     LEFT JOIN FETCH q.questioningEvents evt
                     LEFT JOIN FETCH q.questioningCommunications comm
                     JOIN FETCH  q.surveyUnit su
-                WHERE UPPER(q.surveyUnit.identificationName) = :searchParam
+                WHERE q.surveyUnit.identificationName = :searchParam
                 UNION
                 SELECT q FROM Questioning q
                     LEFT JOIN FETCH q.questioningAccreditations acc
                     LEFT JOIN FETCH q.questioningEvents evt
                     LEFT JOIN FETCH q.questioningCommunications comm
                     JOIN FETCH q.surveyUnit su
-                WHERE UPPER(q.surveyUnit.identificationCode) = :searchParam
+                WHERE q.surveyUnit.identificationCode = :searchParam
                 UNION
                 SELECT q FROM Questioning q
                     LEFT JOIN FETCH q.questioningAccreditations acc
@@ -47,7 +47,7 @@ WHERE UPPER(q.surveyUnit.identificationCode) = :searchParam
                 WHERE EXISTS (
                     SELECT 1 FROM QuestioningAccreditation qa
                     WHERE qa.questioning = q
-                    AND UPPER(qa.idContact) = :searchParam)
+                    AND qa.idContact = :searchParam)
             """)
     List<Questioning> findQuestioningByParam(String searchParam);