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

Merge branch 'master' into fix-count

Browse Source
This commit is contained in:
Rebecca Law
2016-07-06 14:45:10 +01:00
parent 8bea8b6a8f 447086d065
commit a1209ed9a4
7 changed files with 935 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/celery/provider_tasks.py
View File

@@ -24,7 +24,7 @@ from notifications_utils.template import (
Template
)
from app.models import SMS_TYPE, EMAIL_TYPE
from app.models import SMS_TYPE, EMAIL_TYPE, KEY_TYPE_TEST
def retry_iteration_to_delay(retry=0):
@@ -65,7 +65,7 @@ def send_sms_to_provider(self, service_id, notification_id):
prefix=service.name
)
try:
if service.research_mode:
if service.research_mode or notification.key_type == KEY_TYPE_TEST:
send_sms_response.apply_async(
(provider.get_name(), str(notification_id), notification.to), queue='research-mode'
)
@@ -134,7 +134,7 @@ def send_email_to_provider(self, service_id, notification_id):
values=notification.personalisation
)
if service.research_mode:
if service.research_mode or notification.key_type == KEY_TYPE_TEST:
reference = str(create_uuid())
send_email_response.apply_async(
(provider.get_name(), reference, notification.to), queue='research-mode'

1
app/models.py
View File

@@ -142,6 +142,7 @@ class ApiKey(db.Model, Versioned):
KEY_TYPE_NORMAL = 'normal'
KEY_TYPE_TEAM = 'team'
KEY_TYPE_TEST = 'test'
class KeyTypes(db.Model):