Skip to content

Includes country in the sensor data serializer #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 28, 2021
Merged

Includes country in the sensor data serializer #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
236322b
Includes country in the sensor data serializer
esirK Jan 27, 2021
501fec9
Only return location id and country
esirK Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion sensorsafrica/api/v2/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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()
4 changes: 2 additions & 2 deletions sensorsafrica/api/v2/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
SensorType,
)

from feinstaub.sensors.serializers import VerboseSensorDataSerializer

from ..models import City, LastActiveNodes, SensorDataStat
from .serializers import (
Expand All @@ -43,6 +42,7 @@
NodeSerializer,
SensorSerializer,
SensorLocationSerializer,
SensorDataSerializer,
)


Expand Down Expand Up @@ -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():
Expand Down