spacecruft
/
satnogs-db
1
0
Fork 0
Code Releases Activity

Remove schema field from telemetry model and API 

Closes https://gitlab.com/librespacefoundation/satnogs/satnogs-db/-/issues/319

Signed-off-by: George Sfoungaris <sfou@libre.space>
spacecruft
George Sfoungaris 2022-10-03 13:24:03 +03:00
parent 0e2cfdea83
commit 4eb3a9cce6
6 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
db/api/serializers.py
View File

@ -394,7 +394,6 @@ class LatestTleSetSerializer(serializers.ModelSerializer):
'norad_cat_id': 40379,
'transmitter': None,
'app_source': 'network',
'schema': None,
'decoded': 'influxdb',
'frame': '968870A6A0A66086A240404040E103F0ABCD0000004203F500B475E215EA5FA0040C000B'
'000900010025008E55EE7B64650100000000AE4D07005D660F007673340000C522370067076507FD0'
@ -415,7 +414,6 @@ class TelemetrySerializer(serializers.ModelSerializer):
sat_id = serializers.SerializerMethodField()
norad_cat_id = serializers.SerializerMethodField()
transmitter = serializers.SerializerMethodField()
schema = serializers.SerializerMethodField()
decoded = serializers.SerializerMethodField()
frame = serializers.SerializerMethodField()
associated_satellites = serializers.SerializerMethodField()
@ -423,9 +421,8 @@ class TelemetrySerializer(serializers.ModelSerializer):
class Meta:
model = DemodData
fields = (
'sat_id', 'norad_cat_id', 'transmitter', 'app_source', 'schema', 'decoded', 'frame',
'observer', 'timestamp', 'version', 'observation_id', 'station_id',
'associated_satellites'
'sat_id', 'norad_cat_id', 'transmitter', 'app_source', 'decoded', 'frame', 'observer',
'timestamp', 'version', 'observation_id', 'station_id', 'associated_satellites'
)
@extend_schema_field(OpenApiTypes.STR)
@ -448,15 +445,6 @@ class TelemetrySerializer(serializers.ModelSerializer):
except AttributeError:
return ''
# deprecated, needs pulled out - cshields
@extend_schema_field(OpenApiTypes.STR)
def get_schema(self, obj):
"""Returns Transmitter telemetry schema"""
try:
return obj.payload_telemetry.schema
except AttributeError:
return ''
@extend_schema_field(OpenApiTypes.STR)
def get_decoded(self, obj):
"""Returns the payload_decoded field"""

14
db/base/fixtures/telemetries.json
View File

@ -5,7 +5,6 @@
"fields": {
"satellite": 95,
"name": "UNISAT-6 telemetry",
"schema": "",
"decoder": "us6"
}
},
@ -15,7 +14,6 @@
"fields": {
"satellite": 206,
"name": "CAS-4A Telemetry",
"schema": "",
"decoder": "cas4"
}
},
@ -25,7 +23,6 @@
"fields": {
"satellite": 205,
"name": "CAS-4B Telemetry",
"schema": "",
"decoder": "cas4"
}
},
@ -35,7 +32,6 @@
"fields": {
"satellite": 255,
"name": "SiriusSat-1 Telemetry",
"schema": "",
"decoder": "siriussat"
}
},
@ -45,7 +41,6 @@
"fields": {
"satellite": 256,
"name": "SiriusSat-2 Telemetry",
"schema": "",
"decoder": "siriussat"
}
},
@ -55,7 +50,6 @@
"fields": {
"satellite": 55,
"name": "STRAND-1 Telemetry",
"schema": "",
"decoder": "strand"
}
},
@ -65,7 +59,6 @@
"fields": {
"satellite": 219,
"name": "SKCUBE Telemetry",
"schema": "",
"decoder": "skcube"
}
},
@ -75,7 +68,6 @@
"fields": {
"satellite": 257,
"name": "ELFIN-B Telemetry",
"schema": "",
"decoder": "elfin"
}
},
@ -85,7 +77,6 @@
"fields": {
"satellite": 258,
"name": "ELFIN-A Telemetry",
"schema": "",
"decoder": "elfin"
}
},
@ -95,7 +86,6 @@
"fields": {
"satellite": 11,
"name": "ISS AX.25",
"schema": "",
"decoder": "ax25frames"
}
},
@ -105,7 +95,6 @@
"fields": {
"satellite": 136,
"name": "FOX-1A Telemetry",
"schema": "",
"decoder": "fox"
}
},
@ -115,7 +104,6 @@
"fields": {
"satellite": 232,
"name": "FOX-1B Telemetry",
"schema": "",
"decoder": "fox"
}
},
@ -125,7 +113,6 @@
"fields": {
"satellite": 182,
"name": "QBEE Telemetry",
"schema": "",
"decoder": "qbee"
}
},
@ -135,7 +122,6 @@
"fields": {
"satellite": 24,
"name": "FALCONSAT 3 AX.25",
"schema": "",
"decoder": "ax25monitor"
}
}

17
db/base/migrations/0055_remove_telemetry_schema.py 100644
View File

@ -0,0 +1,17 @@
# Generated by Django 4.0.6 on 2022-09-29 14:23
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0054_rename_itu_coordination_field'),
]
operations = [
migrations.RemoveField(
model_name='telemetry',
name='schema',
),
]

1
db/base/models.py
View File

@ -709,7 +709,6 @@ class Telemetry(models.Model):
Satellite, null=True, related_name='telemetries', on_delete=models.SET_NULL
)
name = models.CharField(max_length=45)
schema = models.TextField(blank=True)
decoder = models.CharField(max_length=200, blank=True)
class Meta:

1
db/base/tests.py
View File

@ -121,7 +121,6 @@ class TelemetryFactory(factory.django.DjangoModelFactory):
"""Telemetry model factory."""
satellite = factory.SubFactory(SatelliteFactory)
name = fuzzy.FuzzyText()
schema = '{}'
decoder = 'qb50'
class Meta:

6
db/templates/base/satellite.html
View File

@ -492,7 +492,6 @@
aria-hidden="true">×</span></button>
</div>
<div class="modal-body">
{% if not telemetry.schema == '' %}
<div class="kaitai-header">
See <a href="http://kaitai.io" target="_blank">kaitai.io <i
class="fas fa-external-link-alt fa-xs"></i></a> for more information on the format
@ -505,11 +504,6 @@
<code>{{ field }}</code><br />
{% endfor %}
</div>
{% else %}
<div>
Struct fields appear to be missing.
</div>
{% endif %}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>