Handle multiple unpage event logs when getting paged users (#4698)

Related to grafana/oncall-private#2816
grafana · Jul 18, 2024 · 7777a60 · 7777a60
1 parent dd84aa1
commit 7777a60
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/engine/apps/alerts/models/alert_group.py b/engine/apps/alerts/models/alert_group.py
@@ -554,7 +554,7 @@ def get_paged_users(self) -> typing.List[PagedUser]:
 
         log_records = self.log_records.filter(
             type__in=(AlertGroupLogRecord.TYPE_DIRECT_PAGING, AlertGroupLogRecord.TYPE_UNPAGE_USER)
-        )
+        ).order_by("created_at")
 
         for log_record in log_records:
             # filter paging events, track still active escalations
@@ -592,7 +592,9 @@ def get_paged_users(self) -> typing.List[PagedUser]:
                     }
                 else:
                     # user was unpaged at some point, remove them
-                    del users[user_id]
+                    # there could be multiple unpage log records if API was hit several times
+                    if user_id in users:
+                        del users[user_id]
 
         return list(users.values())
 

diff --git a/engine/apps/alerts/tests/test_alert_group.py b/engine/apps/alerts/tests/test_alert_group.py
@@ -589,6 +589,24 @@ def _make_log_record(alert_group, user, log_type, important=False):
     assert len(paged_users) == 1
     assert alert_group.get_paged_users()[0]["pk"] == user.public_primary_key
 
+    # user was paged and then paged again, then unpaged - they should not show up
+    alert_group = make_alert_group(alert_receive_channel)
+    _make_log_record(alert_group, user, AlertGroupLogRecord.TYPE_DIRECT_PAGING)
+    _make_log_record(alert_group, user, AlertGroupLogRecord.TYPE_DIRECT_PAGING)
+    _make_log_record(alert_group, user, AlertGroupLogRecord.TYPE_UNPAGE_USER)
+
+    paged_users = alert_group.get_paged_users()
+    assert len(paged_users) == 0
+
+    # adding extra unpage events should not break things
+    _make_log_record(alert_group, user, AlertGroupLogRecord.TYPE_UNPAGE_USER)
+    _make_log_record(alert_group, user, AlertGroupLogRecord.TYPE_UNPAGE_USER)
+    _make_log_record(alert_group, user, AlertGroupLogRecord.TYPE_DIRECT_PAGING)
+
+    paged_users = alert_group.get_paged_users()
+    assert len(paged_users) == 1
+    assert alert_group.get_paged_users()[0]["pk"] == user.public_primary_key
+
 
 @patch("apps.alerts.models.AlertGroup.start_unsilence_task", return_value=None)
 @pytest.mark.django_db