Remove unused methods

app/celery/scheduled_tasks.py

@@ -9,7 +9,6 @@ from flask import current_app
 from notifications_utils.statsd_decorators import statsd
 from sqlalchemy import and_
 from sqlalchemy.exc import SQLAlchemyError
-from notifications_utils.s3 import s3upload
 
 from app.aws import s3
 from app import notify_celery
@@ -39,7 +38,6 @@ from app.dao.notifications_dao import (
     dao_get_count_of_letters_to_process_for_date,
     dao_get_scheduled_notifications,
     set_scheduled_notification_to_processed,
-    dao_set_created_live_letter_api_notifications_to_pending,
 )
 from app.dao.statistics_dao import dao_timeout_job_statistics
 from app.dao.provider_details_dao import (
@@ -57,7 +55,6 @@ from app.models import (
 )
 from app.notifications.process_notifications import send_notification_to_queue
 from app.celery.tasks import (
-    create_dvla_file_contents_for_notifications,
     process_job
 )
 from app.config import QueueNames, TaskNames
@@ -415,37 +412,6 @@ def trigger_letter_pdfs_for_day():
         letter_pdfs_count, 'collate-letter-pdfs-for-day'))
 
 
-@notify_celery.task(name="run-letter-api-notifications")
-@statsd(namespace="tasks")
-def run_letter_api_notifications():
-    current_time = datetime.utcnow().isoformat()
-
-    notifications = dao_set_created_live_letter_api_notifications_to_pending()
-
-    if notifications:
-        file_contents = create_dvla_file_contents_for_notifications(notifications)
-
-        filename = '{}-dvla-notifications.txt'.format(current_time)
-        s3upload(
-            filedata=file_contents + '\n',
-            region=current_app.config['AWS_REGION'],
-            bucket_name=current_app.config['DVLA_BUCKETS']['notification'],
-            file_location=filename
-        )
-
-        notify_celery.send_task(
-            name=TaskNames.DVLA_NOTIFICATIONS,
-            kwargs={'filename': filename},
-            queue=QueueNames.PROCESS_FTP
-        )
-        current_app.logger.info(
-            "Queued {} ready letter api notifications onto {}".format(
-                len(notifications),
-                QueueNames.PROCESS_FTP
-            )
-        )
-
-
 @notify_celery.task(name='check-job-status')
 @statsd(namespace="tasks")
 def check_job_status():

app/celery/tasks.py

@@ -20,7 +20,6 @@ from requests import (
     RequestException
 )
 from sqlalchemy.exc import SQLAlchemyError
-from botocore.exceptions import ClientError as BotoClientError
 
 from app import (
     create_uuid,
@@ -36,8 +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,
-    all_notifications_are_created_for_job,
-    dao_get_all_notifications_for_job,
     dao_update_job_status
 )
 from app.dao.notifications_dao import (
@@ -60,7 +57,6 @@ from app.models import (
     JOB_STATUS_FINISHED,
     JOB_STATUS_IN_PROGRESS,
     JOB_STATUS_PENDING,
-    JOB_STATUS_READY_TO_SEND,
     JOB_STATUS_SENT_TO_DVLA, JOB_STATUS_ERROR,
     KEY_TYPE_NORMAL,
     LETTER_TYPE,
@@ -73,7 +69,6 @@ from app.models import (
 )
 from app.notifications.process_notifications import persist_notification
 from app.service.utils import service_allowed_to_send_to
-from notifications_utils.s3 import s3upload
 
 
 @worker_process_shutdown.connect
@@ -335,29 +330,6 @@ def save_letter(
         handle_exception(self, notification, notification_id, e)
 
 
-@notify_celery.task(bind=True, name="build-dvla-file", countdown=60, max_retries=15, default_retry_delay=300)
-@statsd(namespace="tasks")
-def build_dvla_file(self, job_id):
-    try:
-        if all_notifications_are_created_for_job(job_id):
-            file_contents = create_dvla_file_contents_for_job(job_id)
-            s3upload(
-                filedata=file_contents + '\n',
-                region=current_app.config['AWS_REGION'],
-                bucket_name=current_app.config['DVLA_BUCKETS']['job'],
-                file_location="{}-dvla-job.text".format(job_id)
-            )
-            dao_update_job_status(job_id, JOB_STATUS_READY_TO_SEND)
-        else:
-            msg = "All notifications for job {} are not persisted".format(job_id)
-            current_app.logger.info(msg)
-            self.retry(queue=QueueNames.RETRY)
-    # specifically don't catch celery.retry errors
-    except (SQLAlchemyError, BotoClientError):
-        current_app.logger.exception("build_dvla_file threw exception")
-        self.retry(queue=QueueNames.RETRY)
-
-
 @notify_celery.task(bind=True, name='update-letter-job-to-sent')
 @statsd(namespace="tasks")
 def update_job_to_sent_to_dvla(self, job_id):
@@ -414,12 +386,6 @@ def update_letter_notifications_to_error(self, notification_references):
     current_app.logger.debug("Updated {} letter notifications to technical-failure".format(updated_count))
 
 
-def create_dvla_file_contents_for_job(job_id):
-    notifications = dao_get_all_notifications_for_job(job_id)
-
-    return create_dvla_file_contents_for_notifications(notifications)
-
-
 def create_dvla_file_contents_for_notifications(notifications):
     file_contents = '\n'.join(
         str(LetterDVLATemplate(