Use the correct names for the API and the serializer fields

program/serializers.py

@@ -247,8 +247,7 @@ class ShowSerializer(serializers.HyperlinkedModelSerializer):
         hosts = validated_data.pop('hosts')
         language = validated_data.pop('language')
         topic = validated_data.pop('topic')
-        # TODO: replace `musicfocus` with `music_focus` when the dashboard is updated
-        music_focus = validated_data.pop('musicfocus')
+        music_focus = validated_data.pop('music_focus')
 
         show = Show.objects.create(**validated_data)
 
@@ -279,20 +278,18 @@ class ShowSerializer(serializers.HyperlinkedModelSerializer):
         instance.website = validated_data.get('website', instance.website)
         instance.cba_series_id = validated_data.get('cba_series_id', instance.cba_series_id)
         instance.default_playlist_id = validated_data.get('default_playlist_id', instance.default_playlist_id)
+        instance.type = validated_data.get('type', instance.type)
+        instance.funding_category = validated_data.get('funding_category', instance.funding_category)
+        instance.predecessor = validated_data.get('predecessor', instance.predecessor)
+        instance.is_active = validated_data.get('is_active', instance.is_active)
+        instance.is_public = validated_data.get('is_public', instance.is_public)
 
         instance.owners.set(validated_data.get('owners', instance.owners))
         instance.category.set(validated_data.get('category', instance.category))
         instance.hosts.set(validated_data.get('hosts', instance.hosts))
         instance.language.set(validated_data.get('language', instance.language))
         instance.topic.set(validated_data.get('topic', instance.topic))
-        # TODO: replace `musicfocs` with `music_focus` when the dashboard in updated
-        instance.music_focus.set(validated_data.get('musicfocus', instance.music_focus))
-        instance.type = validated_data.get('type', instance.type)
-        # TODO: replace `fundingcategory` with `funding_category` when the dashboard is updated
-        instance.funding_category = validated_data.get('fundingcategory', instance.funding_category)
-        instance.predecessor = validated_data.get('predecessor', instance.predecessor)
-        instance.is_active = validated_data.get('is_active', instance.is_active)
-        instance.is_public = validated_data.get('is_public', instance.is_public)
+        instance.music_focus.set(validated_data.get('music_focus', instance.music_focus))
 
         instance.save()
         return instance