fix(emails): include actor in organization project add/remove notifications

tests/unit/email/test_init.py

@@ -1948,16 +1948,20 @@ def test_send_organization_project_email(
             email_template_name
         )
 
+        submitter_username = "submitter"
+
         result = send_organization_project_email(
             db_request,
             self.user,
             organization_name=self.organization_name,
             project_name=self.project_name,
+            submitter_username=submitter_username,
         )
 
         assert result == {
             "organization_name": self.organization_name,
             "project_name": self.project_name,
+            "submitter": submitter_username,
         }
         subject_renderer.assert_(**result)
         body_renderer.assert_(**result)

tests/unit/manage/test_views.py

@@ -3488,6 +3488,7 @@ def test_remove_organization_project(self, monkeypatch, db_request):
                 {db_request.user},
                 organization_name=project.organization.name,
                 project_name=project.name,
+                submitter_username=db_request.user.username,
             ),
         ]
 
@@ -3628,6 +3629,7 @@ def test_transfer_organization_project_no_current_organization(
                 {db_request.user},
                 organization_name=organization.name,
                 project_name=project.name,
+                submitter_username=db_request.user.username,
             )
         ]
 
@@ -3723,6 +3725,7 @@ def test_transfer_organization_project_no_individual_owner(
                 {db_request.user},
                 organization_name=project.organization.name,
                 project_name=project.name,
+                submitter_username=db_request.user.username,
             )
         ]
         assert send_organization_project_added_email.calls == [
@@ -3731,6 +3734,7 @@ def test_transfer_organization_project_no_individual_owner(
                 {db_request.user},
                 organization_name=organization.name,
                 project_name=project.name,
+                submitter_username=db_request.user.username,
             )
         ]
 
@@ -3858,6 +3862,7 @@ def test_transfer_organization_project_from_organization_managed(
                 {db_request.user},
                 organization_name=project.organization.name,
                 project_name=project.name,
+                submitter_username=db_request.user.username,
             )
         ]
         assert send_organization_project_added_email.calls == [
@@ -3866,6 +3871,7 @@ def test_transfer_organization_project_from_organization_managed(
                 {db_request.user},
                 organization_name=organization.name,
                 project_name=project.name,
+                submitter_username=db_request.user.username,
             )
         ]
 
@@ -3959,6 +3965,7 @@ def test_transfer_organization_project_from_organization_owned(
                 {db_request.user},
                 organization_name=project.organization.name,
                 project_name=project.name,
+                submitter_username=db_request.user.username,
             )
         ]
         assert send_organization_project_added_email.calls == [
@@ -3967,6 +3974,7 @@ def test_transfer_organization_project_from_organization_owned(
                 {db_request.user},
                 organization_name=organization.name,
                 project_name=project.name,
+                submitter_username=db_request.user.username,
             )
         ]
 

tests/unit/manage/views/test_organizations.py

@@ -1847,6 +1847,7 @@ def add_organization_project(*args, **kwargs):
                 {db_request.user},
                 organization_name=organization.name,
                 project_name=project.name,
+                submitter_username=db_request.user.username,
             )
         ]
 
@@ -1912,6 +1913,7 @@ def add_organization_project(*args, **kwargs):
                 {db_request.user},
                 organization_name=organization.name,
                 project_name=project.name,
+                submitter_username=db_request.user.username,
             )
         ]
 
@@ -2015,6 +2017,7 @@ def test_add_organization_project_new_project(
                 {db_request.user},
                 organization_name=organization.name,
                 project_name="fakepackage",
+                submitter_username=db_request.user.username,
             )
         ]
 

warehouse/email/__init__.py

