Use a custom dictionnary instead of making unaccent immutable

gip-inclusion · Jan 10, 2025 · 1bd5d3b · 1bd5d3b
1 parent 75462ed
commit 1bd5d3b
Show file tree

Hide file tree

Showing 32 changed files with 302 additions and 29 deletions.
diff --git a/itou/users/migrations/0020_add_simple_unaccent_search_config.py b/itou/users/migrations/0020_add_simple_unaccent_search_config.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.1.4 on 2025-01-10 09:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "0019_drop_jobseekerprofile_ata_allocation_since"),
+    ]
+
+    operations = [
+        migrations.RunSQL(
+            "CREATE TEXT SEARCH CONFIGURATION simple_unaccent (COPY=simple);",
+            reverse_sql="DROP TEXT SEARCH CONFIGURATION simple_unaccent;",
+        ),
+        migrations.RunSQL(
+            "ALTER TEXT SEARCH CONFIGURATION simple_unaccent "
+            "ALTER MAPPING FOR hword, hword_part, word "
+            "WITH unaccent,simple;",
+            reverse_sql=migrations.RunSQL.noop,
+        ),
+    ]
diff --git a/itou/users/migrations/0020_make_unnaccent_immutable.py b/itou/users/migrations/0020_make_unnaccent_immutable.py
diff --git a/itou/users/migrations/0021_user_full_name.py b/itou/users/migrations/0021_user_full_name.py
@@ -7,7 +7,7 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("users", "0020_make_unnaccent_immutable"),
+        ("users", "0020_add_simple_unaccent_search_config"),
     ]
 
     operations = [
@@ -17,9 +17,7 @@ class Migration(migrations.Migration):
             field=models.GeneratedField(
                 db_persist=True,
                 expression=django.contrib.postgres.search.SearchVector(
-                    django.contrib.postgres.lookups.Unaccent("first_name"),
-                    django.contrib.postgres.lookups.Unaccent("last_name"),
-                    config="simple",
+                    "first_name", "last_name", config="simple_unaccent"
                 ),
                 output_field=django.contrib.postgres.search.SearchVectorField(),
                 verbose_name="nom complet utilisé pour rechercher un utilisateur",

diff --git a/itou/users/models.py b/itou/users/models.py
@@ -8,7 +8,6 @@
 from django.conf import settings
 from django.contrib.auth.models import AbstractUser, UserManager
 from django.contrib.postgres.indexes import GinIndex, OpClass
-from django.contrib.postgres.lookups import Unaccent
 from django.contrib.postgres.search import SearchVector, SearchVectorField
 from django.core.exceptions import ValidationError
 from django.core.serializers.json import DjangoJSONEncoder
@@ -173,7 +172,7 @@ class User(AbstractUser, AddressMixin):
         choices=Title.choices,
     )
     full_name = models.GeneratedField(
-        expression=SearchVector(Unaccent("first_name"), Unaccent("last_name"), config="simple"),
+        expression=SearchVector("first_name", "last_name", config="simple_unaccent"),
         output_field=SearchVectorField(),
         verbose_name="nom complet utilisé pour rechercher un utilisateur",
         db_persist=True,

diff --git a/itou/www/autocomplete/views.py b/itou/www/autocomplete/views.py
@@ -154,7 +154,7 @@ def gps_users_autocomplete(request):
             )
         )
 
-        search_query = SearchQuery(unidecode(term), config="simple")
+        search_query = SearchQuery(term, config="simple_unaccent")
         users_qs = users_qs.filter(full_name=search_query)
         users_qs = users_qs.annotate(rank=SearchRank("full_name", search_query)).order_by("-rank")
 

diff --git a/tests/api/__snapshots__/test_geiq.ambr b/tests/api/__snapshots__/test_geiq.ambr
@@ -160,6 +160,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -510,6 +511,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",

diff --git a/tests/api/employee_record_api/__snapshots__/tests.ambr b/tests/api/employee_record_api/__snapshots__/tests.ambr
@@ -43,6 +43,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -344,6 +345,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",

diff --git a/tests/companies/__snapshots__/test_admin.ambr b/tests/companies/__snapshots__/test_admin.ambr
@@ -43,6 +43,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",

