ensure emails are formatted before sending

we allow some invalid to addresses - for example, phone numbers with
spaces or brackets - in the database. This is so that users can match
up their data in a format that they expect (since they passed it in).
When we send SMS, we strip this formatting just before sending - but we
weren't with email. This commit changes that and adds some tests.

It also adds formatting for reply_to addresses. We should never expect
invalid reply_to email addresses in our data, but just in case, lets
validate them here.

Also, bump requirements.txt to capture some more email validation

tests/app/db.py

@@ -109,7 +109,7 @@ def create_notification(
     template,
     job=None,
     job_row_number=None,
-    to_field='+447700900855',
+    to_field=None,
     status='created',
     reference=None,
     created_at=None,
@@ -131,6 +131,9 @@ def create_notification(
     if created_at is None:
         created_at = datetime.utcnow()
 
+    if to_field is None:
+        to_field = '+447700900855' if template.template_type == SMS_TYPE else 'test@example.com'
+
     if status != 'created':
         sent_at = sent_at or datetime.utcnow()
         updated_at = updated_at or datetime.utcnow()

tests/app/delivery/test_send_to_providers.py

@@ -781,3 +781,61 @@ def test_send_email_to_provider_get_linked_email_reply_to_create_service_email_a
         html_body=ANY,
         reply_to_address=reply_to.email_address
     )
+
+
+def test_send_email_to_provider_should_format_reply_to_email_address(
+        sample_service,
+        sample_email_template,
+        mocker):
+    mocker.patch('app.aws_ses_client.send_email', return_value='reference')
+    mocker.patch('app.delivery.send_to_providers.create_initial_notification_statistic_tasks')
+
+    db_notification = create_notification(template=sample_email_template)
+
+    reply_to = create_reply_to_email_for_notification(
+        db_notification.id,
+        sample_service,
+        "test@test.com\t"
+    )
+
+    send_to_providers.send_email_to_provider(
+        db_notification,
+    )
+
+    app.aws_ses_client.send_email.assert_called_once_with(
+        ANY,
+        ANY,
+        ANY,
+        body=ANY,
+        html_body=ANY,
+        reply_to_address="test@test.com"
+    )
+
+
+def test_send_sms_to_provider_should_format_phone_number(sample_notification, mocker):
+    sample_notification.to = '+44 (7123) 123-123'
+    send_mock = mocker.patch('app.mmg_client.send_sms')
+    mocker.patch('app.delivery.send_to_providers.create_initial_notification_statistic_tasks')
+
+    send_to_providers.send_sms_to_provider(sample_notification)
+
+    assert send_mock.call_args[1]['to'] == '447123123123'
+
+
+def test_send_email_to_provider_should_format_email_address(sample_email_notification, mocker):
+    sample_email_notification.to = 'test@example.com\t'
+    send_mock = mocker.patch('app.aws_ses_client.send_email', return_value='reference')
+    mocker.patch('app.delivery.send_to_providers.create_initial_notification_statistic_tasks')
+
+    send_to_providers.send_email_to_provider(sample_email_notification)
+
+    # to_addresses
+    send_mock.assert_called_once_with(
+        ANY,
+        # to_addresses
+        'test@example.com',
+        ANY,
+        body=ANY,
+        html_body=ANY,
+        reply_to_address=ANY,
+    )