[Feature] Make v1/now return public data only

sensorsafrica/api/v1/router.py

@@ -2,14 +2,13 @@
 from feinstaub.main.views import UsersView
 from feinstaub.sensors.views import (
     NodeView,
-    NowView,
     PostSensorDataView,
     SensorView,
     StatisticsView,
     SensorDataView,
 )
 
-from .views import SensorDataView as SensorsAfricaSensorDataView, FilterView
+from .views import FilterView, NowView, SensorDataView as SensorsAfricaSensorDataView
 
 from rest_framework import routers
 

sensorsafrica/api/v1/views.py

@@ -2,49 +2,63 @@
 import pytz
 import json
 
-from rest_framework.exceptions import ValidationError
 
 from django.conf import settings
-from django.utils import timezone
-from dateutil.relativedelta import relativedelta
 from django.db.models import ExpressionWrapper, F, FloatField, Max, Min, Sum, Avg, Q
 from django.db.models.functions import Cast, TruncDate
+from dateutil.relativedelta import relativedelta
+from django.utils import timezone
 from rest_framework import mixins, pagination, viewsets
+from rest_framework.exceptions import ValidationError
 
-from .serializers import SensorDataSerializer
 from feinstaub.sensors.models import SensorData
+from feinstaub.sensors.serializers import NowSerializer
 
+from .serializers import SensorDataSerializer
 
-class SensorDataView(mixins.ListModelMixin, viewsets.GenericViewSet):
+class FilterView(mixins.ListModelMixin, viewsets.GenericViewSet):
     serializer_class = SensorDataSerializer
 
     def get_queryset(self):
+        sensor_type = self.request.GET.get("type", r"\w+")
+        country = self.request.GET.get("country", r"\w+")
+        city = self.request.GET.get("city", r"\w+")
         return (
-            SensorData.objects
-            .filter(
+            SensorData.objects.filter(
                 timestamp__gte=timezone.now() - datetime.timedelta(minutes=5),
-                sensor=self.kwargs["sensor_id"]
+                sensor__sensor_type__uid__iregex=sensor_type,
+                location__country__iregex=country,
+                location__city__iregex=city,
             )
-            .only('sensor', 'timestamp')
-            .prefetch_related('sensordatavalues')
+            .only("sensor", "timestamp")
+            .prefetch_related("sensordatavalues")
         )
 
 
-class FilterView(mixins.ListModelMixin, viewsets.GenericViewSet):
+class NowView(mixins.ListModelMixin, viewsets.GenericViewSet):
+    """Show all public sensors active in the last 5 minutes with newest value"""
+
+    permission_classes = []
+    serializer_class = NowSerializer
+    queryset = SensorData.objects.none()
+
+    def get_queryset(self):
+        now = timezone.now()
+        startdate = now - datetime.timedelta(minutes=5)
+        return SensorData.objects.filter(
+            sensor__public=True, modified__range=[startdate, now]
+        )
+
+
+class SensorDataView(mixins.ListModelMixin, viewsets.GenericViewSet):
     serializer_class = SensorDataSerializer
 
     def get_queryset(self):
-        sensor_type = self.request.GET.get('type', r'\w+')
-        country = self.request.GET.get('country', r'\w+')
-        city = self.request.GET.get('city', r'\w+')
         return (
-            SensorData.objects
-            .filter(
+            SensorData.objects.filter(
                 timestamp__gte=timezone.now() - datetime.timedelta(minutes=5),
-                sensor__sensor_type__uid__iregex=sensor_type,
-                location__country__iregex=country,
-                location__city__iregex=city
+                sensor=self.kwargs["sensor_id"],
             )
-            .only('sensor', 'timestamp')
-            .prefetch_related('sensordatavalues')
+            .only("sensor", "timestamp")
+            .prefetch_related("sensordatavalues")
         )