@@ -370,21 +370,23 @@ def send_new_organization_moreinformationneeded_email(
 
 @_email("organization-project-added")
 def send_organization_project_added_email(
-    request, user, *, organization_name, project_name
+    request, user, *, organization_name, project_name, submitter_username
 ):
     return {
         "organization_name": organization_name,
         "project_name": project_name,
+        "submitter": submitter_username,
     }
 
 
 @_email("organization-project-removed")
 def send_organization_project_removed_email(
-    request, user, *, organization_name, project_name
+    request, user, *, organization_name, project_name, submitter_username
 ):
     return {
         "organization_name": organization_name,
         "project_name": project_name,
+        "submitter": submitter_username,
     }
 
 

warehouse/manage/views/organizations.py

@@ -921,6 +921,7 @@ def add_organization_project(self):
             owner_users,
             organization_name=self.organization.name,
             project_name=project.name,
+            submitter_username=self.request.user.username,
         )
 
         # Display notification message.
@@ -1542,6 +1543,7 @@ def remove_organization_project(project, request):
             owner_users,
             organization_name=organization.name,
             project_name=project.name,
+            submitter_username=request.user.username,
         )
         # Display notification message.
         request.session.flash(
@@ -1688,6 +1690,7 @@ def transfer_organization_project(project, request):
             owner_users,
             organization_name=organization.name,
             project_name=project.name,
+            submitter_username=request.user.username,
         )
 
         # Mark Organization as dirty, so purges will happen
@@ -1725,6 +1728,7 @@ def transfer_organization_project(project, request):
         owner_users,
         organization_name=organization.name,
         project_name=project.name,
+        submitter_username=request.user.username,
     )
 
     request.session.flash(

warehouse/templates/email/organization-project-added/body.html

@@ -5,6 +5,9 @@
   <p>
     {% trans organization_name=organization_name, project_name=project_name, site=site %}The {{ site }} project "{{ project_name }}" has been added to the "{{ organization_name }}" organization.{% endtrans %}
   </p>
+  <p>
+    <strong>{% trans %}Added by{% endtrans %}</strong>: {{ submitter }}
+  </p>
   <p>
     {% trans email_address="admin@pypi.org", site=site %}If this was a mistake, you can email <a href="mailto:{{ email_address }}">{{ email_address }}</a> to communicate with the {{ site }} administrators.{% endtrans %}
   </p>

warehouse/templates/email/organization-project-added/body.txt

@@ -7,6 +7,8 @@
 {% block content %}
 {% trans organization_name=organization_name, project_name=project_name, site=site %}The {{ site }} project "{{ project_name }}" has been added to the "{{ organization_name }}" organization.{% endtrans %}
 
+{% trans %}Added by{% endtrans %}: {{ submitter }}
+
 {% trans email_address="admin@pypi.org", site=site %}If this was a mistake, you can email {{ email_address }} to communicate with the {{ site }} administrators.{% endtrans %}
 {% endblock %}
 

warehouse/templates/email/organization-project-removed/body.html

@@ -5,6 +5,9 @@
   <p>
     {% trans organization_name=organization_name, project_name=project_name, site=site %}The {{ site }} project "{{ project_name }}" has been removed from the "{{ organization_name }}" organization.{% endtrans %}
   </p>
+  <p>
+    <strong>{% trans %}Removed by{% endtrans %}</strong>: {{ submitter }}
+  </p>
   <p>
     {% trans email_address="admin@pypi.org", site=site %}If this was a mistake, you can email <a href="mailto:{{ email_address }}">{{ email_address }}</a> to communicate with the {{ site }} administrators.{% endtrans %}
   </p>

warehouse/templates/email/organization-project-removed/body.txt

@@ -7,6 +7,8 @@
 {% block content %}
 {% trans organization_name=organization_name, project_name=project_name, site=site %}The {{ site }} project "{{ project_name }}" has been removed from the "{{ organization_name }}" organization.{% endtrans %}
 
+{% trans %}Removed by{% endtrans %}: {{ submitter }}
+
 {% trans email_address="admin@pypi.org", site=site %}If this was a mistake, you can email {{ email_address }} to communicate with the {{ site }} administrators.{% endtrans %}
 {% endblock %}