fix registry.get_job_id not returning execution id anymore (#700)

This change uses the new ``registry.get_job_and_execution_ids`` instead
of the updated ``registry.get_job_id`` which no longer returns the
execution id.

fixes: #697

Author: terencehonles

django_rq/utils.py

@@ -1,4 +1,4 @@
-from typing import cast, Optional, List, Union
+from typing import cast, Optional, List, Tuple, Union
 
 from django.core.exceptions import ImproperlyConfigured
 from django.db import connections
@@ -153,13 +153,12 @@ def get_jobs(
     return valid_jobs
 
 
-def get_executions(queue, composite_keys: List[str]) -> List[Execution]:
+def get_executions(queue, composite_keys: List[Tuple[str, str]]) -> List[Execution]:
     """Fetch executions in bulk from Redis.
     1. If execution data is not present in Redis, discard the result
     """
     executions = []
-    for key in composite_keys:
-        job_id, id = key.split(':')
+    for job_id, id in composite_keys:
         try:
             executions.append(Execution.fetch(id=id, job_id=job_id, connection=queue.connection))
         except ValueError:

django_rq/views.py

@@ -1,7 +1,7 @@
 from __future__ import division
 
 from math import ceil
-from typing import Any
+from typing import Any, cast, Tuple
 
 from django.contrib import admin, messages
 from django.contrib.admin.views.decorators import staff_member_required
@@ -222,9 +222,17 @@ def started_jobs(request, queue_index):
         last_page = int(ceil(num_jobs / items_per_page))
         page_range = list(range(1, last_page + 1))
         offset = items_per_page * (page - 1)
-        job_ids = registry.get_job_ids(offset, offset + items_per_page - 1)
-        jobs = get_jobs(queue, job_ids, registry)
-        executions = get_executions(queue, job_ids)
+
+        try:
+            composite_keys = registry.get_job_and_execution_ids(offset, offset + items_per_page - 1)
+        except AttributeError:
+            composite_keys = [
+                cast(Tuple[str, str], key.split(':'))
+                for key in registry.get_job_ids(offset, offset + items_per_page - 1)
+            ]
+
+        jobs = get_jobs(queue, [i[0] for i in composite_keys], registry)
+        executions = get_executions(queue, composite_keys)
 
     else:
         page_range = []