Merge branch 'master' into reset-password

app/celery/tasks.py

@@ -12,7 +12,7 @@ from sqlalchemy.exc import SQLAlchemyError
 from app.aws import s3
 from datetime import datetime
 from utils.template import Template
-from utils.process_csv import get_rows_from_csv, get_recipient_from_row, first_column_heading
+from utils.recipients import RecipientCSV, first_column_heading
 
 
 @notify_celery.task(name="process-job")
@@ -22,15 +22,16 @@ def process_job(job_id):
     job.status = 'in progress'
     dao_update_job(job)
 
-    file = s3.get_job_from_s3(job.bucket_name, job_id)
-
-    for row in get_rows_from_csv(file):
+    for recipient, personalisation in RecipientCSV(
+        s3.get_job_from_s3(job.bucket_name, job_id),
+        template_type=job.template.template_type
+    ).recipients_and_personalisation:
 
         encrypted = encryption.encrypt({
             'template': job.template_id,
             'job': str(job.id),
-            'to': get_recipient_from_row(row, job.template.template_type),
-            'personalisation': row
+            'to': recipient,
+            'personalisation': personalisation
         })
 
         if job.template.template_type == 'sms':

app/schemas.py

@@ -5,10 +5,11 @@ from . import models
 from app.dao.permissions_dao import permission_dao
 from marshmallow import (post_load, ValidationError, validates, validates_schema)
 from marshmallow_sqlalchemy import field_for
-
-mobile_regex = re.compile("^\\+44[\\d]{10}$")
-
-email_regex = re.compile("(^[^@^\\s]+@[^@^\\.^\\s]+(\\.[^@^\\.^\\s]*)*\.(.+))")
+from utils.recipients import (
+    validate_email_address, InvalidEmailError,
+    validate_phone_number, InvalidPhoneError,
+    format_phone_number
+)
 
 
 # TODO I think marshmallow provides a better integration and error handling.
@@ -117,8 +118,17 @@ class SmsNotificationSchema(NotificationSchema):
 
     @validates('to')
     def validate_to(self, value):
-        if not mobile_regex.match(value):
-            raise ValidationError('Invalid phone number, must be of format +441234123123')
+        try:
+            validate_phone_number(value)
+        except InvalidPhoneError as error:
+            raise ValidationError('Invalid phone number: {}'.format(error))
+
+    @post_load
+    def format_phone_number(self, item):
+        item['to'] = format_phone_number(validate_phone_number(
+            item['to'])
+        )
+        return item
 
 
 class EmailNotificationSchema(NotificationSchema):
@@ -127,7 +137,9 @@ class EmailNotificationSchema(NotificationSchema):
 
     @validates('to')
     def validate_to(self, value):
-        if not email_regex.match(value):
+        try:
+            validate_email_address(value)
+        except InvalidEmailError:
             raise ValidationError('Invalid email')
 
 
@@ -163,7 +175,9 @@ class InvitedUserSchema(BaseSchema):
 
     @validates('email_address')
     def validate_to(self, value):
-        if not email_regex.match(value):
+        try:
+            validate_email_address(value)
+        except InvalidEmailError:
             raise ValidationError('Invalid email')