Create nested ingest module

aliu39 · aliu39 · commit 8f9be9722e7c · 2025-07-11T16:05:25.000-07:00
diff --git a/src/sentry/feedback/endpoints/project_user_reports.py b/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.feedback.usecases.userreport import Conflict, save_userreport
+from sentry.feedback.usecases.ingest.userreport import Conflict, save_userreport
 from sentry.models.environment import Environment
 from sentry.models.userreport import UserReport
 from sentry.utils.dates import epoch
diff --git a/src/sentry/feedback/usecases/ingest/__init__.py b/src/sentry/feedback/usecases/ingest/__init__.py
diff --git a/src/sentry/feedback/usecases/ingest/create_feedback.py b/src/sentry/feedback/usecases/ingest/create_feedback.py
diff --git a/src/sentry/feedback/usecases/ingest/save_event_feedback.py b/src/sentry/feedback/usecases/ingest/save_event_feedback.py
diff --git a/src/sentry/feedback/usecases/ingest/shim_to_feedback.py b/src/sentry/feedback/usecases/ingest/shim_to_feedback.py
diff --git a/src/sentry/feedback/usecases/ingest/userreport.py b/src/sentry/feedback/usecases/ingest/userreport.py
diff --git a/src/sentry/ingest/consumer/processors.py b/src/sentry/ingest/consumer/processors.py
@@ -15,7 +15,7 @@
 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.feedback.usecases.ingest.userreport import Conflict, save_userreport
 from sentry.ingest.types import ConsumerType
 from sentry.killswitches import killswitch_matches_context
 from sentry.models.organization import Organization
diff --git a/src/sentry/ingest/userreport.py b/src/sentry/ingest/userreport.py
diff --git a/src/sentry/tasks/post_process.py b/src/sentry/tasks/post_process.py
@@ -1428,7 +1428,7 @@ def check_has_high_priority_alerts(job: PostProcessJob) -> None:
 
 def link_event_to_user_report(job: PostProcessJob) -> None:
     from sentry.feedback.lib.utils import FeedbackCreationSource
-    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.userreport import UserReport
 
     event = job["event"]
diff --git a/src/sentry/tasks/store.py b/src/sentry/tasks/store.py
@@ -16,7 +16,7 @@
 from sentry.constants import DEFAULT_STORE_NORMALIZER_ARGS
 from sentry.datascrubbing import scrub_data
 from sentry.eventstore import processing
