From 4cbc79a7aa78287f5a17cf8273d83ac6af51ec8e Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Tue, 14 Jun 2016 11:04:41 +0300
Subject: [PATCH 1/2] Use default user for alert_subscription factory

---
 tests/factories.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/factories.py b/tests/factories.py
index b3dfae46a4..c91c584293 100644
--- a/tests/factories.py
+++ b/tests/factories.py
@@ -185,6 +185,14 @@ def create_alert(self, **kwargs):
         args.update(**kwargs)
         return alert_factory.create(**args)
 
+    def create_alert_subscription(self, **kwargs):
+        args = {
+            'user': self.user
+        }
+
+        args.update(**kwargs)
+        return alert_subscription_factory.create(**args)
+
     def create_data_source(self, **kwargs):
         args = {
             'org': self.org
@@ -274,6 +282,3 @@ def create_api_key(self, **kwargs):
 
     def create_destination(self, **kwargs):
         return destination_factory.create(**kwargs)
-
-    def create_alert_subscription(self, **kwargs):
-        return alert_subscription_factory.create(**kwargs)

From da4db94cf80cb0e29bcdc0bb4782fb4c4eaf9b92 Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Tue, 14 Jun 2016 11:09:35 +0300
Subject: [PATCH 2/2] Close #930: remove alerts for archived queries

---
 rd_ui/app/views/query.html |  2 +-
 redash/models.py           |  3 +++
 tests/test_models.py       | 10 ++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/rd_ui/app/views/query.html b/rd_ui/app/views/query.html
index 9be65037af..812d37076d 100644
--- a/rd_ui/app/views/query.html
+++ b/rd_ui/app/views/query.html
@@ -8,7 +8,7 @@ <h4 class="modal-title">Query Archive</h4>
       </div>
       <div class="modal-body">
         Are you sure you want to archive this query?
-        <br/> All dashboard widgets created with its visualizations will be deleted.
+        <br/> All alerts and dashboard widgets created with its visualizations will be deleted.
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">No</button>
diff --git a/redash/models.py b/redash/models.py
index 5cd51abf21..9b9071d0fd 100644
--- a/redash/models.py
+++ b/redash/models.py
@@ -641,6 +641,9 @@ def archive(self):
             for w in vis.widgets:
                 w.delete_instance()
 
+        for alert in self.alerts:
+            alert.delete_instance(recursive=True)
+
         self.save()
 
     @classmethod
diff --git a/tests/test_models.py b/tests/test_models.py
index 12c5d5ae24..3304613391 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -276,6 +276,16 @@ def test_removes_scheduling(self):
 
         self.assertEqual(None, query.schedule)
 
+    def test_deletes_alerts(self):
+        subscription = self.factory.create_alert_subscription()
+        query = subscription.alert.query
+
+        query.archive()
+
+        self.assertRaises(models.Alert.DoesNotExist, models.Alert.get_by_id, subscription.alert.id)
+        self.assertRaises(models.AlertSubscription.DoesNotExist, models.AlertSubscription.get_by_id, subscription.id)
+
+
 class DataSourceTest(BaseTestCase):
     def test_get_schema(self):
         return_value = [{'name': 'table', 'columns': []}]