Added new Severity Pyramid Rungs to the Signal Set filters

dmytrotsko · dmytrotsko · commit 760a4ad14e2d · 2025-01-20T18:15:00.000+02:00
diff --git a/src/fixtures/severity_pyramid_rungs.json b/src/fixtures/severity_pyramid_rungs.json
@@ -1,72 +1,189 @@
 [
-{
-    "model": "signals.severitypyramidrung",
-    "pk": 73,
-    "fields": {
-        "created": "2024-08-15T09:57:05.874Z",
-        "modified": "2024-08-15T13:08:28.334Z",
-        "name": "outpatient visit",
-        "display_name": "Outpatient / ED"
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 73,
+        "fields": {
+            "created": "2024-08-15T09:57:05.874Z",
+            "modified": "2024-08-15T13:08:28.334Z",
+            "name": "outpatient visit",
+            "display_name": "Outpatient / ED",
+            "used_in": "signals"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 74,
+        "fields": {
+            "created": "2024-08-15T09:57:06.623Z",
+            "modified": "2024-08-15T13:08:20.357Z",
+            "name": "infected",
+            "display_name": "Infected",
+            "used_in": "signals"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 75,
+        "fields": {
+            "created": "2024-08-15T09:57:06.742Z",
+            "modified": "2024-08-15T13:08:14.615Z",
+            "name": "population",
+            "display_name": "Population",
+            "used_in": "signals"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 76,
+        "fields": {
+            "created": "2024-08-15T09:57:07.184Z",
+            "modified": "2024-08-15T13:08:07.134Z",
+            "name": "hospitalized",
+            "display_name": "Hospitalized",
+            "used_in": "signals"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 77,
+        "fields": {
+            "created": "2024-08-15T09:57:07.541Z",
+            "modified": "2024-08-15T13:07:59.789Z",
+            "name": "symptomatic",
+            "display_name": "Symptomatic",
+            "used_in": "signals"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 78,
+        "fields": {
+            "created": "2024-08-15T09:57:16.477Z",
+            "modified": "2024-08-15T13:07:54.021Z",
+            "name": "ascertained (case)",
+            "display_name": "Ascertained (case)",
+            "used_in": "signals"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 79,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "dead",
+            "display_name": "Dead",
+            "used_in": "signals"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 80,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "Population",
+            "display_name": "Population",
+            "used_in": "signal_sets"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 81,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "Vaccinated",
+            "display_name": "Vaccinated",
+            "used_in": "signal_sets"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 82,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "Infected",
+            "display_name": "Infected",
+            "used_in": "signal_sets"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 83,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "Tested",
+            "display_name": "Tested",
+            "used_in": "signal_sets"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 84,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "Case",
+            "display_name": "Case",
+            "used_in": "signal_sets"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 85,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "Symptomatic",
+            "display_name": "Symptomatic",
+            "used_in": "signal_sets"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 86,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "Outpatient / ED",
+            "display_name": "Outpatient / ED",
+            "used_in": "signal_sets"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 87,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "Hospitalized",
+            "display_name": "Hospitalized",
+            "used_in": "signal_sets"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 88,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "ICU",
+            "display_name": "ICU",
+            "used_in": "signal_sets"
+        }
+    },
+    {
+        "model": "signals.severitypyramidrung",
+        "pk": 89,
+        "fields": {
+            "created": "2024-08-15T09:57:49.327Z",
+            "modified": "2024-08-15T13:07:46.136Z",
+            "name": "Deceased",
+            "display_name": "Deceased",
+            "used_in": "signal_sets"
+        }
     }
-},
-{
-    "model": "signals.severitypyramidrung",
-    "pk": 74,
-    "fields": {
-        "created": "2024-08-15T09:57:06.623Z",
-        "modified": "2024-08-15T13:08:20.357Z",
-        "name": "infected",
-        "display_name": "Infected"
-    }
-},
-{
-    "model": "signals.severitypyramidrung",
-    "pk": 75,
-    "fields": {
-        "created": "2024-08-15T09:57:06.742Z",
-        "modified": "2024-08-15T13:08:14.615Z",
-        "name": "population",
-        "display_name": "Population"
-    }
-},
-{
-    "model": "signals.severitypyramidrung",
-    "pk": 76,
-    "fields": {
-        "created": "2024-08-15T09:57:07.184Z",
-        "modified": "2024-08-15T13:08:07.134Z",
-        "name": "hospitalized",
-        "display_name": "Hospitalized"
-    }
-},
-{
-    "model": "signals.severitypyramidrung",
-    "pk": 77,
-    "fields": {
-        "created": "2024-08-15T09:57:07.541Z",
-        "modified": "2024-08-15T13:07:59.789Z",
-        "name": "symptomatic",
-        "display_name": "Symptomatic"
-    }
-},
-{
-    "model": "signals.severitypyramidrung",
-    "pk": 78,
-    "fields": {
-        "created": "2024-08-15T09:57:16.477Z",
-        "modified": "2024-08-15T13:07:54.021Z",
-        "name": "ascertained (case)",
-        "display_name": "Ascertained (case)"
-    }
-},
-{
-    "model": "signals.severitypyramidrung",
-    "pk": 79,
-    "fields": {
-        "created": "2024-08-15T09:57:49.327Z",
-        "modified": "2024-08-15T13:07:46.136Z",
-        "name": "dead",
-        "display_name": "Dead"
-    }
-}
 ]
diff --git a/src/signal_sets/filters.py b/src/signal_sets/filters.py
@@ -41,7 +41,10 @@ class SignalSetFilter(django_filters.FilterSet):
 
     severity_pyramid_rungs = django_filters.ModelMultipleChoiceFilter(
         field_name="severity_pyramid_rungs",
-        queryset=SeverityPyramidRung.objects.filter(id__in=SignalSet.objects.values_list("severity_pyramid_rungs", flat="True")),
+        queryset=SeverityPyramidRung.objects.filter(
+            # id__in=SignalSet.objects.values_list("severity_pyramid_rungs", flat="True")
+            used_in="signal_sets"
+        ),
         widget=QueryArrayWidget,
     )
 
diff --git a/src/signal_sets/forms.py b/src/signal_sets/forms.py
@@ -33,7 +33,8 @@ class SignalSetFilterForm(forms.ModelForm):
 
     severity_pyramid_rungs = forms.ModelChoiceField(
         queryset=SeverityPyramidRung.objects.filter(
-            id__in=SignalSet.objects.values_list("severity_pyramid_rungs", flat="True")
+            # id__in=SignalSet.objects.values_list("severity_pyramid_rungs", flat="True")
+            used_in="signal_sets"
         ),
         widget=forms.CheckboxSelectMultiple(),
     )
diff --git a/src/signal_sets/resources.py b/src/signal_sets/resources.py
@@ -43,7 +43,9 @@ def process_severity_pyramid_rungs(row) -> None:
         for severity_pyramid_rung in severity_pyramid_rungs:
             severity_pyramid_rung = severity_pyramid_rung.strip()
             severity_pyramid_rung_obj, _ = SeverityPyramidRung.objects.get_or_create(
-                name=severity_pyramid_rung
+                name=severity_pyramid_rung,
+                used_in="signal_sets",
+                defaults={"used_in": "signal_sets", "display_name": severity_pyramid_rung}
             )
 
 
@@ -227,7 +229,8 @@ def after_import_row(self, row, row_result, **kwargs):
                 signal_set_obj.pathogens.add(pathogen)
             for severity_pyramid_rung in row["Severity Pyramid Rung(s)"].split(","):
                 severity_pyramid_rung = SeverityPyramidRung.objects.filter(
-                    name=severity_pyramid_rung
+                    name=severity_pyramid_rung,
+                    used_in="signal_sets"
                 ).first()
                 signal_set_obj.severity_pyramid_rungs.add(severity_pyramid_rung)
 
diff --git a/src/signals/admin.py b/src/signals/admin.py
@@ -69,7 +69,7 @@ class SeverityPyramidRungAdmin(admin.ModelAdmin):
     """
     Admin interface for managing severity pyramid objects.
     """
-    list_display: tuple[Literal['name'], Literal['display_name']] = ('name', 'display_name')
+    list_display: tuple[Literal['name'], Literal['display_name']] = ('name', 'display_name', 'used_in',)
     search_fields: tuple[Literal['name']] = ('name',)
 
 
diff --git a/src/signals/forms.py b/src/signals/forms.py
@@ -46,7 +46,10 @@ class SignalFilterForm(forms.ModelForm):
     )
 
     severity_pyramid_rung = forms.ModelChoiceField(
-        queryset=SeverityPyramidRung.objects.filter(id__in=Signal.objects.values_list("severity_pyramid_rung", flat=True)),
+        queryset=SeverityPyramidRung.objects.filter(
+            # id__in=Signal.objects.values_list("severity_pyramid_rung", flat=True)
+            used_in="signals"
+        ),
         widget=forms.CheckboxSelectMultiple(),
     )
 
diff --git a/src/signals/migrations/0015_severitypyramidrung_used_in_and_more.py b/src/signals/migrations/0015_severitypyramidrung_used_in_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 5.0.7 on 2025-01-20 14:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('signals', '0014_geography_used_in_alter_geography_name_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='severitypyramidrung',
+            name='used_in',
+            field=models.CharField(choices=[('signals', 'Signals'), ('signal_sets', 'Signal Sets')], default='signals', max_length=11),
+        ),
+        migrations.AlterField(
+            model_name='severitypyramidrung',
+            name='name',
+            field=models.CharField(help_text='Name of the severity pyramid rung.', max_length=255, verbose_name='name'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='severitypyramidrung',
+            unique_together={('name', 'used_in')},
+        ),
+    ]
diff --git a/src/signals/models.py b/src/signals/models.py
@@ -64,7 +64,6 @@ class SeverityPyramidRung(TimeStampedModel):
 
     name: models.CharField = models.CharField(
         max_length=255,
-        unique=True,
         verbose_name=_("name"),
         help_text=_("Name of the severity pyramid rung."),
     )
@@ -76,8 +75,15 @@ class SeverityPyramidRung(TimeStampedModel):
         blank=True,
     )
 
+    used_in: models.CharField = models.CharField(
+        max_length=11,
+        choices=USED_IN_CHOICES,
+        default="signals",
+    )
+
     class Meta:
         verbose_name_plural: str = "Severity Pyramid Rungs"
+        unique_together: list[str] = ["name", "used_in"]
 
     def __str__(self) -> str:
         return str(self.display_name) if self.display_name else str(self.name)
diff --git a/src/signals/resources.py b/src/signals/resources.py

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ class SignalSetFilterForm(forms.ModelForm):`
`33`	`33`
`34`	`34`	`severity_pyramid_rungs = forms.ModelChoiceField(`
`35`	`35`	`queryset=SeverityPyramidRung.objects.filter(`
`36`		`- id__in=SignalSet.objects.values_list("severity_pyramid_rungs", flat="True")`
	`36`	`+ # id__in=SignalSet.objects.values_list("severity_pyramid_rungs", flat="True")`
	`37`	`+ used_in="signal_sets"`
`37`	`38`	`),`
`38`	`39`	`widget=forms.CheckboxSelectMultiple(),`
`39`	`40`	`)`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,10 @@ class SignalFilterForm(forms.ModelForm):`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`severity_pyramid_rung = forms.ModelChoiceField(`
`49`		`- queryset=SeverityPyramidRung.objects.filter(id__in=Signal.objects.values_list("severity_pyramid_rung", flat=True)),`
	`49`	`+ queryset=SeverityPyramidRung.objects.filter(`
	`50`	`+ # id__in=Signal.objects.values_list("severity_pyramid_rung", flat=True)`
	`51`	`+ used_in="signals"`
	`52`	`+ ),`
`50`	`53`	`widget=forms.CheckboxSelectMultiple(),`
`51`	`54`	`)`
`52`	`55`