Merge pull request #14 from cmu-delphi/staging

Staging

Author: dmytrotsko

.gitignore

@@ -172,3 +172,7 @@ cython_debug/
 
 # PyPI configuration file
 .pypirc
+
+
+# Django collected staticfiles
+src/staticfiles/

src/base/models.py

@@ -5,6 +5,12 @@
     ("indicatorsets", "Indicator Sets"),
 )
 
+SOURCE_TYPES = [
+    ("covidcast", "Covidcast"),
+    ("other_endpoint", "Other Endpoint"),
+    ("non_delphi", "Non Delphi"),
+]
+
 
 class Pathogen(models.Model):
 

src/indicators/models.py

@@ -3,12 +3,7 @@
 
 from django.db import models
 
-
-SOURCE_TYPES = [
-    ("covidcast", "Covidcast"),
-    ("other_endpoint", "Other Endpoint"),
-    ("non_delphi", "Non Delphi"),
-]
+from base.models import SOURCE_TYPES
 
 
 # Create your models here.

src/indicatorsets/admin.py

@@ -50,7 +50,8 @@ class NonDelphiIndicatorSetAdmin(ImportExportModelAdmin):
         "version_number",
         "original_data_provider",
         "origin_datasource",
+        "source_type",
     )
     search_fields = ("name", "short_name", "description")
     ordering = ["name"]
-    list_filter = ["original_data_provider"]
+    list_filter = ["original_data_provider", "source_type"]

src/indicatorsets/migrations/0003_indicatorset_source_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.7 on 2025-05-07 17:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('indicatorsets', '0002_nondelphiindicatorset'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='indicatorset',
+            name='source_type',
+            field=models.CharField(blank=True, choices=[('covidcast', 'Covidcast'), ('other_endpoint', 'Other Endpoint'), ('non_delphi', 'Non Delphi')], default='covidcast', help_text='Type of source for the indicator', max_length=255, null=True, verbose_name='Source Type'),
+        ),
+    ]

src/indicatorsets/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from base.models import SOURCE_TYPES
 
 
 DUA_REQUIRED_CHOICES = (
@@ -184,6 +185,16 @@ class IndicatorSet(models.Model):
         help_text="Link to the documentation for the Indicator Set",
     )
 
+    source_type: models.CharField = models.CharField(
+        verbose_name="Source Type",
+        max_length=255,
+        choices=SOURCE_TYPES,
+        default="covidcast",
+        help_text="Type of source for the indicator",
+        blank=True,
+        null=True,
+    )
+
     class Meta:
         verbose_name = "Indicator Set"
         verbose_name_plural = "Indicator Sets"

src/indicatorsets/resources.py

@@ -225,6 +225,10 @@ def before_import_row(self, row, **kwargs):
         process_pathogens(row)
         process_available_geographies(row)
 
+    def after_save_instance(self, instance, row, **kwargs):
+        instance.source_type = "covidcast" if instance.epidata_endpoint == "covidcast" else "other_endpoint"
+        instance.save()
+
 
 class NonDelphiIndicatorSetResource(resources.ModelResource):
     name = Field(attribute="name", column_name="Indicator Set name* ")
@@ -360,3 +364,7 @@ def before_import_row(self, row, **kwargs):
         process_severity_pyramid_rungs(row)
         process_pathogens(row)
         process_available_geographies(row)
+
+    def after_save_instance(self, instance, row, **kwargs):
+        instance.source_type = "non_delphi"
+        instance.save()