wip model unions

Author: asottile-sentry

src/sentry/deletions/defaults/group.py

@@ -13,7 +13,32 @@
 # Group models that relate only to groups and not to events. We assume those to
 # be safe to delete/mutate within a single transaction for user-triggered
 # actions (delete/reprocess/merge/unmerge)
-DIRECT_GROUP_RELATED_MODELS = (
+DIRECT_GROUP_RELATED_MODELS: tuple[
+    type[
+        models.GroupHash
+        | models.GroupAssignee
+        | models.GroupCommitResolution
+        | models.GroupLink
+        | models.GroupHistory
+        | models.GroupBookmark
+        | models.GroupMeta
+        | models.GroupEnvironment
+        | models.GroupRelease
+        | models.GroupRedirect
+        | models.GroupResolution
+        | models.GroupRuleStatus
+        | models.GroupSeen
+        | models.GroupShare
+        | models.GroupSnooze
+        | models.GroupInbox
+        | models.GroupOwner
+        | models.GroupEmailThread
+        | models.GroupSubscription
+        | models.GroupHistory
+        | RuleFireHistory
+    ],
+    ...,
+] = (
     # prioritize GroupHash
     models.GroupHash,
     models.GroupAssignee,

src/sentry/models/project.py

@@ -506,8 +506,9 @@ def transfer_to(self, organization):
         # to this however, such as rules, which should maintain their
         # configuration when moved across organizations.
         if org_changed:
-            for model in ReleaseProject, ReleaseProjectEnvironment, EnvironmentProject:
-                model.objects.filter(project_id=self.id).delete()
+            ReleaseProject.objects.filter(project_id=self.id).delete()
+            ReleaseProjectEnvironment.objects.filter(project_id=self.id).delete()
+            EnvironmentProject.objects.filter(project_id=self.id).delete()
             # this is getting really gross, but make sure there aren't lingering associations
             # with old orgs or teams
             ProjectTeam.objects.filter(project=self, team__organization_id=old_org_id).delete()

src/sentry/models/release.py

@@ -514,7 +514,18 @@ def merge(cls, to_release, from_releases):
         from sentry.models.releaseprojectenvironment import ReleaseProjectEnvironment
         from sentry.models.releases.release_project import ReleaseProject
 
-        model_list = (
+        model_list: tuple[
+            type[
+                ReleaseCommit
+                | ReleaseEnvironment
+                | ReleaseFile
+                | ReleaseProject
+                | ReleaseProjectEnvironment
+                | GroupRelease
+                | GroupResolution
+            ],
+            ...,
+        ] = (
             ReleaseCommit,
             ReleaseEnvironment,
             ReleaseFile,

src/sentry/models/user.py

@@ -377,7 +377,9 @@ def merge_to(from_user: User, to_user: User) -> None:
         # While it would be nice to make the following changes in a transaction, there are too many
         # unique constraints to make this feasible. Instead, we just do it sequentially and ignore
         # the `IntegrityError`s.
-        user_related_models: tuple[type[Model], ...] = (
+        user_related_models: tuple[
+            type[Authenticator | Identity | UserAvatar | UserEmail | UserOption], ...
+        ] = (
             Authenticator,
             Identity,
             UserAvatar,

src/sentry/reprocessing2.py

@@ -119,7 +119,10 @@
 # 1. they are migrated as part of the processing pipeline (post-process/save-event)
 # 2. there are a lot of them per group. For remaining events, we need to chunk
 #    up those queries for them to not get too slow
-EVENT_MODELS_TO_MIGRATE = (EventAttachment, models.UserReport)
+EVENT_MODELS_TO_MIGRATE: tuple[type[EventAttachment | models.UserReport], ...] = (
+    EventAttachment,
+    models.UserReport,
+)
 
 # The amount of seconds after which we assume there was no progress during reprocessing,
 # and after which we just give up and mark the group as finished.

src/sentry/runner/commands/cleanup.py

@@ -248,7 +248,11 @@ def is_filtered(model: type[Model]) -> bool:
             expired_threshold = timezone.now() - timedelta(days=days)
             models.OrganizationMember.objects.delete_expired(expired_threshold)
 
-        for model_tp in [models.ApiGrant, models.ApiToken]:
+        expires_models: tuple[type[models.ApiGrant | models.ApiToken], ...] = (
+            models.ApiGrant,
+            models.ApiToken,
+        )
+        for model_tp in expires_models:
             debug_output(f"Removing expired values for {model_tp.__name__}")
 
             if is_filtered(model_tp):
@@ -273,8 +277,8 @@ def is_filtered(model: type[Model]) -> bool:
         if is_filtered(ExportedData):
             debug_output(">> Skipping ExportedData files")
         else:
-            queryset = ExportedData.objects.filter(date_expired__lt=(timezone.now()))
-            for item in queryset:
+            export_data_queryset = ExportedData.objects.filter(date_expired__lt=(timezone.now()))
+            for item in export_data_queryset:
                 item.delete_file()
 
         project_id = None

src/sentry/testutils/helpers/backups.py

@@ -610,12 +610,11 @@ def create_exhaustive_organization(
             user_id=owner_id,
             type=1,
         )
-        for group_model in {GroupAssignee, GroupBookmark, GroupSeen, GroupShare, GroupSubscription}:
-            group_model.objects.create(
-                project=project,
-                group=group,
-                user_id=owner_id,
-            )
+        GroupAssignee.objects.create(project=project, group=group, user_id=owner_id)
+        GroupBookmark.objects.create(project=project, group=group, user_id=owner_id)
+        GroupSeen.objects.create(project=project, group=group, user_id=owner_id)
+        GroupShare.objects.create(project=project, group=group, user_id=owner_id)
+        GroupSubscription.objects.create(project=project, group=group, user_id=owner_id)
 
         return org