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

Remove insert to NotificationHistory

Browse Source 
Fix all test failures
This commit is contained in:
Rebecca Law
2019-05-30 10:37:57 +01:00
parent b0baf10229
commit c23ae15f32
12 changed files with 163 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/dao/notifications_dao.py
View File

@@ -77,8 +77,6 @@ def dao_create_notification(notification):
notification.status = NOTIFICATION_CREATED
db.session.add(notification)
if _should_record_notification_in_history_table(notification):
db.session.add(NotificationHistory.from_original(notification))
def _should_record_notification_in_history_table(notification):
@@ -423,13 +421,10 @@ def _delete_letters_from_s3(
@statsd(namespace="dao")
@transactional
def dao_delete_notifications_and_history_by_id(notification_id):
def dao_delete_notifications_by_id(notification_id):
db.session.query(Notification).filter(
Notification.id == notification_id
).delete(synchronize_session='fetch')
db.session.query(NotificationHistory).filter(
NotificationHistory.id == notification_id
).delete(synchronize_session='fetch')
def _timeout_notifications(current_statuses, new_status, timeout_start, updated_at):
@@ -438,17 +433,14 @@ def _timeout_notifications(current_statuses, new_status, timeout_start, updated_
Notification.status.in_(current_statuses),
Notification.notification_type != LETTER_TYPE
).all()
for table in [NotificationHistory, Notification]:
q = table.query.filter(
table.created_at < timeout_start,
table.status.in_(current_statuses),
table.notification_type != LETTER_TYPE
)
q.update(
{'status': new_status, 'updated_at': updated_at},
synchronize_session=False
)
# return a list of q = notification_ids in Notification table for sending delivery receipts
Notification.query.filter(
Notification.created_at < timeout_start,
Notification.status.in_(current_statuses),
Notification.notification_type != LETTER_TYPE
).update(
{'status': new_status, 'updated_at': updated_at},
synchronize_session=False
)
return notifications