diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt index 2e95b43f1aa1e6..b1fb76e54a588f 100644 --- a/migrations_lockfile.txt +++ b/migrations_lockfile.txt @@ -31,7 +31,7 @@ replays: 0007_organizationmember_replay_access seer: 0010_drop_legacy_columns -sentry: 1080_backfill_deprecated_dashboard_widget_display_types +sentry: 1081_remove_neglectedrule social_auth: 0003_social_auth_json_field diff --git a/src/sentry/migrations/1081_remove_neglectedrule.py b/src/sentry/migrations/1081_remove_neglectedrule.py new file mode 100644 index 00000000000000..6656c25b981164 --- /dev/null +++ b/src/sentry/migrations/1081_remove_neglectedrule.py @@ -0,0 +1,54 @@ +# Generated by Django 5.2.12 on 2026-05-05 22:43 + +import django.db.models.deletion +import sentry.db.models.fields.foreignkey +from django.db import migrations + +from sentry.new_migrations.migrations import CheckedMigration +from sentry.new_migrations.monkey.models import SafeDeleteModel +from sentry.new_migrations.monkey.state import DeletionAction + + +class Migration(CheckedMigration): + # This flag is used to mark that a migration shouldn't be automatically run in production. + # This should only be used for operations where it's safe to run the migration after your + # code has deployed. So this should not be used for most operations that alter the schema + # of a table. + # Here are some things that make sense to mark as post deployment: + # - Large data migrations. Typically we want these to be run manually so that they can be + # monitored and not block the deploy for a long period of time while they run. + # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to + # run this outside deployments so that we don't block them. Note that while adding an index + # is a schema change, it's completely safe to run the operation after the code has deployed. + # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment + + is_post_deployment = False + + dependencies = [ + ("sentry", "1080_backfill_deprecated_dashboard_widget_display_types"), + ] + + operations = [ + migrations.AlterField( + model_name="neglectedrule", + name="organization", + field=sentry.db.models.fields.foreignkey.FlexibleForeignKey( + db_constraint=False, + on_delete=django.db.models.deletion.CASCADE, + to="sentry.organization", + ), + ), + migrations.AlterField( + model_name="neglectedrule", + name="rule", + field=sentry.db.models.fields.foreignkey.FlexibleForeignKey( + db_constraint=False, + on_delete=django.db.models.deletion.CASCADE, + to="sentry.rule", + ), + ), + SafeDeleteModel( + name="NeglectedRule", + deletion_action=DeletionAction.MOVE_TO_PENDING, + ), + ] diff --git a/src/sentry/models/rule.py b/src/sentry/models/rule.py index ca85de10397998..f1f06cdcc00661 100644 --- a/src/sentry/models/rule.py +++ b/src/sentry/models/rule.py @@ -183,15 +183,3 @@ class RuleActivity(Model): class Meta: app_label = "sentry" db_table = "sentry_ruleactivity" - - -@cell_silo_model -class NeglectedRule(Model): - __relocation_scope__ = RelocationScope.Organization - - rule = FlexibleForeignKey("sentry.Rule") - organization = FlexibleForeignKey("sentry.Organization") - disable_date = models.DateTimeField() - opted_out = models.BooleanField(default=False) - sent_initial_email_date = models.DateTimeField(null=True) - sent_final_email_date = models.DateTimeField(null=True) diff --git a/src/sentry/testutils/helpers/backups.py b/src/sentry/testutils/helpers/backups.py index 197fbf642b7e09..8c4ab10dd68fcb 100644 --- a/src/sentry/testutils/helpers/backups.py +++ b/src/sentry/testutils/helpers/backups.py @@ -99,7 +99,7 @@ from sentry.models.recentsearch import RecentSearch from sentry.models.relay import Relay, RelayUsage from sentry.models.repositorysettings import CodeReviewTrigger -from sentry.models.rule import NeglectedRule, RuleActivity, RuleActivityType +from sentry.models.rule import RuleActivity, RuleActivityType from sentry.models.savedsearch import SavedSearch, Visibility from sentry.models.search_common import SearchType from sentry.monitors.models import Monitor, ScheduleType @@ -512,13 +512,6 @@ def create_exhaustive_organization( rule=rule, type=RuleActivityType.CREATED.value, user_id=owner_id ) self.snooze_rule(user_id=owner_id, owner_id=owner_id, rule=rule) - NeglectedRule.objects.create( - rule=rule, - organization=org, - disable_date=timezone.now(), - sent_initial_email_date=timezone.now(), - sent_final_email_date=timezone.now(), - ) # Environment* self.create_environment(project=project)