Use commit author falling back to special -1 id if does not exist

Author: spalmurray

upload/tests/views/test_bundle_analysis.py

@@ -110,7 +110,7 @@ def test_upload_bundle_analysis_success(db, client, mocker, mock_redis):
     mock_amplitude.assert_called_with(
         "Upload Sent",
         {
-            "user_ownerid": commit.repository.author.ownerid,
+            "user_ownerid": commit.author.ownerid,
             "ownerid": commit.repository.author.ownerid,
             "repoid": commit.repository.repoid,
             "commitid": commit.id,

upload/tests/views/test_test_results.py

@@ -122,7 +122,7 @@ def test_upload_test_results(db, client, mocker, mock_redis):
     mock_amplitude.assert_called_with(
         "Upload Sent",
         {
-            "user_ownerid": commit.repository.author.ownerid,
+            "user_ownerid": commit.author.ownerid,
             "ownerid": commit.repository.author.ownerid,
             "repoid": commit.repository.repoid,
             "commitid": commit.id,

upload/views/bundle_analysis.py

@@ -224,7 +224,7 @@ def post(self, request: HttpRequest) -> Response:
         AmplitudeEventPublisher().publish(
             "Upload Sent",
             {
-                "user_ownerid": repo.author.ownerid,
+                "user_ownerid": commit.author.ownerid if commit.author else -1,
                 "ownerid": repo.author.ownerid,
                 "repoid": repo.repoid,
                 "commitid": commit.id,  # Not commit.commitid, we do not want a commit SHA here!

upload/views/test_results.py

@@ -191,7 +191,7 @@ def post(self, request):
         AmplitudeEventPublisher().publish(
             "Upload Sent",
             {
-                "user_ownerid": repo.author.ownerid,
+                "user_ownerid": commit.author.ownerid if commit.author else -1,
                 "ownerid": repo.author.ownerid,
                 "repoid": repo.repoid,
                 "commitid": commit.id,  # Not commit.commitid, we do not want a commit SHA here!

upload/views/uploads.py

@@ -171,15 +171,10 @@ def send_analytics_data(
     AmplitudeEventPublisher().publish(
         "Upload Sent",
         {
-            # Attribute this event to the repo owner. For BA/TA uploads we
-            # don't necessarily have the commit author at upload time, so to
-            # align the upload events, we will always attribute uploads to the
-            # repo owner. It's also not necessarily the case that the commit
-            # author is the owner performing the 'Upload Sent' action.
-            "user_ownerid": commit.repository.author.ownerid,
+            "user_ownerid": commit.author.ownerid,
             "ownerid": commit.repository.author.ownerid,
             "repoid": commit.repository.repoid,
-            "commitid": commit.id,  # Not commit.commitid, we do not want a commit SHA here!
+            "commitid": commit.id,  # Not commit.commitid, we do not want a commit SHA here.
             "pullid": commit.pullid,
             "upload_type": "Coverage report",
         },