From 2f60081b350deeae53aa0fe90e8b9137e61f59b8 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Feb 28 2018 13:07:22 +0000
Subject: PR#804: hub: fix KeyError in `get_notification_recipients`


Merges #804
https://pagure.io/koji/pull-request/804

Fixes: #803
https://pagure.io/koji/issue/803
Email notifications makes build tasks fail with "KeyError: 'users_usertype'"

---

diff --git a/hub/kojihub.py b/hub/kojihub.py
index 6f62ffc..464f58f 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -7153,7 +7153,7 @@ def get_notification_recipients(build, tag_id, state):
     users_usertypes = [koji.USERTYPES['NORMAL'], koji.USERTYPES['GROUP']]
     clauses = [
         'status = %(users_status)i',
-        'usertype IN %(users_usertype)s',
+        'usertype IN %(users_usertypes)s',
     ]
 
     if not build and tag_id:
diff --git a/tests/test_hub/test_notifications.py b/tests/test_hub/test_notifications.py
index 4629fdd..1608260 100644
--- a/tests/test_hub/test_notifications.py
+++ b/tests/test_hub/test_notifications.py
@@ -71,7 +71,7 @@ class TestNotifications(unittest.TestCase):
         self.assertEqual(q.columns, ('email',))
         self.assertEqual(q.tables, ['build_notifications'])
         self.assertEqual(q.clauses, [ 'status = %(users_status)i',
-                                     'usertype IN %(users_usertype)s',
+                                     'usertype IN %(users_usertypes)s',
                                      'package_id IS NULL',
                                      'tag_id IS NULL',
                                      'success_only = FALSE'])
@@ -95,7 +95,7 @@ class TestNotifications(unittest.TestCase):
         self.assertEqual(q.columns, ('email',))
         self.assertEqual(q.tables, ['build_notifications'])
         self.assertEqual(q.clauses, ['status = %(users_status)i',
-                                     'usertype IN %(users_usertype)s',
+                                     'usertype IN %(users_usertypes)s',
                                      'package_id = %(package_id)i OR package_id IS NULL',
                                      'tag_id IS NULL',
                                      'success_only = FALSE'])
@@ -139,7 +139,7 @@ class TestNotifications(unittest.TestCase):
         self.assertEqual(q.columns, ('email',))
         self.assertEqual(q.tables, ['build_notifications'])
         self.assertEqual(q.clauses, ['status = %(users_status)i',
-                                     'usertype IN %(users_usertype)s',
+                                     'usertype IN %(users_usertypes)s',
                                      'package_id = %(package_id)i OR package_id IS NULL',
                                      'tag_id = %(tag_id)i OR tag_id IS NULL',
                                      'success_only = FALSE'])