UI updates (#49)

* fixing proxy

* fixing dependencies

* adjusting zoom buttons

* remove unneeded import

* update retrieval method

* removing trailing spaces

* adding list of available quarters to api

* new migrations

* send back latest quarter year combo

* send top locations from api

* fixing state data

* remove array

* improve variable names

* Add buttons for quarters

* adjust button variants

* add string helper

* return list of quarters

* get proper sorting

* random lat long

* making method private

* add cities back to response

api/v1/views.py

@@ -1,6 +1,8 @@
+from django.db.models.expressions import Value
+from django.db.models.fields import BooleanField
 from rest_framework.views import APIView
 from rest_framework.response import Response
-from rest_framework import (generics)
+from rest_framework import generics
 from django.db.models import F, Q
 
 
@@ -11,33 +13,75 @@
 from rawdata import models as raw_models
 from utils.utils import str2bool
 from django_pandas.io import read_frame
+from django.db.models import Max, Min, Avg
+import math
 
 
 class locationData(APIView):
-    # /v1/data/?sources=locations
+    def _get_quarter_list(self, quarters):
+        num_left = 8 - quarters.count()
+        initial_values = list(quarters.order_by("-year", "-quarter")[:8])
+        if num_left <= 0:
+            return initial_values
+
+        min_year = quarters.aggregate(Min("year"))["year__min"]
+        quarter_options = ["q1", "q2", "q3", "q4"]
+        min_quarter = quarters.filter(year=min_year).aggregate(Min("quarter"))[
+            "quarter__min"
+        ]
+        min_quarter_index = quarter_options.index(min_quarter)
+
+        num_left_index = num_left + 1
+        for i in range(1, num_left_index):
+            quarter_diff = min_quarter_index - i
+            year_diff = math.floor(quarter_diff / 4)
+            quarter_diff = quarter_diff - year_diff * 4
+            quarter = quarter_options[quarter_diff]
+            year = min_year + year_diff
+            initial_values.append({"quarter": quarter, "year": year, "existing": False})
+        return initial_values
 
+    # /v1/data/?sources=locations
     def get(self, request):
         response = {
             "meta": {"cities": 0, "utilities": 0, "locations": 0},
             "locations": [],
             "utilities": [],
             "cities": [],
+            "states": [],
+            "quarters": [],
+            "top_locations": [],
         }
+        quarters = (
+            app_models.data.objects.values("quarter", "year")
+            .annotate(existing=Value(True, output_field=BooleanField()))
+            .distinct()
+        )
+        max_year = quarters.aggregate(Max("year"))["year__max"]
+        max_quarter = quarters.filter(year=max_year).aggregate(Max("quarter"))[
+            "quarter__max"
+        ]
+
+        response["quarters"] = self._get_quarter_list(quarters)
 
         # insert filter for quarter and year
         queryset = Q()
-        if request.query_params.get("quarter"):
-            queryset &= Q(quarter=request.query_params.get("quarter"))
+        has_specified_period = request.query_params.get(
+            "quarter"
+        ) and request.query_params.get("year")
 
-        if request.query_params.get("year"):
-            queryset &= Q( year=request.query_params.get("year"))
+        if has_specified_period:
+            queryset &= Q(quarter=request.query_params.get("quarter"))
+            queryset &= Q(year=request.query_params.get("year"))
+        else:
+            queryset &= Q(year=max_year)
+            queryset &= Q(quarter=max_quarter)
 
         # filter for locations
         sources = request.query_params.get("sources", "").split(",")
         if "locations" in sources or not len(sources):
             data = app_models.data.objects.filter(
-                queryset
-                ,location__major_city__isnull=False
+                queryset, location__major_city__isnull=False
             ).values(
                 "score",
                 fipsState=F("location__fips_state"),
@@ -49,7 +93,11 @@ def get(self, request):
                 populationServed=F("location__population_served"),
             )
             response["locations"] = data
+            response["top_locations"] = data.order_by("-score")[0:3]
             response["meta"]["locations"] = len(data)
+            response["states"] = data.values("fipsState").annotate(
+                avg=Avg("score"), max=Max("score"), min=Min("score")
+            )
 
         # filter for news
         if "news" in sources or not len(sources):

app/migrations/0012_auto_20211123_0405.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.12 on 2021-11-23 04:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0011_auto_20211022_0013'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='location',
+            name='facilities',
+        ),
+        migrations.AlterField(
+            model_name='data',
+            name='location',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='app.location'),
+        ),
+    ]