fix:local datetime for OnceTask #280

Author: cunla

scheduler/admin/task_admin.py

@@ -4,6 +4,7 @@
 from django.contrib.contenttypes.admin import GenericStackedInline
 from django.db.models import QuerySet
 from django.http import HttpRequest
+from django.utils import timezone, formats
 from django.utils.translation import gettext_lazy as _
 
 from scheduler.helpers.queues import get_queue
@@ -120,7 +121,11 @@ class Media:
     @admin.display(description="Schedule")
     def task_schedule(self, o: Task) -> str:
         if o.task_type == TaskType.ONCE.value:
-            return f"Run once: {o.scheduled_time:%Y-%m-%d %H:%M:%S}"
+            if timezone.is_naive(o.scheduled_time):
+                local_time = timezone.make_aware(o.scheduled_time, timezone.get_current_timezone())
+            else:
+                local_time = timezone.localtime(o.scheduled_time)
+            return f"Run once: {formats.date_format(local_time, 'DATETIME_FORMAT')}"
         elif o.task_type == TaskType.CRON.value:
             return f"Cron: {o.cron_string}"
         else:  # if o.task_type == TaskType.REPEATABLE.value:

scheduler/tests/test_task_types/test_once_task.py

@@ -1,6 +1,8 @@
 from datetime import timedelta, datetime
 
+import time_machine
 from django.core.exceptions import ValidationError
+from django.urls import reverse
 from django.utils import timezone
 
 from scheduler import settings
@@ -9,7 +11,7 @@
 from scheduler.tests.testtools import task_factory
 
 
-class TestScheduledTask(BaseTestCases.TestSchedulableTask):
+class TestScheduledOnceTask(BaseTestCases.TestSchedulableTask):
     task_type = TaskType.ONCE
     queue_name = settings.get_queue_names()[0]
 
@@ -19,6 +21,17 @@ def test_clean(self):
         task.callable = "scheduler.tests.jobs.test_job"
         self.assertIsNone(task.clean())
 
+    @time_machine.travel(datetime(2016, 12, 25))
+    def test_admin_changelist_view__has_timezone_data(self):
+        # arrange
+        self.client.login(username="admin", password="admin")
+        task_factory(self.task_type)
+        url = reverse("admin:scheduler_task_changelist")
+        # act
+        res = self.client.get(url)
+        # assert
+        self.assertContains(res, "Run once: Dec. 26, 2016, midnight", count=1, 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)

scheduler/tests/test_task_types/test_repeatable_task.py

@@ -13,6 +13,7 @@
 
 
 class TestRepeatableTask(BaseTestCases.TestSchedulableTask):
+    task_type = TaskType.REPEATABLE
     queue_name = settings.get_queue_names()[0]
 
     def test_create_task_error(self):

scheduler/tests/test_task_types/test_task_model.py

@@ -265,7 +265,7 @@ def test_function_string(self):
                 f"key1='one', key2=2, key3={repr(date)}, key4=False)",
             )
 
-        def test_admin_list_view(self):
+        def test_admin_changelist_view(self):
             # arrange
             self.client.login(username="admin", password="admin")
             task_factory(self.task_type)
@@ -278,20 +278,10 @@ def test_admin_list_view(self):
         def test_admin_list_view_delete_model(self):
             # arrange
             self.client.login(username="admin", password="admin")
-            task = task_factory(
-                self.task_type,
-            )
+            task = task_factory(self.task_type)
             url = reverse("admin:scheduler_task_changelist")
             # act
-            res = self.client.post(
-                url,
-                data={
-                    "action": "delete_model",
-                    "_selected_action": [
-                        task.pk,
-                    ],
-                },
-            )
+            res = self.client.post(url, data={"action": "delete_model", "_selected_action": [task.pk]})
             # assert
             self.assertEqual(302, res.status_code)
 
@@ -320,15 +310,8 @@ def test_admin_run_job_now_enqueues_job_at(self):
         def test_admin_change_view(self):
             # arrange
             self.client.login(username="admin", password="admin")
-            task = task_factory(
-                self.task_type,
-            )
-            url = reverse(
-                "admin:scheduler_task_change",
-                args=[
-                    task.pk,
-                ],
-            )
+            task = task_factory(self.task_type)
+            url = reverse("admin:scheduler_task_change", args=[task.pk])
             # act
             res = self.client.get(url)
             # assert
@@ -339,12 +322,7 @@ def test_admin_change_view__bad_redis_connection(self):
             self.client.login(username="admin", password="admin")
             task = task_factory(self.task_type, queue="test2", instance_only=True)
             task.save(schedule_job=False)
-            url = reverse(
-                "admin:scheduler_task_change",
-                args=[
-                    task.pk,
-                ],
-            )
+            url = reverse("admin:scheduler_task_change", args=[task.pk])
             # act
             res = self.client.get(url)
             # assert