ref: fix Activity nullability issues in sentry.rules.conditions (#73783)

getsentry · Jul 22, 2024 · 0a2689b · 0a2689b
1 parent dc71a49
commit 0a2689b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/src/sentry/rules/conditions/existing_high_priority_issue.py b/src/sentry/rules/conditions/existing_high_priority_issue.py
@@ -42,7 +42,11 @@ def get_activity(
 
         return [
             ConditionActivity(
-                group_id=a[0], type=ConditionActivityType.REAPPEARED, timestamp=a[1], data=a[2]
+                group_id=group_id,
+                type=ConditionActivityType.REAPPEARED,
+                timestamp=timestamp,
+                data=data,
             )
-            for a in activities
+            for group_id, timestamp, data in activities
+            if group_id is not None
         ]
diff --git a/src/sentry/rules/conditions/new_high_priority_issue.py b/src/sentry/rules/conditions/new_high_priority_issue.py
@@ -49,7 +49,11 @@ def get_activity(
 
         return [
             ConditionActivity(
-                group_id=a[0], type=ConditionActivityType.REAPPEARED, timestamp=a[1], data=a[2]
+                group_id=group_id,
+                type=ConditionActivityType.REAPPEARED,
+                timestamp=timestamp,
+                data=data,
             )
-            for a in activities
+            for group_id, timestamp, data in activities
+            if group_id is not None
         ]
diff --git a/src/sentry/rules/conditions/reappeared_event.py b/src/sentry/rules/conditions/reappeared_event.py
@@ -34,7 +34,11 @@ def get_activity(
 
         return [
             ConditionActivity(
-                group_id=a[0], type=ConditionActivityType.REAPPEARED, timestamp=a[1], data=a[2]
+                group_id=group_id,
+                type=ConditionActivityType.REAPPEARED,
+                timestamp=timestamp,
+                data=data,
             )
-            for a in activities
+            for group_id, timestamp, data in activities
+            if group_id is not None
         ]
diff --git a/src/sentry/rules/conditions/regression_event.py b/src/sentry/rules/conditions/regression_event.py
@@ -32,7 +32,11 @@ def get_activity(
 
         return [
             ConditionActivity(
-                group_id=a[0], type=ConditionActivityType.REGRESSION, timestamp=a[1], data=a[2]
+                group_id=group_id,
+                type=ConditionActivityType.REGRESSION,
+                timestamp=timestamp,
+                data=data,
             )
-            for a in activities
+            for group_id, timestamp, data in activities
+            if group_id is not None
         ]