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

update service_email_branding mapping table alongside organisation_id

Browse Source
This commit is contained in:
Leo Hemsted
2018-02-01 17:16:48 +00:00
parent 6e9edc3e8a
commit 5d00abd6bc
4 changed files with 97 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,9 +13,16 @@ from app.dao.services_dao import dao_remove_user_from_service
from app.dao.templates_dao import dao_redact_template
from app.dao.users_dao import save_model_user
from app.models import (
User, Organisation, Service, ServicePermission, Notification,
ServiceEmailReplyTo, ServiceLetterContact,
ServiceSmsSender, InboundNumber,
EmailBranding,
InboundNumber,
Notification,
Organisation,
Service,
ServiceEmailReplyTo,
ServiceLetterContact,
ServicePermission,
ServiceSmsSender,
User,
DVLA_ORG_LAND_REGISTRY,
KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST,
EMAIL_TYPE, SMS_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, INBOUND_SMS_TYPE
@@ -403,6 +410,10 @@ def test_update_service(client, notify_db, sample_service):
org = Organisation(colour='#000000', logo='justice-league.png', name='Justice League')
notify_db.session.add(org)
notify_db.session.commit()
# Need to set this up manually until org->email_branding migration is complete :(
brand = EmailBranding(id=org.id, colour='#000000', logo='justice-league.png', name='Justice League')
notify_db.session.add(brand)
notify_db.session.commit()
auth_header = create_authorization_header()
resp = client.get(
@@ -412,6 +423,8 @@ def test_update_service(client, notify_db, sample_service):
json_resp = json.loads(resp.get_data(as_text=True))
assert resp.status_code == 200
assert json_resp['data']['name'] == sample_service.name
assert json_resp['data']['organisation'] is None
assert json_resp['data']['email_branding'] is None
data = {
'name': 'updated service name',
@@ -434,10 +447,48 @@ def test_update_service(client, notify_db, sample_service):
assert result['data']['name'] == 'updated service name'
assert result['data']['email_from'] == 'updated.service.name'
assert result['data']['organisation'] == str(org.id)
assert result['data']['email_branding'] == str(org.id)
assert result['data']['dvla_organisation'] == DVLA_ORG_LAND_REGISTRY
assert result['data']['organisation_type'] == 'foo'
def test_update_service_remove_org(admin_request, notify_db, sample_service):
org = Organisation(colour='#000000', logo='justice-league.png', name='Justice League')
notify_db.session.add(org)
notify_db.session.commit()
# Need to set this up manually until org->email_branding migration is complete :(
brand = EmailBranding(id=org.id, colour='#000000', logo='justice-league.png', name='Justice League')
sample_service.organisation = org
sample_service.email_branding = brand
notify_db.session.commit()
resp = admin_request.post('service.update_service', service_id=sample_service.id, _data={'organisation': None})
assert resp['data']['organisation'] is None
assert resp['data']['email_branding'] is None
def test_update_service_change_org(admin_request, notify_db, sample_service):
org1 = Organisation(colour='#000000', logo='justice-league.png', name='Justice League')
org2 = Organisation(colour='#111111', logo='avengers.png', name='Avengers')
notify_db.session.add_all([org1, org2])
notify_db.session.commit()
# Need to set this up manually until org->email_branding migration is complete :(
brand1 = EmailBranding(id=org1.id, colour='#000000', logo='justice-league.png', name='Justice League')
brand2 = EmailBranding(id=org2.id, colour='#111111', logo='avengers.png', name='Avengers')
notify_db.session.add_all([brand1, brand2])
sample_service.organisation = org1
sample_service.email_branding = brand1
notify_db.session.commit()
resp = admin_request.post(
'service.update_service',
service_id=sample_service.id,
_data={'organisation': str(org2.id)}
)
assert resp['data']['organisation'] == str(org2.id)
assert resp['data']['email_branding'] == str(brand2.id)
def test_update_service_flags(client, sample_service):
auth_header = create_authorization_header()
resp = client.get(