Skip to content

Commit 8dab28f

Browse files
moved models to new directory and updated imports
1 parent 5b5023d commit 8dab28f

File tree

314 files changed

+1494
-1482
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

314 files changed

+1494
-1482
lines changed

src/sentry/api/authentication.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
)
3636
from sentry.models.projectkey import ProjectKey
3737
from sentry.models.relay import Relay
38-
from sentry.models.user import User
3938
from sentry.relay.utils import get_header_relay_id, get_header_relay_signature
4039
from sentry.silo.base import SiloLimit, SiloMode
40+
from sentry.users.models.user import User
4141
from sentry.users.services.user import RpcUser
4242
from sentry.users.services.user.service import user_service
4343
from sentry.utils.linksign import process_signature

src/sentry/api/bases/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
from sentry.models.organization import OrganizationStatus
1414
from sentry.models.organizationmapping import OrganizationMapping
1515
from sentry.models.organizationmembermapping import OrganizationMemberMapping
16-
from sentry.models.user import User
1716
from sentry.organizations.services.organization import organization_service
17+
from sentry.users.models.user import User
1818
from sentry.users.services.user import RpcUser
1919
from sentry.users.services.user.service import user_service
2020

src/sentry/api/endpoints/group_ai_autofix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
from sentry.api.serializers import EventSerializer, serialize
1919
from sentry.autofix.utils import get_autofix_repos_from_project_code_mappings
2020
from sentry.models.group import Group
21-
from sentry.models.user import User
2221
from sentry.seer.signed_seer_api import sign_with_seer_secret
2322
from sentry.types.ratelimit import RateLimit, RateLimitCategory
23+
from sentry.users.models.user import User
2424
from sentry.users.services.user.service import user_service
2525

2626
logger = logging.getLogger(__name__)

src/sentry/api/endpoints/group_details.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
from sentry.models.integrations.external_issue import ExternalIssue
4141
from sentry.models.platformexternalissue import PlatformExternalIssue
4242
from sentry.models.team import Team
43-
from sentry.models.userreport import UserReport
4443
from sentry.plugins.base import plugins
4544
from sentry.tasks.post_process import fetch_buffered_group_stats
4645
from sentry.types.ratelimit import RateLimit, RateLimitCategory
46+
from sentry.users.models.userreport import UserReport
4747
from sentry.users.services.user.service import user_service
4848
from sentry.utils import metrics
4949

src/sentry/api/endpoints/group_event_details.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
from sentry.api.serializers import EventSerializer, serialize
2222
from sentry.issues.grouptype import GroupCategory
2323
from sentry.models.environment import Environment
24-
from sentry.models.user import User
2524
from sentry.search.events.filter import convert_search_filter_to_snuba_query, format_search_filter
2625
from sentry.snuba.dataset import Dataset
2726
from sentry.types.ratelimit import RateLimit, RateLimitCategory
27+
from sentry.users.models.user import User
2828
from sentry.utils import metrics
2929

3030
if TYPE_CHECKING:

src/sentry/api/endpoints/group_integration_details.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
from sentry.models.group import Group
1818
from sentry.models.grouplink import GroupLink
1919
from sentry.models.integrations.external_issue import ExternalIssue
20-
from sentry.models.user import User
2120
from sentry.shared_integrations.exceptions import IntegrationError, IntegrationFormError
2221
from sentry.signals import integration_issue_created, integration_issue_linked
2322
from sentry.types.activity import ActivityType
23+
from sentry.users.models.user import User
2424

2525
MISSING_FEATURE_MESSAGE = "Your organization does not have access to this feature."
2626

src/sentry/api/endpoints/group_integrations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from sentry.models.group import Group
2020
from sentry.models.grouplink import GroupLink
2121
from sentry.models.integrations.external_issue import ExternalIssue
22-
from sentry.models.user import User
22+
from sentry.users.models.user import User
2323

2424

2525
class IntegrationIssueSerializer(IntegrationSerializer):

src/sentry/api/endpoints/group_similar_issues_embeddings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
from sentry.api.serializers import serialize
1515
from sentry.grouping.grouping_info import get_grouping_info
1616
from sentry.models.group import Group
17-
from sentry.models.user import User
1817
from sentry.seer.similarity.similar_issues import get_similarity_data_from_seer
1918
from sentry.seer.similarity.types import SeerSimilarIssueData, SimilarIssuesEmbeddingsRequest
2019
from sentry.seer.similarity.utils import get_stacktrace_string
20+
from sentry.users.models.user import User
2121
from sentry.utils.safe import get_path
2222

2323
logger = logging.getLogger(__name__)

