Merge branch 'v2'

# Conflicts:
#	docs/changelog.md
#	poetry.lock
#	pyproject.toml
#	scheduler/models/old_scheduled_task.py
#	scheduler/tests/test_old_models/test_old_repeatable_task.py

Author: cunla

docs/changelog.md

@@ -18,6 +18,7 @@
 ### 🐛 Bug Fixes
 
 - Support for valkey sentinel configuration @amirreza8002 (#191)
+- Fix issue with task being scheduled despite being already scheduled #202
 
 ## v2.1.0 🌈
 

scheduler/rq_classes.py

@@ -267,7 +267,7 @@ def reschedule_all_jobs():
         for model_name in MODEL_NAMES:
             model = apps.get_model(app_label="scheduler", model_name=model_name)
             enabled_jobs = model.objects.filter(enabled=True)
-            unscheduled_jobs = filter(lambda j: j.ready_for_schedule(), enabled_jobs)
+            unscheduled_jobs = filter(lambda j: j._ready_for_schedule(), enabled_jobs)
             for item in unscheduled_jobs:
                 logger.debug(f"Rescheduling {str(item)}")
                 item.save()

scheduler/tests/test_old_models/test_old_repeatable_task.py

@@ -150,12 +150,12 @@ def test_repeat_old_job_remaining(self):
 
     def test_repeat_none_interval_2_min(self):
         base_time = timezone.now()
-        job = old_task_factory(self.TaskModelClass, scheduled_time=base_time - timedelta(minutes=29), repeat=None)
-        job.interval = 120
-        job.interval_unit = "seconds"
-        job.schedule()
-        self.assertTrue(job.scheduled_time > base_time)
-        self.assertTrue(job.is_scheduled())
+        task = old_task_factory(self.TaskModelClass, scheduled_time=base_time - timedelta(minutes=29), repeat=None)
+        task.interval = 120
+        task.interval_unit = "seconds"
+        task.schedule()
+        self.assertTrue(task.scheduled_time > base_time)
+        self.assertTrue(task.is_scheduled())
 
     def test_check_rescheduled_after_execution(self):
         task = old_task_factory(self.TaskModelClass, scheduled_time=timezone.now() + timedelta(seconds=1), repeat=10)

scheduler/tests/test_old_models/test_old_task_model.py

@@ -96,7 +96,7 @@ def test_is_schedulable_already_scheduled(self):
             task = old_task_factory(
                 self.TaskModelClass,
             )
-            task.schedule()
+            task.save(schedule_job=True)
             self.assertTrue(task.is_scheduled())
 
         def test_is_schedulable_disabled(self):
@@ -151,7 +151,7 @@ def test_schedule2(self):
             task.queue = list(settings.QUEUES)[0]
             task.enabled = False
             task.scheduled_time = timezone.now() + timedelta(minutes=1)
-            self.assertFalse(task.schedule())
+            self.assertFalse(task._schedule())
 
         def test_delete_and_unschedule(self):
             task = old_task_factory(