ref(control_silo): Move UserEmail model to users module

Part of moving control silo user related resources into the users module. Includes adding of types for functions.

Apart of (#73856)

Author: Christinarlong

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.models.useremail import UserEmail
+from sentry.users.models.useremail import UserEmail
 
 
 class InsufficientScopesError(SentryAPIException):

src/sentry/api/endpoints/organization_details.py

@@ -77,7 +77,6 @@
 from sentry.models.options.organization_option import OrganizationOption
 from sentry.models.organization import Organization, OrganizationStatus
 from sentry.models.scheduledeletion import RegionScheduledDeletion
-from sentry.models.useremail import UserEmail
 from sentry.organizations.services.organization import organization_service
 from sentry.organizations.services.organization.model import (
     RpcOrganization,
@@ -88,6 +87,7 @@
     OrganizationSlugCollisionException,
     organization_provisioning_service,
 )
+from sentry.users.models.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/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.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.models.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

@@ -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.useremail import UserEmail
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 
 logger = logging.getLogger("sentry.accounts")
 

src/sentry/api/endpoints/user_emails_confirm.py

@@ -8,8 +8,8 @@
 from sentry.api.base import control_silo_endpoint
 from sentry.api.bases.user import UserEndpoint
 from sentry.api.validators import AllowedEmailField
-from sentry.models.useremail import UserEmail
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
+from sentry.users.models.useremail import UserEmail
 
 logger = logging.getLogger("sentry.accounts")
 

src/sentry/api/endpoints/user_notification_email.py

@@ -8,7 +8,7 @@
 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.models.useremail import UserEmail
+from sentry.users.models.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_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.useremail import UserEmail
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 
 
 class DefaultNewsletterValidator(serializers.Serializer):

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.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.users.models.useremail import UserEmail
 from sentry.utils import metrics
 from sentry.utils.audit import create_audit_entry
 

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

@@ -23,12 +23,12 @@
 from sentry.models.organization import OrganizationStatus
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
-from sentry.models.useremail import UserEmail
 from sentry.models.userpermission import UserPermission
 from sentry.models.userrole import UserRoleUser
 from sentry.organizations.services.organization import RpcOrganizationSummary
 from sentry.users.models.authenticator import Authenticator
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 from sentry.users.services.user import RpcUser
 from sentry.utils.avatar import get_gravatar_url
 

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

@@ -1,5 +1,5 @@
 from sentry.api.serializers import Serializer, register
-from sentry.models.useremail import UserEmail
+from sentry.users.models.useremail import UserEmail
 
 
 @register(UserEmail)

src/sentry/auth/email.py

@@ -5,9 +5,9 @@
 from dataclasses import dataclass
 
 from sentry.models.organization import Organization
-from sentry.models.useremail import UserEmail
 from sentry.organizations.services.organization import organization_service
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 from sentry.utils import metrics
 
 

src/sentry/integrations/slack/tasks/link_slack_user_identities.py

@@ -9,11 +9,11 @@
 from sentry.integrations.slack.utils.users import SlackUserData, get_slack_data_by_user
 from sentry.integrations.utils import get_identities_by_user
 from sentry.models.identity import Identity, IdentityProvider, IdentityStatus
-from sentry.models.useremail import UserEmail
 from sentry.organizations.services.organization import organization_service
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 
 logger = logging.getLogger("sentry.integrations.slack.tasks")
 

src/sentry/models/__init__.py

@@ -1,6 +1,7 @@
 from sentry.users.models.authenticator import *  # NOQA
 from sentry.users.models.email import *  # NOQA
 from sentry.users.models.user import *  # NOQA
+from sentry.users.models.useremail import *  # NOQA
 
 from .activity import *  # NOQA
 from .apiapplication import *  # NOQA
@@ -119,7 +120,6 @@
 from .teamreplica import *  # NOQA
 from .tombstone import *  # NOQA
 from .transaction_threshold import *  # NOQA
-from .useremail import *  # NOQA
 from .userip import *  # NOQA
 from .userpermission import *  # NOQA
 from .userreport import *  # NOQA

src/sentry/newsletter/dummy.py

@@ -26,7 +26,7 @@ def __init__(
         unsubscribed_date=None,
         **kwargs,
     ):
-        from sentry.models.useremail import UserEmail
+        from sentry.users.models.useremail import UserEmail
 
         self.email = user.email or email
         self.list_id = list_id

src/sentry/receivers/email.py

@@ -1,8 +1,8 @@
 from django.db import IntegrityError, router, transaction
 from django.db.models.signals import post_delete, post_save
 
-from sentry.models.useremail import UserEmail
 from sentry.users.models.email import Email
+from sentry.users.models.useremail import UserEmail
 
 
 def create_email(instance, created, **kwargs):

src/sentry/receivers/useremail.py

@@ -1,8 +1,8 @@
 from django.db import IntegrityError
 from django.db.models.signals import post_save
 
-from sentry.models.useremail import UserEmail
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 
 
 def create_user_email(instance, created, **kwargs):

src/sentry/tasks/auth.py

@@ -12,13 +12,13 @@
 from sentry.auth.exceptions import ProviderNotRegistered
 from sentry.models.organization import Organization
 from sentry.models.organizationmember import OrganizationMember
-from sentry.models.useremail import UserEmail
 from sentry.organizations.services.organization.service import organization_service
 from sentry.silo.base import SiloMode
 from sentry.silo.safety import unguarded_write
 from sentry.tasks.base import instrumented_task, retry
 from sentry.types.region import RegionMappingNotFound
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
 from sentry.utils.audit import create_audit_entry_from_user

src/sentry/testutils/cases.py

@@ -111,7 +111,6 @@
 from sentry.models.releasecommit import ReleaseCommit
 from sentry.models.repository import Repository
 from sentry.models.rule import RuleSource
-from sentry.models.useremail import UserEmail
 from sentry.monitors.models import Monitor, MonitorEnvironment, MonitorType, ScheduleType
 from sentry.notifications.notifications.base import alert_page_needs_org_id
 from sentry.notifications.types import FineTuningAPIKey
@@ -146,6 +145,7 @@
 from sentry.testutils.pytest.selenium import Browser
 from sentry.types.condition_activity import ConditionActivity, ConditionActivityType
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 from sentry.utils import json
 from sentry.utils.auth import SsoSession
 from sentry.utils.json import dumps_htmlsafe

src/sentry/testutils/factories.py

@@ -138,7 +138,6 @@
 from sentry.models.savedsearch import SavedSearch
 from sentry.models.servicehook import ServiceHook
 from sentry.models.team import Team
-from sentry.models.useremail import UserEmail
 from sentry.models.userpermission import UserPermission
 from sentry.models.userreport import UserReport
 from sentry.models.userrole import UserRole
@@ -168,6 +167,7 @@
     UptimeSubscription,
 )
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 from sentry.users.services.user import RpcUser
 from sentry.utils import loremipsum
 from sentry.utils.performance_issues.performance_problem import PerformanceProblem

