From e41022214f7b9e1e396d33994669c29bef220e58 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 28 Jul 2020 11:23:30 +0100 Subject: [PATCH] Rename backref to service model To reflect the new name. Appears this is only used by the tests. --- app/models.py | 2 +- app/schemas.py | 6 +++--- app/service/utils.py | 2 +- tests/app/dao/test_service_whitelist_dao.py | 4 ++-- tests/app/notifications/rest/test_send_notification.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/models.py b/app/models.py index baff90554..b05ce5233 100644 --- a/app/models.py +++ b/app/models.py @@ -664,7 +664,7 @@ class ServiceGuestList(db.Model): id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4) service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), index=True, nullable=False) - service = db.relationship('Service', backref='whitelist') + service = db.relationship('Service', backref='guest_list') recipient_type = db.Column(guest_list_recipient_types, nullable=False) recipient = db.Column(db.String(255), nullable=False) created_at = db.Column(db.DateTime, default=datetime.datetime.utcnow) diff --git a/app/schemas.py b/app/schemas.py index 7788e3c79..f9127d394 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -259,7 +259,7 @@ class ServiceSchema(BaseSchema, UUIDsAsStringsMixin): 'returned_letters', 'users', 'version', - 'whitelist', + 'guest_list', 'broadcast_messages', ) strict = True @@ -310,7 +310,7 @@ class DetailedServiceSchema(BaseSchema): 'message_limit', 'email_from', 'inbound_api', - 'whitelist', + 'guest_list', 'reply_to_email_address', 'sms_sender', 'permissions', @@ -326,7 +326,7 @@ class DetailedServiceSchema(BaseSchema): 'returned_letters', 'users', 'version', - 'whitelist', + 'guest_list', 'broadcast_messages', ) diff --git a/app/service/utils.py b/app/service/utils.py index 346d75fcf..04c879777 100644 --- a/app/service/utils.py +++ b/app/service/utils.py @@ -43,7 +43,7 @@ def service_allowed_to_send_to(recipient, service, key_type, allow_guest_list_re [user.mobile_number, user.email_address] for user in service.users ) guest_list_members = [ - member.recipient for member in service.whitelist + member.recipient for member in service.guest_list if allow_guest_list_recipients ] diff --git a/tests/app/dao/test_service_whitelist_dao.py b/tests/app/dao/test_service_whitelist_dao.py index c0a22be5d..10b7c3d93 100644 --- a/tests/app/dao/test_service_whitelist_dao.py +++ b/tests/app/dao/test_service_whitelist_dao.py @@ -43,8 +43,8 @@ def test_remove_service_whitelist_only_removes_for_my_service(notify_db, notify_ dao_remove_service_guest_list(service_1.id) - assert service_1.whitelist == [] - assert len(service_2.whitelist) == 1 + assert service_1.guest_list == [] + assert len(service_2.guest_list) == 1 def test_remove_service_whitelist_does_not_commit(notify_db, sample_service_whitelist): diff --git a/tests/app/notifications/rest/test_send_notification.py b/tests/app/notifications/rest/test_send_notification.py index 92c31f555..63856a47e 100644 --- a/tests/app/notifications/rest/test_send_notification.py +++ b/tests/app/notifications/rest/test_send_notification.py @@ -793,7 +793,7 @@ def test_should_not_send_notification_to_non_whitelist_recipient_in_trial_mode( apply_async = mocker.patch('app.celery.provider_tasks.deliver_{}.apply_async'.format(notification_type)) template = create_template(service, template_type=notification_type) assert sample_service_whitelist.service_id == service.id - assert to not in [member.recipient for member in service.whitelist] + assert to not in [member.recipient for member in service.guest_list] create_notification(template=template) @@ -852,7 +852,7 @@ def test_should_send_notification_to_whitelist_recipient( service_whitelist = create_service_whitelist(sample_service, email_address=to) assert service_whitelist.service_id == sample_service.id - assert to in [member.recipient for member in sample_service.whitelist] + assert to in [member.recipient for member in sample_service.guest_list] create_notification(template=template)