Expose user name for the visa invitation letter email (#4350)

Author: marcoacierno

backend/grants/tasks.py

@@ -16,7 +16,10 @@
 logger = logging.getLogger(__name__)
 
 
-def get_name(user: User, fallback: str = "<no name specified>"):
+def get_name(user: User | None, fallback: str = "<no name specified>"):
+    if not user:
+        return fallback
+
     return user.full_name or user.name or user.username or fallback
 
 

backend/notifications/models.py

@@ -163,6 +163,7 @@ class EmailTemplate(TimeStampedModel):
             *BASE_PLACEHOLDERS,
             "invitation_letter_download_url",
             "has_grant",
+            "user_name",
         ],
     }
 

backend/visa/tasks.py

@@ -1,4 +1,5 @@
 from django.urls import reverse
+from grants.tasks import get_name
 from notifications.models import EmailTemplate, EmailTemplateIdentifier
 from pycon.signing import sign_path
 from integrations import slack
@@ -256,6 +257,7 @@ def send_invitation_letter_via_email(*, invitation_letter_request_id: int):
     email_template.send_email(
         recipient_email=invitation_letter_request.email,
         placeholders={
+            "user_name": get_name(invitation_letter_request.user, "there"),
             "invitation_letter_download_url": invitation_letter_download_url,
             "has_grant": invitation_letter_request.has_grant,
         },

backend/visa/tests/test_tasks.py

@@ -384,7 +384,9 @@ def test_notify_new_invitation_letter_request_on_slack(mocker):
 
 
 def test_send_invitation_letter_via_email():
-    invitation_letter_request = InvitationLetterRequestFactory()
+    invitation_letter_request = InvitationLetterRequestFactory(
+        requester__full_name="Marco",
+    )
 
     with patch("visa.tasks.EmailTemplate") as mock_email_template:
         send_invitation_letter_via_email(
@@ -410,6 +412,7 @@ def test_send_invitation_letter_via_email():
         placeholders={
             "invitation_letter_download_url": f"https://admin.pycon.it{url_path}?sig={signature}",
             "has_grant": False,
+            "user_name": "Marco",
         },
     )