darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-22 16:31:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into do-not-write-test-data-to-the-history-table

Browse Source 
Conflicts:
	app/dao/notifications_dao.py
This commit is contained in:
Rebecca Law
2016-12-21 09:57:17 +00:00
parent 825db5e39d 6bf024569a
commit c6df84a8f3
13 changed files with 269 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/notifications_dao.py
View File

@@ -132,7 +132,7 @@ def dao_create_notification(notification):
db.session.add(notification)
if _should_record_notification_in_history_table(notification):
db.session.add(NotificationHistory.from_notification(notification))
db.session.add(NotificationHistory.from_original(notification))
def _should_record_notification_in_history_table(notification):
@@ -200,7 +200,7 @@ def dao_update_notification(notification):
db.session.add(notification)
if _should_record_notification_in_history_table(notification):
notification_history = NotificationHistory.query.get(notification.id)
notification_history.update_from_notification(notification)
notification_history.update_from_original(notification)
db.session.add(notification_history)
db.session.commit()