-from sentry.feedback.usecases.save_event_feedback import (
+from sentry.feedback.usecases.ingest.save_event_feedback import (
     save_event_feedback as save_event_feedback_impl,
 )
 from sentry.ingest.types import ConsumerType
diff --git a/src/sentry/tasks/update_user_reports.py b/src/sentry/tasks/update_user_reports.py
@@ -6,7 +6,7 @@
 
 from sentry import eventstore, quotas
 from sentry.feedback.lib.utils import 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.silo.base import SiloMode
diff --git a/src/sentry/utils/mockdata/core.py b/src/sentry/utils/mockdata/core.py
@@ -22,7 +22,7 @@
 from sentry.constants import ObjectStatus
 from sentry.exceptions import HashDiscarded
 from sentry.feedback.lib.utils import FeedbackCreationSource
-from sentry.feedback.usecases.create_feedback import create_feedback_issue
+from sentry.feedback.usecases.ingest.create_feedback import create_feedback_issue
 from sentry.incidents.logic import create_alert_rule, create_alert_rule_trigger, create_incident
 from sentry.incidents.models.alert_rule import AlertRuleThresholdType
 from sentry.incidents.models.incident import IncidentType
diff --git a/src/sentry/web/frontend/error_page_embed.py b/src/sentry/web/frontend/error_page_embed.py
@@ -13,7 +13,7 @@
 
 from sentry import eventstore
 from sentry.feedback.lib.utils import FeedbackCreationSource
-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.options.project_option import ProjectOption
 from sentry.models.project import Project
 from sentry.models.projectkey import ProjectKey
diff --git a/tests/sentry/feedback/endpoints/test_organization_feedback_summary.py b/tests/sentry/feedback/endpoints/test_organization_feedback_summary.py
@@ -4,7 +4,7 @@
 from django.urls import reverse
 
 from sentry.feedback.lib.utils import FeedbackCreationSource
-from sentry.feedback.usecases.create_feedback import create_feedback_issue
+from sentry.feedback.usecases.ingest.create_feedback import create_feedback_issue
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.pytest.fixtures import django_db_all
 from sentry.testutils.silo import region_silo_test
diff --git a/tests/sentry/feedback/test_create_feedback.py b/tests/sentry/feedback/test_create_feedback.py
@@ -7,7 +7,7 @@
 import pytest
 
 from sentry.feedback.lib.utils import FeedbackCreationSource
-from sentry.feedback.usecases.create_feedback import (
+from sentry.feedback.usecases.ingest.create_feedback import (
     create_feedback_issue,
     fix_for_issue_platform,
     get_feedback_title,
diff --git a/tests/sentry/feedback/test_save_event_feedback.py b/tests/sentry/feedback/test_save_event_feedback.py
@@ -5,7 +5,7 @@
 
 from sentry.eventstore.models import Event
 from sentry.feedback.lib.utils import FeedbackCreationSource
-from sentry.feedback.usecases.save_event_feedback import save_event_feedback
+from sentry.feedback.usecases.ingest.save_event_feedback import save_event_feedback
 from sentry.models.environment import Environment
 from sentry.models.userreport import UserReport
 from sentry.testutils.factories import Factories
diff --git a/tests/sentry/feedback/test_shim_to_feedback.py b/tests/sentry/feedback/test_shim_to_feedback.py
@@ -8,7 +8,7 @@
 
 from sentry.eventstore.models import Event
 from sentry.feedback.lib.utils import FeedbackCreationSource
-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.testutils.factories import Factories
 from sentry.testutils.pytest.fixtures import django_db_all
 
diff --git a/tests/sentry/feedback/test_userreport.py b/tests/sentry/feedback/test_userreport.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.feedback.usecases.userreport import save_userreport, validate_user_report
+from sentry.feedback.usecases.ingest.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
diff --git a/tests/sentry/issues/endpoints/test_organization_group_index.py b/tests/sentry/issues/endpoints/test_organization_group_index.py
@@ -13,7 +13,7 @@
 
 from sentry import options
 from sentry.feedback.lib.utils import FeedbackCreationSource
-from sentry.feedback.usecases.create_feedback import create_feedback_issue
+from sentry.feedback.usecases.ingest.create_feedback import create_feedback_issue
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.issues.grouptype import (
diff --git a/tests/sentry/tasks/test_post_process.py b/tests/sentry/tasks/test_post_process.py
@@ -19,7 +19,7 @@
 from sentry.eventstore.processing import event_processing_store
 from sentry.eventstream.types import EventStreamEventType
 from sentry.feedback.lib.utils import FeedbackCreationSource
-from sentry.feedback.usecases.create_feedback import get_feedback_title
+from sentry.feedback.usecases.ingest.create_feedback import get_feedback_title
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.source_code_management.commit_context import CommitInfo, FileBlameInfo
 from sentry.issues.auto_source_code_config.utils.platform import get_supported_platforms

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`from sentry.constants import DEFAULT_STORE_NORMALIZER_ARGS`
`17`	`17`	`from sentry.datascrubbing import scrub_data`
`18`	`18`	`from sentry.eventstore import processing`
`19`		`-from sentry.feedback.usecases.save_event_feedback import (`
	`19`	`+from sentry.feedback.usecases.ingest.save_event_feedback import (`
`20`	`20`	`save_event_feedback as save_event_feedback_impl,`
`21`	`21`	`)`
`22`	`22`	`from sentry.ingest.types import ConsumerType`