ref(control_silo): Consolidate User models (and authenticator) and tests

Moves all User and authenticator specific models and tests to their own directories.

ref(#73856)

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.users.user import User
 
     user = User.objects.get(username__iexact=username)
 

src/sentry/api/authentication.py

@@ -37,7 +37,7 @@
 from sentry.models.relay import Relay
 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.models.users.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

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

src/sentry/api/endpoints/auth_index.py

@@ -20,8 +20,8 @@
 from sentry.auth.authenticators.u2f import U2fInterface
 from sentry.auth.services.auth.impl import promote_request_rpc_user
 from sentry.auth.superuser import SUPERUSER_ORG_ID
-from sentry.models.authenticator import Authenticator
 from sentry.organizations.services.organization import organization_service
+from sentry.users.models.auth.authenticator import Authenticator
 from sentry.utils import auth, json, metrics
 from sentry.utils.auth import DISABLE_SSO_CHECK_FOR_LOCAL_DEV, has_completed_sso, initiate_login
 from sentry.utils.settings import is_self_hosted

src/sentry/api/endpoints/authenticator_index.py

@@ -7,7 +7,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, control_silo_endpoint
-from sentry.models.authenticator import Authenticator
+from sentry.users.models.auth.authenticator import Authenticator
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/avatar/user.py

@@ -7,7 +7,7 @@
 from sentry.api.base import control_silo_endpoint
 from sentry.api.bases.avatar import AvatarMixin
 from sentry.api.bases.user import UserEndpoint
-from sentry.models.avatars.user_avatar import UserAvatar
+from sentry.users.models.users.user_avatar import UserAvatar
 from sentry.users.services.user.serial import serialize_rpc_user
 from sentry.users.services.user.service import user_service
 

src/sentry/api/endpoints/group_ai_autofix.py

@@ -20,7 +20,7 @@
 from sentry.models.group import Group
 from sentry.seer.signed_seer_api import sign_with_seer_secret
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
-from sentry.users.models.user import User
+from sentry.users.models.users.user import User
 from sentry.users.services.user.service import user_service
 
 logger = logging.getLogger(__name__)

src/sentry/api/endpoints/group_details.py

@@ -43,7 +43,7 @@
 from sentry.plugins.base import plugins
 from sentry.tasks.post_process import fetch_buffered_group_stats
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
-from sentry.users.models.userreport import UserReport
+from sentry.users.models.users.userreport import UserReport
 from sentry.users.services.user.service import user_service
 from sentry.utils import metrics
 

src/sentry/api/endpoints/group_event_details.py

@@ -24,7 +24,7 @@
 from sentry.search.events.filter import 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.users.models.users.user import User
 from sentry.utils import metrics
 
 if TYPE_CHECKING:

src/sentry/api/endpoints/group_integration_details.py

@@ -20,7 +20,7 @@
 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
+from sentry.users.models.users.user import User
 
 MISSING_FEATURE_MESSAGE = "Your organization does not have access to this feature."
 

src/sentry/api/endpoints/group_integrations.py

@@ -19,7 +19,7 @@
 from sentry.models.group import Group
 from sentry.models.grouplink import GroupLink
 from sentry.models.integrations.external_issue import ExternalIssue
-from sentry.users.models.user import User
+from sentry.users.models.users.user import User
 
 
 class IntegrationIssueSerializer(IntegrationSerializer):

src/sentry/api/endpoints/group_similar_issues_embeddings.py

@@ -17,7 +17,7 @@
 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
-from sentry.users.models.user import User
+from sentry.users.models.users.user import User
 from sentry.utils.safe import get_path
 
 logger = logging.getLogger(__name__)

src/sentry/api/endpoints/group_user_reports.py

@@ -7,7 +7,7 @@
 from sentry.api.paginator import DateTimePaginator
 from sentry.api.serializers import serialize
 from sentry.models.environment import Environment
-from sentry.users.models.userreport import UserReport
+from sentry.users.models.users.userreport import UserReport
 
 
 @region_silo_endpoint

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.users.models.user import User
+from sentry.users.models.users.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.users.models.user import User
+from sentry.users.models.users.user import User
 from sentry.users.services.user.serial import serialize_rpc_user
 
 

src/sentry/api/endpoints/oauth_userinfo.py

@@ -8,7 +8,7 @@
 from sentry.api.base import Endpoint, control_silo_endpoint
 from sentry.api.exceptions import ParameterValidationError, ResourceDoesNotExist, SentryAPIException
 from sentry.models.apitoken import ApiToken
-from sentry.users.models.useremail import UserEmail
+from sentry.users.models.users.useremail import UserEmail
 
 
 class InsufficientScopesError(SentryAPIException):

src/sentry/api/endpoints/org_auth_tokens.py

@@ -24,7 +24,7 @@
     RpcUserOrganizationContext,
 )
 from sentry.security.utils import capture_security_activity
