Fixed geographic scope during singals import.

Author: dmytrotsko

src/signals/migrations/0016_remove_signal_geographic_scope_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.10 on 2024-06-10 13:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('signals', '0015_signal_from_date_signal_to_date_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='signal',
+            name='geographic_scope',
+        ),
+        migrations.AddField(
+            model_name='signal',
+            name='geographic_scope',
+            field=models.ForeignKey(help_text='Geographic Scope', null=True, on_delete=django.db.models.deletion.SET_NULL, to='signals.geographicscope'),
+        ),
+    ]

src/signals/models.py

@@ -368,9 +368,11 @@ class Signal(TimeStampedModel):
         help_text=_('Signal links'),
         related_name="signals"
     )
-    geographic_scope: models.ManyToManyField = models.ManyToManyField(
+    geographic_scope: models.ForeignKey = models.ForeignKey(
         'signals.GeographicScope',
-        help_text=_('Geographic Scope')
+        help_text=_('Geographic Scope'),
+        on_delete=models.SET_NULL,
+        null=True
     )
     available_geography: models.ManyToManyField = models.ManyToManyField(
         'signals.Geography',

src/signals/resources.py

@@ -16,6 +16,7 @@
     Signal,
     SignalCategory,
     SignalType,
+    GeographicScope,
 )
 
 
@@ -144,6 +145,11 @@ class SignalResource(resources.ModelResource):
         attribute='temporal_scope_end',
         column_name='Temporal Scope End',
     )
+    geographic_scope = Field(
+        attribute='geographic_scope',
+        column_name='Geographic Scope',
+        widget=widgets.ForeignKeyWidget(GeographicScope, field='name'),
+    )
     # gender_breakdown = Field(attribute='gender_breakdown', column_name='Gender Breakdown')
     # race_breakdown = Field(attribute='race_breakdown', column_name='Race Breakdown')
     # age_breakdown = Field(attribute='age_breakdown', column_name='Age Breakdown')
@@ -177,6 +183,7 @@ class Meta:
             'missingness',
             'temporal_scope_start',
             'temporal_scope_end',
+            'geographic_scope',
             # 'gender_breakdown',
             # 'race_breakdown',
             # 'age_breakdown',
@@ -204,6 +211,7 @@ def before_import_row(self, row, **kwargs) -> None:
         self.process_license(row)
         self.process_signal_category(row)
         self.process_signal_type(row)
+        self.process_geographic_scope(row)
         self.process_demographic_scope(row)
 
     def is_url_in_domain(self, url, domain) -> Any:
@@ -337,6 +345,11 @@ def process_signal_type(self, row):
             signal_type, created = SignalType.objects.get_or_create(name=row['Signal Type'])
             row['Signal Type'] = signal_type
 
+    def process_geographic_scope(self, row):
+        if row['Geographic Scope']:
+            geographic_scope, created = GeographicScope.objects.get_or_create(name=row['Geographic Scope'])
+            row['Geographic Scope'] = geographic_scope
+
     def after_import_row(self, row, row_result, **kwargs) -> None:
         """
         Post-processes each row after importing.