Merge pull request #1084 from getredash/fix_dup_alerts

Fix #1049: duplicate alerts when data source belongs to multiple groups
getredash · May 30, 2016 · e831218 · e831218
2 parents 6edb0ca + 07d2b5b
commit e831218
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/redash/models.py b/redash/models.py
@@ -755,7 +755,8 @@ def all(cls, groups):
             .join(DataSourceGroup, on=(Query.data_source==DataSourceGroup.data_source))\
             .where(DataSourceGroup.group << groups)\
             .switch(Alert)\
-            .join(User)
+            .join(User)\
+            .group_by(Alert, User, Query)
 
     @classmethod
     def get_by_id_and_org(cls, id, org):

diff --git a/tests/models/test_alerts.py b/tests/models/test_alerts.py
@@ -25,3 +25,13 @@ def test_returns_all_alerts_for_given_groups(self):
         alerts = Alert.all(groups=[group])
         self.assertNotIn(alert1, alerts)
         self.assertIn(alert2, alerts)
+
+    def test_return_each_alert_only_once(self):
+        group = self.factory.create_group()
+        self.factory.data_source.add_group(group)
+
+        alert = self.factory.create_alert()
+
+        alerts = Alert.all(groups=[self.factory.default_group, group])
+        self.assertEqual(1, len(list(alerts)))
+        self.assertIn(alert, alerts)