fix:repeatable task without start date #276

Author: cunla

scheduler/models/task.py

@@ -187,9 +187,9 @@ def is_scheduled(self) -> bool:
             return False
         # check whether job_id is in scheduled/queued/active jobs
         res = (
-            (self.job_name in self.rqueue.scheduled_job_registry.all())
-            or (self.job_name in self.rqueue.queued_job_registry.all())
-            or (self.job_name in self.rqueue.active_job_registry.all())
+                (self.job_name in self.rqueue.scheduled_job_registry.all())
+                or (self.job_name in self.rqueue.queued_job_registry.all())
+                or (self.job_name in self.rqueue.active_job_registry.all())
         )
         # If the job_id is not scheduled/queued/started,
         # update the job_id to None. (The job_id belongs to a previous run which is completed)
@@ -360,6 +360,7 @@ def _schedule(self) -> bool:
         return True
 
     def save(self, **kwargs):
+        self.clean()
         schedule_job = kwargs.pop("schedule_job", True)
         update_fields = kwargs.get("update_fields", None)
         if update_fields is not None:
@@ -406,7 +407,7 @@ def clean_interval_unit(self):
                 code="invalid",
                 params={"queue": self.queue, "interval": config.SCHEDULER_INTERVAL},
             )
-        if self.interval_seconds() % config.SCHEDULER_INTERVAL:
+        if self.interval_seconds() <= config.SCHEDULER_INTERVAL:
             raise ValidationError(
                 _("Job interval is not a multiple of rq_scheduler's interval frequency: %(interval)ss"),
                 code="invalid",
@@ -434,13 +435,19 @@ def clean_cron_string(self):
             raise ValidationError({"cron_string": ValidationError(_(str(e)), code="invalid")})
 
     def clean(self):
+        if self.task_type not in TaskType.values:
+            raise ValidationError(
+                {"task_type": ValidationError(_("Invalid task type"), code="invalid")},
+            )
         self.clean_queue()
         self.clean_callable()
         if self.task_type == TaskType.CRON:
             self.clean_cron_string()
         if self.task_type == TaskType.REPEATABLE:
             self.clean_interval_unit()
             self.clean_result_ttl()
+        if self.task_type == TaskType.REPEATABLE and self.scheduled_time is None:
+            self.scheduled_time = timezone.now() + timedelta(seconds=2)
         if self.task_type == TaskType.ONCE and self.scheduled_time is None:
             raise ValidationError({"scheduled_time": ValidationError(_("Scheduled time is required"), code="invalid")})
         if self.task_type == TaskType.ONCE and self.scheduled_time < timezone.now():

scheduler/tests/test_task_types/test_repeatable_task.py

@@ -18,17 +18,38 @@ class TestRepeatableTask(BaseTestCases.TestSchedulableTask):
 
     def test_create_task_error(self):
         scheduled_time = timezone.now()
-
-        Task.objects.create(
+        task = Task.objects.create(
             name="konichiva_every_2s",
-            callable="chat.task_scheduler.konichiva_func",
-            task_type="REPEATABLE",
-            interval=2,
+            callable="scheduler.tests.jobs.test_args_kwargs",
+            task_type=TaskType.REPEATABLE,
+            interval=333,
             interval_unit="seconds",
             queue="default",
             enabled=True,
             scheduled_time=scheduled_time,
         )
+        self.assertEqual(task.name, "konichiva_every_2s")
+        self.assertEqual(task.callable, "scheduler.tests.jobs.test_args_kwargs")
+        self.assertEqual(task.task_type, TaskType.REPEATABLE)
+        self.assertEqual(task.interval, 333)
+        self.assertEqual(task.interval_unit, "seconds")
+
+    def test_create_task_without_scheduled_time(self):
+        task = Task.objects.create(
+            name="konichiva_every_2s",
+            callable="scheduler.tests.jobs.test_args_kwargs",
+            task_type=TaskType.REPEATABLE,
+            interval=33,
+            interval_unit="seconds",
+            queue="default",
+            enabled=True,
+        )
+        self.assertAlmostEqual(task.scheduled_time.timestamp(), timezone.now().timestamp(), delta=2)
+        self.assertEqual(task.name, "konichiva_every_2s")
+        self.assertEqual(task.callable, "scheduler.tests.jobs.test_args_kwargs")
+        self.assertEqual(task.task_type, TaskType.REPEATABLE)
+        self.assertEqual(task.interval, 33)
+        self.assertEqual(task.interval_unit, "seconds")
 
     def test_unschedulable_old_job(self):
         job = task_factory(self.task_type, scheduled_time=timezone.now() - timedelta(hours=1), repeat=0)
@@ -67,16 +88,6 @@ def test_clean_too_frequent(self):
         with self.assertRaises(ValidationError):
             job.clean_interval_unit()
 
-    @override_settings(SCHEDULER_CONFIG=SchedulerConfiguration(SCHEDULER_INTERVAL=10))
-    def test_clean_not_multiple(self):
-        job = task_factory(self.task_type)
-        job.queue = self.queue_name
-        job.callable = "scheduler.tests.jobs.test_job"
-        job.interval = 121
-        job.interval_unit = "seconds"
-        with self.assertRaises(ValidationError):
-            job.clean_interval_unit()
-
     def test_clean_short_result_ttl(self):
         task = task_factory(self.task_type)
         task.queue = self.queue_name