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

Rename model

Browse Source 
Reflects the new name of the feature.

Note that the name of the underlying table hasn’t changed because it’s
explicitly set to `service_whitelist`. Changing this will be a more
involved process.
This commit is contained in:
Chris Hill-Scott
2020-07-28 10:22:13 +01:00
parent 4d896aa642
commit 083573e4dc
9 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/app/conftest.py
View File

@@ -33,7 +33,7 @@ from app.models import (
ProviderDetails,
ProviderDetailsHistory,
ProviderRates,
ServiceWhitelist,
ServiceGuestList,
KEY_TYPE_NORMAL,
KEY_TYPE_TEST,
KEY_TYPE_TEAM,
@@ -811,7 +811,7 @@ def notify_service(notify_db, notify_db_session):
@pytest.fixture(scope='function')
def sample_service_whitelist(notify_db, notify_db_session):
service = create_service(check_if_service_exists=True)
whitelisted_user = ServiceWhitelist.from_string(service.id, EMAIL_TYPE, 'whitelisted_user@digital.gov.uk')
whitelisted_user = ServiceGuestList.from_string(service.id, EMAIL_TYPE, 'whitelisted_user@digital.gov.uk')
notify_db.session.add(whitelisted_user)
notify_db.session.commit()

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

@@ -1,7 +1,7 @@
import uuid
from app.models import (
ServiceWhitelist,
ServiceGuestList,
EMAIL_TYPE,
)
@@ -24,11 +24,11 @@ def test_fetch_service_whitelist_ignores_other_service(sample_service_whitelist)
def test_add_and_commit_whitelisted_contacts_saves_data(sample_service):
whitelist = ServiceWhitelist.from_string(sample_service.id, EMAIL_TYPE, 'foo@example.com')
whitelist = ServiceGuestList.from_string(sample_service.id, EMAIL_TYPE, 'foo@example.com')
dao_add_and_commit_guest_list_contacts([whitelist])
db_contents = ServiceWhitelist.query.all()
db_contents = ServiceGuestList.query.all()
assert len(db_contents) == 1
assert db_contents[0].id == whitelist.id
@@ -37,8 +37,8 @@ def test_remove_service_whitelist_only_removes_for_my_service(notify_db, notify_
service_1 = create_service(service_name="service 1")
service_2 = create_service(service_name="service 2")
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')
ServiceGuestList.from_string(service_1.id, EMAIL_TYPE, 'service1@example.com'),
ServiceGuestList.from_string(service_2.id, EMAIL_TYPE, 'service2@example.com')
])
dao_remove_service_guest_list(service_1.id)
@@ -53,4 +53,4 @@ def test_remove_service_whitelist_does_not_commit(notify_db, sample_service_whit
# since dao_remove_service_guest_list doesn't commit, we can still rollback its changes
notify_db.session.rollback()
assert ServiceWhitelist.query.count() == 1
assert ServiceGuestList.query.count() == 1

8
tests/app/db.py
View File

@@ -40,7 +40,7 @@ from app.models import (
ServiceLetterContact,
ServicePermission,
ServiceSmsSender,
ServiceWhitelist,
ServiceGuestList,
Template,
User,
EMAIL_TYPE,
@@ -740,11 +740,11 @@ def create_ft_notification_status(
def create_service_whitelist(service, email_address=None, mobile_number=None):
if email_address:
whitelisted_user = ServiceWhitelist.from_string(service.id, EMAIL_TYPE, email_address)
whitelisted_user = ServiceGuestList.from_string(service.id, EMAIL_TYPE, email_address)
elif mobile_number:
whitelisted_user = ServiceWhitelist.from_string(service.id, MOBILE_TYPE, mobile_number)
whitelisted_user = ServiceGuestList.from_string(service.id, MOBILE_TYPE, mobile_number)
else:
whitelisted_user = ServiceWhitelist.from_string(service.id, EMAIL_TYPE, 'whitelisted_user@digital.gov.uk')
whitelisted_user = ServiceGuestList.from_string(service.id, EMAIL_TYPE, 'whitelisted_user@digital.gov.uk')
db.session.add(whitelisted_user)
db.session.commit()

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

@@ -17,7 +17,7 @@ from app.models import (
PRIORITY,
SMS_TYPE,
Notification,
ServiceWhitelist,
ServiceGuestList,
)
from tests.app.db import (
@@ -270,7 +270,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_guest_list_contacts([
ServiceWhitelist.from_string(service.id, MOBILE_TYPE, '07700900123'),
ServiceGuestList.from_string(service.id, MOBILE_TYPE, '07700900123'),
])
post_data = {

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

@@ -5,7 +5,7 @@ import json
from tests import create_authorization_header
from app.models import (
ServiceWhitelist,
ServiceGuestList,
MOBILE_TYPE, EMAIL_TYPE)
from app.dao.service_whitelist_dao import dao_add_and_commit_guest_list_contacts
@@ -28,9 +28,9 @@ 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_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'),
ServiceGuestList.from_string(sample_service.id, EMAIL_TYPE, 'service@example.com'),
ServiceGuestList.from_string(sample_service.id, MOBILE_TYPE, '07123456789'),
ServiceGuestList.from_string(sample_service.id, MOBILE_TYPE, '+1800-555-555'),
])
response = client.get('service/{}/guest-list'.format(sample_service.id), headers=[create_authorization_header()])
@@ -76,7 +76,7 @@ def test_update_whitelist_replaces_old_whitelist(client, sample_service_whitelis
)
assert response.status_code == 204
whitelist = ServiceWhitelist.query.order_by(ServiceWhitelist.recipient).all()
whitelist = ServiceGuestList.query.order_by(ServiceGuestList.recipient).all()
assert len(whitelist) == 2
assert whitelist[0].recipient == '07123456789'
assert whitelist[1].recipient == 'foo@bar.com'
@@ -100,5 +100,5 @@ def test_update_whitelist_doesnt_remove_old_whitelist_if_error(client, sample_se
'result': 'error',
'message': 'Invalid whitelist: "" is not a valid email address or phone number'
}
whitelist = ServiceWhitelist.query.one()
whitelist = ServiceGuestList.query.one()
assert whitelist.id == sample_service_whitelist.id

8
tests/app/test_model.py
View File

@@ -5,7 +5,7 @@ from sqlalchemy.exc import IntegrityError
from app import encryption
from app.models import (
ServiceWhitelist,
ServiceGuestList,
Notification,
SMS_TYPE,
MOBILE_TYPE,
@@ -38,7 +38,7 @@ from tests.app.db import (
'+44 7700 900678'
])
def test_should_build_service_whitelist_from_mobile_number(mobile_number):
service_whitelist = ServiceWhitelist.from_string('service_id', MOBILE_TYPE, mobile_number)
service_whitelist = ServiceGuestList.from_string('service_id', MOBILE_TYPE, mobile_number)
assert service_whitelist.recipient == mobile_number
@@ -47,7 +47,7 @@ def test_should_build_service_whitelist_from_mobile_number(mobile_number):
'test@example.com'
])
def test_should_build_service_whitelist_from_email_address(email_address):
service_whitelist = ServiceWhitelist.from_string('service_id', EMAIL_TYPE, email_address)
service_whitelist = ServiceGuestList.from_string('service_id', EMAIL_TYPE, email_address)
assert service_whitelist.recipient == email_address
@@ -59,7 +59,7 @@ def test_should_build_service_whitelist_from_email_address(email_address):
])
def test_should_not_build_service_whitelist_from_invalid_contact(recipient_type, contact):
with pytest.raises(ValueError):
ServiceWhitelist.from_string('service_id', recipient_type, contact)
ServiceGuestList.from_string('service_id', recipient_type, contact)
@pytest.mark.parametrize('initial_statuses, expected_statuses', [