fix merge conflicts

Author: suejungshin

tests/sentry/seer/code_review/test_webhooks.py

@@ -802,21 +802,6 @@ def _build_issue_comment_event(
         }
         return orjson.dumps(event)
 
-    @patch("sentry.seer.code_review.webhooks.task.schedule_task")
-    def test_skips_when_code_review_not_enabled(self, mock_schedule: MagicMock) -> None:
-        """Test that issue_comment skips when preflight requirements are not met."""
-        event = self._build_issue_comment_event(f"Please {SENTRY_REVIEW_COMMAND} this PR")
-        self._send_issue_comment_event(event, enable_code_review=False)
-        mock_schedule.assert_not_called()
-
-    @patch("sentry.seer.code_review.webhooks.task.schedule_task")
-    def test_skips_when_no_review_command(self, mock_schedule: MagicMock) -> None:
-        """Test that issue_comment skips when the comment doesn't contain the review command."""
-        event = self._build_issue_comment_event("This is a regular comment without the command")
-        self._send_issue_comment_event(event, enable_code_review=True)
-        mock_schedule.assert_not_called()
-
-    @patch("sentry.seer.code_review.webhooks.task.schedule_task")
     def test_skips_when_code_review_features_are_missing(self) -> None:
         """Test that processing is skipped when code review features are missing."""
         with self.code_review_setup(features={}):  # Missing on purpose
@@ -828,29 +813,20 @@ def test_skips_when_code_review_features_are_missing(self) -> None:
 
             self.mock_seer.assert_not_called()
 
+    def test_skips_when_no_review_command(self) -> None:
+        """Test that processing is skipped when comment doesn't contain review command."""
+        with self.code_review_setup():
+            event = self._build_issue_comment_event("This is a regular comment without the command")
+
+            with self.tasks():
+                response = self._send_issue_comment_event(event)
+                assert response.status_code == 204
+
+            self.mock_seer.assert_not_called()
+
     def test_runs_when_code_review_beta_flag_disabled_but_pr_review_test_generation_enabled(
         self,
     ) -> None:
-        """Test that code review works via legacy option even without the beta feature flag."""
-        # Only enable gen-ai-features flag, not code-review-beta
-        with self.options({"github.webhook.issue-comment": False}):
-            event = self._build_issue_comment_event(f"Please {SENTRY_REVIEW_COMMAND} this PR")
-            self._send_issue_comment_event(
-                event,
-                enable_code_review=True,
-                features={"organizations:gen-ai-features"},
-            )
-
-    @patch("sentry.seer.code_review.webhooks.task.make_seer_request")
-    @patch("sentry.integrations.github.client.GitHubApiClient.create_comment_reaction")
-    def test_adds_reaction_and_forwards_when_valid(
-        self, mock_create_reaction: MagicMock, mock_seer: MagicMock
-    ) -> None:
-        with self.options({"github.webhook.issue-comment": False}):
-            event = self._build_issue_comment_event(f"Please {SENTRY_REVIEW_COMMAND} this PR")
-
-            with self.tasks():
-                self._send_issue_comment_event(event, enable_code_review=True)
         """Test that processing runs with gen-ai-features flag alone when org option is enabled."""
         with self.options(
             {"organizations:code-review-beta": False, "github.webhook.issue-comment": False}
@@ -864,24 +840,55 @@ def test_adds_reaction_and_forwards_when_valid(
 
         self.mock_seer.assert_called_once()
 
+    def test_adds_reaction_and_forwards_when_valid(self) -> None:
+        """Test successful PR review command processing with reaction and Seer request."""
+        with self.code_review_setup():
+            event = self._build_issue_comment_event(f"Please {SENTRY_REVIEW_COMMAND} this PR")
+
+            with self.tasks():
+                response = self._send_issue_comment_event(event)
+                assert response.status_code == 204
+
+            self.mock_reaction.assert_called_once_with(
+                "owner/repo", "123456789", GitHubReaction.EYES
+            )
+            self.mock_seer.assert_called_once()
+
+            call_args = self.mock_seer.call_args
+            assert call_args[1]["path"] == "/v1/automation/overwatch-request"
+            payload = call_args[1]["payload"]
+            assert payload["request_type"] == "pr-review"
+            assert payload["data"]["repo"]["base_commit_sha"] == "abc123"
+
     @patch("sentry.seer.code_review.webhooks.issue_comment._add_eyes_reaction_to_comment")
-    @patch("sentry.seer.code_review.webhooks.task.schedule_task")
-    def test_skips_reaction_when_no_comment_id(
-        self, mock_schedule: MagicMock, mock_reaction: MagicMock
-    ) -> None:
-        with self.options({"github.webhook.issue-comment": False}):
+    def test_skips_reaction_when_no_comment_id(self, mock_reaction: MagicMock) -> None:
+        """Test that reaction is skipped when comment has no ID, but processing continues."""
+        with self.code_review_setup():
             event = self._build_issue_comment_event(SENTRY_REVIEW_COMMAND, comment_id=None)
-            self._send_issue_comment_event(event, enable_code_review=True)
+
+            with self.tasks():
+                response = self._send_issue_comment_event(event)
+                assert response.status_code == 204
+
+            mock_reaction.assert_not_called()
+            self.mock_seer.assert_called_once()
 
     @patch("sentry.seer.code_review.webhooks.issue_comment._add_eyes_reaction_to_comment")
-    @patch("sentry.seer.code_review.webhooks.task.schedule_task")
-    def test_skips_processing_when_option_is_true(
-        self, mock_schedule: MagicMock, mock_reaction: MagicMock
-    ) -> None:
-        """Test that when github.webhook.issue-comment option is True (default), no processing occurs."""
-        with self.options({"github.webhook.issue-comment": True}):
+    def test_skips_processing_when_option_is_true(self, mock_reaction: MagicMock) -> None:
+        """Test that when github.webhook.issue-comment option is True (kill switch), no processing occurs."""
+        self._enable_code_review()
+        with (
+            self.feature(CODE_REVIEW_FEATURES),
+            self.options({"github.webhook.issue-comment": True}),
+        ):
             event = self._build_issue_comment_event(f"Please {SENTRY_REVIEW_COMMAND} this PR")
-            self._send_issue_comment_event(event, enable_code_review=True)
+
+            with self.tasks():
+                response = self._send_issue_comment_event(event)
+                assert response.status_code == 204
+
+            mock_reaction.assert_not_called()
+            self.mock_seer.assert_not_called()
 
     def test_validates_seer_request_contains_trigger_metadata(self) -> None:
         """Test that Seer request includes trigger metadata from the comment."""