Update project role journal entries and events

- Standardize journal entry action to be "add {role_name} {username}"
- Standardize project event tag to be "project:role:create"
- Standardize user event tag to be "account:role:create"

Author: divbzero

tests/unit/malware/checks/package_turnover/test_check.py

@@ -94,7 +94,7 @@ def test_user_turnover_verdicts(db_session):
     RoleFactory.create(user=user, project=project, role_name="Owner")
 
     project.record_event(
-        tag="project:role:add",
+        tag="project:role:create",
         ip_address="0.0.0.0",
         additional={"target_user": user.username},
     )

warehouse/accounts/views.py

@@ -1062,13 +1062,13 @@ def _error(message):
     request.db.add(
         JournalEntry(
             name=project.name,
-            action=f"accepted {desired_role} {user.username}",
+            action=f"add {desired_role} {user.username}",
             submitted_by=request.user,
             submitted_from=request.remote_addr,
         )
     )
     project.record_event(
-        tag="project:role:accepted",
+        tag="project:role:create",
         ip_address=request.remote_addr,
         additional={
             "submitted_by": request.user.username,
@@ -1077,7 +1077,7 @@ def _error(message):
         },
     )
     user.record_event(
-        tag="account:role:accepted",
+        tag="account:role:create",
         ip_address=request.remote_addr,
         additional={
             "submitted_by": request.user.username,

warehouse/forklift/legacy.py

@@ -912,7 +912,7 @@ def file_upload(request):
             )
         )
         project.record_event(
-            tag="project:role:add",
+            tag="project:role:create",
             ip_address=request.remote_addr,
             additional={
                 "submitted_by": request.user.username,

warehouse/malware/checks/package_turnover/check.py

@@ -67,7 +67,11 @@ def user_turnover_verdicts(self, project):
             self.db.query(Project.Event.additional)
             .filter(Project.Event.source_id == project.id)
             .filter(Project.Event.time >= self._scan_interval)
-            .filter(Project.Event.tag == "project:role:add")
+            .filter(
+                (Project.Event.tag == "project:role:accepted")
+                | (Project.Event.tag == "project:role:add")
+                | (Project.Event.tag == "project:role:create")
+            )
             .all()
         )
 

warehouse/templates/manage/history.html

@@ -46,7 +46,7 @@ <h2>{% trans %}Security history{% endtrans %}</h2>
     <small>
       {% trans %}Removed by:{% endtrans %} <a href="{{ request.route_path('accounts.profile', username=event.additional.submitted_by) }}">{{ event.additional.submitted_by }}</a>
     </small>
-    {% elif event.tag == "project:role:add" %}
+    {% elif event.tag in ["project:role:accepted", "project:role:add", "project:role:create"] %}
     <strong>{% trans href=request.route_path('accounts.profile', username=event.additional.target_user), username=event.additional.target_user, role_name=event.additional.role_name|lower %}<a href="{{ href }}">{{ username }}</a> added as project {{ role_name }}{% endtrans %}</strong><br>
     <small>
       {% trans %}Added by:{% endtrans %} <a href="{{ request.route_path('accounts.profile', username=event.additional.submitted_by) }}">{{ event.additional.submitted_by }}</a>