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 client-callbacks

Browse Source 
Conflicts:
	app/notifications/rest.py
	tests/app/celery/test_tasks.py
This commit is contained in:
Martyn Inglis
2016-03-14 11:45:21 +00:00
parent fd973179cc c75bb9c5c3
commit 1ff4ebad5c
28 changed files with 106 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/dao/notifications_dao.py
View File

@@ -21,7 +21,12 @@ def dao_get_notification_statistics_for_service_and_day(service_id, day):
def dao_create_notification(notification, notification_type):
try:
if notification.job_id:
update_job_sent_count(notification)
db.session.query(Job).filter_by(
id=notification.job_id
).update({
Job.notifications_sent: Job.notifications_sent + 1,
Job.updated_at: datetime.utcnow()
})
if update_notification_stats(notification, notification_type) == 0:
stats = NotificationStatistics(
@@ -54,16 +59,6 @@ def update_notification_stats(notification, notification_type):
).update(update)
def update_job_sent_count(notification):
db.session.query(Job).filter_by(
id=notification.job_id
).update({
Job.notifications_sent: Job.notifications_sent + 1,
Job.updated_at: datetime.utcnow()
})
db.session.commit()
def dao_update_notification(notification):
notification.updated_at = datetime.utcnow()
db.session.add(notification)
@@ -74,8 +69,7 @@ def update_notification_status_by_id(notification_id, status):
count = db.session.query(Notification).filter_by(
id=notification_id
).update({
Notification.status: status,
Notification.updated_at: datetime.utcnow()
Notification.status: status
})
db.session.commit()
return count
@@ -85,8 +79,7 @@ def update_notification_status_by_reference(reference, status):
count = db.session.query(Notification).filter_by(
reference=reference
).update({
Notification.status: status,
Notification.updated_at: datetime.utcnow()
Notification.status: status
})
db.session.commit()
return count
@@ -96,8 +89,7 @@ def update_notification_reference_by_id(id, reference):
count = db.session.query(Notification).filter_by(
id=id
).update({
Notification.reference: reference,
Notification.updated_at: datetime.utcnow()
Notification.reference: reference
})
db.session.commit()
return count