fix:get_many return nones #285

Author: cunla

scheduler/helpers/queues/queue_logic.py

@@ -167,37 +167,38 @@ def get_registry(self, name: str) -> JobNamesRegistry:
         raise NoSuchRegistryError(f"Unknown registry name {name}")
 
     def get_all_job_names(self) -> List[str]:
-        res = list()
-        res.extend(self.queued_job_registry.all())
-        res.extend(self.finished_job_registry.all())
-        res.extend(self.active_job_registry.all())
-        res.extend(self.failed_job_registry.all())
-        res.extend(self.scheduled_job_registry.all())
-        res.extend(self.canceled_job_registry.all())
+        all_job_names = list()
+        all_job_names.extend(self.queued_job_registry.all())
+        all_job_names.extend(self.finished_job_registry.all())
+        all_job_names.extend(self.active_job_registry.all())
+        all_job_names.extend(self.failed_job_registry.all())
+        all_job_names.extend(self.scheduled_job_registry.all())
+        all_job_names.extend(self.canceled_job_registry.all())
+        res = list(filter(lambda job_name: JobModel.exists(job_name, self.connection), all_job_names))
         return res
 
     def get_all_jobs(self) -> List[JobModel]:
         job_names = self.get_all_job_names()
         return JobModel.get_many(job_names, connection=self.connection)
 
     def create_and_enqueue_job(
-        self,
-        func: FunctionReferenceType,
-        args: Union[Tuple[Any, ...], List[Any], None] = None,
-        kwargs: Optional[Dict[str, Any]] = None,
-        when: Optional[datetime] = None,
-        timeout: Optional[int] = None,
-        result_ttl: Optional[int] = None,
-        job_info_ttl: Optional[int] = None,
-        description: Optional[str] = None,
-        name: Optional[str] = None,
-        at_front: bool = False,
-        meta: Optional[Dict[str, Any]] = None,
-        on_success: Optional[Callback] = None,
-        on_failure: Optional[Callback] = None,
-        on_stopped: Optional[Callback] = None,
-        task_type: Optional[str] = None,
-        scheduled_task_id: Optional[int] = None,
+            self,
+            func: FunctionReferenceType,
+            args: Union[Tuple[Any, ...], List[Any], None] = None,
+            kwargs: Optional[Dict[str, Any]] = None,
+            when: Optional[datetime] = None,
+            timeout: Optional[int] = None,
+            result_ttl: Optional[int] = None,
+            job_info_ttl: Optional[int] = None,
+            description: Optional[str] = None,
+            name: Optional[str] = None,
+            at_front: bool = False,
+            meta: Optional[Dict[str, Any]] = None,
+            on_success: Optional[Callback] = None,
+            on_failure: Optional[Callback] = None,
+            on_stopped: Optional[Callback] = None,
+            task_type: Optional[str] = None,
+            scheduled_task_id: Optional[int] = None,
     ) -> JobModel:
         """Creates a job to represent the delayed function call and enqueues it.
         :param when: When to schedule the job (None to enqueue immediately)
@@ -248,7 +249,7 @@ def create_and_enqueue_job(
         return job_model
 
     def job_handle_success(
-        self, job: JobModel, result: Any, job_info_ttl: int, result_ttl: int, connection: ConnectionType
+            self, job: JobModel, result: Any, job_info_ttl: int, result_ttl: int, connection: ConnectionType
     ) -> None:
         """Saves and cleanup job after successful execution"""
         job.after_execution(
@@ -307,7 +308,7 @@ def run_sync(self, job: JobModel) -> JobModel:
 
     @classmethod
     def dequeue_any(
-        cls, queues: List[Self], timeout: Optional[int], connection: ConnectionType
+            cls, queues: List[Self], timeout: Optional[int], connection: ConnectionType
     ) -> Tuple[Optional[JobModel], Optional[Self]]:
         """Class method returning a Job instance at the front of the given set of Queues, where the order of the queues
         is important.
