chore(notifications): move over notificationsettingoption

src/sentry/api/endpoints/user_notification_settings_options.py

@@ -8,7 +8,7 @@
 from sentry.api.exceptions import ParameterValidationError
 from sentry.api.serializers import serialize
 from sentry.api.validators.notifications import validate_type
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.serializers import NotificationSettingsOptionSerializer
 from sentry.notifications.validators import UserNotificationSettingOptionWithValueSerializer
 from sentry.users.api.bases.user import UserEndpoint

src/sentry/api/endpoints/user_notification_settings_options_detail.py

@@ -6,7 +6,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import control_silo_endpoint
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.users.api.bases.user import UserEndpoint
 from sentry.users.models.user import User
 

src/sentry/models/__init__.py

@@ -61,7 +61,6 @@
 from .importchunk import *  # NOQA
 from .latestreporeleaseenvironment import *  # NOQA
 from .notificationmessage import *  # NOQA
-from .notificationsettingoption import *  # NOQA
 from .notificationsettingprovider import *  # NOQA
 from .options import *  # NOQA
 from .organization import *  # NOQA

src/sentry/models/notificationsettingoption.py

@@ -1,40 +1,3 @@
-from django.db import models
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 
-from sentry.backup.scopes import RelocationScope
-from sentry.db.models import control_silo_model, sane_repr
-
-from .notificationsettingbase import NotificationSettingBase
-
-
-@control_silo_model
-class NotificationSettingOption(NotificationSettingBase):
-    __relocation_scope__ = RelocationScope.Excluded
-
-    class Meta:
-        app_label = "sentry"
-        db_table = "sentry_notificationsettingoption"
-        unique_together = (
-            (
-                "scope_type",
-                "scope_identifier",
-                "user_id",
-                "team_id",
-                "type",
-            ),
-        )
-        constraints = [
-            models.CheckConstraint(
-                condition=models.Q(team_id__isnull=False, user_id__isnull=True)
-                | models.Q(team_id__isnull=True, user_id__isnull=False),
-                name="notification_setting_option_team_or_user_check",
-            )
-        ]
-
-    __repr__ = sane_repr(
-        "scope_type",
-        "scope_identifier",
-        "type",
-        "user_id",
-        "team_id",
-        "value",
-    )
+__all__ = ("NotificationSettingOption",)

src/sentry/notifications/models/notificationsettingoption.py

@@ -0,0 +1,39 @@
+from django.db import models
+
+from sentry.backup.scopes import RelocationScope
+from sentry.db.models import control_silo_model, sane_repr
+from sentry.models.notificationsettingbase import NotificationSettingBase
+
+
+@control_silo_model
+class NotificationSettingOption(NotificationSettingBase):
+    __relocation_scope__ = RelocationScope.Excluded
+
+    class Meta:
+        app_label = "sentry"
+        db_table = "sentry_notificationsettingoption"
+        unique_together = (
+            (
+                "scope_type",
+                "scope_identifier",
+                "user_id",
+                "team_id",
+                "type",
+            ),
+        )
+        constraints = [
+            models.CheckConstraint(
+                condition=models.Q(team_id__isnull=False, user_id__isnull=True)
+                | models.Q(team_id__isnull=True, user_id__isnull=False),
+                name="notification_setting_option_team_or_user_check",
+            )
+        ]
+
+    __repr__ = sane_repr(
+        "scope_type",
+        "scope_identifier",
+        "type",
+        "user_id",
+        "team_id",
+        "value",
+    )

src/sentry/notifications/notificationcontroller.py

