Fix up the Recipient query

Makes sure we're not accidentally doubling up somewhere

Author: Henry Walshaw

tests/test_resources.py

@@ -42,6 +42,7 @@
 from resourceauth import ResourceAuth
 import result
 
+
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
@@ -95,26 +96,30 @@ def testRunResoures(self):
                 (resource.url, str(resource.runs[0])))
 
     def testNotificationsApi(self):
-        Rcp = Recipient
         test_emails = ['[email protected]', '[email protected]', '[email protected]']
         invalid_emails = ['invalid', None, object()]
 
         # invalid values should raise exception
         for email in invalid_emails:
             with self.assertRaises(ValueError):
-                Rcp.get_or_create('email', email)
+                Recipient.get_or_create('email', email)
 
         for email in test_emails:
-            Rcp.get_or_create('email', email)
-        from_db = set(r[0] for r in DB.session.query(Rcp.location).all())
+            Recipient.get_or_create('email', email)
+        from_db = {
+            r[0]
+            for r in DB.session.query(Recipient.location).filter(
+                Recipient.channel == 'email'
+            )
+        }
         self.assertEqual(from_db, set(test_emails))
 
         r = Resource.query.first()
         r.set_recipients('email', test_emails[:2])
 
         # unused email should be removed
         self.assertEqual(set(r.get_recipients('email')), set(test_emails[:2]))
-        q = Rcp.query.filter(Rcp.location == test_emails[-1])
+        q = Recipient.query.filter(Recipient.location == test_emails[-1])
         self.assertEqual(q.count(), 0)
 
     def testWebhookNotifications(self):