darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-26 04:21:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename whitelist DAO functions

Browse Source 
To reflect the new name of the feature.
This commit is contained in:
Chris Hill-Scott
2020-07-28 10:18:47 +01:00
parent 7d09599bc5
commit 6384b9ef4f
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/app/dao/test_service_whitelist_dao.py
View File

@@ -6,27 +6,27 @@ from app.models import (
)
from app.dao.service_whitelist_dao import (
dao_fetch_service_whitelist,
dao_add_and_commit_whitelisted_contacts,
dao_remove_service_whitelist
dao_fetch_service_guest_list,
dao_add_and_commit_guest_list_contacts,
dao_remove_service_guest_list
)
from tests.app.db import create_service
def test_fetch_service_whitelist_gets_whitelists(sample_service_whitelist):
whitelist = dao_fetch_service_whitelist(sample_service_whitelist.service_id)
whitelist = dao_fetch_service_guest_list(sample_service_whitelist.service_id)
assert len(whitelist) == 1
assert whitelist[0].id == sample_service_whitelist.id
def test_fetch_service_whitelist_ignores_other_service(sample_service_whitelist):
assert len(dao_fetch_service_whitelist(uuid.uuid4())) == 0
assert len(dao_fetch_service_guest_list(uuid.uuid4())) == 0
def test_add_and_commit_whitelisted_contacts_saves_data(sample_service):
whitelist = ServiceWhitelist.from_string(sample_service.id, EMAIL_TYPE, 'foo@example.com')
dao_add_and_commit_whitelisted_contacts([whitelist])
dao_add_and_commit_guest_list_contacts([whitelist])
db_contents = ServiceWhitelist.query.all()
assert len(db_contents) == 1
@@ -36,21 +36,21 @@ def test_add_and_commit_whitelisted_contacts_saves_data(sample_service):
def test_remove_service_whitelist_only_removes_for_my_service(notify_db, notify_db_session):
service_1 = create_service(service_name="service 1")
service_2 = create_service(service_name="service 2")
dao_add_and_commit_whitelisted_contacts([
dao_add_and_commit_guest_list_contacts([
ServiceWhitelist.from_string(service_1.id, EMAIL_TYPE, 'service1@example.com'),
ServiceWhitelist.from_string(service_2.id, EMAIL_TYPE, 'service2@example.com')
])
dao_remove_service_whitelist(service_1.id)
dao_remove_service_guest_list(service_1.id)
assert service_1.whitelist == []
assert len(service_2.whitelist) == 1
def test_remove_service_whitelist_does_not_commit(notify_db, sample_service_whitelist):
dao_remove_service_whitelist(sample_service_whitelist.service_id)
dao_remove_service_guest_list(sample_service_whitelist.service_id)
# since dao_remove_service_whitelist doesn't commit, we can still rollback its changes
# since dao_remove_service_guest_list doesn't commit, we can still rollback its changes
notify_db.session.rollback()
assert ServiceWhitelist.query.count() == 1

4
tests/app/service/test_send_one_off_notification.py
View File

@@ -7,7 +7,7 @@ from notifications_utils.recipients import InvalidPhoneError
from app.v2.errors import BadRequestError, TooManyRequestsError
from app.config import QueueNames
from app.dao.service_whitelist_dao import dao_add_and_commit_whitelisted_contacts
from app.dao.service_whitelist_dao import dao_add_and_commit_guest_list_contacts
from app.service.send_notification import send_one_off_notification
from app.models import (
EMAIL_TYPE,
@@ -269,7 +269,7 @@ def test_send_one_off_notification_raises_if_cant_send_to_recipient(
):
service = create_service(restricted=True)
template = create_template(service=service)
dao_add_and_commit_whitelisted_contacts([
dao_add_and_commit_guest_list_contacts([
ServiceWhitelist.from_string(service.id, MOBILE_TYPE, '07700900123'),
])

4
tests/app/service/test_service_whitelist.py
View File

@@ -8,7 +8,7 @@ from app.models import (
ServiceWhitelist,
MOBILE_TYPE, EMAIL_TYPE)
from app.dao.service_whitelist_dao import dao_add_and_commit_whitelisted_contacts
from app.dao.service_whitelist_dao import dao_add_and_commit_guest_list_contacts
@pytest.mark.parametrize('url_path', (
@@ -27,7 +27,7 @@ def test_get_whitelist_returns_data(client, sample_service_whitelist, url_path):
def test_get_whitelist_separates_emails_and_phones(client, sample_service):
dao_add_and_commit_whitelisted_contacts([
dao_add_and_commit_guest_list_contacts([
ServiceWhitelist.from_string(sample_service.id, EMAIL_TYPE, 'service@example.com'),
ServiceWhitelist.from_string(sample_service.id, MOBILE_TYPE, '07123456789'),
ServiceWhitelist.from_string(sample_service.id, MOBILE_TYPE, '+1800-555-555'),