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

Merge pull request #2568 from alphagov/add-nhs-trust-org

Browse Source 
Add email and letter branding to the add organisation command
This commit is contained in:
Rebecca Law
2019-07-30 14:49:22 +01:00
committed by GitHub
parent de42b1004d b39da01573
commit 2b0ef807d6
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/commands.py
View File

@@ -42,7 +42,9 @@ from app.dao.users_dao import delete_model_user, delete_user_verify_codes, get_u
from app.models import ( from app.models import (
PROVIDERS, User, Notification, Organisation, Domain, Service, SMS_TYPE, PROVIDERS, User, Notification, Organisation, Domain, Service, SMS_TYPE,
NOTIFICATION_CREATED, NOTIFICATION_CREATED,
KEY_TYPE_TEST KEY_TYPE_TEST,
EmailBranding,
LetterBranding
) )
from app.performance_platform.processing_time import send_processing_time_for_start_and_end from app.performance_platform.processing_time import send_processing_time_for_start_and_end
from app.utils import get_london_midnight_in_utc, get_midnight_for_day_before from app.utils import get_london_midnight_in_utc, get_midnight_for_day_before
@@ -697,6 +699,8 @@ def populate_organisations_from_file(file_name):
# [2] crown:: TRUE | FALSE only # [2] crown:: TRUE | FALSE only
# [3] argeement_signed:: TRUE | FALSE # [3] argeement_signed:: TRUE | FALSE
# [4] domains:: comma separated list of domains related to the organisation # [4] domains:: comma separated list of domains related to the organisation
# [5] email branding name: name of the default email branding for the org
# [6] letter branding name: name of the default letter branding for the org
# The expectation is that the organisation, organisation_to_service # The expectation is that the organisation, organisation_to_service
# and user_to_organisation will be cleared before running this command. # and user_to_organisation will be cleared before running this command.
@@ -713,12 +717,23 @@ def populate_organisations_from_file(file_name):
for line in itertools.islice(f, 1, None): for line in itertools.islice(f, 1, None):
columns = line.split('|') columns = line.split('|')
print(columns) print(columns)
email_branding = None
email_branding_column = columns[5].strip()
if len(email_branding_column) > 0:
email_branding = EmailBranding.query.filter(EmailBranding.name == email_branding_column).one()
letter_branding = None
letter_branding_column = columns[6].strip()
if len(letter_branding_column) > 0:
letter_branding = LetterBranding.query.filter(LetterBranding.name == letter_branding_column).one()
data = { data = {
'name': columns[0], 'name': columns[0],
'active': True, 'active': True,
'agreement_signed': boolean_or_none(columns[3]), 'agreement_signed': boolean_or_none(columns[3]),
'crown': boolean_or_none(columns[2]), 'crown': boolean_or_none(columns[2]),
'organisation_type': columns[1].lower() 'organisation_type': columns[1].lower(),
'email_branding_id': email_branding.id if email_branding else None,
'letter_branding_id': letter_branding.id if letter_branding else None
} }
org = Organisation(**data) org = Organisation(**data)
try: try:
@@ -729,7 +744,7 @@ def populate_organisations_from_file(file_name):
db.session.rollback() db.session.rollback()
domains = columns[4].split(',') domains = columns[4].split(',')
for d in domains: for d in domains:
if d != '\n': if len(d.strip()) > 0:
domain = Domain(domain=d.strip(), organisation_id=org.id) domain = Domain(domain=d.strip(), organisation_id=org.id)
try: try:
db.session.add(domain) db.session.add(domain)