From 3ca34348de1770790afda0eb3e3d6aa3d6afdf4e Mon Sep 17 00:00:00 2001
From: olivierdalang <olivier.dalang@gmail.com>
Date: Tue, 12 Sep 2023 08:58:17 +0200
Subject: [PATCH] fix force execute schedule admin action not working

---
 django_toosimple_q/admin.py             |  2 +-
 django_toosimple_q/tests/tests_admin.py | 33 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/django_toosimple_q/admin.py b/django_toosimple_q/admin.py
index 59bdc85..ed1f00d 100644
--- a/django_toosimple_q/admin.py
+++ b/django_toosimple_q/admin.py
@@ -166,7 +166,7 @@ def next_due_(self, obj):
     @admin.display(description="Force run schedule")
     def action_force_run(self, request, queryset):
         for schedule_exec in queryset:
-            schedule_exec.schedule.execute(force=True)
+            schedule_exec.schedule.execute(dues=[None])
         self.message_user(
             request,
             f"{queryset.count()} schedules successfully executed",
diff --git a/django_toosimple_q/tests/tests_admin.py b/django_toosimple_q/tests/tests_admin.py
index 947616b..0afba61 100644
--- a/django_toosimple_q/tests/tests_admin.py
+++ b/django_toosimple_q/tests/tests_admin.py
@@ -43,6 +43,39 @@ def a():
         )
         self.assertEqual(response.status_code, 200)
 
+    def test_schedule_admin_force_action(self):
+        """Check if he force execute schedule action works"""
+
+        @schedule_task(cron="13 0 1 1 *")
+        @register_task(name="a")
+        def a():
+            return 2
+
+        self.assertSchedule("a", None)
+        self.assertQueue(0, state=TaskExec.States.SUCCEEDED)
+        self.assertQueue(0, state=TaskExec.States.QUEUED)
+
+        management.call_command("worker", "--until_done")
+
+        self.assertSchedule("a", ScheduleExec.States.ACTIVE)
+        self.assertQueue(0, state=TaskExec.States.SUCCEEDED)
+        self.assertQueue(0, state=TaskExec.States.QUEUED)
+
+        data = {
+            "action": "action_force_run",
+            "_selected_action": ScheduleExec.objects.get(name="a").pk,
+        }
+        response = self.client.post(
+            "/admin/toosimpleq/scheduleexec/", data, follow=True
+        )
+        self.assertEqual(response.status_code, 200)
+
+        management.call_command("worker", "--until_done")
+
+        self.assertSchedule("a", ScheduleExec.States.ACTIVE)
+        self.assertQueue(1, state=TaskExec.States.SUCCEEDED)
+        self.assertQueue(0, state=TaskExec.States.QUEUED)
+
     def test_task_admin_requeue_action(self):
         """Check if the requeue action works"""