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

Update job.notifications_delivered and job.notifications_failed count when updating the status of a notification.

Browse Source
This commit is contained in:
Rebecca Law
2016-05-24 11:31:44 +01:00
parent dff60175a4
commit e4eecb894a
3 changed files with 93 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
app/dao/notifications_dao.py
View File

@@ -1,4 +1,4 @@
from sqlalchemy import (desc, func, Integer, and_, or_, asc)
from sqlalchemy import (desc, func, Integer, or_, asc)
from sqlalchemy.sql.expression import cast
from datetime import (
@@ -35,11 +35,11 @@ from app.dao.dao_utils import transactional
def dao_get_notification_statistics_for_service(service_id, limit_days=None):
filter = [NotificationStatistics.service_id == service_id]
query_filter = [NotificationStatistics.service_id == service_id]
if limit_days is not None:
filter.append(NotificationStatistics.day >= days_ago(limit_days))
query_filter.append(NotificationStatistics.day >= days_ago(limit_days))
return NotificationStatistics.query.filter(
*filter
*query_filter
).order_by(
desc(NotificationStatistics.day)
).all()
@@ -53,9 +53,7 @@ def dao_get_notification_statistics_for_service_and_day(service_id, day):
def dao_get_notification_statistics_for_day(day):
return NotificationStatistics.query.filter_by(
day=day
).all()
return NotificationStatistics.query.filter_by(day=day).all()
def dao_get_potential_notification_statistics_for_day(day):
@@ -131,10 +129,10 @@ def dao_get_7_day_agg_notification_statistics_for_service(service_id,
def dao_get_template_statistics_for_service(service_id, limit_days=None):
filter = [TemplateStatistics.service_id == service_id]
query_filter = [TemplateStatistics.service_id == service_id]
if limit_days is not None:
filter.append(TemplateStatistics.day >= days_ago(limit_days))
return TemplateStatistics.query.filter(*filter).order_by(
query_filter.append(TemplateStatistics.day >= days_ago(limit_days))
return TemplateStatistics.query.filter(*query_filter).order_by(
desc(TemplateStatistics.updated_at)).all()
@@ -153,7 +151,7 @@ def dao_create_notification(notification, notification_type, provider_identifier
update_count = db.session.query(NotificationStatistics).filter_by(
day=notification.created_at.date(),
service_id=notification.service_id
).update(update_query(notification_type, 'requested'))
).update(update_notification_stats_query(notification_type, 'requested'))
if update_count == 0:
stats = NotificationStatistics(
@@ -194,7 +192,7 @@ def dao_create_notification(notification, notification_type, provider_identifier
db.session.add(notification)
def update_query(notification_type, status):
def update_notification_stats_query(notification_type, status):
mapping = {
TEMPLATE_TYPE_SMS: {
STATISTICS_REQUESTED: NotificationStatistics.sms_requested,
@@ -212,6 +210,26 @@ def update_query(notification_type, status):
}
def _update_statistics(notification, notification_statistics_status):
db.session.query(NotificationStatistics).filter_by(
day=notification.created_at.date(),
service_id=notification.service_id
).update(
update_notification_stats_query(notification.template.template_type, notification_statistics_status)
)
if notification.job_id:
db.session.query(Job).filter_by(id=notification.job_id
).update(update_job_stats_query(notification_statistics_status))
def update_job_stats_query(status):
mapping = {
STATISTICS_FAILURE: Job.notifications_failed,
STATISTICS_DELIVERED: Job.notifications_delivered
}
return {mapping[status]: mapping[status] + 1}
def dao_update_notification(notification):
notification.updated_at = datetime.utcnow()
db.session.add(notification)
@@ -229,12 +247,7 @@ def update_notification_status_by_id(notification_id, status, notification_stati
if count == 1 and notification_statistics_status:
notification = Notification.query.get(notification_id)
db.session.query(NotificationStatistics).filter_by(
day=notification.created_at.date(),
service_id=notification.service_id
).update(
update_query(notification.template.template_type, notification_statistics_status)
)
_update_statistics(notification, notification_statistics_status)
db.session.commit()
return count
@@ -246,16 +259,8 @@ def update_notification_status_by_reference(reference, status, notification_stat
{Notification.status: status})
if count == 1:
notification = Notification.query.filter_by(
reference=reference
).first()
db.session.query(NotificationStatistics).filter_by(
day=notification.created_at.date(),
service_id=notification.service_id
).update(
update_query(notification.template.template_type, notification_statistics_status)
)
notification = Notification.query.filter_by(reference=reference).first()
_update_statistics(notification, notification_statistics_status)
db.session.commit()
return count
@@ -279,7 +284,7 @@ def get_notifications_for_job(service_id, job_id, filter_dict=None, page=1, page
if page_size is None:
page_size = current_app.config['PAGE_SIZE']
query = Notification.query.filter_by(service_id=service_id, job_id=job_id)
query = filter_query(query, filter_dict)
query = _filter_query(query, filter_dict)
return query.order_by(asc(Notification.job_row_number)).paginate(
page=page,
per_page=page_size
@@ -308,14 +313,14 @@ def get_notifications_for_service(service_id,
filters.append(func.date(Notification.created_at) >= days_ago)
query = Notification.query.filter(*filters)
query = filter_query(query, filter_dict)
query = _filter_query(query, filter_dict)
return query.order_by(desc(Notification.created_at)).paginate(
page=page,
per_page=page_size
)
def filter_query(query, filter_dict=None):
def _filter_query(query, filter_dict=None):
if filter_dict is None:
filter_dict = MultiDict()
else: