Added Geo-Level ordering in filters list

Author: dmytrotsko

src/fixtures/available_geography.json

@@ -5,6 +5,7 @@
       "fields": {
         "name": "county",
         "display_name": "ADM2 (e.g. U.S. counties)",
+        "order_id": 3,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -15,6 +16,7 @@
       "fields": {
         "name": "hhs",
         "display_name": "HHS Regions",
+        "order_id": 4,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -25,6 +27,7 @@
       "fields": {
         "name": "hrr",
         "display_name": "Hospital Referral Regions (HRRs)",
+        "order_id": 6,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -35,6 +38,7 @@
       "fields": {
         "name": "msa",
         "display_name": "Metropolitan Statistical Areas (MSAs)",
+        "order_id": 5,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -45,6 +49,7 @@
       "fields": {
         "name": "nation",
         "display_name": "National",
+        "order_id": 1,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -55,6 +60,7 @@
       "fields": {
         "name": "state",
         "display_name": "ADM1 (e.g. U.S. states)",
+        "order_id": 2,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -65,6 +71,7 @@
       "fields": {
         "name": "dma",
         "display_name": "Designated Market Areas (DMAs)",
+        "order_id": 7,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }

src/signals/forms.py

@@ -79,3 +79,5 @@ def __init__(self, *args, **kwargs) -> None:
             field.required = False
             field.help_text = ''
             field.label = ''
+            if field_name == "available_geography":
+                field.queryset = field.queryset.order_by("order_id")

src/signals/migrations/0018_geography_order_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-06-11 18:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('signals', '0017_geography_display_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='geography',
+            name='order_id',
+            field=models.IntegerField(blank=True, help_text='Order ID', null=True),
+        ),
+    ]

src/signals/models.py

@@ -160,6 +160,12 @@ class Geography(TimeStampedModel):
         blank=True
     )
 
+    order_id: models.IntegerField = models.IntegerField(
+        help_text=_('Order ID'),
+        null=True,
+        blank=True
+    )
+
     class Meta:
         verbose_name_plural: str = "geographies"
         ordering: list[str] = ["name"]