mirror of
https://github.com/GSA/notifications-api.git
synced 2026-09-11 10:28:55 -04:00
Update the update statements with the updated_at and sent_at timestamps.
This commit is contained in:
@@ -444,12 +444,13 @@ def is_delivery_slow_for_provider(
|
|||||||
@statsd(namespace="dao")
|
@statsd(namespace="dao")
|
||||||
@transactional
|
@transactional
|
||||||
def dao_update_notifications_sent_to_dvla(job_id, provider):
|
def dao_update_notifications_sent_to_dvla(job_id, provider):
|
||||||
|
now = datetime.utcnow()
|
||||||
updated_count = db.session.query(
|
updated_count = db.session.query(
|
||||||
Notification).filter(Notification.job_id == job_id).update(
|
Notification).filter(Notification.job_id == job_id).update(
|
||||||
{'status': 'sending', "sent_by": provider})
|
{'status': 'sending', "sent_by": provider, "sent_at": now})
|
||||||
|
|
||||||
db.session.query(
|
db.session.query(
|
||||||
NotificationHistory).filter(NotificationHistory.job_id == job_id).update(
|
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
|
return updated_count
|
||||||
|
|||||||
@@ -363,3 +363,4 @@ def test_dao_update_job_status(sample_job):
|
|||||||
dao_update_job_status(sample_job.id, 'sent to dvla')
|
dao_update_job_status(sample_job.id, 'sent to dvla')
|
||||||
updated_job = Job.query.get(sample_job.id)
|
updated_job = Job.query.get(sample_job.id)
|
||||||
assert updated_job.job_status == 'sent to dvla'
|
assert updated_job.job_status == 'sent to dvla'
|
||||||
|
assert updated_job.updated_at
|
||||||
|
|||||||
@@ -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)
|
updated_notification = Notification.query.get(notification.id)
|
||||||
assert updated_notification.status == 'sending'
|
assert updated_notification.status == 'sending'
|
||||||
assert updated_notification.sent_by == 'some provider'
|
assert updated_notification.sent_by == 'some provider'
|
||||||
|
assert updated_notification.sent_at
|
||||||
|
assert updated_notification.updated_at
|
||||||
history = NotificationHistory.query.get(notification.id)
|
history = NotificationHistory.query.get(notification.id)
|
||||||
assert history.status == 'sending'
|
assert history.status == 'sending'
|
||||||
assert history.sent_by == 'some provider'
|
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(
|
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)
|
updated_notification = Notification.query.get(notification.id)
|
||||||
assert updated_notification.status == 'sending'
|
assert updated_notification.status == 'sending'
|
||||||
assert updated_notification.sent_by == 'some provider'
|
assert updated_notification.sent_by == 'some provider'
|
||||||
|
assert updated_notification.sent_at
|
||||||
|
assert updated_notification.updated_at
|
||||||
assert not NotificationHistory.query.get(notification.id)
|
assert not NotificationHistory.query.get(notification.id)
|
||||||
|
|||||||
Reference in New Issue
Block a user