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

Use from_id_and_service_id method from SerialisedTemplate.

Browse Source 
Minor updates as per requested from review
This commit is contained in:
Rebecca Law
2021-02-15 12:41:50 +00:00
parent 61af203ad6
commit d67f9fcfd6
3 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/config.py
View File

@@ -430,7 +430,6 @@ class Development(Config):
class Test(Development):
SQLALCHEMY_ECHO = False
NOTIFY_EMAIL_DOMAIN = 'test.notify.com'
FROM_NUMBER = 'testing'
NOTIFY_ENVIRONMENT = 'test'

13
app/delivery/send_to_providers.py
View File

@@ -15,7 +15,6 @@ from app.dao.provider_details_dao import (
dao_reduce_sms_provider_priority
)
from app.celery.research_mode_tasks import send_sms_response, send_email_response
from app.dao.templates_dao import dao_get_template_by_id
from app.exceptions import NotificationTechnicalFailureException
from app.models import (
SMS_TYPE,
@@ -41,9 +40,9 @@ def send_sms_to_provider(notification):
if notification.status == 'created':
provider = provider_to_use(SMS_TYPE, notification.international)
template_dict = SerialisedTemplate.get_dict(template_id=notification.template_id,
service_id=service.id,
version=notification.template_version)['data']
template_dict = SerialisedTemplate.from_id_and_service_id(template_id=notification.template_id,
service_id=service_id,
version=notification.template_version).__dict__
template = SMSMessageTemplate(
template_dict,
@@ -95,9 +94,9 @@ def send_email_to_provider(notification):
if notification.status == 'created':
provider = provider_to_use(EMAIL_TYPE)
template_dict = SerialisedTemplate.get_dict(template_id=notification.template_id,
service_id=service_id,
version=notification.template_version)['data']
template_dict = SerialisedTemplate.from_id_and_service_id(template_id=notification.template_id,
service_id=service_id,
version=notification.template_version).__dict__
html_email = HTMLEmailTemplate(
template_dict,