@@ -14,7 +14,6 @@
     ExternalProviderEnum,
     ExternalProviders,
 )
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.team import Team
@@ -26,6 +25,7 @@
     recipient_is_user,
     team_is_valid_recipient,
 )
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import (
     GroupSubscriptionStatus,
     NotificationScopeEnum,

src/sentry/notifications/serializers.py

@@ -4,8 +4,8 @@
 from typing import Any
 
 from sentry.api.serializers import Serializer
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 
 
 class NotificationSettingsBaseSerializer(Serializer):

src/sentry/notifications/services/impl.py

@@ -5,8 +5,8 @@
 from django.db import router, transaction
 
 from sentry.integrations.types import EXTERNAL_PROVIDERS, ExternalProviderEnum, ExternalProviders
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.notificationcontroller import NotificationController
 from sentry.notifications.services import NotificationsService
 from sentry.notifications.services.model import RpcSubscriptionStatus

src/sentry/testutils/cases.py

@@ -99,7 +99,6 @@
 from sentry.models.environment import Environment
 from sentry.models.files.file import File
 from sentry.models.groupmeta import GroupMeta
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.organization import Organization
@@ -110,6 +109,7 @@
 from sentry.models.repository import Repository
 from sentry.models.rule import RuleSource
 from sentry.monitors.models import Monitor, MonitorEnvironment, MonitorType, ScheduleType
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.notifications.base import alert_page_needs_org_id
 from sentry.notifications.types import FineTuningAPIKey
 from sentry.organizations.services.organization.serial import serialize_rpc_organization

tests/sentry/api/endpoints/test_organization_unsubscribe.py

@@ -1,7 +1,7 @@
 from django.urls import reverse
 
 from sentry.models.groupsubscription import GroupSubscription
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import assume_test_silo_mode

tests/sentry/api/endpoints/test_user_notification_settings_options.py

@@ -1,6 +1,6 @@
 from rest_framework import status
 
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import (
     NotificationScopeEnum,
     NotificationSettingEnum,

tests/sentry/api/endpoints/test_user_notification_settings_options_details.py

@@ -1,6 +1,6 @@
 from rest_framework import status
 
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import (
     NotificationScopeEnum,
     NotificationSettingEnum,

tests/sentry/api/serializers/test_group.py

@@ -10,8 +10,8 @@
 from sentry.models.groupresolution import GroupResolution
 from sentry.models.groupsnooze import GroupSnooze
 from sentry.models.groupsubscription import GroupSubscription
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import (
     NotificationScopeEnum,
     NotificationSettingEnum,

tests/sentry/db/models/test_base.py

@@ -11,7 +11,6 @@
     RegionImportChunk,
 )
 from sentry.models.notificationsettingbase import NotificationSettingBase
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.projecttemplate import ProjectTemplate
 from sentry.models.relocation import (
@@ -24,6 +23,7 @@
     ProjectTransactionThreshold,
     ProjectTransactionThresholdOverride,
 )
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.sentry_apps.models import SentryAppInstallationForProvider
 from sentry.uptime.models import ProjectUptimeSubscription, UptimeSubscription
 

tests/sentry/incidents/action_handlers/test_email.py

@@ -26,7 +26,7 @@
 )
 from sentry.incidents.models.incident import INCIDENT_STATUS, IncidentStatus, TriggerStatus
 from sentry.incidents.utils.types import AlertRuleActivationConditionType
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.seer.anomaly_detection.types import StoreDataResponse
 from sentry.sentry_metrics import indexer
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID

tests/sentry/integrations/slack/notifications/test_issue_alert.py

@@ -16,10 +16,10 @@
 from sentry.integrations.types import ExternalProviders
 from sentry.issues.grouptype import MonitorIncidentType
 from sentry.issues.issue_occurrence import IssueEvidence, IssueOccurrence
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.projectownership import ProjectOwnership
 from sentry.models.rule import Rule
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.notifications.rules import AlertRuleNotification
 from sentry.notifications.types import ActionTargetType, FallthroughChoiceType, FineTuningAPIKey
 from sentry.ownership.grammar import Matcher, Owner

tests/sentry/mail/activity/test_note.py

@@ -1,6 +1,6 @@
 from sentry.integrations.types import ExternalProviders
 from sentry.models.activity import Activity
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.notifications.activity.note import NoteActivityNotification
 from sentry.notifications.types import GroupSubscriptionReason
 from sentry.silo.base import SiloMode

tests/sentry/mail/activity/test_release.py

@@ -3,10 +3,10 @@
 from sentry.integrations.types import ExternalProviderEnum, ExternalProviders
 from sentry.models.activity import Activity
 from sentry.models.environment import Environment
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.release import Release
 from sentry.models.repository import Repository
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.notifications.activity.release import ReleaseActivityNotification
 from sentry.notifications.types import (
     GroupSubscriptionReason,

tests/sentry/mail/test_adapter.py

@@ -22,7 +22,6 @@
 from sentry.mail import build_subject_prefix, mail_adapter
 from sentry.models.activity import Activity
 from sentry.models.grouprelease import GroupRelease
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.organization import Organization
@@ -33,6 +32,7 @@
 from sentry.models.repository import Repository
 from sentry.models.rule import Rule
 from sentry.models.userreport import UserReport
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.notifications.rules import AlertRuleNotification
 from sentry.notifications.types import ActionTargetType, FallthroughChoiceType
 from sentry.notifications.utils.digest import get_digest_subject

tests/sentry/migrations/test_0574_bacfkill_weekly_report_settings.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.testutils.cases import TestMigrations
 
 

tests/sentry/migrations/test_0743_backfill_broken_monitor_notification_setting_option.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.testutils.cases import TestMigrations
 from sentry.testutils.silo import control_silo_test
 

tests/sentry/models/test_groupsubscription.py

@@ -3,9 +3,9 @@
 from sentry.integrations.types import ExternalProviderEnum, ExternalProviders
 from sentry.models.group import Group
 from sentry.models.groupsubscription import GroupSubscription
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.team import Team
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import (
     GroupSubscriptionReason,
     NotificationScopeEnum,

tests/sentry/models/test_organization.py

@@ -19,11 +19,11 @@
 )
 from sentry.models.apikey import ApiKey
 from sentry.models.auditlogentry import AuditLogEntry
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.options.organization_option import OrganizationOption
 from sentry.models.organization import Organization
 from sentry.models.organizationmember import OrganizationMember
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.features import with_feature

tests/sentry/models/test_project.py

@@ -7,7 +7,6 @@
 from sentry.integrations.types import ExternalProviders
 from sentry.models.environment import Environment, EnvironmentProject
 from sentry.models.grouplink import GroupLink
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.options.project_template_option import ProjectTemplateOption
 from sentry.models.organizationmember import OrganizationMember
@@ -20,6 +19,7 @@
 from sentry.models.releases.release_project import ReleaseProject
 from sentry.models.rule import Rule
 from sentry.monitors.models import Monitor, MonitorEnvironment, MonitorType, ScheduleType
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import NotificationSettingEnum
 from sentry.notifications.utils.participants import get_notification_recipients
 from sentry.silo.base import SiloMode

tests/sentry/models/test_team.py

@@ -1,11 +1,11 @@
 from django.test import override_settings
 
 from sentry.deletions.tasks.hybrid_cloud import schedule_hybrid_cloud_foreign_key_jobs_control
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.organizationmemberteam import OrganizationMemberTeam
 from sentry.models.team import Team
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.outbox import outbox_runner

tests/sentry/monitors/tasks/test_detect_broken_monitor_envs.py

@@ -6,7 +6,6 @@
 
 from sentry.constants import ObjectStatus
 from sentry.grouping.utils import hash_from_values
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.monitors.models import (
     CheckInStatus,
     Monitor,
@@ -19,6 +18,7 @@
     ScheduleType,
 )
 from sentry.monitors.tasks.detect_broken_monitor_envs import detect_broken_monitor_envs
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.datetime import before_now

tests/sentry/models/test_notificationsettingoption.py → tests/sentry/notifications/models/test_notificationsettingoption.py

@@ -1,5 +1,5 @@
 from sentry.deletions.tasks.hybrid_cloud import schedule_hybrid_cloud_foreign_key_jobs_control
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.outbox import outbox_runner

tests/sentry/notifications/test_helpers.py

@@ -2,7 +2,6 @@
 from urllib.parse import parse_qs, urlparse
 
 from sentry.integrations.models.external_actor import ExternalActor
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.organizationmemberteamreplica import OrganizationMemberTeamReplica
 from sentry.models.rule import Rule
 from sentry.notifications.helpers import (
@@ -12,6 +11,7 @@
     team_is_valid_recipient,
     validate,
 )
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import NotificationSettingEnum, NotificationSettingsOptionEnum
 from sentry.notifications.utils import (
     get_email_link_extra_params,

tests/sentry/notifications/test_notificationcontroller.py

@@ -1,8 +1,8 @@
 from sentry.integrations.models.external_actor import ExternalActor
 from sentry.integrations.types import ExternalProviderEnum, ExternalProviders
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.team import Team
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.notificationcontroller import NotificationController
 from sentry.notifications.types import (
     GroupSubscriptionStatus,

tests/sentry/notifications/test_notifications.py

@@ -18,8 +18,8 @@
 from sentry.models.activity import Activity
 from sentry.models.group import Group, GroupStatus
 from sentry.models.groupassignee import GroupAssignee
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.rule import Rule
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.notifications.activity.assigned import AssignedActivityNotification
 from sentry.notifications.notifications.activity.regression import RegressionActivityNotification
 from sentry.silo.base import SiloMode