(PC-32561)[BO] fix: conditions for email updated icon

NEW_EMAIL_SELECTION added in 2024 had never been taken into account in the backoffice
pass-culture · Nov 12, 2024 · a580508 · a580508
1 parent 8b642f4
commit a580508
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/api/src/pcapi/core/users/api.py b/api/src/pcapi/core/users/api.py
@@ -1144,6 +1144,8 @@ def search_public_account_in_history_email(search_query: str) -> BaseQuery:
             models.UserEmailHistory.oldEmail == sanitized_term,
             models.UserEmailHistory.eventType.in_(
                 {
+                    models.EmailHistoryEventTypeEnum.NEW_EMAIL_SELECTION,
+                    models.EmailHistoryEventTypeEnum.CONFIRMATION,
                     models.EmailHistoryEventTypeEnum.VALIDATION,
                     models.EmailHistoryEventTypeEnum.ADMIN_VALIDATION,
                     models.EmailHistoryEventTypeEnum.ADMIN_UPDATE,

diff --git a/api/src/pcapi/routes/backoffice/accounts/blueprint.py b/api/src/pcapi/routes/backoffice/accounts/blueprint.py
@@ -321,6 +321,7 @@ def render_public_account_details(
         email_event.eventType
         not in (
             users_models.EmailHistoryEventTypeEnum.UPDATE_REQUEST,
+            users_models.EmailHistoryEventTypeEnum.NEW_EMAIL_SELECTION,
             users_models.EmailHistoryEventTypeEnum.CANCELLATION,
         )
         for email_event in user.email_history

diff --git a/api/src/pcapi/routes/backoffice/accounts/serialization.py b/api/src/pcapi/routes/backoffice/accounts/serialization.py
@@ -93,6 +93,8 @@ def actionType(self) -> history_models.ActionType | str:
         match self._email_change.eventType:
             case users_models.EmailHistoryEventTypeEnum.UPDATE_REQUEST:
                 return "Demande de changement d'email"
+            case users_models.EmailHistoryEventTypeEnum.NEW_EMAIL_SELECTION:
+                return "Saisie d'une nouvelle adresse email"
             case users_models.EmailHistoryEventTypeEnum.CONFIRMATION:
                 return "Confirmation de changement d'email"
             case users_models.EmailHistoryEventTypeEnum.CANCELLATION:

diff --git a/api/tests/routes/backoffice/accounts_test.py b/api/tests/routes/backoffice/accounts_test.py
@@ -690,6 +690,7 @@ def test_get_suspended_public_account(self, legit_user, authenticated_client):
     def test_get_public_account_with_unconfirmed_modified_email(self, authenticated_client):
         user = users_factories.UserFactory()
         users_factories.EmailUpdateEntryFactory(user=user)
+        users_factories.NewEmailSelectionEntryFactory(user=user)
         user_id = user.id
 
         with assert_num_queries(self.expected_num_queries):
@@ -702,6 +703,7 @@ def test_get_public_account_with_unconfirmed_modified_email(self, authenticated_
     def test_get_public_account_with_confirmed_modified_email(self, authenticated_client):
         user = users_factories.UserFactory()
         users_factories.EmailUpdateEntryFactory(user=user)
+        users_factories.NewEmailSelectionEntryFactory(user=user)
         users_factories.EmailConfirmationEntryFactory(user=user)
         user_id = user.id