Update ShowSerializer

- remove ThumbnailsMixin and thumbnails fields,
- remove image_* fields and theis usage,
- use utils.delete_links function

program/serializers.py

@@ -357,23 +357,29 @@ class ShowLinkSerializer(serializers.ModelSerializer):
         fields = ("type", "url")
 
 
-class ShowSerializer(ThumbnailsMixin, serializers.HyperlinkedModelSerializer):
-    links = HostLinkSerializer(many=True, required=False)
-    owners = serializers.PrimaryKeyRelatedField(queryset=User.objects.all(), many=True)
+class ShowSerializer(serializers.HyperlinkedModelSerializer):
     category = serializers.PrimaryKeyRelatedField(queryset=Category.objects.all(), many=True)
+    funding_category = serializers.PrimaryKeyRelatedField(queryset=FundingCategory.objects.all())
     hosts = serializers.PrimaryKeyRelatedField(queryset=Host.objects.all(), many=True)
+    image = serializers.PrimaryKeyRelatedField(queryset=Image.objects.all(), required=False)
     language = serializers.PrimaryKeyRelatedField(queryset=Language.objects.all(), many=True)
-    topic = serializers.PrimaryKeyRelatedField(queryset=Topic.objects.all(), many=True)
+    links = HostLinkSerializer(many=True, required=False)
     music_focus = serializers.PrimaryKeyRelatedField(queryset=MusicFocus.objects.all(), many=True)
-    type = serializers.PrimaryKeyRelatedField(queryset=Type.objects.all())
-    funding_category = serializers.PrimaryKeyRelatedField(queryset=FundingCategory.objects.all())
+    owners = serializers.PrimaryKeyRelatedField(queryset=User.objects.all(), many=True)
     predecessor = serializers.PrimaryKeyRelatedField(
         queryset=Show.objects.all(), required=False, allow_null=True
     )
-    thumbnails = serializers.SerializerMethodField()
+    topic = serializers.PrimaryKeyRelatedField(queryset=Topic.objects.all(), many=True)
+    type = serializers.PrimaryKeyRelatedField(queryset=Type.objects.all())
 
     class Meta:
         model = Show
+        read_only_fields = (
+            "created_at",
+            "created_by",
+            "updated_at",
+            "updated_by",
+        )
         fields = (
             "category",
             "cba_series_id",
@@ -383,6 +389,7 @@ class ShowSerializer(ThumbnailsMixin, serializers.HyperlinkedModelSerializer):
             "funding_category",
             "hosts",
             "id",
+            "image",
             "internal_note",
             "is_active",
             "is_public",
@@ -398,25 +405,7 @@ class ShowSerializer(ThumbnailsMixin, serializers.HyperlinkedModelSerializer):
             "thumbnails",
             "topic",
             "type",
-            # ModelWithImageFields
-            "image",
-            "image_alt_text",
-            "image_credits",
-            "image_height",
-            "image_ppoi",
-            "image_width",
-            # ModelWithCreatedUpdatedFields
-            "created_at",
-            "created_by",
-            "updated_at",
-            "updated_by",
-        )
-        read_only_fields = (
-            "created_at",
-            "created_by",
-            "updated_at",
-            "updated_by",
-        )
+        ) + read_only_fields
 
     def create(self, validated_data):
         """
@@ -431,7 +420,7 @@ class ShowSerializer(ThumbnailsMixin, serializers.HyperlinkedModelSerializer):
         music_focus = validated_data.pop("music_focus")
         links_data = validated_data.pop("links", [])
 
-        show = Show.objects.create(**validated_data | self.context)
+        show = Show.objects.create(**validated_data | self.context)  # created_by
 
         # Save many-to-many relationships
         show.owners.set(owners)
@@ -445,6 +434,7 @@ class ShowSerializer(ThumbnailsMixin, serializers.HyperlinkedModelSerializer):
             ShowLink.objects.create(show=show, **link_data)
 
         show.save()
+
         return show
 
     def update(self, instance, validated_data):
@@ -452,47 +442,43 @@ class ShowSerializer(ThumbnailsMixin, serializers.HyperlinkedModelSerializer):
         Update and return an existing Show instance, given the validated data.
         """
 
-        instance.name = validated_data.get("name", instance.name)
-        instance.slug = validated_data.get("slug", instance.slug)
-        instance.image = validated_data.get("image", instance.image)
-        instance.image_ppoi = validated_data.get("image_ppoi", instance.image_ppoi)
-        instance.image_credits = validated_data.get("image_credits", instance.image_credits)
-        instance.image_alt_text = validated_data.get("image_alt_text", instance.image_alt_text)
-        instance.logo = validated_data.get("logo", instance.logo)
-        instance.short_description = validated_data.get(
-            "short_description", instance.short_description
-        )
-        instance.description = validated_data.get("description", instance.description)
-        instance.email = validated_data.get("email", instance.email)
         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.description = validated_data.get("description", instance.description)
+        instance.email = validated_data.get("email", instance.email)
         instance.funding_category = validated_data.get(
             "funding_category", instance.funding_category
         )
-        instance.predecessor = validated_data.get("predecessor", instance.predecessor)
+        instance.image = validated_data.get("image", instance.image)
+        instance.internal_note = validated_data.get("internal_note", instance.internal_note)
         instance.is_active = validated_data.get("is_active", instance.is_active)
         instance.is_public = validated_data.get("is_public", instance.is_public)
-        instance.internal_note = validated_data.get("internal_note", instance.internal_note)
-        instance.owners.set(validated_data.get("owners", instance.owners))
+        instance.logo = validated_data.get("logo", instance.logo)
+        instance.name = validated_data.get("name", instance.name)
+        instance.predecessor = validated_data.get("predecessor", instance.predecessor)
+        instance.short_description = validated_data.get(
+            "short_description", instance.short_description
+        )
+        instance.slug = validated_data.get("slug", instance.slug)
+        instance.type = validated_data.get("type", instance.type)
+
         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))
         instance.music_focus.set(validated_data.get("music_focus", instance.music_focus))
-
-        instance.updated_by = self.context.get("updated_by")
-
-        if instance.links.count() > 0:
-            for link in instance.links.all():
-                link.delete(keep_parents=True)
+        instance.owners.set(validated_data.get("owners", instance.owners))
+        instance.topic.set(validated_data.get("topic", instance.topic))
 
         if links_data := validated_data.get("links"):
+            instance = delete_links(instance)
+
             for link_data in links_data:
                 ShowLink.objects.create(show=instance, **link_data)
 
+        instance.updated_by = self.context.get("updated_by")
+
         instance.save()
 
         return instance