Exposes norad_follow_id in Satellite/Transmitter
Signed-off-by: Michał Drzał michal.drzal@gmail.comspacecruft
parent
aafb7a4c5e
commit
a94d14ba71
|
@ -82,6 +82,7 @@ class SatelliteSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
sat_id = serializers.SerializerMethodField()
|
sat_id = serializers.SerializerMethodField()
|
||||||
norad_cat_id = serializers.SerializerMethodField()
|
norad_cat_id = serializers.SerializerMethodField()
|
||||||
|
norad_follow_id = serializers.SerializerMethodField()
|
||||||
name = serializers.SerializerMethodField()
|
name = serializers.SerializerMethodField()
|
||||||
names = serializers.SerializerMethodField()
|
names = serializers.SerializerMethodField()
|
||||||
image = serializers.SerializerMethodField()
|
image = serializers.SerializerMethodField()
|
||||||
|
@ -102,9 +103,9 @@ class SatelliteSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Satellite
|
model = Satellite
|
||||||
fields = (
|
fields = (
|
||||||
'sat_id', 'norad_cat_id', 'name', 'names', 'image', 'status', 'decayed', 'launched',
|
'sat_id', 'norad_cat_id', 'norad_follow_id', 'name', 'names', 'image', 'status',
|
||||||
'deployed', 'website', 'operator', 'countries', 'telemetries', 'updated', 'citation',
|
'decayed', 'launched', 'deployed', 'website', 'operator', 'countries', 'telemetries',
|
||||||
'is_frequency_violator', 'associated_satellites'
|
'updated', 'citation', 'is_frequency_violator', 'associated_satellites'
|
||||||
)
|
)
|
||||||
|
|
||||||
@extend_schema_field(OpenApiTypes.STR)
|
@extend_schema_field(OpenApiTypes.STR)
|
||||||
|
@ -117,6 +118,11 @@ class SatelliteSerializer(serializers.ModelSerializer):
|
||||||
"""Returns Satellite norad_cat_id"""
|
"""Returns Satellite norad_cat_id"""
|
||||||
return obj.satellite_entry.norad_cat_id
|
return obj.satellite_entry.norad_cat_id
|
||||||
|
|
||||||
|
@extend_schema_field(OpenApiTypes.INT64)
|
||||||
|
def get_norad_follow_id(self, obj):
|
||||||
|
"""Returns Satellite norad_follow_id"""
|
||||||
|
return obj.satellite_entry.norad_follow_id
|
||||||
|
|
||||||
@extend_schema_field(OpenApiTypes.STR)
|
@extend_schema_field(OpenApiTypes.STR)
|
||||||
def get_name(self, obj):
|
def get_name(self, obj):
|
||||||
"""Returns Satellite name"""
|
"""Returns Satellite name"""
|
||||||
|
@ -247,6 +253,7 @@ class TransmitterSerializer(serializers.ModelSerializer):
|
||||||
"""SatNOGS DB Transmitter API Serializer"""
|
"""SatNOGS DB Transmitter API Serializer"""
|
||||||
sat_id = serializers.SerializerMethodField()
|
sat_id = serializers.SerializerMethodField()
|
||||||
norad_cat_id = serializers.SerializerMethodField()
|
norad_cat_id = serializers.SerializerMethodField()
|
||||||
|
norad_follow_id = serializers.SerializerMethodField()
|
||||||
mode = serializers.SerializerMethodField()
|
mode = serializers.SerializerMethodField()
|
||||||
mode_id = serializers.SerializerMethodField()
|
mode_id = serializers.SerializerMethodField()
|
||||||
uplink_mode = serializers.SerializerMethodField()
|
uplink_mode = serializers.SerializerMethodField()
|
||||||
|
@ -259,8 +266,9 @@ class TransmitterSerializer(serializers.ModelSerializer):
|
||||||
fields = (
|
fields = (
|
||||||
'uuid', 'description', 'alive', 'type', 'uplink_low', 'uplink_high', 'uplink_drift',
|
'uuid', 'description', 'alive', 'type', 'uplink_low', 'uplink_high', 'uplink_drift',
|
||||||
'downlink_low', 'downlink_high', 'downlink_drift', 'mode', 'mode_id', 'uplink_mode',
|
'downlink_low', 'downlink_high', 'downlink_drift', 'mode', 'mode_id', 'uplink_mode',
|
||||||
'invert', 'baud', 'sat_id', 'norad_cat_id', 'status', 'updated', 'citation', 'service',
|
'invert', 'baud', 'sat_id', 'norad_cat_id', 'norad_follow_id', 'status', 'updated',
|
||||||
'iaru_coordination', 'iaru_coordination_url', 'itu_notification', 'frequency_violation'
|
'citation', 'service', 'iaru_coordination', 'iaru_coordination_url',
|
||||||
|
'itu_notification', 'frequency_violation'
|
||||||
)
|
)
|
||||||
|
|
||||||
# Keeping alive field for compatibility issues
|
# Keeping alive field for compatibility issues
|
||||||
|
@ -301,6 +309,14 @@ class TransmitterSerializer(serializers.ModelSerializer):
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
@extend_schema_field(OpenApiTypes.INT64)
|
||||||
|
def get_norad_follow_id(self, obj):
|
||||||
|
"""Returns Satellite NORAD ID following initial determination"""
|
||||||
|
try:
|
||||||
|
return obj.satellite.satellite_entry.norad_follow_id
|
||||||
|
except AttributeError:
|
||||||
|
return None
|
||||||
|
|
||||||
@extend_schema_field(OpenApiTypes.STR)
|
@extend_schema_field(OpenApiTypes.STR)
|
||||||
def get_sat_id(self, obj):
|
def get_sat_id(self, obj):
|
||||||
"""Returns Satellite NORAD ID"""
|
"""Returns Satellite NORAD ID"""
|
||||||
|
|
Loading…
Reference in New Issue