fix:admin view shows next run time properly #288

Author: cunla

docs/changelog.md

@@ -5,6 +5,7 @@
 ### 🐛 Bug Fixes
 
 - Issue on task admin showing list of jobs where jobs have been deleted from broker #285
+- Task admin view shows next run currently #288
 
 ### 🧰 Maintenance
 

pyproject.toml

@@ -41,7 +41,6 @@ dependencies = [
     "django>=5",
     "croniter>=2.0",
     "click~=8.2",
-    "fakeredis",
 ]
 
 [project.optional-dependencies]
@@ -57,13 +56,14 @@ Funding = "https://github.com/sponsors/cunla"
 
 [dependency-groups]
 dev = [
-    "time-machine>=2.16.0,<3",
+    "time-machine>=2.16.0",
     "ruff>=0.11",
-    "coverage~=7.6",
-    "fakeredis~=2.28",
+    "coverage>=7.6",
+    "fakeredis>=2.28",
     "pyyaml>=6,<7",
     "mypy>=1.16.0",
     "types-croniter>=6.0.0.20250411",
+    "beautifulsoup4>=4.13.4"
 ]
 
 [tool.hatch.build.targets.sdist]

scheduler/admin/task_admin.py

@@ -1,10 +1,12 @@
-from typing import List
+from datetime import datetime
+from typing import List, Optional, Union
 
 from django.contrib import admin, messages
 from django.contrib.contenttypes.admin import GenericStackedInline
 from django.db.models import QuerySet
 from django.http import HttpRequest, HttpResponse
 from django.utils import timezone, formats
+from django.utils.timezone import is_naive
 from django.utils.translation import gettext_lazy as _
 
 from scheduler.helpers.queues import get_queue
@@ -137,8 +139,16 @@ def task_schedule(self, o: Task) -> str:
             return f"Repeatable: {o.interval} {o.get_interval_unit_display()}"
 
     @admin.display(description="Next run")
-    def next_run(self, o: Task) -> str:
-        return get_next_cron_time(o.cron_string)
+    def next_run(self, o: Task) -> Union[str, datetime]:
+        res = o.scheduled_time
+        if res < timezone.now():
+            o.save(clean=False)
+            res = o.scheduled_time
+        if res is None:
+            return _("Not scheduled")
+        if is_naive(res):
+            res = timezone.make_aware(res, timezone.get_current_timezone())
+        return res
 
     def change_view(self, request: HttpRequest, object_id, form_url="", extra_context=None) -> HttpResponse:
         extra = extra_context or {}

scheduler/models/task.py

@@ -333,7 +333,6 @@ def _schedule(self) -> bool:
         """Schedule the next execution for the task to run.
         :returns: True if a job was scheduled, False otherwise.
         """
-        self.refresh_from_db()
         if self.is_scheduled():
             logger.debug(f"Task {self.name} already scheduled")
             return False
@@ -358,10 +357,10 @@ def save(self, **kwargs: Any) -> None:
         should_clean = kwargs.pop("clean", True)
         if should_clean:
             self.clean()
-        schedule_job = kwargs.pop("schedule_job", True)
         update_fields = kwargs.get("update_fields", None)
         if update_fields is not None:
             kwargs["update_fields"] = set(update_fields).union({"updated_at"})
+        schedule_job = kwargs.pop("schedule_job", True)
         super(Task, self).save(**kwargs)
         if schedule_job:
             self._schedule()
@@ -443,13 +442,13 @@ def clean(self) -> None:
             )
 
 
-def get_next_cron_time(cron_string: Optional[str]) -> Optional[timezone.datetime]:
+def get_next_cron_time(cron_string: Optional[str]) -> Optional[datetime]:
     """Calculate the next scheduled time by creating a crontab object with a cron string"""
     if cron_string is None:
         return None
     now = timezone.now()
     itr = croniter.croniter(cron_string, now)
-    next_itr = itr.get_next(timezone.datetime)
+    next_itr = itr.get_next(datetime)
     return next_itr
 
 

scheduler/tests/test_internals.py

@@ -1,11 +1,11 @@
-from datetime import timedelta
+from datetime import timedelta, datetime, timezone as dt_timezone
 
 from django.core.exceptions import ImproperlyConfigured
 from django.test import override_settings
 from django.utils import timezone
 
 from scheduler.helpers.callback import Callback, CallbackSetupError
-from scheduler.models import TaskType, get_scheduled_task
+from scheduler.models import TaskType, get_scheduled_task, get_next_cron_time
 from scheduler.tests.testtools import SchedulerBaseCase, task_factory
 
 
@@ -80,3 +80,10 @@ def test_conf_settings__unknown_setting(self):
             settings.conf_settings()
 
         self.assertEqual(str(cm.exception), "Unknown setting UNKNOWN_SETTING in SCHEDULER_CONFIG")
+
+    @override_settings(USE_TZ=True, TIME_ZONE="EST")
+    def test_get_next_cron_time(self):
+        next_cron_time = get_next_cron_time("0 0 * * *")
+        self.assertIsNotNone(next_cron_time)
+        self.assertTrue(next_cron_time > timezone.now())
+        self.assertEqual(dt_timezone.utc, next_cron_time.tzinfo)

scheduler/tests/test_task_types/test_once_task.py

@@ -1,5 +1,6 @@
 from datetime import timedelta, datetime
 
+import bs4
 import time_machine
 from django.core.exceptions import ValidationError
 from django.urls import reverse
@@ -43,13 +44,16 @@ def test_admin_change_view__has_execution_list(self):
         # act
         res = self.client.get(url)
         # assert
+        self.assertEqual(200, res.status_code)
         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)
         self.assertFalse(res.context["pagination_required"])
         self.assertEqual(res.context["executions"].paginator.count, 1)
+        soup = bs4.BeautifulSoup(res.content, "html.parser")
+        self.assertEqual(1, len(soup.find_all("table", {"id": "result_list"})))
+        counter_element_list = soup.find_all("span", {"id": "counter"})
+        self.assertEqual(1, len(counter_element_list))
+        counter_element = counter_element_list[0]
+        self.assertEqual("1 entry", counter_element.text.strip())
 
     @time_machine.travel(datetime(2016, 12, 25))
     def test_admin_change_view__has_empty_execution_list(self):

scheduler/tests/test_task_types/test_task_model.py

@@ -1,6 +1,7 @@
 import zoneinfo
 from datetime import datetime, timedelta
 
+import bs4
 import time_machine
 from django.contrib.messages import get_messages
 from django.core.exceptions import ValidationError