diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index 94f0d3856..bcd7eec4d 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -22,7 +22,8 @@ from app.models import ( NOTIFICATION_CREATED, NOTIFICATION_SENDING, NOTIFICATION_PENDING, - NOTIFICATION_TEMPORARY_FAILURE, KEY_TYPE_NORMAL, KEY_TYPE_TEST) + NOTIFICATION_TECHNICAL_FAILURE, + KEY_TYPE_NORMAL, KEY_TYPE_TEST) from app.dao.dao_utils import transactional from app.statsd_decorators import statsd @@ -353,11 +354,11 @@ def dao_timeout_notifications(timeout_period_in_seconds): updated = db.session.query(Notification). \ filter(Notification.created_at < (datetime.utcnow() - timedelta(seconds=timeout_period_in_seconds))). \ filter(Notification.status.in_([NOTIFICATION_CREATED, NOTIFICATION_SENDING, NOTIFICATION_PENDING])). \ - update({'status': NOTIFICATION_TEMPORARY_FAILURE, 'updated_at': update_at}, synchronize_session=False) + update({'status': NOTIFICATION_TECHNICAL_FAILURE, 'updated_at': update_at}, synchronize_session=False) db.session.query(NotificationHistory). \ filter(NotificationHistory.created_at < (datetime.utcnow() - timedelta(seconds=timeout_period_in_seconds))). \ filter(NotificationHistory.status.in_([NOTIFICATION_CREATED, NOTIFICATION_SENDING, NOTIFICATION_PENDING])). \ - update({'status': NOTIFICATION_TEMPORARY_FAILURE, 'updated_at': update_at}, synchronize_session=False) + update({'status': NOTIFICATION_TECHNICAL_FAILURE, 'updated_at': update_at}, synchronize_session=False) db.session.commit() return updated diff --git a/tests/app/celery/test_scheduled_tasks.py b/tests/app/celery/test_scheduled_tasks.py index aa5345ff2..541c9fb6f 100644 --- a/tests/app/celery/test_scheduled_tasks.py +++ b/tests/app/celery/test_scheduled_tasks.py @@ -67,7 +67,7 @@ def test_update_status_of_notifications_after_timeout(notify_api, created_at=datetime.utcnow() - timedelta( seconds=current_app.config.get('SENDING_NOTIFICATIONS_TIMEOUT_PERIOD') + 10)) timeout_notifications() - assert not1.status == 'temporary-failure' + assert not1.status == 'technical-failure' def test_not_update_status_of_notification_before_timeout(notify_api, diff --git a/tests/app/dao/test_notification_dao.py b/tests/app/dao/test_notification_dao.py index 5efad98ae..43c4b0bd1 100644 --- a/tests/app/dao/test_notification_dao.py +++ b/tests/app/dao/test_notification_dao.py @@ -960,13 +960,13 @@ def test_dao_timeout_notifications(notify_db, notify_db_session, ): assert Notification.query.get(pending.id).status == 'pending' assert Notification.query.get(delivered.id).status == 'delivered' updated = dao_timeout_notifications(1) - assert Notification.query.get(created.id).status == 'temporary-failure' - assert Notification.query.get(sending.id).status == 'temporary-failure' - assert Notification.query.get(pending.id).status == 'temporary-failure' + assert Notification.query.get(created.id).status == 'technical-failure' + assert Notification.query.get(sending.id).status == 'technical-failure' + assert Notification.query.get(pending.id).status == 'technical-failure' assert Notification.query.get(delivered.id).status == 'delivered' - assert NotificationHistory.query.get(created.id).status == 'temporary-failure' - assert NotificationHistory.query.get(sending.id).status == 'temporary-failure' - assert NotificationHistory.query.get(pending.id).status == 'temporary-failure' + assert NotificationHistory.query.get(created.id).status == 'technical-failure' + assert NotificationHistory.query.get(sending.id).status == 'technical-failure' + assert NotificationHistory.query.get(pending.id).status == 'technical-failure' assert NotificationHistory.query.get(delivered.id).status == 'delivered' assert updated == 3