diff --git a/sensorsafrica/api/v2/serializers.py b/sensorsafrica/api/v2/serializers.py index 80e9c16..f909cb6 100644 --- a/sensorsafrica/api/v2/serializers.py +++ b/sensorsafrica/api/v2/serializers.py @@ -3,7 +3,8 @@ NestedSensorLocationSerializer, NestedSensorTypeSerializer, ) -from feinstaub.sensors.models import Node, Sensor, SensorType +from feinstaub.sensors.models import Node, Sensor, SensorType, SensorLocation +from feinstaub.sensors.serializers import (VerboseSensorDataSerializer, ) class SensorDataStatSerializer(serializers.Serializer): @@ -76,3 +77,11 @@ class Meta: "inactive", "exact_location", ) + +class SensorDataSensorLocationSerializer(serializers.ModelSerializer): + class Meta: + model = SensorLocation + fields = ('id', "country", ) + +class SensorDataSerializer(VerboseSensorDataSerializer): + location = SensorDataSensorLocationSerializer() diff --git a/sensorsafrica/api/v2/views.py b/sensorsafrica/api/v2/views.py index 030cd9f..f4e7272 100644 --- a/sensorsafrica/api/v2/views.py +++ b/sensorsafrica/api/v2/views.py @@ -33,7 +33,6 @@ SensorType, ) -from feinstaub.sensors.serializers import VerboseSensorDataSerializer from ..models import City, LastActiveNodes, SensorDataStat from .serializers import ( @@ -43,6 +42,7 @@ NodeSerializer, SensorSerializer, SensorLocationSerializer, + SensorDataSerializer, ) @@ -238,7 +238,7 @@ class SensorDataView( permission_classes = [IsAuthenticated] filter_backends = (django_filters.rest_framework.DjangoFilterBackend,) filter_class = SensorFilter - serializer_class = VerboseSensorDataSerializer + serializer_class = SensorDataSerializer def get_queryset(self): if self.request.user.is_authenticated():