src/sentry/users/models/email.py

@@ -33,8 +33,8 @@ class Meta:
 
     @classmethod
     def query_for_relocation_export(cls, q: models.Q, pk_map: PrimaryKeyMap) -> models.Q:
-        from sentry.models.useremail import UserEmail
         from sentry.users.models.user import User
+        from sentry.users.models.useremail import UserEmail
 
         # `Sentry.Email` models don't have any explicit dependencies on `Sentry.User`, so we need to
         # find them manually via `UserEmail`.

src/sentry/users/models/user.py

@@ -46,10 +46,10 @@
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
 from sentry.models.orgauthtoken import OrgAuthToken
-from sentry.models.useremail import UserEmail
 from sentry.organizations.services.organization import RpcRegionUser, organization_service
 from sentry.types.region import find_all_region_names, find_regions_for_user
 from sentry.users.models.authenticator import Authenticator
+from sentry.users.models.useremail import UserEmail
 from sentry.users.services.user import RpcUser
 from sentry.utils.http import absolute_uri
 from sentry.utils.retries import TimedRetryPolicy
@@ -341,8 +341,8 @@ def merge_to(from_user: User, to_user: User) -> None:
         from sentry.models.identity import Identity
         from sentry.models.options.user_option import UserOption
         from sentry.models.organizationmembermapping import OrganizationMemberMapping
-        from sentry.models.useremail import UserEmail
         from sentry.users.models.authenticator import Authenticator
+        from sentry.users.models.useremail import UserEmail
 
         from_user_id = from_user.id
         to_user_id = to_user.id

src/sentry/models/useremail.py renamed to src/sentry/users/models/useremail.py

