darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-02 12:48:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3128 from alphagov/move-provider-restriction

Browse Source 
Move provider restriction into broadcast service settings table
This commit is contained in:
David McDonald
2021-02-10 17:32:11 +00:00
committed by GitHub
parent 4be3af5410 b2213dad19
commit 5f58f6c698
4 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/app/celery/test_broadcast_message_tasks.py
View File

@@ -9,7 +9,6 @@ from app.models import (
BroadcastStatusType,
BroadcastEventMessageType,
BroadcastProviderMessageStatus,
ServiceBroadcastProviderRestriction,
ServiceBroadcastSettings,
)
from app.celery.broadcast_message_tasks import send_broadcast_event, send_broadcast_provider_message, trigger_link_test
@@ -47,10 +46,8 @@ def test_send_broadcast_event_only_sends_to_one_provider_if_set_on_service(
notify_api,
sample_service
):
notify_db.session.add(ServiceBroadcastProviderRestriction(
service=sample_service,
provider='vodafone'
))
settings = ServiceBroadcastSettings(service=sample_service, channel="test", provider="vodafone")
notify_db.session.add(settings)
template = create_template(sample_service, BROADCAST_TYPE)
broadcast_message = create_broadcast_message(template, status=BroadcastStatusType.BROADCASTING)
@@ -74,10 +71,8 @@ def test_send_broadcast_event_does_nothing_if_provider_set_on_service_isnt_enabl
notify_api,
sample_service
):
notify_db.session.add(ServiceBroadcastProviderRestriction(
service=sample_service,
provider='three'
))
settings = ServiceBroadcastSettings(service=sample_service, channel="test", provider="three")
notify_db.session.add(settings)
template = create_template(sample_service, BROADCAST_TYPE)
broadcast_message = create_broadcast_message(template, status=BroadcastStatusType.BROADCASTING)

9
tests/app/service/test_rest.py
View File

@@ -19,7 +19,7 @@ from app.models import (
Notification,
Permission,
Service,
ServiceBroadcastProviderRestriction,
ServiceBroadcastSettings,
ServiceEmailReplyTo,
ServiceLetterContact,
ServicePermission,
@@ -280,11 +280,8 @@ def test_get_service_by_id(admin_request, sample_service):
def test_get_service_by_id_returns_allowed_broadcast_provider(notify_db, admin_request, sample_service):
notify_db.session.add(ServiceBroadcastProviderRestriction(
service=sample_service,
provider='ee'
))
notify_db.session.commit()
settings = ServiceBroadcastSettings(service=sample_service, channel="severe", provider="ee")
notify_db.session.add(settings)
json_resp = admin_request.get('service.get_service_by_id', service_id=sample_service.id)
assert json_resp['data']['id'] == str(sample_service.id)