Queue name field added

Author: AngryLawyer

django_dbq/management/commands/create_job.py

@@ -16,7 +16,10 @@ class Command(BaseCommand):
 
     option_list = BaseCommand.option_list + (
         make_option('--workspace',
-                    help='JSON-formatted initial command workspace'),)
+                    help='JSON-formatted initial command workspace'),
+        make_option('--queue_name',
+                    help='A specific queue to add this job to'),
+    )
 
     def handle(self, *args, **options):
         if len(args) != 1:
@@ -30,5 +33,15 @@ def handle(self, *args, **options):
         if workspace:
             workspace = json.loads(workspace)
 
-        job = Job.objects.create(name=name, workspace=workspace)
+        queue_name = options['queue_name']
+
+        kwargs = {
+            'name': name,
+            'workspace': workspace,
+        }
+
+        if queue_name:
+            kwargs['queue_name'] = queue_name
+
+        job = Job.objects.create(**kwargs)
         self.stdout.write('Created job: "%s", id=%s' % (job.name, job.pk))

django_dbq/migrations/0001_initial.py

@@ -9,34 +9,36 @@ class Migration(SchemaMigration):
 
     def forwards(self, orm):
         # Adding model 'Job'
-        db.create_table(u'core_job', (
+        db.create_table(u'django_dbq_job', (
             ('id', self.gf('uuidfield.fields.UUIDField')(unique=True, max_length=32, primary_key=True, db_index=True)),
             ('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='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)),
+            ('queue_name', self.gf('django.db.models.fields.CharField')(default='default', max_length=20, db_index=True)),
         ))
-        db.send_create_signal(u'core', ['Job'])
+        db.send_create_signal(u'django_dbq', ['Job'])
 
 
     def backwards(self, orm):
         # Deleting model 'Job'
-        db.delete_table(u'core_job')
+        db.delete_table(u'django_dbq_job')
 
 
     models = {
-        u'core.job': {
+        u'django_dbq.job': {
             'Meta': {'ordering': "['-created']", 'object_name': 'Job'},
             'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
             'id': ('uuidfield.fields.UUIDField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True', 'db_index': 'True'}),
             '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'}),
+            'queue_name': ('django.db.models.fields.CharField', [], {'default': "'default'", '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 = ['django_dbq']

django_dbq/models.py

@@ -14,7 +14,7 @@ class JobManager(models.Manager):
 
     def get_ready_or_none(self, max_retries=3):
         """
-        Get a job in state READY. Supports retrying in case of database deadlock
+        Get a job in state READY or NEW. Supports retrying in case of database deadlock
 
         See https://dev.mysql.com/doc/refman/5.0/en/innodb-deadlocks.html
 
@@ -50,6 +50,7 @@ class Job(models.Model):
     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)
+    queue_name = models.CharField(max_length=20, default='default', db_index=True)
 
     class Meta:
         ordering = ['-created']

django_dbq/tests.py

@@ -36,13 +36,20 @@ def test_create_job(self):
         call_command('create_job', 'testjob', stdout=StringIO())
         job = Job.objects.get()
         self.assertEqual(job.name, 'testjob')
+        self.assertEqual(job.queue_name, 'default')
 
     def test_create_job_with_workspace(self):
         workspace = '{"test": "test"}'
         call_command('create_job', 'testjob', workspace=workspace, stdout=StringIO())
         job = Job.objects.get()
         self.assertEqual(job.workspace, {'test': 'test'})
 
+    def test_create_job_with_queue_name(self):
+        call_command('create_job', 'testjob', queue_name='lol', stdout=StringIO())
+        job = Job.objects.get()
+        self.assertEqual(job.name, 'testjob')
+        self.assertEqual(job.queue_name, 'lol')
+
     def test_errors_raised_correctly(self):
         with self.assertRaises(CommandError):
             call_command('create_job', stdout=StringIO())

testsettings.py

@@ -7,6 +7,7 @@
 
 INSTALLED_APPS = (
     'django_dbq',
+    'south'
 )
 
 MIDDLEWARE_CLASSES = (