@@ -410,7 +411,7 @@ def delete_job(self, job_name: str, expire_job_model: bool = True) -> None:
                 pass
 
     def enqueue_job(
-        self, job_model: JobModel, pipeline: Optional[PipelineType] = None, at_front: bool = False
+            self, job_model: JobModel, pipeline: Optional[PipelineType] = None, at_front: bool = False
     ) -> JobModel:
         """Enqueues a job for delayed execution without checking dependencies.
 

scheduler/templates/admin/scheduler/jobs-list-with-tasks.partial.html

@@ -30,27 +30,13 @@ <h2>Job executions</h2>
                                 </a>
                             {% endif %}
                         </td>
-                        <td>
-                            {{ exec|job_status }}
-                        </td>
-                        <td>
-                            {{ exec.created_at|date:"Y-m-d, H:i:s"|default:"-" }}
-                        </td>
-                        <td>
-                            {{ exec.enqueued_at|date:"Y-m-d, H:i:s"|default:"-" }}
-                        </td>
-                        <td>
-                            {{ exec.started_at|date:"Y-m-d, H:i:s"|default:"-" }}
-                        </td>
-                        <td>
-                            {{ exec|job_runtime }}
-                        </td>
-                        <td>
-                            {{ exec.worker_name|default:"-" }}
-                        </td>
-                        <td>
-                            {{ exec|job_result|default:"-" }}
-                        </td>
+                        <td>{{ exec|job_status }}</td>
+                        <td>{{ exec.created_at|date:"Y-m-d, H:i:s"|default:"-" }}</td>
+                        <td>{{ exec.enqueued_at|date:"Y-m-d, H:i:s"|default:"-" }}</td>
+                        <td>{{ exec.started_at|date:"Y-m-d, H:i:s"|default:"-" }}</td>
+                        <td>{{ exec|job_runtime }}</td>
+                        <td>{{ exec.worker_name|default:"-" }}</td>
+                        <td>{{ exec|job_result|default:"-" }}</td>
                     </tr>
                 {% endfor %}
                 </tbody>
@@ -68,9 +54,8 @@ <h2>Job executions</h2>
                            class="end" {% endif %}>{{ i }}</a>
                     {% endif %}
                 {% endfor %}
-                {{ executions.paginator.count }} {% blocktranslate count counter=executions.paginator.count %}entry
-                {% plural %}entries{% endblocktranslate %}
             {% endif %}
+            <span id="counter">{{ executions.paginator.count }} {% blocktranslate count counter=executions.paginator.count %}entry{% plural %}entries{% endblocktranslate %}</span>
         </p>
     </fieldset>
 {% endif %}

scheduler/templates/admin/scheduler/jobs-list.partial.html

@@ -27,27 +27,13 @@ <h2>Job executions</h2>
                                 </a>
                             {% endif %}
                         </td>
-                        <td>
-                            {{ exec|job_status }}
-                        </td>
-                        <td>
-                            {{ exec.created_at|date:"Y-m-d, H:i:s"|default:"-" }}
-                        </td>
-                        <td>
-                            {{ exec.enqueued_at|date:"Y-m-d, H:i:s"|default:"-" }}
-                        </td>
-                        <td>
-                            {{ exec.started_at|date:"Y-m-d, H:i:s"|default:"-" }}
-                        </td>
-                        <td>
-                            {{ exec|job_runtime }}
-                        </td>
-                        <td>
-                            {{ exec.worker_name|default:"-" }}
-                        </td>
-                        <td>
-                            {{ exec|job_result|default:"-" }}
-                        </td>
+                        <td>{{ exec|job_status }}</td>
+                        <td>{{ exec.created_at|date:"Y-m-d, H:i:s"|default:"-" }}</td>
+                        <td>{{ exec.enqueued_at|date:"Y-m-d, H:i:s"|default:"-" }}</td>
+                        <td>{{ exec.started_at|date:"Y-m-d, H:i:s"|default:"-" }}</td>
+                        <td>{{ exec|job_runtime }}</td>
+                        <td>{{ exec.worker_name|default:"-" }}</td>
+                        <td>{{ exec|job_result|default:"-" }}</td>
                     </tr>
                 {% endfor %}
                 </tbody>
@@ -65,9 +51,8 @@ <h2>Job executions</h2>
                            class="end" {% endif %}>{{ i }}</a>
                     {% endif %}
                 {% endfor %}
-                {{ executions.paginator.count }} {% blocktranslate count counter=executions.paginator.count %}entry
-                {% plural %}entries{% endblocktranslate %}
             {% endif %}
+            <span id="counter">{{ executions.paginator.count }} {% blocktranslate count counter=executions.paginator.count %}entry{% plural %}entries{% endblocktranslate %}</span>
         </p>
     </fieldset>
 {% endif %}

scheduler/tests/test_task_types/test_once_task.py

@@ -6,7 +6,9 @@
 from django.utils import timezone
 
 from scheduler import settings
+from scheduler.helpers.queues import get_queue
 from scheduler.models import TaskType
+from scheduler.redis_models import JobModel
 from scheduler.tests.test_task_types.test_task_model import BaseTestCases
 from scheduler.tests.testtools import task_factory
 
@@ -32,6 +34,39 @@ def test_admin_changelist_view__has_timezone_data(self):
         # assert
         self.assertContains(res, "Run once: Dec. 26, 2016, midnight", count=1, status_code=200)
 
+    @time_machine.travel(datetime(2016, 12, 25))
+    def test_admin_change_view__has_execution_list(self):
+        # arrange
+        self.client.login(username="admin", password="admin")
+        task = task_factory(self.task_type)
+        queue = get_queue(self.queue_name)
+        job = JobModel.get(task.job_name, connection=queue.connection)
+        url = reverse("admin:scheduler_task_change", args=(task.id,))
+        # act
+        res = self.client.get(url)
+        # assert
+        self.assertContains(res, "Job executions")
+        self.assertContains(res, """<table id="result_list">""")
+        self.assertContains(res, task.job_name, status_code=200)
+        self.assertContains(res, "Scheduled", status_code=200)
+        self.assertContains(res, """<span id="counter">1""", status_code=200)
+
+    @time_machine.travel(datetime(2016, 12, 25))
+    def test_admin_change_view__has_empty_execution_list(self):
+        # arrange
+        self.client.login(username="admin", password="admin")
+        task = task_factory(self.task_type)
+        queue = get_queue(self.queue_name)
+        job = JobModel.get(task.job_name, connection=queue.connection)
+        JobModel.delete(job, connection=queue.connection)
+        url = reverse("admin:scheduler_task_change", args=(task.id,))
+        # act
+        res = self.client.get(url)
+        # assert
+        self.assertContains(res, "Job executions")
+        self.assertContains(res, """<table id="result_list">""")
+        self.assertContains(res, """<span id="counter">0""", status_code=200)
+
     def test_create_without_date__fail(self):
         task = task_factory(self.task_type, scheduled_time=None, instance_only=True)
         self.assertIsNone(task.scheduled_time)