wip

Author: cunla

scheduler/admin/task_admin.py

@@ -32,7 +32,10 @@ class TaskAdmin(admin.ModelAdmin):
     """TaskAdmin admin view for all task models."""
 
     class Media:
-        js = ("admin/js/jquery.init.js", "admin/js/select-fields.js",)
+        js = (
+            "admin/js/jquery.init.js",
+            "admin/js/select-fields.js",
+        )
 
     save_on_top = True
     change_form_template = "admin/scheduler/change_form.html"
@@ -90,7 +93,8 @@ class Media:
         (
             None,
             dict(fields=("cron_string",), classes=("tasktype-CronTask",)),
-        ), (
+        ),
+        (
             None,
             dict(fields=("interval", "interval_unit", "repeat"), classes=("tasktype-RepeatableTask",)),
         ),

scheduler/migrations/0019_task.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.2 on 2024-10-15 14:56
+# Generated by Django 5.1.2 on 2024-10-15 22:39
 
 import scheduler.models.task
 from django.db import migrations, models
@@ -148,7 +148,7 @@ class Migration(migrations.Migration):
                         verbose_name="repeat",
                     ),
                 ),
-                ("scheduled_time", models.DateTimeField(verbose_name="scheduled time")),
+                ("scheduled_time", models.DateTimeField(blank=True, null=True, verbose_name="scheduled time")),
                 (
                     "cron_string",
                     models.CharField(

scheduler/models/task.py

@@ -24,6 +24,7 @@
 from scheduler.rq_classes import DjangoQueue
 from scheduler.settings import QUEUES
 from scheduler.settings import logger
+from scheduler.tools import TaskType
 
 SCHEDULER_INTERVAL = settings.SCHEDULER_CONFIG.SCHEDULER_INTERVAL
 
@@ -64,12 +65,6 @@ def get_queue_choices():
     return [(queue, queue) for queue in QUEUES.keys()]
 
 
-class TaskType(models.TextChoices):
-    CRON = "CronTask", _("Cron Task")
-    REPEATABLE = "RepeatableTask", _("Repeatable Task")
-    ONCE = "OnceTask", _("Run once")
-
-
 class Task(models.Model):
     class TimeUnits(models.TextChoices):
         SECONDS = "seconds", _("seconds")
@@ -164,7 +159,7 @@ class TimeUnits(models.TextChoices):
         null=True,
         help_text=_("Number of times to run the job. Leaving this blank means it will run forever."),
     )
-    scheduled_time = models.DateTimeField(_("scheduled time"))
+    scheduled_time = models.DateTimeField(_("scheduled time"), blank=True, null=True)
     cron_string = models.CharField(
         _("cron string"),
         max_length=64,

scheduler/tests/test_cron_task.py

@@ -4,30 +4,30 @@
 from scheduler.models import CronTask
 from scheduler.tools import create_worker
 from .test_old_models import BaseTestCases
-from .testtools import task_factory
+from .testtools import old_task_factory
 from ..queues import get_queue
 
 
 class TestCronTask(BaseTestCases.TestBaseTask):
     TaskModelClass = CronTask
 
     def test_clean(self):
-        task = task_factory(CronTask)
+        task = old_task_factory(CronTask)
         task.cron_string = "* * * * *"
         task.queue = list(settings.QUEUES)[0]
         task.callable = "scheduler.tests.jobs.test_job"
         self.assertIsNone(task.clean())
 
     def test_clean_cron_string_invalid(self):
-        task = task_factory(CronTask)
+        task = old_task_factory(CronTask)
         task.cron_string = "not-a-cron-string"
         task.queue = list(settings.QUEUES)[0]
         task.callable = "scheduler.tests.jobs.test_job"
         with self.assertRaises(ValidationError):
             task.clean_cron_string()
 
     def test_check_rescheduled_after_execution(self):
-        task = task_factory(
+        task = old_task_factory(
             CronTask,
         )
         queue = task.rqueue
@@ -43,7 +43,7 @@ def test_check_rescheduled_after_execution(self):
         self.assertNotEqual(task.job_id, first_run_id)
 
     def test_check_rescheduled_after_failed_execution(self):
-        task = task_factory(
+        task = old_task_factory(
             CronTask,
             callable_name="scheduler.tests.jobs.scheduler.tests.jobs.test_job",
         )
@@ -63,7 +63,7 @@ def test_cron_task_enqueuing_jobs(self):
         queue = get_queue()
         prev_queued = len(queue.scheduled_job_registry)
         prev_finished = len(queue.finished_job_registry)
-        task = task_factory(CronTask, callable_name="scheduler.tests.jobs.enqueue_jobs")
+        task = old_task_factory(CronTask, callable_name="scheduler.tests.jobs.enqueue_jobs")
         self.assertEqual(prev_queued + 1, len(queue.scheduled_job_registry))
         first_run_id = task.job_id
         entry = queue.fetch_job(first_run_id)

scheduler/tests/test_internals.py

@@ -2,15 +2,15 @@
 
 from django.utils import timezone
 
-from scheduler.models import ScheduledTask
+from scheduler.models.task import TaskType
 from scheduler.tests.testtools import SchedulerBaseCase, task_factory
 from scheduler.tools import get_scheduled_task
 
 
 class TestInternals(SchedulerBaseCase):
     def test_get_scheduled_job(self):
-        task = task_factory(ScheduledTask, scheduled_time=timezone.now() - timedelta(hours=1))
-        self.assertEqual(task, get_scheduled_task(task.task_type, task.id))
+        task = task_factory(TaskType.ONCE, scheduled_time=timezone.now() - timedelta(hours=1))
+        self.assertEqual(task, get_scheduled_task(TaskType.ONCE, task.id))
         with self.assertRaises(ValueError):
             get_scheduled_task(task.task_type, task.id + 1)
         with self.assertRaises(ValueError):