Fix imports and tests

Author: aliu39

src/sentry/feedback/usecases/ingest/save_event_feedback.py

@@ -4,8 +4,8 @@
 from typing import Any
 
 from sentry.feedback.lib.utils import FeedbackCreationSource
-from sentry.feedback.usecases.create_feedback import create_feedback_issue
-from sentry.feedback.usecases.userreport import Conflict, save_userreport
+from sentry.feedback.usecases.ingest.create_feedback import create_feedback_issue
+from sentry.feedback.usecases.ingest.userreport import Conflict, save_userreport
 from sentry.models.environment import Environment
 from sentry.models.project import Project
 from sentry.utils import metrics

src/sentry/feedback/usecases/ingest/shim_to_feedback.py

@@ -8,7 +8,7 @@
 from sentry.eventstore.models import Event, GroupEvent
 from sentry.feedback.lib.types import UserReportDict
 from sentry.feedback.lib.utils import FeedbackCreationSource, is_in_feedback_denylist
-from sentry.feedback.usecases.create_feedback import create_feedback_issue
+from sentry.feedback.usecases.ingest.create_feedback import create_feedback_issue
 from sentry.models.project import Project
 from sentry.utils import metrics
 from sentry.utils.outcomes import Outcome, track_outcome

src/sentry/feedback/usecases/ingest/userreport.py

@@ -19,7 +19,7 @@
     FeedbackCreationSource,
     is_in_feedback_denylist,
 )
-from sentry.feedback.usecases.shim_to_feedback import shim_to_feedback
+from sentry.feedback.usecases.ingest.shim_to_feedback import shim_to_feedback
 from sentry.models.project import Project
 from sentry.models.userreport import UserReport
 from sentry.signals import user_feedback_received
@@ -40,7 +40,7 @@ def save_userreport(
     source: FeedbackCreationSource,
     start_time: datetime | None = None,
 ) -> UserReport | None:
-    with metrics.timer("sentry.ingest.userreport.save_userreport", tags={"referrer": source.value}):
+    with metrics.timer("userreport.create_user_report", tags={"referrer": source.value}):
         if start_time is None:
             start_time = timezone.now()
 

tests/sentry/feedback/conftest.py

@@ -7,7 +7,7 @@
 def mock_produce_occurrence_to_kafka(monkeypatch):
     mock = Mock()
     monkeypatch.setattr(
-        "sentry.feedback.usecases.create_feedback.produce_occurrence_to_kafka", mock
+        "sentry.feedback.usecases.ingest.create_feedback.produce_occurrence_to_kafka", mock
     )
     return mock
 

tests/sentry/feedback/endpoints/test_organization_user_reports.py

@@ -3,7 +3,7 @@
 
 from sentry.feedback.lib.types import UserReportDict
 from sentry.feedback.lib.utils import FeedbackCreationSource
-from sentry.ingest.userreport import save_userreport
+from sentry.feedback.usecases.ingest.userreport import save_userreport
 from sentry.models.group import GroupStatus
 from sentry.models.userreport import UserReport
 from sentry.testutils.cases import APITestCase, SnubaTestCase

tests/sentry/feedback/endpoints/test_project_user_reports.py

@@ -415,7 +415,7 @@ def test_environments(self):
             == self.environment.id
         )
 
-    @patch("sentry.feedback.usecases.create_feedback.produce_occurrence_to_kafka")
+    @patch("sentry.feedback.usecases.ingest.create_feedback.produce_occurrence_to_kafka")
     def test_simple_shim_to_feedback(self, mock_produce_occurrence_to_kafka):
         replay_id = "b" * 32
         event_with_replay = self.store_event(
@@ -471,7 +471,7 @@ def test_simple_shim_to_feedback(self, mock_produce_occurrence_to_kafka):
         )
         assert mock_event_data["level"] == "error"
 
-    @patch("sentry.feedback.usecases.create_feedback.produce_occurrence_to_kafka")
+    @patch("sentry.feedback.usecases.ingest.create_feedback.produce_occurrence_to_kafka")
     def test_simple_shim_to_feedback_no_event_should_not_call(
         self, mock_produce_occurrence_to_kafka
     ):
@@ -499,7 +499,7 @@ def test_simple_shim_to_feedback_no_event_should_not_call(
 
         assert len(mock_produce_occurrence_to_kafka.mock_calls) == 0
 
-    @patch("sentry.ingest.userreport.validate_user_report")
+    @patch("sentry.feedback.usecases.ingest.userreport.validate_user_report")
     def test_validation_error(self, mock_validate_user_report):
         mock_validate_user_report.return_value = (True, "data_invalid", "Data invalid")
         self.login_as(user=self.user)
@@ -518,7 +518,7 @@ def test_validation_error(self, mock_validate_user_report):
         assert response.status_code == 400, response.content
         assert UserReport.objects.count() == 0
 
-    @patch("sentry.ingest.userreport.is_in_feedback_denylist")
+    @patch("sentry.feedback.usecases.ingest.userreport.is_in_feedback_denylist")
     def test_denylist(self, mock_is_in_feedback_denylist):
         mock_is_in_feedback_denylist.return_value = True
         self.login_as(user=self.user)

tests/sentry/feedback/test_create_feedback.py

@@ -845,7 +845,7 @@ def test_create_feedback_evidence_has_spam(
     default_project, mock_produce_occurrence_to_kafka, monkeypatch
 ):
     """We need this evidence field in post process, to determine if we should send alerts."""
-    monkeypatch.setattr("sentry.feedback.usecases.create_feedback.is_spam", lambda _: True)
+    monkeypatch.setattr("sentry.feedback.usecases.ingest.create_feedback.is_spam", lambda _: True)
     default_project.update_option("sentry:feedback_ai_spam_detection", True)
 
     with Feature({"organizations:user-feedback-spam-ingest": True}):

tests/sentry/feedback/test_organization_user_reports.py

@@ -15,7 +15,9 @@
 
 @pytest.fixture
 def mock_create_feedback_issue():
-    with mock.patch("sentry.feedback.usecases.save_event_feedback.create_feedback_issue") as m:
+    with mock.patch(
+        "sentry.feedback.usecases.ingest.save_event_feedback.create_feedback_issue"
+    ) as m:
         yield m