From fd480febb49ff96fcdd7ecb1e928582ba191a61b Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 6 Mar 2020 09:40:59 +0000 Subject: [PATCH] Refactor to use constants for scheduled status Reduces risk of typos, matches what we do for other statuses. --- app/notify_client/job_api_client.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/notify_client/job_api_client.py b/app/notify_client/job_api_client.py index 7fa93d52f..81b7cfb12 100644 --- a/app/notify_client/job_api_client.py +++ b/app/notify_client/job_api_client.py @@ -14,8 +14,9 @@ class JobApiClient(NotifyAdminAPIClient): 'ready to send', 'sent to dvla' } - - NON_SCHEDULED_JOB_STATUSES = JOB_STATUSES - {'scheduled', 'cancelled'} + SCHEDULED_JOB_STATUS = 'scheduled' + CANCELLED_JOB_STATUS = 'cancelled' + NON_SCHEDULED_JOB_STATUSES = JOB_STATUSES - {SCHEDULED_JOB_STATUS, CANCELLED_JOB_STATUS} def get_job(self, service_id, job_id): params = {} @@ -65,7 +66,10 @@ class JobApiClient(NotifyAdminAPIClient): def get_scheduled_jobs(self, service_id): return sorted( - self.get_jobs(service_id, statuses=['scheduled'])['data'], + self.get_jobs( + service_id, + statuses=[self.SCHEDULED_JOB_STATUS] + )['data'], key=lambda job: job['scheduled_for'] )