diff --git a/designsafe/apps/api/notifications/migrations/0003_auto_20180417_2012.py b/designsafe/apps/api/notifications/migrations/0003_auto_20180417_2012.py index b0991a3b2b..8c04d722b6 100644 --- a/designsafe/apps/api/notifications/migrations/0003_auto_20180417_2012.py +++ b/designsafe/apps/api/notifications/migrations/0003_auto_20180417_2012.py @@ -14,12 +14,12 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( model_name='broadcast', - name='jobId', + name='jobid', field=models.CharField(blank=True, max_length=255), ), migrations.AddField( model_name='notification', - name='jobId', + name='jobid', field=models.CharField(blank=True, max_length=255), ), ] diff --git a/designsafe/apps/api/notifications/models.py b/designsafe/apps/api/notifications/models.py index af874b9b7a..70176c09ac 100644 --- a/designsafe/apps/api/notifications/models.py +++ b/designsafe/apps/api/notifications/models.py @@ -27,7 +27,7 @@ class BaseNotify(models.Model): ERROR = RED = 'ERROR' WARNING = ORANGE = 'WARNING' EVENT_TYPE = 'event_type' - JOB_ID = 'jobId' + JOB_ID = 'jobid' STATUS = 'status' USER = USERNAME = 'user' EXTRA = CONTENT = 'extra' diff --git a/designsafe/apps/workspace/tasks.py b/designsafe/apps/workspace/tasks.py index 29cfa9f887..f3b3319eaf 100644 --- a/designsafe/apps/workspace/tasks.py +++ b/designsafe/apps/workspace/tasks.py @@ -136,7 +136,7 @@ def handle_webhook_request(job): event_data[Notification.MESSAGE] = "Job '%s' Failed. Please try again..." % (job_name) event_data[Notification.OPERATION] = 'job_failed' - last_notification = Notification.objects.filter(jobId=job_id).last() + last_notification = Notification.objects.filter(jobid=job_id).last() should_notify = True if last_notification: @@ -165,7 +165,7 @@ def handle_webhook_request(job): event_data[Notification.OPERATION] = 'job_finished' - last_notification = Notification.objects.filter(jobId=job_id).last() + last_notification = Notification.objects.filter(jobid=job_id).last() should_notify = True if last_notification: @@ -198,7 +198,7 @@ def handle_webhook_request(job): event_data[Notification.OPERATION] = 'job_status_update' - last_notification = Notification.objects.filter(jobId=job_id).last() + last_notification = Notification.objects.filter(jobid=job_id).last() should_notify = True