use default=dict for JSONField model fields

austinjhunt · Nov 26, 2022 · 57c2183 · 57c2183
1 parent f84d38c
commit 57c2183
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/...eb/migrations/0010_alter_administrationsettings_google_oauth_json_credentials_and_more.py b/...eb/migrations/0010_alter_administrationsettings_google_oauth_json_credentials_and_more.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.1.3 on 2022-11-26 20:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('web', '0009_administrationsettings_onedrive_email_notification_template_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='administrationsettings',
+            name='google_oauth_json_credentials',
+            field=models.JSONField(blank=True, default=dict, null=True, verbose_name='Google OAuth Credentials - JSON (Copy and Paste)'),
+        ),
+        migrations.AlterField(
+            model_name='administrationsettings',
+            name='google_service_account_auth_json_credentials',
+            field=models.JSONField(blank=True, default=dict, null=True, verbose_name='Google Service Account Credentials - JSON (Copy and Paste)'),
+        ),
+        migrations.AlterField(
+            model_name='migration',
+            name='google_source',
+            field=models.JSONField(blank=True, default=dict, null=True, verbose_name='JSON object including at minimum id, name, or type as keys describing the source folder or shared drive being migrated. Type can be "shared_drive" or "folder"'),
+        ),
+        migrations.AlterField(
+            model_name='migration',
+            name='source_data_scan_result',
+            field=models.JSONField(blank=True, default=dict, null=True, verbose_name='High-level stats about the migration to be run based on scanning the source data to be migrated'),
+        ),
+        migrations.AlterField(
+            model_name='migration',
+            name='target',
+            field=models.JSONField(blank=True, default=dict, null=True, verbose_name='Information describing either a SharePoint Site Folder in a Document Library or a OneDrive Folder for the user OneDrive account'),
+        ),
+    ]
diff --git a/GoogleSharePointMigrationAssistant/web/models.py b/GoogleSharePointMigrationAssistant/web/models.py
@@ -39,13 +39,15 @@ class STATES(models.TextChoices):
     end_timestamp = models.DateTimeField(blank=True, null=True)
 
     google_source = models.JSONField(
+        default=dict,
         null=True, blank=True, verbose_name=(
             'JSON object including at minimum id, name, '
             'or type as keys describing the source folder '
             'or shared drive being migrated. Type can be '
             '"shared_drive" or "folder"')
     )
     source_data_scan_result = models.JSONField(
+        default=dict,
         null=True, blank=True, 
         verbose_name=(
             'High-level stats about the migration '
@@ -67,7 +69,7 @@ class STATES(models.TextChoices):
         default=False, verbose_name='Whether a post-completion notification has been sent')
 
     target = models.JSONField(
-        blank=True, null=True, default={}, 
+        blank=True, null=True, default=dict, 
         verbose_name=(
             'Information describing either a SharePoint '
             'Site Folder in a Document Library or a OneDrive '
@@ -174,8 +176,10 @@ class Meta:
 
     # For OAuth-driven migrations (user-driven)
     google_oauth_json_credentials = models.JSONField(
+        default=dict,
         null=True, blank=True, verbose_name='Google OAuth Credentials - JSON (Copy and Paste)')
     google_service_account_auth_json_credentials = models.JSONField(
+        default=dict,
         null=True, blank=True, verbose_name='Google Service Account Credentials - JSON (Copy and Paste)')
 
     # SMTP-based email notifications.