Merge pull request #3353 from alphagov/reverse-sort-scheduled-jobs

Reverse sort scheduled jobs

app/notify_client/job_api_client.py

@@ -14,8 +14,9 @@ class JobApiClient(NotifyAdminAPIClient):
         'ready to send',
         'sent to dvla'
     }
-
+    SCHEDULED_JOB_STATUS = 'scheduled'
-    NON_SCHEDULED_JOB_STATUSES = JOB_STATUSES - {'scheduled', 'cancelled'}
+    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,8 +66,12 @@ class JobApiClient(NotifyAdminAPIClient):
 
     def get_scheduled_jobs(self, service_id):
         return sorted(
-            self.get_jobs(service_id, statuses=['scheduled'])['data'],
+            self.get_jobs(
-            key=lambda job: job['scheduled_for']
+                service_id,
+                statuses=[self.SCHEDULED_JOB_STATUS]
+            )['data'],
+            key=lambda job: job['scheduled_for'],
+            reverse=True,
         )
 
     @cache.set('has_jobs-{service_id}')

app/templates/views/dashboard/_upcoming.html

@@ -20,7 +20,7 @@
       </span>
       <span class="banner-dashboard-meta">
         sending starts
-        {{ current_service.scheduled_jobs[0].scheduled_for|format_datetime_relative }}
+        {{ current_service.scheduled_jobs[-1].scheduled_for|format_datetime_relative }}
       </span>
     </a>
   {% endif %}

tests/app/main/views/test_jobs.py

@@ -44,14 +44,14 @@ from tests.conftest import (
         (
             'File Messages to be sent'
         ),
-        (
-            'send_me_later.csv '
-            'Sending 1 January 2016 at 11:09am 1'
-        ),
         (
             'even_later.csv '
             'Sending 1 January 2016 at 11:09pm 1'
         ),
+        (
+            'send_me_later.csv '
+            'Sending 1 January 2016 at 11:09am 1'
+        ),
         (
             'File Status'
         ),

tests/app/main/views/test_uploads.py

@@ -668,13 +668,13 @@ def test_uploads_page_shows_scheduled_jobs(
             'File Status'
         ),
         (
-            'send_me_later.csv '
+            'even_later.csv '
-            'Sending 1 January 2016 at 11:09am '
+            'Sending 1 January 2016 at 11:09pm '
             '1 text message waiting to send'
         ),
         (
-            'even_later.csv '
+            'send_me_later.csv '
-            'Sending 1 January 2016 at 11:09pm '
+            'Sending 1 January 2016 at 11:09am '
             '1 text message waiting to send'
         ),
     ]