diff --git a/tests/gps/test_views.py b/tests/gps/test_views.py
@@ -75,9 +75,9 @@ def get_autocomplete_results(user, term="gps"):
     results = get_autocomplete_results(prescriber)
     assert set(results) == {first_beneficiary.pk, second_beneficiary.pk}
 
-    # with "martin gps" Martin is the first result
+    # with "martin gps" Martin is the only match
     results = get_autocomplete_results(prescriber, term="martin gps")
-    assert results == [second_beneficiary.pk, first_beneficiary.pk]
+    assert results == [second_beneficiary.pk]
 
 
 @pytest.mark.parametrize(

diff --git a/tests/job_applications/__snapshots__/test_transfer.ambr b/tests/job_applications/__snapshots__/test_transfer.ambr
@@ -124,6 +124,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -184,6 +185,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",

diff --git a/tests/users/__snapshots__/test_admin_views.ambr b/tests/users/__snapshots__/test_admin_views.ambr
@@ -43,6 +43,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -97,6 +98,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -287,6 +289,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -377,6 +380,7 @@
                  T3."ban_api_resolved_address",
                  T3."insee_city_id",
                  T3."title",
+                 T3."full_name",
                  T3."email",
                  T3."phone",
                  T3."kind",
@@ -467,6 +471,7 @@
                  T3."ban_api_resolved_address",
                  T3."insee_city_id",
                  T3."title",
+                 T3."full_name",
                  T3."email",
                  T3."phone",
                  T3."kind",

diff --git a/tests/www/apply/__snapshots__/test_list_for_siae.ambr b/tests/www/apply/__snapshots__/test_list_for_siae.ambr
@@ -43,6 +43,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -257,6 +258,7 @@
                              "users_user"."ban_api_resolved_address",
                              "users_user"."insee_city_id",
                              "users_user"."title",
+                             "users_user"."full_name",
                              "users_user"."email",
                              "users_user"."phone",
                              "users_user"."kind",
@@ -349,6 +351,7 @@
                              "users_user"."ban_api_resolved_address",
                              "users_user"."insee_city_id",
                              "users_user"."title",
+                             "users_user"."full_name",
                              "users_user"."email",
                              "users_user"."phone",
                              "users_user"."kind",
@@ -866,6 +869,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -934,6 +938,7 @@
                  T10."ban_api_resolved_address",
                  T10."insee_city_id",
                  T10."title",
+                 T10."full_name",
                  T10."email",
                  T10."phone",
                  T10."kind",

diff --git a/tests/www/apply/__snapshots__/test_list_prescriptions.ambr b/tests/www/apply/__snapshots__/test_list_prescriptions.ambr
@@ -43,6 +43,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -193,6 +194,7 @@
                              "users_user"."ban_api_resolved_address",
                              "users_user"."insee_city_id",
                              "users_user"."title",
+                             "users_user"."full_name",
                              "users_user"."email",
                              "users_user"."phone",
                              "users_user"."kind",
@@ -286,6 +288,7 @@
                              T3."ban_api_resolved_address",
                              T3."insee_city_id",
                              T3."title",
+                             T3."full_name",
                              T3."email",
                              T3."phone",
                              T3."kind",
@@ -681,6 +684,7 @@
                  T5."ban_api_resolved_address",
                  T5."insee_city_id",
                  T5."title",
+                 T5."full_name",
                  T5."email",
                  T5."phone",
                  T5."kind",
@@ -749,6 +753,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -1223,6 +1228,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -1394,6 +1400,7 @@
                  T5."ban_api_resolved_address",
                  T5."insee_city_id",
                  T5."title",
+                 T5."full_name",
                  T5."email",
                  T5."phone",
                  T5."kind",
@@ -1462,6 +1469,7 @@
                  "users_user"."ban_api_resolved_address",
                  "users_user"."insee_city_id",
                  "users_user"."title",
+                 "users_user"."full_name",
                  "users_user"."email",
                  "users_user"."phone",
                  "users_user"."kind",
@@ -1805,6 +1813,7 @@
                  T3."ban_api_resolved_address",
                  T3."insee_city_id",
                  T3."title",
+                 T3."full_name",
                  T3."email",
                  T3."phone",
                  T3."kind",
@@ -1982,6 +1991,7 @@
                  T3."ban_api_resolved_address",
                  T3."insee_city_id",
                  T3."title",
+                 T3."full_name",
                  T3."email",
                  T3."phone",
                  T3."kind",