Browse Source

feat(issue-states): Substatus update use matching strings (#49642)

Scott Cooper 1 year ago
parent
commit
2df0b8436e
2 changed files with 15 additions and 9 deletions
  1. 9 3
      src/sentry/types/group.py
  2. 6 6
      tests/sentry/api/helpers/test_group_index.py

+ 9 - 3
src/sentry/types/group.py

@@ -32,13 +32,19 @@ IGNORED_SUBSTATUS_CHOICES = {
 }
 
 SUBSTATUS_UPDATE_CHOICES: Mapping[str, int] = {
-    "until_escalating": GroupSubStatus.UNTIL_ESCALATING,
+    "archived_until_escalating": GroupSubStatus.UNTIL_ESCALATING,
+    "archived_until_condition_met": GroupSubStatus.UNTIL_CONDITION_MET,
+    "archived_forever": GroupSubStatus.FOREVER,
     "escalating": GroupSubStatus.ESCALATING,
     "ongoing": GroupSubStatus.ONGOING,
-    "forever": GroupSubStatus.FOREVER,
-    "until_condition_met": GroupSubStatus.UNTIL_CONDITION_MET,
     "regressed": GroupSubStatus.REGRESSED,
     "new": GroupSubStatus.NEW,
+    # Deprecated
+    "until_escalating": GroupSubStatus.UNTIL_ESCALATING,
+    # Deprecated
+    "until_condition_met": GroupSubStatus.UNTIL_CONDITION_MET,
+    # Deprecated
+    "forever": GroupSubStatus.FOREVER,
 }
 
 SUBSTATUS_TO_STR: Mapping[int, str] = {

+ 6 - 6
tests/sentry/api/helpers/test_group_index.py

@@ -129,13 +129,13 @@ class UpdateGroupsTest(TestCase):  # type: ignore[misc]
         assert send_robust.called
 
     @patch("sentry.signals.issue_ignored.send_robust")
-    def test_ignoring_group_forever(self, send_robust: Mock) -> None:
+    def test_ignoring_group_archived_forever(self, send_robust: Mock) -> None:
         group = self.create_group()
         add_group_to_inbox(group, GroupInboxReason.NEW)
 
         request = self.make_request(user=self.user, method="GET")
         request.user = self.user
-        request.data = {"status": "ignored", "substatus": "forever"}
+        request.data = {"status": "ignored", "substatus": "archived_forever"}
         request.GET = QueryDict(query_string=f"id={group.id}")
 
         search_fn = Mock()
@@ -151,7 +151,7 @@ class UpdateGroupsTest(TestCase):  # type: ignore[misc]
         assert not GroupInbox.objects.filter(group=group).exists()
 
     @patch("sentry.signals.issue_ignored.send_robust")
-    def test_ignoring_group_until_condition(self, send_robust: Mock) -> None:
+    def test_ignoring_group_archived_until_condition_met(self, send_robust: Mock) -> None:
         group = self.create_group()
         add_group_to_inbox(group, GroupInboxReason.NEW)
 
@@ -159,7 +159,7 @@ class UpdateGroupsTest(TestCase):  # type: ignore[misc]
         request.user = self.user
         request.data = {
             "status": "ignored",
-            "substatus": "until_condition_met",
+            "substatus": "archived_until_condition_met",
             "statusDetails": {"ignoreDuration": 1},
         }
         request.GET = QueryDict(query_string=f"id={group.id}")
@@ -223,13 +223,13 @@ class UpdateGroupsTest(TestCase):  # type: ignore[misc]
 
     @with_feature("organizations:escalating-issues")  # type: ignore[misc]
     @patch("sentry.signals.issue_ignored.send_robust")
-    def test_ignore_with_substatus_until_escalating(self, send_robust: Mock) -> None:
+    def test_ignore_with_substatus_archived_until_escalating(self, send_robust: Mock) -> None:
         group = self.create_group()
         add_group_to_inbox(group, GroupInboxReason.NEW)
 
         request = self.make_request(user=self.user, method="GET")
         request.user = self.user
-        request.data = {"status": "ignored", "substatus": "until_escalating"}
+        request.data = {"status": "ignored", "substatus": "archived_until_escalating"}
         request.GET = QueryDict(query_string=f"id={group.id}")
 
         search_fn = Mock()