diff --git a/app/celery/tasks.py b/app/celery/tasks.py index 92af2bdac..96d26fe7d 100644 --- a/app/celery/tasks.py +++ b/app/celery/tasks.py @@ -35,7 +35,6 @@ from app.dao.inbound_sms_dao import dao_get_inbound_sms_by_id from app.dao.jobs_dao import ( dao_update_job, dao_get_job_by_id, - dao_update_job_status ) from app.dao.notifications_dao import ( get_notification_by_id, @@ -59,7 +58,6 @@ from app.models import ( JOB_STATUS_FINISHED, JOB_STATUS_IN_PROGRESS, JOB_STATUS_PENDING, - JOB_STATUS_ERROR, KEY_TYPE_NORMAL, LETTER_TYPE, NOTIFICATION_CREATED, @@ -342,13 +340,6 @@ def save_letter( handle_exception(self, notification, notification_id, e) -@notify_celery.task(bind=True, name='update-letter-job-to-error') -@statsd(namespace="tasks") -def update_dvla_job_to_error(self, job_id): - dao_update_job_status(job_id, JOB_STATUS_ERROR) - current_app.logger.info("Updated {} job to {}".format(job_id, JOB_STATUS_ERROR)) - - @notify_celery.task(bind=True, name='update-letter-notifications-to-sent') @statsd(namespace="tasks") def update_letter_notifications_to_sent_to_dvla(self, notification_references): diff --git a/app/dao/jobs_dao.py b/app/dao/jobs_dao.py index 4ebde6e58..6e2297302 100644 --- a/app/dao/jobs_dao.py +++ b/app/dao/jobs_dao.py @@ -115,11 +115,6 @@ def dao_update_job(job): db.session.commit() -def dao_update_job_status(job_id, status): - db.session.query(Job).filter_by(id=job_id).update({'job_status': status}) - db.session.commit() - - def dao_get_jobs_older_than_limited_by(job_types, older_than=7, limit_days=2): end_date = datetime.utcnow() - timedelta(days=older_than) start_date = end_date - timedelta(days=limit_days) diff --git a/tests/app/celery/test_ftp_update_tasks.py b/tests/app/celery/test_ftp_update_tasks.py index f8ce4bad0..436846827 100644 --- a/tests/app/celery/test_ftp_update_tasks.py +++ b/tests/app/celery/test_ftp_update_tasks.py @@ -7,7 +7,6 @@ from flask import current_app from app.exceptions import DVLAException, NotificationTechnicalFailureException from app.models import ( - Job, Notification, NotificationHistory, NOTIFICATION_CREATED, @@ -21,7 +20,6 @@ from app.celery.tasks import ( get_billing_date_in_bst_from_filename, persist_daily_sorted_letter_counts, process_updates_from_file, - update_dvla_job_to_error, update_letter_notifications_statuses, update_letter_notifications_to_error, update_letter_notifications_to_sent_to_dvla @@ -41,19 +39,6 @@ def notification_update(): return NotificationUpdate('REFERENCE_ABC', 'sent', '1', 'cost') -def test_update_dvla_job_to_error(sample_letter_template, sample_letter_job): - create_notification(template=sample_letter_template, job=sample_letter_job) - create_notification(template=sample_letter_template, job=sample_letter_job) - update_dvla_job_to_error(job_id=sample_letter_job.id) - - updated_notifications = Notification.query.all() - for n in updated_notifications: - assert n.status == 'created' - assert not n.sent_by - - assert Job.query.filter_by(id=sample_letter_job.id).one().job_status == 'error' - - def test_update_letter_notifications_statuses_raises_for_invalid_format(notify_api, mocker): invalid_file = 'ref-foo|Sent|1|Unsorted\nref-bar|Sent|2' mocker.patch('app.celery.tasks.s3.get_s3_file', return_value=invalid_file) diff --git a/tests/app/dao/test_jobs_dao.py b/tests/app/dao/test_jobs_dao.py index c5c04c180..a6bea2d48 100644 --- a/tests/app/dao/test_jobs_dao.py +++ b/tests/app/dao/test_jobs_dao.py @@ -13,7 +13,6 @@ from app.dao.jobs_dao import ( dao_set_scheduled_jobs_to_pending, dao_get_future_scheduled_job_by_id_and_service_id, dao_get_notification_outcomes_for_job, - dao_update_job_status, dao_get_jobs_older_than_limited_by ) from app.models import ( @@ -348,13 +347,6 @@ def test_get_jobs_for_service_doesnt_return_test_messages( assert jobs == [sample_job] -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 - - @freeze_time('2016-10-31 10:00:00') def test_should_get_jobs_seven_days_old_filters_type(notify_db, notify_db_session): eight_days_ago = datetime.utcnow() - timedelta(days=8)