src/sentry/api/endpoints/group_user_reports.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from sentry.api.paginator import DateTimePaginator
88
from sentry.api.serializers import serialize
99
from sentry.models.environment import Environment
10-
from sentry.models.userreport import UserReport
10+
from sentry.users.models.userreport import UserReport
1111

1212

1313
@region_silo_endpoint

src/sentry/api/endpoints/index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from sentry.api.api_publish_status import ApiPublishStatus
55
from sentry.api.base import Endpoint, control_silo_endpoint
66
from sentry.api.serializers import serialize
7-
from sentry.models.user import User
7+
from sentry.users.models.user import User
88

99

1010
@control_silo_endpoint

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from sentry.mediators.external_issues.issue_link_creator import IssueLinkCreator
1111
from sentry.models.group import Group
1212
from sentry.models.project import Project
13-
from sentry.models.user import User
13+
from sentry.users.models.user import User
1414
from sentry.users.services.user.serial import serialize_rpc_user
1515

1616

src/sentry/api/endpoints/oauth_userinfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from sentry.api.base import Endpoint, control_silo_endpoint
99
from sentry.api.exceptions import ParameterValidationError, ResourceDoesNotExist, SentryAPIException
1010
from sentry.models.apitoken import ApiToken
11-
from sentry.models.useremail import UserEmail
11+
from sentry.users.models.useremail import UserEmail
1212

1313

1414
class InsufficientScopesError(SentryAPIException):

src/sentry/api/endpoints/org_auth_tokens.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
from sentry.models.organizationmapping import OrganizationMapping
2020
from sentry.models.organizationmembermapping import OrganizationMemberMapping
2121
from sentry.models.orgauthtoken import MAX_NAME_LENGTH, OrgAuthToken
22-
from sentry.models.user import User
2322
from sentry.organizations.services.organization.model import (
2423
RpcOrganization,
2524
RpcUserOrganizationContext,
2625
)
2726
from sentry.security.utils import capture_security_activity
27+
from sentry.users.models.user import User
2828
from sentry.utils.security.orgauthtoken_token import (
2929
SystemUrlPrefixMissingException,
3030
generate_token,

src/sentry/api/endpoints/organization_details.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
from sentry.models.options.organization_option import OrganizationOption
6666
from sentry.models.organization import Organization, OrganizationStatus
6767
from sentry.models.scheduledeletion import RegionScheduledDeletion
68-
from sentry.models.useremail import UserEmail
6968
from sentry.organizations.services.organization import organization_service
7069
from sentry.organizations.services.organization.model import (
7170
RpcOrganization,
@@ -76,6 +75,7 @@
7675
OrganizationSlugCollisionException,
7776
organization_provisioning_service,
7877
)
78+
from sentry.users.models.useremail import UserEmail
7979
from sentry.users.services.user.serial import serialize_generic_user
8080
from sentry.utils.audit import create_audit_entry
8181

src/sentry/api/endpoints/organization_onboarding_continuation_email.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from sentry.api.bases.organization import OrganizationEndpoint
99
from sentry.api.serializers.rest_framework.base import CamelSnakeSerializer
1010
from sentry.models.organization import Organization
11-
from sentry.models.user import User
11+
from sentry.users.models.user import User
1212
from sentry.utils.email import MessageBuilder
1313
from sentry.utils.strings import oxfordize_list
1414

src/sentry/api/endpoints/organization_user_reports.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from sentry.api.paginator import DateTimePaginator
1313
from sentry.api.serializers import serialize
1414
from sentry.api.serializers.models import UserReportWithGroupSerializer
15-
from sentry.models.userreport import UserReport
15+
from sentry.users.models.userreport import UserReport
1616

1717

1818
class _PaginateKwargs(TypedDict):

src/sentry/api/endpoints/project_user_reports.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from sentry.ingest.userreport import Conflict, save_userreport
1717
from sentry.models.environment import Environment
1818
from sentry.models.projectkey import ProjectKey
19-
from sentry.models.userreport import UserReport
19+
from sentry.users.models.userreport import UserReport
2020

2121

2222
class UserReportSerializer(serializers.ModelSerializer):

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
from sentry.auth.elevated_mode import has_elevated_mode
2525
from sentry.models.files.file import File
2626
from sentry.models.relocation import Relocation, RelocationFile
27-
from sentry.models.user import MAX_USERNAME_LENGTH
2827
from sentry.options import get
2928
from sentry.search.utils import tokenize_query
3029
from sentry.signals import relocation_link_promo_code
3130
from sentry.slug.patterns import ORG_SLUG_PATTERN
3231
from sentry.tasks.relocation import uploading_complete
32+
from sentry.users.models.user import MAX_USERNAME_LENGTH
3333
from sentry.users.services.user.model import RpcUser
3434
from sentry.users.services.user.service import user_service
3535
from sentry.utils.db import atomic_transaction

src/sentry/api/endpoints/user_authenticator_details.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
from sentry.auth.staff import has_staff_option, is_active_staff
1515
from sentry.auth.superuser import is_active_superuser
1616
from sentry.models.authenticator import Authenticator
17-
from sentry.models.user import User
1817
from sentry.security.utils import capture_security_activity
18+
from sentry.users.models.user import User
1919
from sentry.utils.auth import MFA_SESSION_KEY
2020

2121

src/sentry/api/endpoints/user_authenticator_enroll.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
from sentry.auth.authenticators.base import EnrollmentStatus, NewEnrollmentDisallowed
2020
from sentry.auth.authenticators.sms import SMSRateLimitExceeded
2121
from sentry.models.authenticator import Authenticator
22-
from sentry.models.user import User
2322
from sentry.organizations.services.organization import organization_service
2423
from sentry.security.utils import capture_security_activity
24+
from sentry.users.models.user import User
2525
from sentry.utils.auth import MFA_SESSION_KEY
2626

2727
logger = logging.getLogger(__name__)

src/sentry/api/endpoints/user_details.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
from sentry.models.organization import OrganizationStatus
2626
from sentry.models.organizationmapping import OrganizationMapping
2727
from sentry.models.organizationmembermapping import OrganizationMemberMapping
28-
from sentry.models.user import User
29-
from sentry.models.useremail import UserEmail
3028
from sentry.organizations.services.organization import organization_service
3129
from sentry.organizations.services.organization.model import RpcOrganizationDeleteState
30+
from sentry.users.models.user import User
31+
from sentry.users.models.useremail import UserEmail
3232
from sentry.users.services.user.serial import serialize_generic_user
3333
from sentry.utils.dates import AVAILABLE_TIMEZONES
3434

src/sentry/api/endpoints/user_emails.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
from sentry.api.serializers import serialize
1212
from sentry.api.validators import AllowedEmailField
1313
from sentry.models.options.user_option import UserOption
14-
from sentry.models.user import User
15-
from sentry.models.useremail import UserEmail
14+
from sentry.users.models.user import User
15+
from sentry.users.models.useremail import UserEmail
1616

1717
logger = logging.getLogger("sentry.accounts")
1818

src/sentry/api/endpoints/user_emails_confirm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from sentry.api.base import control_silo_endpoint
99
from sentry.api.bases.user import UserEndpoint
1010
from sentry.api.validators import AllowedEmailField
11-
from sentry.models.useremail import UserEmail
1211
from sentry.types.ratelimit import RateLimit, RateLimitCategory
12+
from sentry.users.models.useremail import UserEmail
1313

1414
logger = logging.getLogger("sentry.accounts")
1515

src/sentry/api/endpoints/user_identity_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
)
1818
from sentry.models.authidentity import AuthIdentity
1919
from sentry.models.identity import Identity
20-
from sentry.models.user import User
20+
from sentry.users.models.user import User
2121
from social_auth.models import UserSocialAuth
2222

