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

Make update notification status transcational.

Browse Source 
Refactor methods for reusability.
This commit is contained in:
Rebecca Law
2016-05-27 12:09:36 +01:00
parent 25a1b7f31c
commit 885abcaf16
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/dao/dao_utils.py
View File

@@ -9,8 +9,9 @@ def transactional(func):
from flask import current_app
from app import db
try:
func(*args, **kwargs)
res = func(*args, **kwargs)
db.session.commit()
return res
except Exception as e:
current_app.logger.error(e)
db.session.rollback()

50
app/dao/notifications_dao.py
View File

@@ -231,47 +231,51 @@ def _update_job_stats_query(status):
return {mapping[status]: mapping[status] + 1}
def _set_firetext_status(notification, status):
def _decide_permanent_temporary_failure(current_status, status):
# Firetext will send pending, then send either succes or fail.
# If we go from pending to delivered we need to set failure type as temporary-failure
if notification.status == 'pending':
if current_status == 'pending':
if status == 'permanent-failure':
status = 'temporary-failure'
return status
def _update_notification_status(notification, status):
def _update_notification_status(notification, status, notification_statistics_status):
if not notification:
return 0
status = _set_firetext_status(notification=notification, status=status)
count = db.session.query(Notification).filter(
Notification.id == notification.id,
or_(Notification.status == 'sending',
Notification.status == 'pending')).update({Notification.status: status})
return count
def update_notification_status_by_id(notification_id, status, notification_statistics_status=None):
notification = Notification.query.get(notification_id)
count = _update_notification_status(notification=notification, status=status)
status = _decide_permanent_temporary_failure(current_status=notification.status, status=status)
count = db.session.query(Notification).filter(Notification.id == notification.id
).update({Notification.status: status})
if count == 1 and notification_statistics_status:
_update_statistics(notification, notification_statistics_status)
db.session.commit()
return count
@transactional
def update_notification_status_by_id(notification_id, status, notification_statistics_status=None):
notification = Notification.query.filter(Notification.id == notification_id,
or_(Notification.status == 'sending',
Notification.status == 'pending')
).first()
count = _update_notification_status(notification=notification,
status=status,
notification_statistics_status=notification_statistics_status)
return count
@transactional
def update_notification_status_by_reference(reference, status, notification_statistics_status):
notification = Notification.query.filter_by(reference=reference).first()
count = _update_notification_status(notification=notification, status=status)
notification = Notification.query.filter(Notification.reference == reference,
or_(Notification.status == 'sending',
Notification.status == 'pending')
).first()
if count == 1:
_update_statistics(notification, notification_statistics_status)
db.session.commit()
return count
return _update_notification_status(notification=notification,
status=status,
notification_statistics_status=notification_statistics_status)
def dao_update_notification(notification):

2
app/models.py
View File

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