Create a new task called send_email_v2 so that I can get rid of the from_address in the signature.

This is done to make sure we do not lose any messages in the queue during deployment.

app/celery/tasks.py

@@ -180,7 +180,7 @@ def process_job(job_id):
             )
 
         if template.template_type == 'email':
-            send_email.apply_async((
+            send_email_v2.apply_async((
                 str(job.service_id),
                 create_uuid(),
                 '',
@@ -290,6 +290,11 @@ def send_sms(service_id, notification_id, encrypted_notification, created_at):
 
 @notify_celery.task(name="send-email")
 def send_email(service_id, notification_id, from_address, encrypted_notification, created_at, reply_to_addresses=None):
+    send_email_v2(service_id, notification_id, encrypted_notification, created_at, reply_to_addresses=None)
+
+
+@notify_celery.task(name="send-email-v2")
+def send_email_v2(service_id, notification_id, encrypted_notification, created_at, reply_to_addresses=None):
     task_start = monotonic()
     notification = encryption.decrypt(encrypted_notification)
     service = dao_fetch_service_by_id(service_id)
@@ -337,9 +342,8 @@ def send_email(service_id, notification_id, from_address, encrypted_notification
                     (provider.get_name(), str(reference), notification['to']), queue='research-mode'
                 )
             else:
-                # First step setting the from_address here rather than the method creating the task
-                from_address = '"{}" <{}@{}>'.format(service.name, service.email_from, current_app.config[
-                    'NOTIFY_EMAIL_DOMAIN']) if from_address == "" else from_address
+                from_address = '"{}" <{}@{}>'.format(service.name, service.email_from,
+                                                     current_app.config['NOTIFY_EMAIL_DOMAIN'])
                 reference = provider.send_email(
                     from_address,
                     notification['to'],

app/notifications/rest.py

@@ -31,7 +31,7 @@ from app.schemas import (
     day_schema,
     unarchived_template_schema
 )
-from app.celery.tasks import send_sms, send_email
+from app.celery.tasks import send_sms, send_email_v2
 
 notifications = Blueprint('notifications', __name__)
 
@@ -384,7 +384,7 @@ def send_notification(notification_type):
             datetime.utcnow().strftime(DATETIME_FORMAT)
         ), queue='sms')
     else:
-        send_email.apply_async((
+        send_email_v2.apply_async((
             service_id,
             notification_id,
             '',

app/user/rest.py

@@ -28,8 +28,7 @@ from app.schemas import (
 from app.celery.tasks import (
     send_sms,
     email_reset_password,
-    email_registration_verification,
-    send_email)
+    send_email_v2)
 
 from app.errors import register_errors
 
@@ -167,10 +166,9 @@ def send_user_email_verification(user_id):
             'url': _create_verification_url(user_to_send_to, secret_code)
         }
     }
-    send_email.apply_async((
+    send_email_v2.apply_async((
         current_app.config['NOTIFY_SERVICE_ID'],
         str(uuid.uuid4()),
-        '',
         encryption.encrypt(message),
         datetime.utcnow().strftime(DATETIME_FORMAT)
     ), queue='email-registration-verification')