diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index a036ae779..432224653 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -411,7 +411,7 @@ def _timeout_notifications(current_statuses, new_status, timeout_start, updated_ table.notification_type != LETTER_TYPE ) last_update_count = q.update( - {'_status_enum': new_status, '_status_fkey': new_status, 'updated_at': updated_at}, + {'status': new_status, 'updated_at': updated_at}, synchronize_session=False ) return last_update_count @@ -432,8 +432,8 @@ def dao_timeout_notifications(timeout_period_in_seconds): """ timeout_start = datetime.utcnow() - timedelta(seconds=timeout_period_in_seconds) updated_at = datetime.utcnow() - timeout = functools.partial(_timeout_notifications, timeout_start=timeout_start, updated_at=updated_at) + # Notifications still in created status are marked with a technical-failure: updated = timeout([NOTIFICATION_CREATED], NOTIFICATION_TECHNICAL_FAILURE) diff --git a/tests/app/celery/test_scheduled_tasks.py b/tests/app/celery/test_scheduled_tasks.py index 2dae0f814..b4ad7e255 100644 --- a/tests/app/celery/test_scheduled_tasks.py +++ b/tests/app/celery/test_scheduled_tasks.py @@ -157,13 +157,8 @@ def test_update_status_of_notifications_after_timeout(notify_api, sample_templat timeout_notifications() assert not1.status == 'temporary-failure' - assert not1._status_fkey == 'temporary-failure' - assert not2.status == 'technical-failure' - assert not2._status_fkey == 'technical-failure' - assert not3.status == 'temporary-failure' - assert not3._status_fkey == 'temporary-failure' def test_not_update_status_of_notification_before_timeout(notify_api, sample_template):