From 4101e2a5a9fc82e4f20d8185887e163837cb7133 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Tue, 27 Oct 2020 17:45:55 +0100 Subject: [PATCH 1/3] ref: Delete activity as part of group deletion, not project deletion --- src/sentry/deletions/defaults/group.py | 1 + src/sentry/deletions/defaults/project.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/deletions/defaults/group.py b/src/sentry/deletions/defaults/group.py index d9e6479b06dbd9..4c6a5ab7509d42 100644 --- a/src/sentry/deletions/defaults/group.py +++ b/src/sentry/deletions/defaults/group.py @@ -89,6 +89,7 @@ def get_child_relations(self, instance): models.GroupSubscription, models.UserReport, models.EventAttachment, + models.Activity, ) relations.extend([ModelRelation(m, {"group_id": instance.id}) for m in model_list]) diff --git a/src/sentry/deletions/defaults/project.py b/src/sentry/deletions/defaults/project.py index 787a46e3c70c71..d75a3c035c00a7 100644 --- a/src/sentry/deletions/defaults/project.py +++ b/src/sentry/deletions/defaults/project.py @@ -17,7 +17,6 @@ def get_child_relations(self, instance): # in bulk model_list = ( - models.Activity, models.EnvironmentProject, models.EventAttachment, models.EventUser, From db6b7e8e055d5e996d495ab40eeab57a3f3b225f Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Tue, 27 Oct 2020 17:50:59 +0100 Subject: [PATCH 2/3] add super basic test --- tests/sentry/deletions/test_group.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sentry/deletions/test_group.py b/tests/sentry/deletions/test_group.py index 9bd1c8dfd2bf74..5e0dc055bcd67b 100644 --- a/tests/sentry/deletions/test_group.py +++ b/tests/sentry/deletions/test_group.py @@ -11,6 +11,7 @@ GroupHash, GroupMeta, GroupRedirect, + Activity, UserReport, ) from sentry import nodestore @@ -77,6 +78,7 @@ def setUp(self): GroupHash.objects.create(project=self.project, group=group, hash=uuid4().hex) GroupMeta.objects.create(group=group, key="foo", value="bar") GroupRedirect.objects.create(group_id=group.id, previous_group_id=1) + Activity.objects.create(group=group, project=self.project, type=Activity.SET_RESOLVED) self.node_id = Event.generate_node_id(self.project.id, self.event_id) self.node_id2 = Event.generate_node_id(self.project.id, self.event_id2) @@ -99,6 +101,7 @@ def test_simple(self): assert not GroupRedirect.objects.filter(group_id=group.id).exists() assert not GroupHash.objects.filter(group_id=group.id).exists() assert not Group.objects.filter(id=group.id).exists() + assert not Activity.objects.filter(group_id=group.id).exists() assert not nodestore.get(self.node_id) assert not nodestore.get(self.node_id2) assert nodestore.get(self.node_id3), "Does not remove from second group" From ad7258aa623a499a4ee2bd6852842deadc715c7d Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Tue, 27 Oct 2020 17:54:27 +0100 Subject: [PATCH 3/3] restore activity in project deletion --- src/sentry/deletions/defaults/project.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sentry/deletions/defaults/project.py b/src/sentry/deletions/defaults/project.py index d75a3c035c00a7..787a46e3c70c71 100644 --- a/src/sentry/deletions/defaults/project.py +++ b/src/sentry/deletions/defaults/project.py @@ -17,6 +17,7 @@ def get_child_relations(self, instance): # in bulk model_list = ( + models.Activity, models.EnvironmentProject, models.EventAttachment, models.EventUser,