mirror of
https://github.com/GSA/notifications-api.git
synced 2026-08-03 05:09:13 -04:00
Rename backref to service model
To reflect the new name. Appears this is only used by the tests.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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',
|
||||
)
|
||||
|
||||
|
||||
@@ -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
|
||||
]
|
||||
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user