From 7ba9b1d26114360306d03769b73302b5771aa619 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Fri, 7 Apr 2017 15:21:27 +0100 Subject: [PATCH] Update the update statements with the updated_at and sent_at timestamps. --- app/dao/notifications_dao.py | 5 +++-- tests/app/dao/test_jobs_dao.py | 1 + tests/app/dao/test_notification_dao.py | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index 768951ca2..3a48eefad 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -444,12 +444,13 @@ def is_delivery_slow_for_provider( @statsd(namespace="dao") @transactional def dao_update_notifications_sent_to_dvla(job_id, provider): + now = datetime.utcnow() updated_count = db.session.query( Notification).filter(Notification.job_id == job_id).update( - {'status': 'sending', "sent_by": provider}) + {'status': 'sending', "sent_by": provider, "sent_at": now}) db.session.query( NotificationHistory).filter(NotificationHistory.job_id == job_id).update( - {'status': 'sending', "sent_by": provider}) + {'status': 'sending', "sent_by": provider, "sent_at": now, "updated_at": now}) return updated_count diff --git a/tests/app/dao/test_jobs_dao.py b/tests/app/dao/test_jobs_dao.py index 889367ec1..b3598fd7f 100644 --- a/tests/app/dao/test_jobs_dao.py +++ b/tests/app/dao/test_jobs_dao.py @@ -363,3 +363,4 @@ def test_dao_update_job_status(sample_job): dao_update_job_status(sample_job.id, 'sent to dvla') updated_job = Job.query.get(sample_job.id) assert updated_job.job_status == 'sent to dvla' + assert updated_job.updated_at diff --git a/tests/app/dao/test_notification_dao.py b/tests/app/dao/test_notification_dao.py index aa957efe7..bf66a12d5 100644 --- a/tests/app/dao/test_notification_dao.py +++ b/tests/app/dao/test_notification_dao.py @@ -1563,9 +1563,13 @@ def test_dao_update_notifications_sent_to_dvla(notify_db, notify_db_session, sam updated_notification = Notification.query.get(notification.id) assert updated_notification.status == 'sending' assert updated_notification.sent_by == 'some provider' + assert updated_notification.sent_at + assert updated_notification.updated_at history = NotificationHistory.query.get(notification.id) assert history.status == 'sending' assert history.sent_by == 'some provider' + assert history.sent_at + assert history.updated_at def test_dao_update_notifications_sent_to_dvla_does_update_history_if_test_key( @@ -1580,4 +1584,6 @@ def test_dao_update_notifications_sent_to_dvla_does_update_history_if_test_key( updated_notification = Notification.query.get(notification.id) assert updated_notification.status == 'sending' assert updated_notification.sent_by == 'some provider' + assert updated_notification.sent_at + assert updated_notification.updated_at assert not NotificationHistory.query.get(notification.id)