chore(users): cleaning up them users shims (#77283)

what if we deleted the user shims since getsentry refs are updated and updated any missed import paths

ref(#73856)

Author: Christinarlong

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

@@ -64,6 +64,5 @@
 from .servicehook import *  # noqa: F401,F403
 from .tagvalue import *  # noqa: F401,F403
 from .team import *  # noqa: F401,F403
-from .user import *  # noqa: F401,F403
 from .user_social_auth import *  # noqa: F401,F403
 from .userreport import *  # noqa: F401,F403

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

@@ -21,16 +21,16 @@
 from sentry.integrations.services.integration import RpcIntegration, integration_service
 from sentry.integrations.types import ExternalProviderEnum, ExternalProviders
 from sentry.integrations.utils.identities import get_identity_or_404
-from sentry.models.identity import Identity, IdentityProvider
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.team import Team
-from sentry.models.user import User
 from sentry.notifications.notificationcontroller import NotificationController
 from sentry.notifications.notifications.integration_nudge import IntegrationNudgeNotification
 from sentry.notifications.services import notifications_service
 from sentry.notifications.types import NotificationSettingEnum
 from sentry.organizations.services.organization import RpcOrganization
 from sentry.types.actor import ActorType
+from sentry.users.models.identity import Identity, IdentityProvider
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.serial import serialize_generic_user
 from sentry.utils import metrics

src/sentry/integrations/messaging/linkage.py

@@ -70,7 +70,7 @@ def task_runner():
 def default_user(factories):
     """A default (super)user with email ``admin@localhost`` and password ``admin``.
 
-    :returns: A :class:`sentry.models.user.User` instance.
+    :returns: A :class:`sentry.users.models.user.User` instance.
     """
     return factories.create_user(email="admin@localhost", is_superuser=True)
 

src/sentry/models/authenticator.py

@@ -16,7 +16,7 @@
 from sentry.utils.security import get_secure_token
 
 if TYPE_CHECKING:
-    from sentry.models.user import User
+    from sentry.users.models.user import User
     from sentry.users.services.lost_password_hash import RpcLostPasswordHash
 
 

src/sentry/models/email.py

@@ -41,13 +41,13 @@
 from sentry.hybridcloud.outbox.category import OutboxCategory
 from sentry.integrations.types import EXTERNAL_PROVIDERS, ExternalProviders
 from sentry.locks import locks
-from sentry.models.lostpasswordhash import LostPasswordHash
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
 from sentry.models.orgauthtoken import OrgAuthToken
 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.lostpasswordhash import LostPasswordHash
 from sentry.users.models.user_avatar import UserAvatar
 from sentry.users.models.useremail import UserEmail
 from sentry.users.services.user import RpcUser

src/sentry/models/identity.py

@@ -23,7 +23,9 @@ class DebugIncidentTriggerEmailView(MailPreviewView):
         "sentry.incidents.models.incident.IncidentTrigger.objects.get",
         return_value=MockedIncidentTrigger(),
     )
-    @mock.patch("sentry.models.UserOption.objects.get_value", return_value="US/Pacific")
+    @mock.patch(
+        "sentry.users.models.user_option.UserOption.objects.get_value", return_value="US/Pacific"
+    )
     def get_context(self, request, incident_trigger_mock, user_option_mock):
         organization = Organization(slug="myorg")
         project = Project(slug="myproject", organization=organization)

src/sentry/models/lostpasswordhash.py

@@ -25,7 +25,9 @@ class DebugIncidentActivatedAlertTriggerEmailView(MailPreviewView):
         "sentry.incidents.models.incident.IncidentTrigger.objects.get",
         return_value=MockedIncidentTrigger(),
     )
-    @mock.patch("sentry.models.UserOption.objects.get_value", return_value="US/Pacific")
+    @mock.patch(
+        "sentry.users.models.user_option.UserOption.objects.get_value", return_value="US/Pacific"
+    )
     def get_context(self, request, incident_trigger_mock, user_option_mock):
         organization = Organization(slug="myorg")
         project = Project(slug="myproject", organization=organization)

src/sentry/models/options/user_option.py

@@ -10,7 +10,6 @@
 from sentry.discover.models import DiscoverSavedQuery, DiscoverSavedQueryTypes
 from sentry.models.organization import Organization
 from sentry.models.project import Project
-from sentry.models.user import User
 from sentry.search.events.builder.discover import DiscoverQueryBuilder
 from sentry.search.events.builder.errors import ErrorsQueryBuilder
 from sentry.search.events.types import SnubaParams
@@ -20,6 +19,7 @@
 from sentry.testutils.helpers.datetime import before_now, freeze_time, iso_format
 from sentry.testutils.pytest.fixtures import django_db_all
 from sentry.testutils.silo import assume_test_silo_mode_of
+from sentry.users.models.user import User
 from sentry.utils.samples import load_data
 
 

src/sentry/models/user.py

@@ -14,31 +14,31 @@ def setUp(self):
         super().setUp()
         self.login_as(self.user)
 
-    @mock.patch("sentry.models.User.send_confirm_email_singular")
+    @mock.patch("sentry.users.models.user.User.send_confirm_email_singular")
     def test_can_confirm(self, send_confirm_email):
         email = UserEmail.objects.create(email="[email protected]", is_verified=False, user=self.user)
         email.save()
 
         self.get_success_response(self.user.id, email="[email protected]", status_code=204)
         send_confirm_email.assert_called_once_with(UserEmail.objects.get(email="[email protected]"))
 
-    @mock.patch("sentry.models.User.send_confirm_email_singular")
+    @mock.patch("sentry.users.models.user.User.send_confirm_email_singular")
     def test_can_confirm_with_uppercase(self, send_confirm_email):
         email = UserEmail.objects.create(email="[email protected]", is_verified=False, user=self.user)
         email.save()
 
         self.get_success_response(self.user.id, email="[email protected]", status_code=204)
         send_confirm_email.assert_called_once_with(UserEmail.objects.get(email="[email protected]"))
 
-    @mock.patch("sentry.models.User.send_confirm_email_singular")
+    @mock.patch("sentry.users.models.user.User.send_confirm_email_singular")
     def test_cant_confirm_verified_email(self, send_confirm_email):
         email = UserEmail.objects.create(email="[email protected]", is_verified=True, user=self.user)
         email.save()
 
         self.get_error_response(self.user.id, email="[email protected]", status_code=400)
         assert send_confirm_email.call_count == 0
 
-    @mock.patch("sentry.models.User.send_confirm_email_singular")
+    @mock.patch("sentry.users.models.user.User.send_confirm_email_singular")
     def test_validate_email(self, send_confirm_email):
         self.get_error_response(self.user.id, email="", status_code=400)
         assert send_confirm_email.call_count == 0