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

create, edit and use email branding instead of organisation

Browse Source 
notable things that have been kept until migration is complete:

* passing in `organisation` to update_service will update email branding
* both `/email-branding` and `/organisation` hit the same code
* service endpoints still return organisation as well as email branding
This commit is contained in:
Leo Hemsted
2018-02-05 12:02:35 +00:00
parent cea52929d3
commit 2f79da8702
18 changed files with 281 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/app/db.py
View File

@@ -13,7 +13,7 @@ from app.models import (
Job,
MonthlyBilling,
Notification,
Organisation,
EmailBranding,
Rate,
Service,
ServiceEmailReplyTo,
@@ -40,7 +40,7 @@ from app.dao.templates_dao import dao_create_template
from app.dao.services_dao import dao_create_service
from app.dao.service_permissions_dao import dao_add_service_permission
from app.dao.inbound_sms_dao import dao_create_inbound_sms
from app.dao.organisations_dao import dao_create_organisation
from app.dao.email_branding_dao import dao_create_email_branding
def create_user(mobile_number="+447700900986", email="notify@digital.cabinet-office.gov.uk", state='active'):
@@ -316,16 +316,16 @@ def create_service_callback_api(
return service_callback_api
def create_organisation(colour='blue', logo='test_x2.png', name='test_org_1'):
def create_email_branding(colour='blue', logo='test_x2.png', name='test_org_1'):
data = {
'colour': colour,
'logo': logo,
'name': name
}
organisation = Organisation(**data)
dao_create_organisation(organisation)
email_branding = EmailBranding(**data)
dao_create_email_branding(email_branding)
return organisation
return email_branding
def create_rate(start_date, value, notification_type):