Truncates scheduler job table. Sets defaults for model json fields.

gwu-libraries · Jul 25, 2018 · 1c12605 · 1c12605
1 parent 451fbc5
commit 1c12605
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/sfm/ui/migrations/0021_auto_20180712_1310.py b/sfm/ui/migrations/0021_auto_20180712_1310.py
@@ -80,7 +80,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='export',
             name='errors',
-            field=jsonfield.fields.JSONField(blank=True),
+            field=jsonfield.fields.JSONField(blank=True, default=[]),
         ),
         migrations.AlterField(
             model_name='export',
@@ -95,7 +95,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='export',
             name='infos',
-            field=jsonfield.fields.JSONField(blank=True),
+            field=jsonfield.fields.JSONField(blank=True, default=[]),
         ),
         migrations.AlterField(
             model_name='export',
@@ -105,17 +105,17 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='export',
             name='warnings',
-            field=jsonfield.fields.JSONField(blank=True),
+            field=jsonfield.fields.JSONField(blank=True, default=[]),
         ),
         migrations.AlterField(
             model_name='harvest',
             name='errors',
-            field=jsonfield.fields.JSONField(blank=True),
+            field=jsonfield.fields.JSONField(blank=True, default=[]),
         ),
         migrations.AlterField(
             model_name='harvest',
             name='infos',
-            field=jsonfield.fields.JSONField(blank=True),
+            field=jsonfield.fields.JSONField(blank=True, default=[]),
         ),
         migrations.AlterField(
             model_name='harvest',
@@ -125,17 +125,17 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='harvest',
             name='token_updates',
-            field=jsonfield.fields.JSONField(blank=True),
+            field=jsonfield.fields.JSONField(blank=True, default={}),
         ),
         migrations.AlterField(
             model_name='harvest',
             name='uids',
-            field=jsonfield.fields.JSONField(blank=True),
+            field=jsonfield.fields.JSONField(blank=True, default={}),
         ),
         migrations.AlterField(
             model_name='harvest',
             name='warnings',
-            field=jsonfield.fields.JSONField(blank=True),
+            field=jsonfield.fields.JSONField(blank=True, default=[]),
         ),
         migrations.AlterField(
             model_name='historicalcollection',

diff --git a/sfm/ui/migrations/0022_auto_20180725_0745.py b/sfm/ui/migrations/0022_auto_20180725_0745.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.0.7 on 2018-07-25 11:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ui', '0021_auto_20180712_1310'),
+    ]
+
+    operations = [
+        migrations.RunSQL('delete from apscheduler_jobs;')
+    ]
diff --git a/sfm/ui/models.py b/sfm/ui/models.py
@@ -645,11 +645,11 @@ class Harvest(models.Model):
     date_started = models.DateTimeField(blank=True, null=True, db_index=True)
     date_ended = models.DateTimeField(blank=True, null=True)
     date_updated = models.DateTimeField(auto_now=True)
-    infos = JSONField(blank=True)
-    warnings = JSONField(blank=True)
-    errors = JSONField(blank=True)
-    token_updates = JSONField(blank=True)
-    uids = JSONField(blank=True)
+    infos = JSONField(blank=True, default=[])
+    warnings = JSONField(blank=True, default=[])
+    errors = JSONField(blank=True, default=[])
+    token_updates = JSONField(blank=True, default={})
+    uids = JSONField(blank=True, default={})
     warcs_count = models.PositiveIntegerField(default=0)
     warcs_bytes = models.BigIntegerField(default=0)
     # These identify who is doing the harvest
@@ -803,9 +803,9 @@ class Export(models.Model):
     item_date_end = models.DateTimeField(blank=True, null=True)
     harvest_date_start = models.DateTimeField(blank=True, null=True)
     harvest_date_end = models.DateTimeField(blank=True, null=True)
-    infos = JSONField(blank=True)
-    warnings = JSONField(blank=True)
-    errors = JSONField(blank=True)
+    infos = JSONField(blank=True, default=[])
+    warnings = JSONField(blank=True, default=[])
+    errors = JSONField(blank=True, default=[])
     # These identify who is doing the harvest
     service = models.CharField(max_length=255, null=True)
     host = models.CharField(max_length=255, null=True)