fix duplicate violations on recurring tasks

Author: knifecake

steady_queue/__init__.py

@@ -1,7 +1,7 @@
 from datetime import timedelta
 from typing import Optional
 
-VERSION = (0, 1, "0b6")
+VERSION = (0, 1, "0b7")
 
 __version__ = ".".join(map(str, VERSION))
 

steady_queue/models/recurring_execution.py

@@ -1,5 +1,3 @@
-from contextlib import contextmanager
-
 from django.db import models
 from django_tasks import TaskResult
 
@@ -10,13 +8,10 @@ class RecurringExecutionQuerySet(ExecutionQuerySet):
     def clearable(self):
         return self.filter(job__isnull=True)
 
-    def create_or_insert(self, **kwargs):
-        # TODO: wtf
-        self.create(**kwargs)
-
-    @contextmanager
     def record(self, task_result: TaskResult, task, run_at):
-        self.create_or_insert(job_id=task_result.id, task=task, run_at=run_at)
+        self.update_or_create(
+            task=task, run_at=run_at, defaults={"job_id": task_result.id}
+        )
 
     def clear_in_batches(self, batch_size=500):
         while True:

steady_queue/models/recurring_task.py

@@ -114,10 +114,10 @@ def enqueue_and_record(self, run_at: datetime):
             args, kwargs = Arguments.deserialize_args_and_kwargs(
                 self.arguments["arguments"]
             )
-            result = self.job_class.using(
+            task_result = self.job_class.using(
                 queue_name=self.queue_name, priority=self.priority
             ).enqueue(*args, **kwargs)
-            RecurringExecution.objects.record(result, self, run_at)
+            RecurringExecution.objects.record(task_result, self, run_at)
 
     @property
     def previous_time(self) -> datetime: