darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-24 16:23:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1194 from alphagov/no-test-key-search

Browse Source 
Exclude test keys when searching by recipient
This commit is contained in:
Chris Hill-Scott
2017-08-22 12:31:00 +01:00
committed by GitHub
parent 6cd6e70fe4 bdc935a8b1
commit 66d1c3ca03
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/dao/notifications_dao.py
View File

@@ -505,7 +505,8 @@ def dao_get_notifications_by_to_field(service_id, search_term, statuses=None):
filters = [ filters = [
Notification.service_id == service_id, Notification.service_id == service_id,
Notification.normalised_to == normalised Notification.normalised_to == normalised,
Notification.key_type != KEY_TYPE_TEST,
] ]
if statuses: if statuses:

17
tests/app/dao/test_notification_dao.py
View File

@@ -1785,8 +1785,17 @@ def test_dao_update_notifications_sent_to_dvla_does_update_history_if_test_key(s
def test_dao_get_notifications_by_to_field(sample_template): def test_dao_get_notifications_by_to_field(sample_template):
recipient_to_search_for = {
'to_field': '+447700900855',
'normalised_to': '447700900855'
}
notification1 = create_notification( notification1 = create_notification(
template=sample_template, to_field='+447700900855', normalised_to='447700900855' template=sample_template, **recipient_to_search_for
)
create_notification(
template=sample_template, key_type=KEY_TYPE_TEST, **recipient_to_search_for
) )
create_notification( create_notification(
template=sample_template, to_field='jack@gmail.com', normalised_to='jack@gmail.com' template=sample_template, to_field='jack@gmail.com', normalised_to='jack@gmail.com'
@@ -1794,7 +1803,11 @@ def test_dao_get_notifications_by_to_field(sample_template):
create_notification( create_notification(
template=sample_template, to_field='jane@gmail.com', normalised_to='jane@gmail.com' template=sample_template, to_field='jane@gmail.com', normalised_to='jane@gmail.com'
) )
results = dao_get_notifications_by_to_field(notification1.service_id, "+447700900855")
results = dao_get_notifications_by_to_field(
notification1.service_id,
recipient_to_search_for["to_field"]
)
assert len(results) == 1 assert len(results) == 1
assert notification1.id == results[0].id assert notification1.id == results[0].id