-from sentry.users.models.user import User
+from sentry.users.models.users.user import User
 from sentry.utils.security.orgauthtoken_token import (
     SystemUrlPrefixMissingException,
     generate_token,

src/sentry/api/endpoints/organization_details.py

@@ -75,7 +75,7 @@
     OrganizationSlugCollisionException,
     organization_provisioning_service,
 )
-from sentry.users.models.useremail import UserEmail
+from sentry.users.models.users.useremail import UserEmail
 from sentry.users.services.user.serial import serialize_generic_user
 from sentry.utils.audit import create_audit_entry
 

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.users.models.user import User
+from sentry.users.models.users.user import User
 from sentry.utils.email import MessageBuilder
 from sentry.utils.strings import oxfordize_list
 

src/sentry/api/endpoints/organization_user_reports.py

@@ -12,7 +12,7 @@
 from sentry.api.paginator import DateTimePaginator
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models import UserReportWithGroupSerializer
-from sentry.users.models.userreport import UserReport
+from sentry.users.models.users.userreport import UserReport
 
 
 class _PaginateKwargs(TypedDict):

src/sentry/api/endpoints/project_user_reports.py

@@ -16,7 +16,7 @@
 from sentry.ingest.userreport import Conflict, save_userreport
 from sentry.models.environment import Environment
 from sentry.models.projectkey import ProjectKey
-from sentry.users.models.userreport import UserReport
+from sentry.users.models.users.userreport import UserReport
 
 
 class UserReportSerializer(serializers.ModelSerializer):

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

@@ -29,7 +29,7 @@
 from sentry.signals import relocation_link_promo_code
 from sentry.slug.patterns import ORG_SLUG_PATTERN
 from sentry.tasks.relocation import uploading_complete
-from sentry.users.models.user import MAX_USERNAME_LENGTH
+from sentry.users.models.users.user import MAX_USERNAME_LENGTH
 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

@@ -13,9 +13,9 @@
 from sentry.auth.authenticators.u2f import 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.authenticator import Authenticator
 from sentry.security.utils import capture_security_activity
-from sentry.users.models.user import User
+from sentry.users.models.auth.authenticator import Authenticator
+from sentry.users.models.users.user import User
 from sentry.utils.auth import MFA_SESSION_KEY
 
 

src/sentry/api/endpoints/user_authenticator_enroll.py

@@ -18,10 +18,10 @@
 from sentry.api.serializers import serialize
 from sentry.auth.authenticators.base import EnrollmentStatus, NewEnrollmentDisallowed
 from sentry.auth.authenticators.sms import SMSRateLimitExceeded
-from sentry.models.authenticator import Authenticator
 from sentry.organizations.services.organization import organization_service
 from sentry.security.utils import capture_security_activity
-from sentry.users.models.user import User
+from sentry.users.models.auth.authenticator import Authenticator
+from sentry.users.models.users.user import User
 from sentry.utils.auth import MFA_SESSION_KEY
 
 logger = logging.getLogger(__name__)

src/sentry/api/endpoints/user_authenticator_index.py

@@ -6,7 +6,7 @@
 from sentry.api.base import control_silo_endpoint
 from sentry.api.bases.user import UserEndpoint
 from sentry.api.serializers import serialize
-from sentry.models.authenticator import Authenticator
+from sentry.users.models.auth.authenticator import Authenticator
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/user_details.py

@@ -21,14 +21,14 @@
 from sentry.api.serializers.rest_framework import CamelSnakeModelSerializer
 from sentry.auth.elevated_mode import has_elevated_mode
 from sentry.constants import LANGUAGES
-from sentry.models.options.user_option import UserOption
 from sentry.models.organization import OrganizationStatus
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
 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.models.useremail import UserEmail
