Move scheduled tasks into their own module.

There is no change to the functionality - only moving the code around.

app/celery/scheduled_tasks.py

@@ -0,0 +1,94 @@
+from datetime import datetime, timedelta
+
+from flask import current_app
+from sqlalchemy.exc import SQLAlchemyError
+
+from app import notify_celery
+from app.clients import STATISTICS_FAILURE
+from app.dao.invited_user_dao import delete_invitations_created_more_than_two_days_ago
+from app.dao.notifications_dao import delete_notifications_created_more_than_a_week_ago, get_notifications, \
+    update_notification_status_by_id
+from app.dao.users_dao import delete_codes_older_created_more_than_a_day_ago
+
+
+@notify_celery.task(name="delete-verify-codes")
+def delete_verify_codes():
+    try:
+        start = datetime.utcnow()
+        deleted = delete_codes_older_created_more_than_a_day_ago()
+        current_app.logger.info(
+            "Delete job started {} finished {} deleted {} verify codes".format(start, datetime.utcnow(), deleted)
+        )
+    except SQLAlchemyError:
+        current_app.logger.info("Failed to delete verify codes")
+        raise
+
+
+@notify_celery.task(name="delete-successful-notifications")
+def delete_successful_notifications():
+    try:
+        start = datetime.utcnow()
+        deleted = delete_notifications_created_more_than_a_week_ago('delivered')
+        current_app.logger.info(
+            "Delete job started {} finished {} deleted {} successful notifications".format(
+                start,
+                datetime.utcnow(),
+                deleted
+            )
+        )
+    except SQLAlchemyError:
+        current_app.logger.info("Failed to delete successful notifications")
+        raise
+
+
+@notify_celery.task(name="delete-failed-notifications")
+def delete_failed_notifications():
+    try:
+        start = datetime.utcnow()
+        deleted = delete_notifications_created_more_than_a_week_ago('failed')
+        deleted += delete_notifications_created_more_than_a_week_ago('technical-failure')
+        deleted += delete_notifications_created_more_than_a_week_ago('temporary-failure')
+        deleted += delete_notifications_created_more_than_a_week_ago('permanent-failure')
+        current_app.logger.info(
+            "Delete job started {} finished {} deleted {} failed notifications".format(
+                start,
+                datetime.utcnow(),
+                deleted
+            )
+        )
+    except SQLAlchemyError:
+        current_app.logger.info("Failed to delete failed notifications")
+        raise
+
+
+@notify_celery.task(name="delete-invitations")
+def delete_invitations():
+    try:
+        start = datetime.utcnow()
+        deleted = delete_invitations_created_more_than_two_days_ago()
+        current_app.logger.info(
+            "Delete job started {} finished {} deleted {} invitations".format(start, datetime.utcnow(), deleted)
+        )
+    except SQLAlchemyError:
+        current_app.logger.info("Failed to delete invitations")
+        raise
+
+
+@notify_celery.task(name='timeout-sending-notifications')
+def timeout_notifications():
+    notifications = get_notifications(filter_dict={'status': 'sending'})
+    now = datetime.utcnow()
+    for noti in notifications:
+        try:
+            if (now - noti.created_at) > timedelta(
+                seconds=current_app.config.get('SENDING_NOTIFICATIONS_TIMEOUT_PERIOD')
+            ):
+                update_notification_status_by_id(noti.id, 'temporary-failure', STATISTICS_FAILURE)
+                current_app.logger.info((
+                    "Timeout period reached for notification ({})"
+                    ", status has been updated.").format(noti.id))
+        except Exception as e:
+            current_app.logger.exception(e)
+            current_app.logger.error((
+                "Exception raised trying to timeout notification ({})"
+                ", skipping notification update.").format(noti.id))

app/celery/tasks.py

@@ -1,27 +1,16 @@
 import itertools
-from datetime import (datetime, timedelta)
+from datetime import (datetime)
 
 from flask import current_app
 from monotonic import monotonic
+from notifications_utils.recipients import (
+    RecipientCSV,
+    allowed_to_send_to
+)
+from notifications_utils.template import Template
 from sqlalchemy.exc import SQLAlchemyError
 
 from app import clients, statsd_client
