Fixed geo filtering, removed unnecessary migration

Author: dmytrotsko

src/signal_sets/filters.py

@@ -2,13 +2,14 @@
 
 import django_filters
 from django_filters.widgets import QueryArrayWidget
+from django.db.models import Q
 
 from signals.models import (
     Pathogen,
     GeographicScope,
     Geography,
     SeverityPyramidRung,
-    SignalSourceDbView,
+    Signal
 )
 from signal_sets.models import SignalSet
 from datasources.models import DataSource
@@ -104,16 +105,8 @@ def filter_by_geo(self, queryset, name, value):
         if not value:
             return queryset
         filtered_signals = get_list_of_signals_filtered_by_geo(value)
-        sources = set()
-        signals = []
-        for source_signal in filtered_signals["epidata"]:
-            sources.add(source_signal["source"])
-            signals.append(source_signal["signal"])
-        signal_set_ids = (
-            SignalSourceDbView.objects.filter(source__in=sources)
-            .filter(signal__in=signals)
-            .exclude(signal_set=None)
-            .values_list("signal_set", flat=True)
-            .distinct()
-        )
-        return queryset.filter(id__in=signal_set_ids)
+        query = Q()
+        for item in filtered_signals["epidata"]:
+            query |= Q(source__name=item["source"], name=item["signal"])
+        signal_sets = Signal.objects.filter(query).values_list("signal_set_id", flat=True).distinct()
+        return queryset.filter(id__in=signal_sets)

src/signal_sets/utils.py

@@ -23,28 +23,8 @@ def dict_to_geo_string(geo_dict):
 
 def get_list_of_signals_filtered_by_geo(geos):
     geos = list_to_dict(ast.literal_eval(geos))
-    # send request to epidata api here
-    # temporary disabled
-    # ------------------------------------------
-    # url = f"{settings.COVIDCAST_URL}geo_coverage"
-    url = "http://localhost:10080/epidata/covidcast/geo_coverage"
+    url = f"{settings.COVIDCAST_URL}geo_coverage"
     params = {"geo": dict_to_geo_string(geos)}
     response = requests.get(url, params=params)
-    # return response.json()
-    # ------------------------------------------
-    return {
-        "epidata": [
-            {"source": "fb-survey", "signal": "7dav_outpatient_covid"},
-            {"source": "fluview_meta", "signal": "adult_icu_bed_covid_utilization"},
-            {
-                "source": "fluview_meta",
-                "signal": "adult_icu_bed_covid_utilization_numerator",
-            },
-            {
-                "source": "fluview_meta",
-                "signal": "adult_icu_bed_utilization_denominator",
-            },
-            {"source": "nchs-mortality", "signal": "confirmed_7dav_incidence_prop"},
-            {"source": "usa-facts", "signal": "confirmed_incidence_prop"},
-        ]
-    }
+    print(response.url)
+    return response.json()

src/signal_sets/views.py

@@ -32,31 +32,41 @@ def get_queryset(self) -> QuerySet[Any]:
 
     def get_url_params(self):
         url_params_dict = {
-            "pathogens": [int(el) for el in self.request.GET.getlist("pathogens")],
+            "pathogens": (
+                [int(el) for el in self.request.GET.getlist("pathogens")]
+                if self.request.GET.get("pathogens")
+                else ""
+            ),
             "geographic_scope": (
                 [el for el in self.request.GET.getlist("geographic_scope")]
                 if self.request.GET.get("geographic_scope")
-                else None
+                else ""
             ),
             "severity_pyramid_rungs": (
                 [el for el in self.request.GET.getlist("severity_pyramid_rungs")]
                 if self.request.GET.get("severity_pyramid_rungs")
-                else None
+                else ""
             ),
             "data_source": [el for el in self.request.GET.getlist("data_source")],
-            "temporal_granularity": [
-                el for el in self.request.GET.getlist("temporal_granularity")
-            ],
+            "temporal_granularity": (
+                [el for el in self.request.GET.getlist("temporal_granularity")]
+                if self.request.GET.get("temporal_granularity")
+                else ""
+            ),
             "available_geographies": (
                 [el for el in self.request.GET.getlist("available_geographies")]
                 if self.request.GET.get("available_geographies")
-                else None
+                else ""
+            ),
+            "temporal_scope_end": (
+                self.request.GET.get("temporal_scope_end")
+                if self.request.GET.get("temporal_scope_end")
+                else ""
             ),
-            "temporal_scope_end": self.request.GET.get("temporal_scope_end"),
             "location_search": (
                 [el for el in self.request.GET.getlist("location_search")]
                 if self.request.GET.get("location_search")
-                else None
+                else ""
             ),
         }
         url_params_str = ""
@@ -83,7 +93,7 @@ def get_related_signals(self):
                         "endpoint": signal_set.endpoint,
                         "source": signal.source.name,
                         "time_type": signal.time_type,
-                        "description": signal.description
+                        "description": signal.description,
                     }
                 )
         return related_signals
@@ -103,7 +113,14 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         context["signal_sets"] = self.get_queryset()
         context["related_signals"] = json.dumps(self.get_related_signals())
         context["available_geographies"] = Geography.objects.filter(used_in="signals")
-        context["geographic_granularities"] = [{"id": str(geo_unit.geo_id), "geoType": geo_unit.geography.name, "text": geo_unit.display_name} for geo_unit in GeographyUnit.objects.all()]
+        context["geographic_granularities"] = [
+            {
+                "id": str(geo_unit.geo_id),
+                "geoType": geo_unit.geography.name,
+                "text": geo_unit.display_name,
+            }
+            for geo_unit in GeographyUnit.objects.all()
+        ]
         return context
 
 

src/signals/migrations/0017_signalsourcedbview.py

@@ -606,13 +606,3 @@ def get_available_geographies(self):
     def get_pathogens(self):
         return self.pathogens.split(",") if self.pathogens else []
 
-
-class SignalSourceDbView(models.Model):
-    id = models.BigIntegerField(primary_key=True)
-    signal = models.CharField(max_length=255)
-    source = models.CharField(max_length=255)
-    signal_set = models.BigIntegerField()
-
-    class Meta:
-        managed = False
-        db_table = "signals_signal_source_view"

src/signals/models.py

@@ -470,6 +470,8 @@ <h5 class="modal-title" id="selectedSignalsModalLabel">Selected signals</h5>
 
     var relatedSignals = JSON.parse(JSON.stringify({{ related_signals|safe }}));
 
+    var urlParams = JSON.parse(JSON.stringify({{ url_params_dict|safe }}));
+
     $(document).ready(function () {
 
         const locationSearchValues = geoValues.map(item => {
@@ -479,6 +481,9 @@ <h5 class="modal-title" id="selectedSignalsModalLabel">Selected signals</h5>
             }
         })
         initSelect2('location_search', locationSearchValues);
+        if (urlParams.location_search != "") {
+            $("#location_search").val(urlParams.location_search).trigger("change"); 
+        }
         table.columns.adjust()
     })