Fixed Signals import

Author: dmytrotsko

src/signals/admin.py

@@ -3,7 +3,7 @@
 from django.contrib import admin
 from import_export.admin import ImportExportModelAdmin
 
-from signals.resources import SignalResource, SignalBaseResource
+from signals.resources import SignalResource, SignalBaseResource, OtherEndpointSignalResource
 
 
 from signals.models import (
@@ -14,6 +14,7 @@
     Pathogen,
     SeverityPyramidRung,
     Signal,
+    OtherEndointSignal,
     SignalType,
     SignalGeography,
     GeographyUnit,
@@ -150,6 +151,35 @@ class SignalAdmin(ImportExportModelAdmin):
     resource_classes: list[type[SignalResource]] = [SignalResource, SignalBaseResource]
 
 
+@admin.register(OtherEndointSignal)
+class OtherEndpointsSignalAdmin(ImportExportModelAdmin):
+    """
+    Admin interface for managing signal objects.
+    """
+
+    list_display: tuple[
+        Literal["name"],
+        Literal["signal_type"],
+        Literal["format_type"],
+        Literal["category"],
+        Literal["geographic_scope"],
+    ] = ("name", "signal_type", "format_type", "category", "geographic_scope")
+    search_fields: tuple[
+        Literal["name"],
+        Literal["signal_type__name"],
+        Literal["format_type__name"],
+        Literal["category__name"],
+        Literal["geographic_scope__name"],
+    ] = (
+        "name",
+        "signal_type__name",
+        "format_type__name",
+        "category__name",
+        "geographic_scope__name",
+    )
+    resource_classes: list[type[SignalResource]] = [OtherEndpointSignalResource]
+
+
 @admin.register(SignalGeography)
 class SignalGeographyAdmin(admin.ModelAdmin):
     """

src/signals/migrations/0018_otherendointsignal.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.0.7 on 2025-03-27 18:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('signals', '0017_severitypyramidrung_display_order_number'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OtherEndointSignal',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Other Endpoint Signal',
+                'verbose_name_plural': 'Other Endpoint Signals',
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('signals.signal',),
+        ),
+    ]

src/signals/models.py

@@ -575,6 +575,13 @@ def get_display_name(self):
             return self.name
 
 
+class OtherEndointSignal(Signal):
+    class Meta:
+        proxy = True
+        verbose_name = "Other Endpoint Signal"
+        verbose_name_plural = "Other Endpoint Signals"
+
+
 class SignalsDbView(models.Model):
     id = models.BigIntegerField(primary_key=True)
     name = models.CharField(max_length=255)

src/signals/resources.py

@@ -155,9 +155,14 @@ def process_available_geographies(row) -> None:
                     "display_order_number": max_display_order_number + 1,
                 },
             )
-            signal = Signal.objects.get(
-                name=row["Indicator"], source=row["Source Subdivision"]
-            )
+            try:
+                signal = Signal.objects.get(
+                    name=row["Indicator"], source=row["Source Subdivision"]
+                )
+            except KeyError:
+                signal = Signal.objects.get(
+                    name=row["Signal"], source=row["Source Subdivision"]
+                )
             signal_geography, _ = SignalGeography.objects.get_or_create(
                 geography=geography_instance, signal=signal
             )
@@ -167,20 +172,20 @@ def process_available_geographies(row) -> None:
 
 
 def process_base(row) -> None:
-    if row["Indicator BaseName"]:
+    if row["Signal BaseName"]:
         source: SourceSubdivision = SourceSubdivision.objects.get(
             name=row["Source Subdivision"]
         )
         base_signal: Signal = Signal.objects.get(
-            name=row["Indicator BaseName"], source=source
+            name=row["Signal BaseName"], source=source
         )
         row["base"] = base_signal.id
 
 
 class ModelResource(resources.ModelResource):
     def get_field_names(self):
         names = []
-        for field in self.get_fields():
+        for field in list(self.fields.values()):
             names.append(self.get_field_name(field))
         return names
 
@@ -213,7 +218,7 @@ class SignalBaseResource(ModelResource):
     Resource class for importing Signals base.
     """
 
-    name = Field(attribute="name", column_name="Indicator")
+    name = Field(attribute="name", column_name="Signal")
     display_name = Field(attribute="display_name", column_name="Name")
     base = Field(
         attribute="base",
@@ -241,6 +246,200 @@ class SignalResource(ModelResource):
     Resource class for importing and exporting Signal models
     """
 
+    name = Field(attribute="name", column_name="Signal")
+    display_name = Field(attribute="display_name", column_name="Name")
+    member_name = Field(attribute="member_name", column_name="Member API Name")
+    member_short_name = Field(
+        attribute="member_short_name", column_name="Member Short Name"
+    )
+    member_description = Field(
+        attribute="member_description", column_name="Member Description"
+    )
+    pathogen = Field(
+        attribute="pathogen",
+        column_name="Pathogen/\nDisease Area",
+        widget=widgets.ManyToManyWidget(Pathogen, field="name", separator=","),
+    )
+    signal_type = Field(
+        attribute="signal_type",
+        column_name="Indicator Type",
+        widget=widgets.ForeignKeyWidget(SignalType, field="name"),
+    )
+    active = Field(attribute="active", column_name="Active")
+    description = Field(attribute="description", column_name="Description")
+    short_description = Field(
+        attribute="short_description", column_name="Short Description"
+    )
+    format_type = Field(
+        attribute="format_type",
+        column_name="Format",
+        widget=widgets.ForeignKeyWidget(FormatType, field="name"),
+    )
+    time_type = Field(attribute="time_type", column_name="Time Type")
+    time_label = Field(attribute="time_label", column_name="Time Label")
+    reporting_cadence = Field(
+        attribute="reporting_cadence", column_name="Reporting Cadence"
+    )
+    typical_reporting_lag = Field(
+        attribute="typical_reporting_lag", column_name="Typical Reporting Lag"
+    )
+    typical_revision_cadence = Field(
+        attribute="typical_revision_cadence", column_name="Typical Revision Cadence"
+    )
+    demographic_scope = Field(
+        attribute="demographic_scope", column_name="Population"
+    )
+    severity_pyramid_rung = Field(
+        attribute="severity_pyramid_rung",
+        column_name="Surveillance Categories",
+        widget=widgets.ForeignKeyWidget(SeverityPyramidRung),
+    )
+    category = Field(
+        attribute="category",
+        column_name="Category",
+        widget=widgets.ForeignKeyWidget(Category, "name"),
+    )
+    geographic_scope = Field(
+        attribute="geographic_scope",
+        column_name="Geographic Coverage",
+        widget=widgets.ForeignKeyWidget(GeographicScope),
+    )
+    available_geographies = Field(
+        attribute="available_geography",
+        column_name="Geographic Levels",
+        widget=widgets.ManyToManyWidget(Geography, field="name", separator=","),
+    )
+    temporal_scope_start = Field(
+        attribute="temporal_scope_start", column_name="Temporal Scope Start"
+    )
+    temporal_scope_start_note = Field(
+        attribute="temporal_scope_start_note", column_name="Temporal Scope Start Note"
+    )
+    temporal_scope_end = Field(
+        attribute="temporal_scope_end", column_name="Temporal Scope End"
+    )
+    temporal_scope_end_note = Field(
+        attribute="temporal_scope_end_note", column_name="Temporal Scope End Note"
+    )
+    is_smoothed = Field(attribute="is_smoothed", column_name="Is Smoothed")
+    is_weighted = Field(attribute="is_weighted", column_name="Is Weighted")
+    is_cumulative = Field(attribute="is_cumulative", column_name="Is Cumulative")
+    has_stderr = Field(attribute="has_stderr", column_name="Has StdErr")
+    has_sample_size = Field(attribute="has_sample_size", column_name="Has Sample Size")
+    high_values_are = Field(attribute="high_values_are", column_name="High Values Are")
+    source = Field(
+        attribute="source",
+        column_name="Source Subdivision",
+        widget=widgets.ForeignKeyWidget(SourceSubdivision, field="name"),
+    )
+    data_censoring = Field(attribute="data_censoring", column_name="Data Censoring")
+    missingness = Field(attribute="missingness", column_name="Missingness")
+    organization_access_list = Field(
+        attribute="organization_access_list", column_name="Who may access this indicator?"
+    )
+    organization_sharing_list = Field(
+        attribute="organization_sharing_list",
+        column_name="Who may be told about this indicator?",
+    )
+    license = Field(attribute="license", column_name="Data Use Terms")
+    restrictions = Field(attribute="restrictions", column_name="Use Restrictions")
+    signal_set = Field(
+        attribute="signal_set",
+        column_name="Indicator Set",
+        widget=widgets.ForeignKeyWidget(SignalSet, field="name"),
+    )
+
+    class Meta:
+        model = Signal
+        fields: list[str] = [
+            "name",
+            "display_name",
+            "member_name",
+            "member_short_name",
+            "member_description",
+            "pathogen",
+            "signal_type",
+            "active",
+            "description",
+            "short_description",
+            "time_label",
+            "reporting_cadence",
+            "typical_reporting_lag",
+            "typical_revision_cadence",
+            "demographic_scope",
+            "category",
+            "geographic_scope",
+            "available_geographies",
+            "temporal_scope_start",
+            "temporal_scope_start_note",
+            "temporal_scope_end",
+            "temporal_scope_end_note",
+            "is_smoothed",
+            "is_weighted",
+            "is_cumulative",
+            "has_stderr",
+            "has_sample_size",
+            "high_values_are",
+            "source",
+            "data_censoring",
+            "missingness",
+            "organization_access_list",
+            "organization_sharing_list",
+            "license",
+            "restrictions",
+            "time_type",
+            "signal_set",
+            "format_type",
+            "severity_pyramid_rung",
+        ]
+        import_id_fields: list[str] = ["name", "source"]
+        store_instance = True
+        skip_unchanged = True
+
+    def before_import_row(self, row, **kwargs) -> None:
+        fix_boolean_fields(row)
+        process_pathogen(row)
+        process_signal_type(row)
+        process_format_type(row)
+        process_severity_pyramid_rungs(row)
+        process_category(row)
+        process_geographic_scope(row)
+        process_source(row)
+        process_links(row, dua_column_name="Link to DUA", link_column_name="Link")
+        if not row.get("Indicator Set"):
+            row["Indicator Set"] = None
+        if not row.get("Source Subdivision"):
+            row["Source Subdivision"] = None
+
+    def skip_row(self, instance, original, row, import_validation_errors=None):
+        if not row["Include in indicator app"]:
+            try:
+                signal = Signal.objects.get(
+                    name=row["Signal"], source=row["Source Subdivision"]
+                )
+                signal.delete()
+            except Signal.DoesNotExist:
+                pass
+            return True
+
+    def after_import_row(self, row, row_result, **kwargs):
+        try:
+            signal_obj = Signal.objects.get(id=row_result.object_id)
+            for link in row["Links"]:
+                signal_obj.related_links.add(link)
+            process_available_geographies(row)
+            signal_obj.severity_pyramid_rung = SeverityPyramidRung.objects.get(id=row["Surveillance Categories"])
+            signal_obj.format_type = row["Format"]
+            signal_obj.save()
+        except Signal.DoesNotExist as e:
+            print(f"Signal.DoesNotExist: {e}")
+
+
+class OtherEndpointSignalResource(ModelResource):
+    """
+    Resource class for importing and exporting Signal models
+    """
+
     name = Field(attribute="name", column_name="Indicator")
     display_name = Field(attribute="display_name", column_name="Name")
     member_name = Field(attribute="member_name", column_name="Member API Name")