+from sentry.users.models.users.user import User
+from sentry.users.models.users.user_option import UserOption
+from sentry.users.models.users.useremail import UserEmail
 from sentry.users.services.user.serial import serialize_generic_user
 from sentry.utils.dates import AVAILABLE_TIMEZONES
 

src/sentry/api/endpoints/user_emails.py

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

src/sentry/api/endpoints/user_emails_confirm.py

@@ -9,7 +9,7 @@
 from sentry.api.bases.user import UserEndpoint
 from sentry.api.validators import AllowedEmailField
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
-from sentry.users.models.useremail import UserEmail
+from sentry.users.models.users.useremail import UserEmail
 
 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.users.models.user import User
+from sentry.users.models.users.user import User
 from social_auth.models import UserSocialAuth
 
 

src/sentry/api/endpoints/user_index.py

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

src/sentry/api/endpoints/user_ips.py

@@ -7,7 +7,7 @@
 from sentry.api.decorators import sudo_required
 from sentry.api.paginator import DateTimePaginator
 from sentry.api.serializers import serialize
-from sentry.users.models.userip import UserIP
+from sentry.users.models.users.userip import UserIP
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/user_notification_details.py

@@ -9,8 +9,8 @@
 from sentry.api.base import control_silo_endpoint
 from sentry.api.bases.user import UserEndpoint
 from sentry.api.serializers import Serializer, serialize
-from sentry.models.options.user_option import UserOption
 from sentry.notifications.types import UserOptionsSettingsKey
+from sentry.users.models.users.user_option import UserOption
 
 USER_OPTION_SETTINGS = {
     UserOptionsSettingsKey.SELF_ACTIVITY: {

src/sentry/api/endpoints/user_notification_email.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.options.user_option import UserOption
-from sentry.users.models.useremail import UserEmail
+from sentry.users.models.users.user_option import UserOption
+from sentry.users.models.users.useremail import UserEmail
 
 INVALID_EMAIL_MSG = (
     "Invalid email value(s) provided. Email values must be verified emails for the given user."

src/sentry/api/endpoints/user_notification_settings_options.py

@@ -12,7 +12,7 @@
 from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.serializers import NotificationSettingsOptionSerializer
 from sentry.notifications.validators import UserNotificationSettingOptionWithValueSerializer
-from sentry.users.models.user import User
+from sentry.users.models.users.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.users.models.user import User
+from sentry.users.models.users.user import User
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/user_notification_settings_providers.py

@@ -15,7 +15,7 @@
 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
+from sentry.users.models.users.user import User
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/user_permission_details.py

@@ -12,7 +12,7 @@
 from sentry.api.bases.user import UserEndpoint
 from sentry.api.decorators import sudo_required
 from sentry.api.permissions import SuperuserOrStaffFeatureFlaggedPermission
-from sentry.users.models.userpermission import UserPermission
+from sentry.users.models.users.userpermission import UserPermission
 
 audit_logger = logging.getLogger("sentry.audit.user")
 

src/sentry/api/endpoints/user_permissions.py

@@ -6,7 +6,7 @@
 from sentry.api.base import control_silo_endpoint
 from sentry.api.bases.user import UserEndpoint
 from sentry.api.permissions import SuperuserOrStaffFeatureFlaggedPermission
-from sentry.users.models.userpermission import UserPermission
+from sentry.users.models.users.userpermission import UserPermission
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/user_regions.py

@@ -12,7 +12,7 @@
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
 from sentry.types.region import get_region_by_name
-from sentry.users.models.user import User
+from sentry.users.models.users.user import User
 from sentry.users.services.user import RpcUser
 
 

src/sentry/api/endpoints/user_role_details.py

@@ -11,7 +11,7 @@
 from sentry.api.decorators import sudo_required
 from sentry.api.permissions import SuperuserPermission
 from sentry.api.serializers import serialize
-from sentry.users.models.userrole import UserRole, UserRoleUser
+from sentry.users.models.users.userrole import UserRole, UserRoleUser
 
 audit_logger = logging.getLogger("sentry.audit.user")
 

src/sentry/api/endpoints/user_roles.py

@@ -6,7 +6,7 @@
 from sentry.api.bases.user import UserEndpoint
 from sentry.api.permissions import SuperuserPermission
 from sentry.api.serializers import serialize
-from sentry.users.models.userrole import UserRole
+from sentry.users.models.users.userrole import UserRole
 
 
 @control_silo_endpoint