diff --git a/app/celery/tasks.py b/app/celery/tasks.py index 50b231630..55ec0fd71 100644 --- a/app/celery/tasks.py +++ b/app/celery/tasks.py @@ -156,7 +156,10 @@ def process_job(job_id): 'template': str(template.id), 'job': str(job.id), 'to': recipient, - 'personalisation': personalisation + 'personalisation': { + key: personalisation.get(key) + for key in template.placeholders + } }) if template.template_type == 'sms': diff --git a/requirements.txt b/requirements.txt index c38e4f8b2..b515baa03 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,4 +22,4 @@ monotonic==0.3 git+https://github.com/alphagov/notifications-python-client.git@0.5.0#egg=notifications-python-client==0.5.0 -git+https://github.com/alphagov/notifications-utils.git@5.1.0#egg=notifications-utils==5.1.0 +git+https://github.com/alphagov/notifications-utils.git@5.2.0#egg=notifications-utils==5.2.0 diff --git a/test_csv_files/email.csv b/test_csv_files/email.csv index 3d720f5e2..f0cefee69 100644 --- a/test_csv_files/email.csv +++ b/test_csv_files/email.csv @@ -1,2 +1,2 @@ -email address +email_address test@test.com diff --git a/test_csv_files/multiple_email.csv b/test_csv_files/multiple_email.csv index e57e35a2a..5da15797d 100644 --- a/test_csv_files/multiple_email.csv +++ b/test_csv_files/multiple_email.csv @@ -1,4 +1,4 @@ -email address +EMAILADDRESS test1@test.com test2@test.com test3@test.com diff --git a/test_csv_files/multiple_sms.csv b/test_csv_files/multiple_sms.csv index ebfd9d360..2ecad9140 100644 --- a/test_csv_files/multiple_sms.csv +++ b/test_csv_files/multiple_sms.csv @@ -1,4 +1,4 @@ -phone number,name +PhoneNumber,Name +441234123121,chris +441234123122,chris +441234123123,chris diff --git a/test_csv_files/sms.csv b/test_csv_files/sms.csv index 5858f35c9..728639972 100644 --- a/test_csv_files/sms.csv +++ b/test_csv_files/sms.csv @@ -1,2 +1,2 @@ -phone number, ignore this column +PHONE NUMBER, IGNORE THIS COLUMN +441234123123, nope