@@ -25,9 +25,9 @@
 from sentry.models.organization import OrganizationStatus
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
-from sentry.models.useremail import UserEmail
 from sentry.signals import user_signup
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 from sentry.users.services.user import (
     RpcAvatar,
     RpcUser,

src/sentry/users/services/user/impl.py

@@ -13,12 +13,12 @@
 from sentry.models.lostpasswordhash import LostPasswordHash
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
-from sentry.models.useremail import UserEmail
 from sentry.organizations.services.organization import organization_service
 from sentry.security.utils import capture_security_activity
 from sentry.signals import email_verified, terms_accepted
 from sentry.silo.base import control_silo_function
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 from sentry.users.services.lost_password_hash import lost_password_hash_service
 from sentry.users.services.user.service import user_service
 from sentry.utils import auth

src/sentry/web/frontend/accounts.py

@@ -3,7 +3,7 @@
 from django.utils import timezone
 
 from sentry.models.apigrant import ApiGrant
-from sentry.models.useremail import UserEmail
+from sentry.users.models.useremail import UserEmail
 from sentry.utils import jwt as jwt_utils
 
 DEFAULT_EXPIRATION = timedelta(minutes=10)

src/sentry/web/frontend/openidtoken.py

@@ -9,7 +9,6 @@
 from sentry.api.invite_helper import ApiInviteHelper
 from sentry.models.organizationmember import InviteStatus, OrganizationMember
 from sentry.models.organizationmemberteam import OrganizationMemberTeam
-from sentry.models.useremail import UserEmail
 from sentry.roles import organization_roles
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase, TestCase
@@ -18,6 +17,7 @@
 from sentry.testutils.outbox import outbox_runner
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.users.models.authenticator import Authenticator
+from sentry.users.models.useremail import UserEmail
 
 
 def mock_organization_roles_get_factory(original_organization_roles_get):

tests/sentry/api/endpoints/test_organization_member_index.py

@@ -11,7 +11,6 @@
 from sentry.models.auditlogentry import AuditLogEntry
 from sentry.models.organization import Organization
 from sentry.models.organizationmember import OrganizationMember
-from sentry.models.useremail import UserEmail
 from sentry.organizations.services.organization.serial import serialize_member
 from sentry.silo.base import SiloMode
 from sentry.silo.safety import unguarded_write
@@ -20,6 +19,7 @@
 from sentry.testutils.outbox import outbox_runner
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
 from sentry.users.models.authenticator import Authenticator
+from sentry.users.models.useremail import UserEmail
 from tests.sentry.api.endpoints.test_user_authenticator_details import assert_security_email_sent
 
 

tests/sentry/api/endpoints/test_user_authenticator_enroll.py

@@ -1,10 +1,10 @@
 from django.urls import reverse
 
 from sentry.models.options.user_option import UserOption
-from sentry.models.useremail import UserEmail
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import control_silo_test
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 
 
 @control_silo_test

tests/sentry/api/endpoints/test_user_emails.py

@@ -1,8 +1,8 @@
 from unittest import mock
 
-from sentry.models.useremail import UserEmail
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import control_silo_test
+from sentry.users.models.useremail import UserEmail
 
 
 @control_silo_test

tests/sentry/api/endpoints/test_user_emails_confirm.py

@@ -1,7 +1,7 @@
 from sentry.models.options.user_option import UserOption
-from sentry.models.useremail import UserEmail
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import control_silo_test
+from sentry.users.models.useremail import UserEmail
 
 
 class UserNotificationEmailTestBase(APITestCase):

tests/sentry/api/endpoints/test_user_notification_email.py

@@ -2,10 +2,10 @@
 from django.conf import settings
 
 from sentry import newsletter
-from sentry.models.useremail import UserEmail
 from sentry.newsletter.dummy import DummyNewsletter
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import control_silo_test
+from sentry.users.models.useremail import UserEmail
 
 
 @pytest.mark.skipif(

tests/sentry/api/endpoints/test_user_subscriptions.py

@@ -19,12 +19,12 @@
 from sentry.models.releasecommit import ReleaseCommit
 from sentry.models.releaseprojectenvironment import ReleaseProjectEnvironment, ReleaseStages
 from sentry.models.releases.release_project import ReleaseProject
-from sentry.models.useremail import UserEmail
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import SnubaTestCase, TestCase
 from sentry.testutils.helpers.datetime import before_now, iso_format
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.users.models.user import User
+from sentry.users.models.useremail import UserEmail
 
 
 class ReleaseSerializerTest(TestCase, SnubaTestCase):

tests/sentry/api/serializers/test_release.py

@@ -4,11 +4,11 @@
 from sentry.models.authidentity import AuthIdentity
 from sentry.models.authprovider import AuthProvider
 from sentry.models.avatars.user_avatar import UserAvatar
-from sentry.models.useremail import UserEmail
 from sentry.models.userpermission import UserPermission
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import control_silo_test
 from sentry.users.models.authenticator import Authenticator
+from sentry.users.models.useremail import UserEmail
 
 
 @control_silo_test