Merge branch 'remove-field' into 'master'

Removed schema field from Telemetry model

Closes #319

See merge request librespacefoundation/satnogs/satnogs-db!424

db/api/serializers.py

@@ -84,14 +84,13 @@ class TelemetrySerializer(serializers.ModelSerializer):
     """SatNOGS DB Telemetry API Serializer"""
     norad_cat_id = serializers.SerializerMethodField()
     transmitter = serializers.SerializerMethodField()
-    schema = serializers.SerializerMethodField()
     decoded = serializers.SerializerMethodField()
     frame = serializers.SerializerMethodField()
 
     class Meta:
         model = DemodData
         fields = (
-            'norad_cat_id', 'transmitter', 'app_source', 'schema', 'decoded', 'frame', 'observer',
+            'norad_cat_id', 'transmitter', 'app_source', 'decoded', 'frame', 'observer',
             'timestamp'
         )
 
@@ -106,13 +105,6 @@ class TelemetrySerializer(serializers.ModelSerializer):
         except Exception:  # pylint: disable=W0703
             return ''
 
-    def get_schema(self, obj):
-        """Returns Transmitter telemetry schema"""
-        try:
-            return obj.payload_telemetry.schema
-        except Exception:  # pylint: disable=W0703
-            return ''
-
     def get_decoded(self, obj):
         """Returns the payload_decoded field"""
         return obj.payload_decoded

db/base/fixtures/telemetries.json

@@ -5,7 +5,6 @@
     "fields": {
         "satellite": 65,
         "name": "UNISAT-6 telemetry",
-        "schema": "",
         "decoder": "us6"
     }
 },
@@ -15,7 +14,6 @@
     "fields": {
         "satellite": 198,
         "name": "CAS-4A Telemetry",
-        "schema": "",
         "decoder": "cas4"
     }
 },
@@ -25,7 +23,6 @@
     "fields": {
         "satellite": 197,
         "name": "CAS-4B Telemetry",
-        "schema": "",
         "decoder": "cas4"
     }
 },
@@ -35,7 +32,6 @@
     "fields": {
         "satellite": 264,
         "name": "SiriusSat-1 Telemetry",
-        "schema": "",
         "decoder": "siriussat"
     }
 },
@@ -45,7 +41,6 @@
     "fields": {
         "satellite": 265,
         "name": "SiriusSat-2 Telemetry",
-        "schema": "",
         "decoder": "siriussat"
     }
 },
@@ -55,7 +50,6 @@
     "fields": {
         "satellite": 32,
         "name": "STRAND-1 Telemetry",
-        "schema": "",
         "decoder": "strand"
     }
 },
@@ -65,7 +59,6 @@
     "fields": {
         "satellite": 203,
         "name": "SKCUBE Telemetry",
-        "schema": "",
         "decoder": "skcube"
     }
 },
@@ -75,7 +68,6 @@
     "fields": {
         "satellite": 272,
         "name": "ELFIN-B Telemetry",
-        "schema": "",
         "decoder": "elfin"
     }
 },
@@ -85,7 +77,6 @@
     "fields": {
         "satellite": 273,
         "name": "ELFIN-A Telemetry",
-        "schema": "",
         "decoder": "elfin"
     }
 },
@@ -95,7 +86,6 @@
     "fields": {
         "satellite": 8,
         "name": "ISS AX.25",
-        "schema": "",
         "decoder": "ax25frames"
     }
 },
@@ -105,7 +95,6 @@
     "fields": {
         "satellite": 89,
         "name": "FOX-1A Telemetry",
-        "schema": "",
         "decoder": "fox"
     }
 },
@@ -115,7 +104,6 @@
     "fields": {
         "satellite": 223,
         "name": "FOX-1B Telemetry",
-        "schema": "",
         "decoder": "fox"
     }
 },
@@ -125,7 +113,6 @@
     "fields": {
         "satellite": 172,
         "name": "QBEE Telemetry",
-        "schema": "",
         "decoder": "qbee"
     }
 },
@@ -135,7 +122,6 @@
     "fields": {
         "satellite": 221,
         "name": "FALCONSAT 3 AX.25",
-        "schema": "",
         "decoder": "ax25monitor"
     }
 }

db/base/migrations/0012_remove_telemetry_schema.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.24 on 2019-09-30 00:24
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0011_transmitterentry_service'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='telemetry',
+            name='schema',
+        ),
+    ]

db/base/migrations/0014_merge_20191227_0104.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.9 on 2019-12-27 01:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0013_auto_20191108_1842'),
+        ('base', '0012_remove_telemetry_schema'),
+    ]
+
+    operations = [
+    ]

db/base/models.py

@@ -299,7 +299,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=20, blank=True)
 
     class Meta:

db/base/tests.py

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

db/templates/base/satellite.html

@@ -478,20 +478,6 @@
                           <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                           <h4 class="modal-title" id="EditSuggestionModalLabel">Kaitai Struct for {{ telemetry.name }}</h4>
                         </div>
-                        <div class="modal-body">
-                          {% if not telemetry.schema == '' %}
-                            <div class="kaitai-header">
-                              See <a href="http://kaitai.io" target="_blank">kaitai.io</a> for more information on the format.
-                            </div>
-                            <div class="kaitai-struct">
-                              <pre>{{ telemetry.schema }}</pre>
-                            </div>
-                          {% else %}
-                            <div>
-                              Struct format appears to be missing.
-                            </div>
-                          {% endif %}
-                        </div>
                         <div class="modal-footer">
                           <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                         </div>