2323

src/sentry/api/endpoints/user_index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from sentry.api.permissions import SuperuserOrStaffFeatureFlaggedPermission
99
from sentry.api.serializers import serialize
1010
from sentry.db.models.query import in_iexact
11-
from sentry.models.user import User
1211
from sentry.search.utils import tokenize_query
12+
from sentry.users.models.user import User
1313

1414

1515
@control_silo_endpoint

src/sentry/api/endpoints/user_ips.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from sentry.api.decorators import sudo_required
88
from sentry.api.paginator import DateTimePaginator
99
from sentry.api.serializers import serialize
10-
from sentry.models.userip import UserIP
10+
from sentry.users.models.userip import UserIP
1111

1212

1313
@control_silo_endpoint

src/sentry/api/endpoints/user_notification_email.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from sentry.api.base import control_silo_endpoint
99
from sentry.api.bases.user import UserEndpoint
1010
from sentry.models.options.user_option import UserOption
11-
from sentry.models.useremail import UserEmail
11+
from sentry.users.models.useremail import UserEmail
1212

1313
INVALID_EMAIL_MSG = (
1414
"Invalid email value(s) provided. Email values must be verified emails for the given user."

src/sentry/api/endpoints/user_notification_settings_options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
from sentry.api.serializers import serialize
1111
from sentry.api.validators.notifications import validate_type
1212
from sentry.models.notificationsettingoption import NotificationSettingOption
13-
from sentry.models.user import User
1413
from sentry.notifications.serializers import NotificationSettingsOptionSerializer
1514
from sentry.notifications.validators import UserNotificationSettingOptionWithValueSerializer
15+
from sentry.users.models.user import User
1616

1717

1818
@control_silo_endpoint

src/sentry/api/endpoints/user_notification_settings_options_detail.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from sentry.api.base import control_silo_endpoint
88
from sentry.api.bases.user import UserEndpoint
99
from sentry.models.notificationsettingoption import NotificationSettingOption
10-
from sentry.models.user import User
10+
from sentry.users.models.user import User
1111

1212

1313
@control_silo_endpoint

src/sentry/api/endpoints/user_notification_settings_providers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
from sentry.api.validators.notifications import validate_type
1313
from sentry.integrations.types import PERSONAL_NOTIFICATION_PROVIDERS
1414
from sentry.models.notificationsettingprovider import NotificationSettingProvider
15-
from sentry.models.user import User
1615
from sentry.notifications.serializers import NotificationSettingsProviderSerializer
1716
from sentry.notifications.types import NotificationSettingsOptionEnum
1817
from sentry.notifications.validators import UserNotificationSettingsProvidersDetailsSerializer
18+
from sentry.users.models.user import User
1919

2020

2121
@control_silo_endpoint

src/sentry/api/endpoints/user_permission_details.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from sentry.api.bases.user import UserEndpoint
1313
from sentry.api.decorators import sudo_required
1414
from sentry.api.permissions import SuperuserOrStaffFeatureFlaggedPermission
15-
from sentry.models.userpermission import UserPermission
15+
from sentry.users.models.userpermission import UserPermission
1616

1717
audit_logger = logging.getLogger("sentry.audit.user")
1818

src/sentry/api/endpoints/user_permissions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from sentry.api.base import control_silo_endpoint
77
from sentry.api.bases.user import UserEndpoint
88
from sentry.api.permissions import SuperuserOrStaffFeatureFlaggedPermission
9-
from sentry.models.userpermission import UserPermission
9+
from sentry.users.models.userpermission import UserPermission
1010

1111

1212
@control_silo_endpoint

src/sentry/api/endpoints/user_regions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
from sentry.auth.system import is_system_auth
1212
from sentry.models.organizationmapping import OrganizationMapping
1313
from sentry.models.organizationmembermapping import OrganizationMemberMapping
14-
from sentry.models.user import User
1514
from sentry.types.region import get_region_by_name
15+
from sentry.users.models.user import User
1616
from sentry.users.services.user import RpcUser
1717

1818

src/sentry/api/endpoints/user_role_details.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from sentry.api.decorators import sudo_required
1212
from sentry.api.permissions import SuperuserPermission
1313
from sentry.api.serializers import serialize
14-
from sentry.models.userrole import UserRole, UserRoleUser
14+
from sentry.users.models.userrole import UserRole, UserRoleUser
1515

1616
audit_logger = logging.getLogger("sentry.audit.user")
1717

src/sentry/api/endpoints/user_roles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from sentry.api.bases.user import UserEndpoint
77
from sentry.api.permissions import SuperuserPermission
88
from sentry.api.serializers import serialize
9-
from sentry.models.userrole import UserRole
9+
from sentry.users.models.userrole import UserRole
1010

1111

1212
@control_silo_endpoint

src/sentry/api/endpoints/user_subscriptions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
from sentry.api.api_publish_status import ApiPublishStatus
88
from sentry.api.base import control_silo_endpoint
99
from sentry.api.bases.user import UserEndpoint
10-
from sentry.models.user import User
11-
from sentry.models.useremail import UserEmail
10+
from sentry.users.models.user import User
11+
from sentry.users.models.useremail import UserEmail
1212

1313

1414
class DefaultNewsletterValidator(serializers.Serializer):

src/sentry/api/endpoints/userroles_details.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from sentry.api.permissions import SuperuserPermission
1111
from sentry.api.serializers import serialize
1212
from sentry.api.validators.userrole import UserRoleValidator
13-
from sentry.models.userrole import UserRole
13+
from sentry.users.models.userrole import UserRole
1414

1515
audit_logger = logging.getLogger("sentry.audit.user")
1616

src/sentry/api/endpoints/userroles_index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from sentry.api.permissions import SuperuserPermission
1111
from sentry.api.serializers import serialize
1212
from sentry.api.validators.userrole import UserRoleValidator
13-
from sentry.models.userrole import UserRole
13+
from sentry.users.models.userrole import UserRole
1414

1515
audit_logger = logging.getLogger("sentry.audit.user")
1616

0 commit comments

Comments
 (0)