Default to empty string when key missing

uktrade · Oct 10, 2024 · 6a0254f · 6a0254f
1 parent 65f3fca
commit 6a0254f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 38 deletions.
diff --git a/...hub/company_activity/migrations/0006_alter_great_actor_dit_blacklisted_reason_and_more.py b/...hub/company_activity/migrations/0006_alter_great_actor_dit_blacklisted_reason_and_more.py
diff --git a/datahub/company_activity/models/great.py b/datahub/company_activity/models/great.py
@@ -27,7 +27,7 @@ class Great(models.Model):
     attributed_to_type = models.CharField(max_length=MAX_LENGTH)
     attributed_to_id = models.CharField(max_length=MAX_LENGTH)
 
-    url = models.CharField(max_length=MAX_LENGTH, default='')
+    url = models.CharField(max_length=MAX_LENGTH)
     meta_action_name = models.CharField(max_length=MAX_LENGTH)
     meta_template_id = models.CharField(max_length=MAX_LENGTH)
     meta_email_address = models.CharField(max_length=MAX_LENGTH)
@@ -53,11 +53,11 @@ class Great(models.Model):
     # This is a duplicate of opportunities but in the form of a '\n' delimited string
     data_opportunity_urls = models.CharField(max_length=MAX_LENGTH)
 
-    actor_type = models.CharField(max_length=MAX_LENGTH, default='')
+    actor_type = models.CharField(max_length=MAX_LENGTH, null=True)
     actor_id = models.IntegerField(null=True)
-    actor_dit_email_address = models.CharField(max_length=MAX_LENGTH, default='')
+    actor_dit_email_address = models.CharField(max_length=MAX_LENGTH, null=True)
     actor_dit_is_blacklisted = models.BooleanField(null=True)
     actor_dit_is_whitelisted = models.BooleanField(null=True)
-    actor_dit_blacklisted_reason = models.CharField(max_length=MAX_LENGTH, default='')
+    actor_dit_blacklisted_reason = models.CharField(max_length=MAX_LENGTH, null=True)
 
     created_on = models.DateTimeField(auto_now_add=True)
diff --git a/datahub/company_activity/tasks/ingest_great_data.py b/datahub/company_activity/tasks/ingest_great_data.py
@@ -88,7 +88,7 @@ def json_to_model(self, jsn):
         actor_blacklisted_reason = str(actor.get('dit:blackListedReason', '') or '')
         values = {
             'published': obj['published'],
-            'url': obj.get('url', ''),
+            'url': str(obj.get('url', '') or ''),
 
             'attributed_to_type': attributed_to_type,
             'attributed_to_id': attributed_to_id,