fix check run billing gate

Author: suejung-sentry

fixtures/github.py

@@ -3560,7 +3560,7 @@
         "external_id": "4663713",
         "html_url": "https://github.com/test/repo/runs/4"
     },
-    "user": {
+    "sender": {
         "id": 12345678,
         "login": "test-user"
     }
@@ -3574,7 +3574,7 @@
         "full_name": "getsentry/sentry",
         "html_url": "https://github.com/getsentry/sentry"
     },
-    "user": {
+    "sender": {
         "id": 12345678,
         "login": "test-user"
     }

src/sentry/seer/code_review/preflight.py

@@ -9,8 +9,6 @@
 from sentry.models.repository import Repository
 from sentry.models.repositorysettings import CodeReviewSettings, RepositorySettings
 
-from .billing import passes_code_review_billing_check
-
 DenialReason = str | None
 
 
@@ -91,6 +89,8 @@ def _check_repo_feature_enablement(self) -> DenialReason:
             return "repo_code_review_disabled"
 
     def _check_billing(self) -> DenialReason:
+        # TODO: Once we're ready to actually gate billing (when it's time for GA), uncomment this
+        """
         if self.integration_id is None or self.pr_author_external_id is None:
             return "billing_missing_contributor_info"
 
@@ -101,6 +101,7 @@ def _check_billing(self) -> DenialReason:
         )
         if not billing_ok:
             return "billing_quota_exceeded"
+        """
 
         return None
 

src/sentry/seer/code_review/utils.py

@@ -220,4 +220,8 @@ def get_pr_author_id(event: Mapping[str, Any]) -> str | None:
     if (user_id := event.get("user", {}).get("id")) is not None:
         return str(user_id)
 
+    # Check sender.id (for check_run events). Sender is the user who triggered the event
+    if (user_id := event.get("sender", {}).get("id")) is not None:
+        return str(user_id)
+
     return None

tests/sentry/seer/code_review/test_preflight.py

@@ -168,10 +168,67 @@ def test_allowed_when_seat_based_org_has_repo_settings_enabled(
         assert result.settings is not None
         assert result.settings.enabled is True
 
+    # -------------------------------------------------------------------------
+    # Settings retrieval tests
+    # -------------------------------------------------------------------------
+
+    @patch("sentry.seer.code_review.billing.quotas.backend.check_seer_quota")
+    @with_feature(["organizations:gen-ai-features", "organizations:seat-based-seer-enabled"])
+    def test_returns_repo_settings_when_allowed(self, mock_check_quota: MagicMock) -> None:
+        mock_check_quota.return_value = True
+
+        RepositorySettings.objects.create(
+            repository=self.repo,
+            enabled_code_review=True,
+            code_review_triggers=[
+                CodeReviewTrigger.ON_COMMAND_PHRASE.value,
+                CodeReviewTrigger.ON_READY_FOR_REVIEW.value,
+            ],
+        )
+
+        OrganizationContributors.objects.create(
+            organization_id=self.organization.id,
+            integration_id=self.integration.id,
+            external_identifier=self.external_identifier,
+        )
+
+        service = self._create_service()
+        result = service.check()
+
+        assert result.allowed is True
+        assert result.settings is not None
+        assert result.settings.enabled is True
+        assert CodeReviewTrigger.ON_COMMAND_PHRASE in result.settings.triggers
+        assert CodeReviewTrigger.ON_READY_FOR_REVIEW in result.settings.triggers
+
+    @patch("sentry.seer.code_review.billing.quotas.backend.check_seer_quota")
+    @with_feature(["organizations:gen-ai-features", "organizations:code-review-beta"])
+    def test_returns_none_settings_for_beta_org_without_repo_settings(
+        self, mock_check_quota: MagicMock
+    ) -> None:
+        mock_check_quota.return_value = True
+
+        self.organization.update_option("sentry:enable_pr_review_test_generation", True)
+
+        OrganizationContributors.objects.create(
+            organization_id=self.organization.id,
+            integration_id=self.integration.id,
+            external_identifier=self.external_identifier,
+        )
+
+        service = self._create_service()
+        result = service.check()
+
+        assert result.allowed is True
+        assert result.settings is None
+
     # -------------------------------------------------------------------------
     # Billing tests
     # -------------------------------------------------------------------------
 
+
+# TODO: Uncomment these billing tests once we're ready to actually gate billing (when it's time for GA)
+"""
     @with_feature(["organizations:gen-ai-features", "organizations:code-review-beta"])
     def test_denied_when_missing_integration_id(self) -> None:
         self.organization.update_option("sentry:enable_pr_review_test_generation", True)
@@ -231,56 +288,4 @@ def test_denied_when_quota_check_fails(self, mock_check_quota: MagicMock) -> Non
         assert result.allowed is False
         assert result.denial_reason == "billing_quota_exceeded"
 
-    # -------------------------------------------------------------------------
-    # Settings retrieval tests
-    # -------------------------------------------------------------------------
-
-    @patch("sentry.seer.code_review.billing.quotas.backend.check_seer_quota")
-    @with_feature(["organizations:gen-ai-features", "organizations:seat-based-seer-enabled"])
-    def test_returns_repo_settings_when_allowed(self, mock_check_quota: MagicMock) -> None:
-        mock_check_quota.return_value = True
-
-        RepositorySettings.objects.create(
-            repository=self.repo,
-            enabled_code_review=True,
-            code_review_triggers=[
-                CodeReviewTrigger.ON_COMMAND_PHRASE.value,
-                CodeReviewTrigger.ON_READY_FOR_REVIEW.value,
-            ],
-        )
-
-        OrganizationContributors.objects.create(
-            organization_id=self.organization.id,
-            integration_id=self.integration.id,
-            external_identifier=self.external_identifier,
-        )
-
-        service = self._create_service()
-        result = service.check()
-
-        assert result.allowed is True
-        assert result.settings is not None
-        assert result.settings.enabled is True
-        assert CodeReviewTrigger.ON_COMMAND_PHRASE in result.settings.triggers
-        assert CodeReviewTrigger.ON_READY_FOR_REVIEW in result.settings.triggers
-
-    @patch("sentry.seer.code_review.billing.quotas.backend.check_seer_quota")
-    @with_feature(["organizations:gen-ai-features", "organizations:code-review-beta"])
-    def test_returns_none_settings_for_beta_org_without_repo_settings(
-        self, mock_check_quota: MagicMock
-    ) -> None:
-        mock_check_quota.return_value = True
-
-        self.organization.update_option("sentry:enable_pr_review_test_generation", True)
-
-        OrganizationContributors.objects.create(
-            organization_id=self.organization.id,
-            integration_id=self.integration.id,
-            external_identifier=self.external_identifier,
-        )
-
-        service = self._create_service()
-        result = service.check()
-
-        assert result.allowed is True
-        assert result.settings is None
+"""