diff --git a/src/sentry/deletions/defaults/file.py b/src/sentry/deletions/defaults/file.py index 7a867c511f4974..6bae36a52ecba6 100644 --- a/src/sentry/deletions/defaults/file.py +++ b/src/sentry/deletions/defaults/file.py @@ -3,7 +3,7 @@ from django.db.models import Q from django.utils import timezone -from sentry.deletions.base import BaseRelation, ModelDeletionTask +from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation from sentry.models.files.file import File @@ -37,8 +37,5 @@ def get_child_relations(self, instance: File) -> list[BaseRelation]: from sentry.models.files.fileblobindex import FileBlobIndex return [ - BaseRelation( - params={"model": FileBlobIndex, "query": {"file_id": instance.id}}, - task=None, # Use BulkModelDeletionTask - ), + ModelRelation(FileBlobIndex, {"file_id": instance.id}), ] diff --git a/src/sentry/runner/commands/cleanup.py b/src/sentry/runner/commands/cleanup.py index dca3cd8e2ecf62..4196a23ccac5b6 100644 --- a/src/sentry/runner/commands/cleanup.py +++ b/src/sentry/runner/commands/cleanup.py @@ -535,7 +535,7 @@ def models_which_use_deletions_code_path() -> list[tuple[type[Model], str, str]] (PullRequest, "date_added", "date_added"), (RuleFireHistory, "date_added", "date_added"), (Release, "date_added", "date_added"), - (File, "timestamp", "timestamp"), + (File, "timestamp", "id"), (Commit, "date_added", "id"), ] @@ -548,7 +548,7 @@ def remove_cross_project_models( # These models span across projects, so let's skip them deletes.remove((ArtifactBundle, "date_added", "date_added")) - deletes.remove((File, "timestamp", "timestamp")) + deletes.remove((File, "timestamp", "id")) return deletes