Merge branch 'master' into celery-jobs

Conflicts:
	app/main/views/sms.py
This commit is contained in:
Martyn Inglis
2016-02-24 15:46:38 +00:00
49 changed files with 708 additions and 381 deletions

View File

@@ -19,13 +19,14 @@ class JobApiClient(BaseAPIClient):
else:
return self.get(url='/service/{}/job'.format(service_id))
def create_job(self, job_id, service_id, template_id, original_file_name):
def create_job(self, job_id, service_id, template_id, original_file_name, notification_count):
data = {
"id": job_id,
"template": template_id,
"original_file_name": original_file_name,
"bucket_name": "service-{}-notify".format(service_id),
"file_name": "{}.csv".format(job_id)
"file_name": "{}.csv".format(job_id),
"notification_count": notification_count
}
resp = self.post(url='/service/{}/job'.format(service_id), data=data)