Skip to content

Commit e61111f

Browse files
committed
chore(incidents): Add GroupOpenPeriodActivity to incinerator/cleanup script
1 parent 86eb858 commit e61111f

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/sentry/runner/commands/cleanup.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,8 +739,10 @@ def remove_old_nodestore_values(days: int) -> None:
739739
def remove_cross_project_bulk_query_models(
740740
bulk_query_deletes: list[tuple[type[BaseModel], str, str | None]],
741741
) -> list[tuple[type[BaseModel], str, str | None]]:
742+
from sentry.models.groupopenperiodactivity import GroupOpenPeriodActivity
742743
from sentry.workflow_engine.models.workflow_fire_history import WorkflowFireHistory
743744

745+
bulk_query_deletes.remove((GroupOpenPeriodActivity, "date_added", None))
744746
bulk_query_deletes.remove((WorkflowFireHistory, "date_added", None))
745747
return bulk_query_deletes
746748

@@ -749,6 +751,7 @@ def generate_bulk_query_deletes() -> list[tuple[type[BaseModel], str, str | None
749751
from django.apps import apps
750752

751753
from sentry.models.groupemailthread import GroupEmailThread
754+
from sentry.models.groupopenperiodactivity import GroupOpenPeriodActivity
752755
from sentry.models.userreport import UserReport
753756
from sentry.workflow_engine.models.workflow_fire_history import WorkflowFireHistory
754757

@@ -763,6 +766,7 @@ def generate_bulk_query_deletes() -> list[tuple[type[BaseModel], str, str | None
763766
BULK_QUERY_DELETES = [
764767
(UserReport, "date_added", None),
765768
(GroupEmailThread, "date", None),
769+
(GroupOpenPeriodActivity, "date_added", None),
766770
(WorkflowFireHistory, "date_added", None),
767771
] + additional_bulk_query_deletes
768772

tests/sentry/runner/commands/test_cleanup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from sentry.constants import ObjectStatus
1010
from sentry.models.files.file import File
1111
from sentry.models.group import Group
12+
from sentry.models.groupopenperiodactivity import GroupOpenPeriodActivity
1213
from sentry.runner.commands.cleanup import (
1314
_cleanup,
1415
generate_bulk_query_deletes,
@@ -234,13 +235,15 @@ def test_project_id_passed_to_task_queue(self) -> None:
234235

235236

236237
class RemoveCrossProjectBulkQueryModelsTest(TestCase):
237-
def test_removes_workflow_fire_history(self) -> None:
238+
def test_removes_cross_project_models(self) -> None:
238239
bulk_query_deletes = generate_bulk_query_deletes()
239240
models_before = {m for m, _, _ in bulk_query_deletes}
241+
assert GroupOpenPeriodActivity in models_before
240242
assert WorkflowFireHistory in models_before
241243

242244
remove_cross_project_bulk_query_models(bulk_query_deletes)
243245
models_after = {m for m, _, _ in bulk_query_deletes}
246+
assert GroupOpenPeriodActivity not in models_after
244247
assert WorkflowFireHistory not in models_after
245248

246249

0 commit comments

Comments
 (0)