From b2f63f4bfe5318f4bdae58368c52dd05e51cb6bf Mon Sep 17 00:00:00 2001
From: Jerry Feng <jerry.feng@sentry.io>
Date: Wed, 5 Feb 2025 10:15:09 -0500
Subject: [PATCH] fix: retrieving repoid through commit report can yield error

---
 upload/serializers.py   | 2 +-
 upload/views/uploads.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/upload/serializers.py b/upload/serializers.py
index b1804a8f71..f092c6f7d5 100644
--- a/upload/serializers.py
+++ b/upload/serializers.py
@@ -71,6 +71,7 @@ def create(self, validated_data: Dict[str, Any]) -> ReportSession | None:
         flag_names = (
             validated_data.pop("flags") if "flags" in validated_data.keys() else []
         )
+        repoid = validated_data.pop("repo_id", None)
 
         # default is necessary here, or else if the key is not in the dict
         # the below will throw a KeyError
@@ -81,7 +82,6 @@ def create(self, validated_data: Dict[str, Any]) -> ReportSession | None:
         flags = []
 
         if upload:
-            repoid = upload.report.commit.repository.repoid
             existing_flags_map = self._create_existing_flags_map(repoid)
             for individual_flag in flag_names:
                 flag_obj = existing_flags_map.get(individual_flag, None)
diff --git a/upload/views/uploads.py b/upload/views/uploads.py
index 50b172d54c..569631517e 100644
--- a/upload/views/uploads.py
+++ b/upload/views/uploads.py
@@ -72,7 +72,10 @@ def create_upload(
         serializer.validated_data["storage_path"] = path
     # Create upload record
     instance: ReportSession = serializer.save(
-        report_id=report.id, upload_extras={"format_version": "v1"}, state="started"
+        repo_id=repository.repoid,
+        report_id=report.id,
+        upload_extras={"format_version": "v1"},
+        state="started",
     )
 
     # Inserts mirror upload record into measurements table. CLI hits this endpoint