-from app.clients import STATISTICS_FAILURE
-from app.clients.email import EmailClientException
-from app.dao.services_dao import dao_fetch_service_by_id
-from app.dao.templates_dao import dao_get_template_by_id
-from app.dao.provider_details_dao import get_provider_details_by_notification_type
-from app.celery.provider_tasks import send_sms_to_provider
-from app.celery.research_mode_tasks import send_email_response
-
-from notifications_utils.template import Template
-
-from notifications_utils.recipients import (
-    RecipientCSV,
-    validate_and_format_phone_number,
-    allowed_to_send_to
-)
-
 from app import (
     create_uuid,
     DATETIME_FORMAT,
@@ -29,26 +18,23 @@ from app import (
     notify_celery,
     encryption
 )
-
 from app.aws import s3
-from app.dao.users_dao import delete_codes_older_created_more_than_a_day_ago
-from app.dao.invited_user_dao import delete_invitations_created_more_than_two_days_ago
-
-from app.dao.notifications_dao import (
-    dao_create_notification,
-    dao_update_notification,
-    delete_notifications_created_more_than_a_week_ago,
-    dao_get_notification_statistics_for_service_and_day,
-    update_provider_stats,
-    get_notifications,
-    update_notification_status_by_id
-)
-
+from app.celery.provider_tasks import send_sms_to_provider
+from app.celery.research_mode_tasks import send_email_response
+from app.clients.email import EmailClientException
 from app.dao.jobs_dao import (
     dao_update_job,
     dao_get_job_by_id
 )
-
+from app.dao.notifications_dao import (
+    dao_create_notification,
+    dao_update_notification,
+    dao_get_notification_statistics_for_service_and_day,
+    update_provider_stats
+)
+from app.dao.provider_details_dao import get_provider_details_by_notification_type
+from app.dao.services_dao import dao_fetch_service_by_id
+from app.dao.templates_dao import dao_get_template_by_id
 from app.models import (
     Notification,
     TEMPLATE_TYPE_EMAIL,
@@ -56,69 +42,6 @@ from app.models import (
 )
 
 
-@notify_celery.task(name="delete-verify-codes")
-def delete_verify_codes():
-    try:
-        start = datetime.utcnow()
-        deleted = delete_codes_older_created_more_than_a_day_ago()
-        current_app.logger.info(
-            "Delete job started {} finished {} deleted {} verify codes".format(start, datetime.utcnow(), deleted)
-        )
-    except SQLAlchemyError:
-        current_app.logger.info("Failed to delete verify codes")
-        raise
-
-
-@notify_celery.task(name="delete-successful-notifications")
-def delete_successful_notifications():
-    try:
-        start = datetime.utcnow()
-        deleted = delete_notifications_created_more_than_a_week_ago('delivered')
-        current_app.logger.info(
-            "Delete job started {} finished {} deleted {} successful notifications".format(
-                start,
-                datetime.utcnow(),
-                deleted
-            )
-        )
-    except SQLAlchemyError:
-        current_app.logger.info("Failed to delete successful notifications")
-        raise
-
-
-@notify_celery.task(name="delete-failed-notifications")
-def delete_failed_notifications():
-    try:
-        start = datetime.utcnow()
-        deleted = delete_notifications_created_more_than_a_week_ago('failed')
-        deleted += delete_notifications_created_more_than_a_week_ago('technical-failure')
-        deleted += delete_notifications_created_more_than_a_week_ago('temporary-failure')
-        deleted += delete_notifications_created_more_than_a_week_ago('permanent-failure')
-        current_app.logger.info(
-            "Delete job started {} finished {} deleted {} failed notifications".format(
-                start,
-                datetime.utcnow(),
-                deleted
-            )
-        )
-    except SQLAlchemyError:
-        current_app.logger.info("Failed to delete failed notifications")
-        raise
-
-
-@notify_celery.task(name="delete-invitations")
-def delete_invitations():
-    try:
-        start = datetime.utcnow()
-        deleted = delete_invitations_created_more_than_two_days_ago()
-        current_app.logger.info(
-            "Delete job started {} finished {} deleted {} invitations".format(start, datetime.utcnow(), deleted)
-        )
-    except SQLAlchemyError:
-        current_app.logger.info("Failed to delete invitations")
-        raise
-
-
 @notify_celery.task(name="process-job")
 def process_job(job_id):
     task_start = monotonic()
@@ -357,23 +280,3 @@ def provider_to_use(notification_type, notification_id):
         raise Exception("No active {} providers".format(notification_type))
 
     return clients.get_client_by_name_and_type(active_providers_in_order[0].identifier, notification_type)
-
-
-@notify_celery.task(name='timeout-sending-notifications')
-def timeout_notifications():
-    notifications = get_notifications(filter_dict={'status': 'sending'})
-    now = datetime.utcnow()
-    for noti in notifications:
-        try:
-            if (now - noti.created_at) > timedelta(
-                seconds=current_app.config.get('SENDING_NOTIFICATIONS_TIMEOUT_PERIOD')
-            ):
-                update_notification_status_by_id(noti.id, 'temporary-failure', STATISTICS_FAILURE)
-                current_app.logger.info((
-                    "Timeout period reached for notification ({})"
-                    ", status has been updated.").format(noti.id))
-        except Exception as e:
-            current_app.logger.exception(e)
-            current_app.logger.error((
-                "Exception raised trying to timeout notification ({})"
-                ", skipping notification update.").format(noti.id))