Browse Source

ref(issue platform): Consolidate and move files (#44368)

Move what was left in
https://github.com/getsentry/sentry/blob/master/src/sentry/types/issues.py
to `grouptype.py` and also move that from `grouptype/grouptype.py` to
`issues/grouptype.py`.
Colleen O'Rourke 2 years ago
parent
commit
6b1af33b73

+ 0 - 1
mypy.ini

@@ -66,7 +66,6 @@ files = fixtures/mypy-stubs,
         src/sentry/eventstream/kafka/state.py,
         src/sentry/eventstream/kafka/synchronized.py,
         src/sentry/features/,
-        src/sentry/grouptype/grouptype.py,
         src/sentry/grouping/result.py,
         src/sentry/grouping/strategies/base.py,
         src/sentry/grouping/strategies/legacy.py,

+ 1 - 1
src/sentry/api/endpoints/group_details.py

@@ -22,13 +22,13 @@ from sentry.api.helpers.group_index import (
 from sentry.api.serializers import GroupSerializer, GroupSerializerSnuba, serialize
 from sentry.api.serializers.models.plugin import PluginSerializer, is_plugin_deprecated
 from sentry.issues.constants import get_issue_tsdb_group_model
+from sentry.issues.grouptype import GroupCategory
 from sentry.models import Activity, Group, GroupSeen, GroupSubscriptionManager, UserReport
 from sentry.models.groupinbox import get_inbox_details
 from sentry.models.groupowner import get_owner_details
 from sentry.plugins.base import plugins
 from sentry.plugins.bases import IssueTrackingPlugin2
 from sentry.services.hybrid_cloud.user import user_service
-from sentry.types.issues import GroupCategory
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
 from sentry.utils import metrics
 from sentry.utils.safe import safe_execute

+ 1 - 1
src/sentry/api/endpoints/issue_occurrence.py

@@ -8,7 +8,7 @@ from rest_framework.response import Response
 
 from sentry.api.base import Endpoint, region_silo_endpoint
 from sentry.api.permissions import SuperuserPermission
-from sentry.grouptype.grouptype import ProfileBlockedThreadGroupType
+from sentry.issues.grouptype import ProfileBlockedThreadGroupType
 from sentry.models.project import Project
 from sentry.services.hybrid_cloud.user import user_service
 from sentry.utils import json

+ 1 - 1
src/sentry/api/helpers/events.py

@@ -8,9 +8,9 @@ from rest_framework.response import Response
 from sentry import eventstore
 from sentry.api.serializers import serialize
 from sentry.eventstore.models import Event
+from sentry.issues.grouptype import GroupCategory
 from sentry.search.events.builder import QueryBuilder
 from sentry.snuba.dataset import Dataset
-from sentry.types.issues import GroupCategory
 from sentry.utils.validators import normalize_event_id
 
 if TYPE_CHECKING:

+ 1 - 1
src/sentry/api/helpers/group_index/delete.py

@@ -9,10 +9,10 @@ from rest_framework.response import Response
 
 from sentry import eventstream
 from sentry.api.base import audit_logger
+from sentry.issues.grouptype import GroupCategory
 from sentry.models import Group, GroupHash, GroupInbox, GroupStatus, Project
 from sentry.signals import issue_deleted
 from sentry.tasks.deletion import delete_groups as delete_groups_task
-from sentry.types.issues import GroupCategory
 from sentry.utils.audit import create_audit_entry
 
 from . import BULK_MUTATION_LIMIT, SearchFunction

+ 1 - 1
src/sentry/api/helpers/group_index/update.py

@@ -17,6 +17,7 @@ from sentry import analytics, eventstream, features
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models.actor import ActorSerializer
 from sentry.db.models.query import create_or_update
+from sentry.issues.grouptype import GroupCategory
 from sentry.models import (
     TOMBSTONE_FIELDS_FROM_GROUP,
     Activity,
@@ -59,7 +60,6 @@ from sentry.signals import (
 from sentry.tasks.integrations import kick_off_status_syncs
 from sentry.tasks.merge import merge_groups
 from sentry.types.activity import ActivityType
-from sentry.types.issues import GroupCategory
 from sentry.utils import metrics
 from sentry.utils.functional import extract_lazy_object
 

+ 5 - 2
src/sentry/api/issue_search.py

@@ -11,7 +11,11 @@ from sentry.api.event_search import (
 )
 from sentry.api.event_search import parse_search_query as base_parse_query
 from sentry.exceptions import InvalidSearchQuery
-from sentry.grouptype.grouptype import get_group_type_by_slug, get_group_types_by_category
+from sentry.issues.grouptype import (
+    GroupCategory,
+    get_group_type_by_slug,
+    get_group_types_by_category,
+)
 from sentry.models import Environment, Organization, Project, Team, User
 from sentry.models.group import STATUS_QUERY_CHOICES, GroupStatus
 from sentry.search.events.constants import EQUALITY_OPERATORS
@@ -22,7 +26,6 @@ from sentry.search.utils import (
     parse_status_value,
     parse_user_value,
 )
-from sentry.types.issues import GroupCategory
 
 is_filter_translation = {
     "assigned": ("unassigned", False),

+ 5 - 2
src/sentry/api/serializers/models/event.py

@@ -9,11 +9,14 @@ from sentry_relay import meta_with_chunks
 
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.eventstore.models import Event, GroupEvent
-from sentry.grouptype.grouptype import get_group_type_by_type_id, get_group_types_by_category
+from sentry.issues.grouptype import (
+    GroupCategory,
+    get_group_type_by_type_id,
+    get_group_types_by_category,
+)
 from sentry.models import EventAttachment, EventError, GroupHash, Release, User, UserReport
 from sentry.sdk_updates import SdkSetupState, get_suggested_updates
 from sentry.search.utils import convert_user_tag_to_query
-from sentry.types.issues import GroupCategory
 from sentry.utils.json import prune_empty_keys
 from sentry.utils.performance_issues.performance_detection import EventPerformanceProblem
 from sentry.utils.safe import get_path

+ 1 - 1
src/sentry/api/serializers/models/group.py

@@ -33,6 +33,7 @@ from sentry.api.serializers.models.user import UserSerializerResponse
 from sentry.app import env
 from sentry.auth.superuser import is_active_superuser
 from sentry.constants import LOG_LEVELS
+from sentry.issues.grouptype import GroupCategory
 from sentry.models import (
     ActorTuple,
     Commit,
@@ -72,7 +73,6 @@ from sentry.services.hybrid_cloud.user import user_service
 from sentry.tagstore.snuba.backend import fix_tag_value_data
 from sentry.tagstore.types import GroupTagValue
 from sentry.tsdb.snuba import SnubaTSDB
-from sentry.types.issues import GroupCategory
 from sentry.utils.cache import cache
 from sentry.utils.json import JSONData
 from sentry.utils.safe import safe_execute

+ 1 - 1
src/sentry/api/serializers/models/group_stream.py

@@ -17,10 +17,10 @@ from sentry.api.serializers.models.group import (
     snuba_tsdb,
 )
 from sentry.constants import StatsPeriod
+from sentry.issues.grouptype import GroupCategory
 from sentry.models import Environment, Group
 from sentry.models.groupinbox import get_inbox_details
 from sentry.models.groupowner import get_owner_details
-from sentry.types.issues import GroupCategory
 from sentry.utils import metrics
 from sentry.utils.cache import cache
 from sentry.utils.hashlib import hash_values

Some files were not shown because too many files changed in this diff