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

[WIP] updating notification to start in the created status

Browse Source
This commit is contained in:
Rebecca Law
2016-06-21 15:51:30 +01:00
parent b17aaaabfb
commit 3d3bff25a8
4 changed files with 84 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/celery/provider_tasks.py
View File

@@ -48,28 +48,29 @@ def retry_iteration_to_delay(retry=0):
@notify_celery.task(bind=True, name="send-sms-to-provider", max_retries=5, default_retry_delay=5)
def send_sms_to_provider(self, service_id, notification_id, encrypted_notification):
def send_sms_to_provider(self, service_id, notification_id, encrypted_notification=None):
task_start = monotonic()
service = dao_fetch_service_by_id(service_id)
provider = provider_to_use('sms', notification_id)
notification = get_notification_by_id(notification_id)
notification_json = encryption.decrypt(encrypted_notification)
# notification_json = encryption.decrypt(encrypted_notification)
template = Template(
dao_get_template_by_id(notification.template_id, notification.template_version).__dict__,
values=notification_json.get('personalisation', {}),
values=notification.personalisation['personalisation'] if notification.personalisation[
'personalisation'] else {},
prefix=service.name
)
try:
if service.research_mode:
send_sms_response.apply_async(
(provider.get_name(), str(notification_id), notification_json['to']), queue='research-mode'
(provider.get_name(), str(notification_id), notification.to), queue='research-mode'
)
else:
provider.send_sms(
to=validate_and_format_phone_number(notification_json['to']),
to=validate_and_format_phone_number(notification.to),
content=template.replaced,
reference=str(notification_id)
)
@@ -84,6 +85,7 @@ def send_sms_to_provider(self, service_id, notification_id, encrypted_notificati
notification.sent_at = datetime.utcnow()
notification.sent_by = provider.get_name(),
notification.content_char_count = template.replaced_content_count
notification.status = 'sending'
dao_update_notification(notification)
except SmsClientException as e:
try:

2
app/models.py
View File

@@ -348,7 +348,7 @@ class Notification(db.Model):
nullable=True,
onupdate=datetime.datetime.utcnow)
status = db.Column(
db.Enum(*NOTIFICATION_STATUS_TYPES, name='notify_status_type'), nullable=False, default='sending')
db.Enum(*NOTIFICATION_STATUS_TYPES, name='notify_status_type'), nullable=False, default='created')
reference = db.Column(db.String, nullable=True, index=True)
_personalisation = db.Column(db.String, nullable=True)