chore(control_silo): Move User model to new home in users package (#75597)

Part of consolidating (user) control silo resources to be located with other user related models. Leaves behind a shim for any getsentry references. Also includes a fix for backfill_outboxes to ensure batch.count doesn't become negative which caused tests in test_backfill_outboxes to fail.

Ref(#73856)

---------

Co-authored-by: Mark Story <[email protected]>

Author: Christinarlong

bin/mock-user

@@ -8,7 +8,7 @@ import argparse
 
 
 def main(username, newsletter_consent_prompt=None):
-    from sentry.models.user import User
+    from sentry.users.models.user import User
 
     user = User.objects.get(username__iexact=username)
 

src/sentry/api/authentication.py

@@ -35,9 +35,9 @@
 )
 from sentry.models.projectkey import ProjectKey
 from sentry.models.relay import Relay
-from sentry.models.user import User
 from sentry.relay.utils import get_header_relay_id, get_header_relay_signature
 from sentry.silo.base import SiloLimit, SiloMode
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
 from sentry.utils.linksign import process_signature

src/sentry/api/bases/user.py

@@ -13,8 +13,8 @@
 from sentry.models.organization import OrganizationStatus
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
-from sentry.models.user import User
 from sentry.organizations.services.organization import organization_service
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
 

src/sentry/api/endpoints/group_ai_autofix.py

@@ -19,10 +19,10 @@
 from sentry.autofix.utils import get_autofix_repos_from_project_code_mappings, get_autofix_state
 from sentry.integrations.utils.code_mapping import get_sorted_code_mapping_configs
 from sentry.models.group import Group
-from sentry.models.user import User
 from sentry.seer.signed_seer_api import sign_with_seer_secret
 from sentry.tasks.autofix import check_autofix_status
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
+from sentry.users.models.user import User
 from sentry.users.services.user.service import user_service
 
 logger = logging.getLogger(__name__)

src/sentry/api/endpoints/group_event_details.py

@@ -22,14 +22,14 @@
 from sentry.issues.grouptype import GroupCategory
 from sentry.models.environment import Environment
 from sentry.models.group import Group
-from sentry.models.user import User
 from sentry.search.events.filter import (
     FilterConvertParams,
     convert_search_filter_to_snuba_query,
     format_search_filter,
 )
 from sentry.snuba.dataset import Dataset
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
+from sentry.users.models.user import User
 from sentry.utils import metrics
 
 

src/sentry/api/endpoints/group_integration_details.py

@@ -17,10 +17,10 @@
 from sentry.models.activity import Activity
 from sentry.models.group import Group
 from sentry.models.grouplink import GroupLink
-from sentry.models.user import User
 from sentry.shared_integrations.exceptions import IntegrationError, IntegrationFormError
 from sentry.signals import integration_issue_created, integration_issue_linked
 from sentry.types.activity import ActivityType
+from sentry.users.models.user import User
 
 MISSING_FEATURE_MESSAGE = "Your organization does not have access to this feature."
 

src/sentry/api/endpoints/group_integrations.py

@@ -20,7 +20,7 @@
 from sentry.integrations.services.integration import RpcIntegration, integration_service
 from sentry.models.group import Group
 from sentry.models.grouplink import GroupLink
-from sentry.models.user import User
+from sentry.users.models.user import User
 
 
 class IntegrationIssueSerializer(IntegrationSerializer):

src/sentry/api/endpoints/group_similar_issues_embeddings.py

@@ -14,10 +14,10 @@
 from sentry.api.serializers import serialize
 from sentry.grouping.grouping_info import get_grouping_info
 from sentry.models.group import Group
-from sentry.models.user import User
 from sentry.seer.similarity.similar_issues import get_similarity_data_from_seer
 from sentry.seer.similarity.types import SeerSimilarIssueData, SimilarIssuesEmbeddingsRequest
 from sentry.seer.similarity.utils import get_stacktrace_string, killswitch_enabled
+from sentry.users.models.user import User
 from sentry.utils.safe import get_path
 
 logger = logging.getLogger(__name__)

src/sentry/api/endpoints/index.py

@@ -4,7 +4,7 @@
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, control_silo_endpoint
 from sentry.api.serializers import serialize
-from sentry.models.user import User
+from sentry.users.models.user import User
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/integrations/sentry_apps/installation/external_issue/actions.py

@@ -10,7 +10,7 @@
 from sentry.mediators.external_issues.issue_link_creator import IssueLinkCreator
 from sentry.models.group import Group
 from sentry.models.project import Project
-from sentry.models.user import User
+from sentry.users.models.user import User
 from sentry.users.services.user.serial import serialize_rpc_user
 
 

src/sentry/api/endpoints/org_auth_tokens.py

@@ -19,12 +19,12 @@
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
 from sentry.models.orgauthtoken import MAX_NAME_LENGTH, OrgAuthToken
-from sentry.models.user import User
 from sentry.organizations.services.organization.model import (
     RpcOrganization,
     RpcUserOrganizationContext,
 )
 from sentry.security.utils import capture_security_activity
+from sentry.users.models.user import User
 from sentry.utils.security.orgauthtoken_token import (
     SystemUrlPrefixMissingException,
     generate_token,

src/sentry/api/endpoints/organization_onboarding_continuation_email.py

@@ -8,7 +8,7 @@
 from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.api.serializers.rest_framework.base import CamelSnakeSerializer
 from sentry.models.organization import Organization
-from sentry.models.user import User
+from sentry.users.models.user import User
 from sentry.utils.email import MessageBuilder
 from sentry.utils.strings import oxfordize_list
 

src/sentry/api/endpoints/relocations/index.py

@@ -25,12 +25,12 @@
 from sentry.auth.elevated_mode import has_elevated_mode
 from sentry.models.files.file import File
 from sentry.models.relocation import Relocation, RelocationFile
-from sentry.models.user import MAX_USERNAME_LENGTH, User
 from sentry.options import get
 from sentry.search.utils import tokenize_query
 from sentry.signals import relocation_link_promo_code
 from sentry.slug.patterns import ORG_SLUG_PATTERN
 from sentry.tasks.relocation import uploading_start
+from sentry.users.models.user import MAX_USERNAME_LENGTH, User
 from sentry.users.services.user.model import RpcUser
 from sentry.users.services.user.service import user_service
 from sentry.utils.db import atomic_transaction

src/sentry/api/endpoints/user_authenticator_details.py

@@ -15,9 +15,9 @@
 from sentry.auth.authenticators.u2f import U2fInterface, decode_credential_id
 from sentry.auth.staff import has_staff_option, is_active_staff
 from sentry.auth.superuser import is_active_superuser
-from sentry.models.user import User
 from sentry.security.utils import capture_security_activity
 from sentry.users.models.authenticator import Authenticator
+from sentry.users.models.user import User
 from sentry.utils.auth import MFA_SESSION_KEY
 
 

src/sentry/api/endpoints/user_authenticator_enroll.py

@@ -20,10 +20,10 @@
 from sentry.auth.authenticators.sms import SmsInterface, SMSRateLimitExceeded
 from sentry.auth.authenticators.totp import TotpInterface
 from sentry.auth.authenticators.u2f import U2fInterface
-from sentry.models.user import User
 from sentry.organizations.services.organization import organization_service
 from sentry.security.utils import capture_security_activity
 from sentry.users.models.authenticator import Authenticator
+from sentry.users.models.user import User
 from sentry.utils.auth import MFA_SESSION_KEY
 
 logger = logging.getLogger(__name__)

src/sentry/api/endpoints/user_details.py

@@ -25,10 +25,10 @@
 from sentry.models.organization import OrganizationStatus
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
-from sentry.models.user import User
 from sentry.models.useremail import UserEmail
 from sentry.organizations.services.organization import organization_service
 from sentry.organizations.services.organization.model import RpcOrganizationDeleteState
+from sentry.users.models.user import User
 from sentry.users.services.user.serial import serialize_generic_user
 from sentry.utils.dates import AVAILABLE_TIMEZONES
 

src/sentry/api/endpoints/user_emails.py

@@ -11,8 +11,8 @@
 from sentry.api.serializers import serialize
 from sentry.api.validators import AllowedEmailField
 from sentry.models.options.user_option import UserOption
-from sentry.models.user import User
 from sentry.models.useremail import UserEmail
+from sentry.users.models.user import User
 
 logger = logging.getLogger("sentry.accounts")
 

src/sentry/api/endpoints/user_identity_config.py

@@ -17,7 +17,7 @@
 )
 from sentry.models.authidentity import AuthIdentity
 from sentry.models.identity import Identity
-from sentry.models.user import User
+from sentry.users.models.user import User
 from social_auth.models import UserSocialAuth
 
 

src/sentry/api/endpoints/user_index.py

@@ -8,8 +8,8 @@
 from sentry.api.permissions import SuperuserOrStaffFeatureFlaggedPermission
 from sentry.api.serializers import serialize
 from sentry.db.models.query import in_iexact
-from sentry.models.user import User
 from sentry.search.utils import tokenize_query
+from sentry.users.models.user import User
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/user_notification_settings_options.py

@@ -10,9 +10,9 @@
 from sentry.api.serializers import serialize
 from sentry.api.validators.notifications import validate_type
 from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.user import User
 from sentry.notifications.serializers import NotificationSettingsOptionSerializer
 from sentry.notifications.validators import UserNotificationSettingOptionWithValueSerializer
+from sentry.users.models.user import User
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/user_notification_settings_options_detail.py

@@ -7,7 +7,7 @@
 from sentry.api.base import control_silo_endpoint
 from sentry.api.bases.user import UserEndpoint
 from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.user import User
+from sentry.users.models.user import User
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/user_notification_settings_providers.py

@@ -12,10 +12,10 @@
 from sentry.api.validators.notifications import validate_type
 from sentry.integrations.types import PERSONAL_NOTIFICATION_PROVIDERS
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
-from sentry.models.user import User
 from sentry.notifications.serializers import NotificationSettingsProviderSerializer
 from sentry.notifications.types import NotificationSettingsOptionEnum
 from sentry.notifications.validators import UserNotificationSettingsProvidersDetailsSerializer
+from sentry.users.models.user import User
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/user_regions.py

@@ -11,8 +11,8 @@
 from sentry.auth.system import is_system_auth
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
-from sentry.models.user import User
 from sentry.types.region import get_region_by_name
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 
 

src/sentry/api/endpoints/user_subscriptions.py

@@ -7,8 +7,8 @@
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import control_silo_endpoint
 from sentry.api.bases.user import UserEndpoint
-from sentry.models.user import User
 from sentry.models.useremail import UserEmail
+from sentry.users.models.user import User
 
 
 class DefaultNewsletterValidator(serializers.Serializer):

src/sentry/api/fields/user.py

@@ -4,7 +4,7 @@
 
 from rest_framework import serializers
 
-from sentry.models.user import User
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
 

src/sentry/api/helpers/group_index/index.py

@@ -22,8 +22,8 @@
 from sentry.models.project import Project
 from sentry.models.release import Release
 from sentry.models.savedsearch import SavedSearch, Visibility
-from sentry.models.user import User
 from sentry.signals import advanced_search_feature_gated
+from sentry.users.models.user import User
 from sentry.utils import metrics
 from sentry.utils.cursors import Cursor, CursorResult
 

src/sentry/api/helpers/group_index/update.py

@@ -45,12 +45,12 @@
 from sentry.models.grouptombstone import TOMBSTONE_FIELDS_FROM_GROUP, GroupTombstone
 from sentry.models.project import Project
 from sentry.models.release import Release, follows_semver_versioning_scheme
-from sentry.models.user import User
 from sentry.notifications.types import SUBSCRIPTION_REASON_MAP, GroupSubscriptionReason
 from sentry.signals import issue_resolved
 from sentry.types.activity import ActivityType
 from sentry.types.actor import Actor, ActorType
 from sentry.types.group import SUBSTATUS_UPDATE_CHOICES, GroupSubStatus, PriorityLevel
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
 from sentry.users.services.user_option import user_option_service

src/sentry/api/invite_helper.py

@@ -9,14 +9,14 @@
 from sentry import audit_log, features
 from sentry.models.authidentity import AuthIdentity
 from sentry.models.authprovider import AuthProvider
-from sentry.models.user import User
 from sentry.models.useremail import UserEmail
 from sentry.organizations.services.organization import (
     RpcOrganizationMember,
     RpcUserInviteContext,
     organization_service,
 )
 from sentry.signals import member_joined
+from sentry.users.models.user import User
 from sentry.utils import metrics
 from sentry.utils.audit import create_audit_entry
 

src/sentry/api/issue_search.py

@@ -25,7 +25,6 @@
 from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.models.team import Team
-from sentry.models.user import User
 from sentry.search.events.constants import EQUALITY_OPERATORS, INEQUALITY_OPERATORS
 from sentry.search.events.filter import ParsedTerms, to_list
 from sentry.search.utils import (
@@ -38,6 +37,7 @@
     parse_user_value,
 )
 from sentry.types.group import SUBSTATUS_UPDATE_CHOICES, GroupSubStatus, PriorityLevel
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 
 is_filter_translation = {

src/sentry/api/serializers/models/event.py

@@ -16,11 +16,11 @@
 from sentry.models.eventattachment import EventAttachment
 from sentry.models.eventerror import EventError
 from sentry.models.release import Release
-from sentry.models.user import User
 from sentry.models.userreport import UserReport
 from sentry.sdk_updates import SdkSetupState, get_suggested_updates
 from sentry.search.utils import convert_user_tag_to_query, map_device_class_level
 from sentry.stacktraces.processing import find_stacktraces_in_data
+from sentry.users.models.user import User
 from sentry.utils.json import prune_empty_keys
 from sentry.utils.safe import get_path
 

src/sentry/api/serializers/models/group.py

@@ -40,7 +40,6 @@
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.orgauthtoken import is_org_auth_token_auth
 from sentry.models.team import Team
-from sentry.models.user import User
 from sentry.notifications.helpers import collect_groups_by_project, get_subscription_from_attributes
 from sentry.notifications.services import notifications_service
 from sentry.notifications.types import NotificationSettingEnum
@@ -52,6 +51,7 @@
 from sentry.tagstore.types import GroupTagValue
 from sentry.tsdb.snuba import SnubaTSDB
 from sentry.types.group import SUBSTATUS_TO_STR, PriorityLevel
+from sentry.users.models.user import User
 from sentry.users.services.user.serial import serialize_generic_user
 from sentry.users.services.user.service import user_service
 from sentry.utils.cache import cache

src/sentry/api/serializers/models/organization.py

@@ -63,9 +63,9 @@
 from sentry.models.organizationonboardingtask import OrganizationOnboardingTask
 from sentry.models.project import Project
 from sentry.models.team import Team, TeamStatus
-from sentry.models.user import User
 from sentry.organizations.absolute_url import generate_organization_url
 from sentry.organizations.services.organization import RpcOrganizationSummary
+from sentry.users.models.user import User
 from sentry.users.services.user.service import user_service
 
 _ORGANIZATION_SCOPE_PREFIX = "organizations:"

src/sentry/api/serializers/models/organization_member/base.py

@@ -6,7 +6,7 @@
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.integrations.models.external_actor import ExternalActor
 from sentry.models.organizationmember import OrganizationMember
-from sentry.models.user import User
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
 

src/sentry/api/serializers/models/organization_member/expand/projects.py

@@ -6,7 +6,7 @@
 from sentry.models.organizationmemberteam import OrganizationMemberTeam
 from sentry.models.projectteam import ProjectTeam
 from sentry.models.team import TeamStatus
-from sentry.models.user import User
+from sentry.users.models.user import User
 
 from ..base import OrganizationMemberSerializer
 from ..response import OrganizationMemberWithProjectsResponse

src/sentry/api/serializers/models/organization_member/expand/roles.py

@@ -5,9 +5,9 @@
 
 from sentry.api.serializers import serialize
 from sentry.models.organizationmember import OrganizationMember
-from sentry.models.user import User
 from sentry.roles import organization_roles, team_roles
 from sentry.roles.manager import OrganizationRole, Role
+from sentry.users.models.user import User
 from sentry.users.services.user import UserSerializeType
 from sentry.users.services.user.service import user_service