Move userreport ingest file under feedback

Author: aliu39

src/sentry/feedback/endpoints/project_user_reports.py

@@ -16,7 +16,7 @@
 from sentry.api.paginator import DateTimePaginator
 from sentry.api.serializers import UserReportWithGroupSerializer, serialize
 from sentry.feedback.lib.utils import FeedbackCreationSource
-from sentry.ingest.userreport import Conflict, save_userreport
+from sentry.feedback.usecases.userreport import Conflict, save_userreport
 from sentry.models.environment import Environment
 from sentry.models.userreport import UserReport
 from sentry.utils.dates import epoch

src/sentry/feedback/usecases/save_event_feedback.py

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

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

@@ -15,8 +15,8 @@
 from sentry.event_manager import EventManager, save_attachment
 from sentry.eventstore.processing import event_processing_store, transaction_processing_store
 from sentry.feedback.lib.utils import FeedbackCreationSource, is_in_feedback_denylist
+from sentry.feedback.usecases.userreport import Conflict, save_userreport
 from sentry.ingest.types import ConsumerType
-from sentry.ingest.userreport import Conflict, save_userreport
 from sentry.killswitches import killswitch_matches_context
 from sentry.models.organization import Organization
 from sentry.models.project import Project

src/sentry/ingest/consumer/processors.py

@@ -5,7 +5,7 @@
 
 from sentry.feedback.lib.types import UserReportDict
 from sentry.feedback.lib.utils import UNREAL_FEEDBACK_UNATTENDED_MESSAGE, FeedbackCreationSource
-from sentry.ingest.userreport import save_userreport, validate_user_report
+from sentry.feedback.usecases.userreport import save_userreport, validate_user_report
 from sentry.models.userreport import UserReport
 from sentry.testutils.factories import Factories
 from sentry.testutils.pytest.fixtures import django_db_all
@@ -30,13 +30,15 @@ def mock_report_dict() -> UserReportDict:
 
 @pytest.fixture
 def skip_denylist(monkeypatch):
-    monkeypatch.setattr("sentry.ingest.userreport.is_in_feedback_denylist", lambda org: False)
+    monkeypatch.setattr(
+        "sentry.feedback.usecases.userreport.is_in_feedback_denylist", lambda org: False
+    )
 
 
 @pytest.fixture
 def skip_filters(monkeypatch):
     monkeypatch.setattr(
-        "sentry.ingest.userreport.validate_user_report",
+        "sentry.feedback.usecases.userreport.validate_user_report",
         Mock(return_value=(False, None, None)),
     )
 
@@ -219,7 +221,9 @@ def test_save_user_report_basic(
 def test_save_user_report_filters_denylist(
     default_project, monkeypatch, skip_filters, mock_report_dict
 ):
-    monkeypatch.setattr("sentry.ingest.userreport.is_in_feedback_denylist", lambda org: True)
+    monkeypatch.setattr(
+        "sentry.feedback.usecases.userreport.is_in_feedback_denylist", lambda org: True
+    )
     result = save_userreport(
         default_project, mock_report_dict, FeedbackCreationSource.USER_REPORT_ENVELOPE
     )
@@ -286,7 +290,9 @@ def test_save_user_report_shims_if_event_found(
     )
 
     mock_shim_to_feedback = Mock()
-    monkeypatch.setattr("sentry.ingest.userreport.shim_to_feedback", mock_shim_to_feedback)
+    monkeypatch.setattr(
+        "sentry.feedback.usecases.userreport.shim_to_feedback", mock_shim_to_feedback
+    )
 
     mock_report_dict["event_id"] = event.event_id
 
@@ -305,7 +311,9 @@ def test_save_user_report_does_not_shim_if_event_found_but_source_is_new_feedbac
     )
 
     mock_shim_to_feedback = Mock()
-    monkeypatch.setattr("sentry.ingest.userreport.shim_to_feedback", mock_shim_to_feedback)
+    monkeypatch.setattr(
+        "sentry.feedback.usecases.userreport.shim_to_feedback", mock_shim_to_feedback
+    )
     # Source is new feedback, so no shim
     save_userreport(
         default_project,