diff --git a/apps/mosquito/api/serializers.py b/apps/mosquito/api/serializers.py index 5c6a58c..d24410f 100644 --- a/apps/mosquito/api/serializers.py +++ b/apps/mosquito/api/serializers.py @@ -178,6 +178,7 @@ class WeatherLogWithInfoSerializer(WeatherLogSerializer): longitude = serializers.SerializerMethodField() latitude = serializers.SerializerMethodField() location_id = serializers.SerializerMethodField() + weather_code = serializers.SerializerMethodField() point_x = serializers.SerializerMethodField() point_y = serializers.SerializerMethodField() @@ -207,6 +208,7 @@ class WeatherLogWithInfoSerializer(WeatherLogSerializer): 'longitude', 'latitude', 'location_id', + 'weather_code', 'point_x', 'point_y', ] @@ -236,6 +238,13 @@ class WeatherLogWithInfoSerializer(WeatherLogSerializer): return device.location_id return None + def get_weather_code(self, obj): + device = self.device + if device: + if device.weather_code: + return device.weather_code + return None + def get_point_x(self, obj): device = self.device if device: @@ -271,12 +280,12 @@ class DeviceInfoSerializer(serializers.ModelSerializer): class Meta: model = DeviceInfo fields = [ + 'weather_code', 'device_id', 'device_name', 'longitude', 'latitude', 'weather_device_id', - 'weather_code', 'location_id', 'point_x', 'point_y',