Jobs now have a 'new' state

Author: AngryLawyer

django_dbq/migrations/0001_initial.py

@@ -14,7 +14,7 @@ def forwards(self, orm):
             ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, db_index=True, blank=True)),
             ('modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
             ('name', self.gf('django.db.models.fields.CharField')(max_length=100)),
-            ('state', self.gf('django.db.models.fields.CharField')(default='READY', max_length=20, db_index=True)),
+            ('state', self.gf('django.db.models.fields.CharField')(default='NEW', max_length=20, db_index=True)),
             ('next_task', self.gf('django.db.models.fields.CharField')(max_length=100, blank=True)),
             ('workspace', self.gf('jsonfield.fields.JSONField')(null=True)),
         ))
@@ -34,9 +34,9 @@ def backwards(self, orm):
             'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'next_task': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'READY'", 'max_length': '20', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NEW'", 'max_length': '20', 'db_index': 'True'}),
             'workspace': ('jsonfield.fields.JSONField', [], {'null': 'True'})
         }
     }
 
-    complete_apps = ['core']
+    complete_apps = ['core']

django_dbq/models.py

@@ -31,7 +31,7 @@ def get_ready_or_none(self, max_retries=3):
         retries_left = max_retries
         while True:
             try:
-                return self.select_for_update().filter(state=Job.STATES.READY).first()
+                return self.select_for_update().filter(state__in=(Job.STATES.READY, Job.STATES.NEW)).first()
             except Exception as e:
                 if retries_left == 0:
                     raise
@@ -41,13 +41,13 @@ def get_ready_or_none(self, max_retries=3):
 
 class Job(models.Model):
 
-    STATES = Choices("READY", "PROCESSING", "FAILED", "COMPLETE")
+    STATES = Choices("NEW", "READY", "PROCESSING", "FAILED", "COMPLETE")
 
     id = uuidfield.UUIDField(primary_key=True, auto=True, db_index=True)
     created = models.DateTimeField(auto_now_add=True, db_index=True)
     modified = models.DateTimeField(auto_now=True)
     name = models.CharField(max_length=100)
-    state = models.CharField(max_length=20, choices=STATES, default=STATES.READY, db_index=True)
+    state = models.CharField(max_length=20, choices=STATES, default=STATES.NEW, db_index=True)
     next_task = models.CharField(max_length=100, blank=True)
     workspace = JSONField(null=True)
 

django_dbq/tests.py

@@ -56,7 +56,7 @@ class JobTestCase(TestCase):
 
     def test_create_job(self):
         job = Job(name='testjob')
-        self.assertEqual(job.state, Job.STATES.READY)
+        self.assertEqual(job.state, Job.STATES.NEW)
 
     def test_get_next_ready_job(self):
         self.assertTrue(Job.objects.get_ready_or_none() is None)
@@ -67,6 +67,18 @@ def test_get_next_ready_job(self):
 
         self.assertEqual(Job.objects.get_ready_or_none(), expected)
 
+    def test_get_next_ready_job_created(self):
+        """
+        Created jobs should be picked too
+        """
+        self.assertTrue(Job.objects.get_ready_or_none() is None)
+
+        Job.objects.create(name='testjob', state=Job.STATES.NEW, created=datetime.now())
+        Job.objects.create(name='testjob', state=Job.STATES.PROCESSING, created=datetime.now())
+        expected = Job.objects.create(name='testjob', state=Job.STATES.NEW, created=datetime.now() - timedelta(minutes=1))
+
+        self.assertEqual(Job.objects.get_ready_or_none(), expected)
+
 
 @override_settings(JOBS={'testjob': {'tasks': ['a', 'b', 'c']}})
 class JobTaskTestCase(TestCase):