From b3848cc311b6f725536c3582053a952fab4a7ea7 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Mon, 5 Oct 2020 15:56:31 +0200 Subject: [PATCH] custom_user: exclude deleted users from duplicates (#47353) --- src/authentic2/custom_user/managers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/authentic2/custom_user/managers.py b/src/authentic2/custom_user/managers.py index 0832b31b..46aab0b4 100644 --- a/src/authentic2/custom_user/managers.py +++ b/src/authentic2/custom_user/managers.py @@ -87,7 +87,8 @@ class UserQuerySet(models.QuerySet): name = '%s %s' % (first_name, last_name) name = unicodedata.normalize('NFKD', name).encode('ascii', 'ignore').decode('ascii').lower() - qs = self.annotate(name=Lower(Unaccent(ImmutableConcat('first_name', Value(' '), 'last_name')))) + qs = self.filter(deleted__isnull=True) + qs = qs.annotate(name=Lower(Unaccent(ImmutableConcat('first_name', Value(' '), 'last_name')))) qs = qs.filter(name__trigram_similar=name) qs = qs.annotate(dist=TrigramDistance('name', name)) qs = qs.order_by('dist') -- 2.20.1