fix: complete the clean-up of the serilalizers

program/serializers.py

@@ -371,7 +371,7 @@ class HostSerializer(serializers.ModelSerializer):
         owners = validated_data.pop("owners", [])
 
         # optional foreign key
-        validated_data["image"] = validated_data.pop("image_id", None)
+        validated_data["image"] = validated_data.pop("image", None)
 
         host = Host.objects.create(
             created_by=self.context.get("request").user.username, **validated_data
@@ -577,13 +577,13 @@ class ShowSerializer(serializers.HyperlinkedModelSerializer):
         links_data = validated_data.pop("links", [])
 
         # required foreign key
-        validated_data["funding_category"] = validated_data.pop("funding_category_id")
-        validated_data["type"] = validated_data.pop("type_id")
+        validated_data["funding_category"] = validated_data.pop("funding_category")
+        validated_data["type"] = validated_data.pop("type")
 
         # optional foreign key
-        validated_data["image"] = validated_data.pop("image_id", None)
-        validated_data["logo"] = validated_data.pop("logo_id", None)
-        validated_data["predecessor"] = validated_data.pop("predecessor_id", None)
+        validated_data["image"] = validated_data.pop("image", None)
+        validated_data["logo"] = validated_data.pop("logo", None)
+        validated_data["predecessor"] = validated_data.pop("predecessor", None)
 
         validated_data["slug"] = validated_data.get(
             "slug", text.slugify(validated_data.get("name"))
@@ -1017,11 +1017,11 @@ class NoteSerializer(serializers.ModelSerializer):
 
         # required
         if "timeslot_id" in validated_data:
-            validated_data["timeslot"] = validated_data.pop("timeslot_id")
+            validated_data["timeslot"] = validated_data.pop("timeslot")
         else:
             # TODO: Once we remove nested routes, this hack should be removed
             timeslot_pk = TimeSlot.objects.get(pk=self.context["request"].path.split("/")[-3])
-            validated_data["timeslot"] = validated_data.pop("timeslot_id", timeslot_pk)
+            validated_data["timeslot"] = validated_data.pop("timeslot", timeslot_pk)
 
         show = validated_data["timeslot"].schedule.show
         user = self.context.get("request").user
@@ -1041,7 +1041,7 @@ class NoteSerializer(serializers.ModelSerializer):
         topic = validated_data.pop("topic", show.topic.values_list("id", flat=True))
 
         # optional foreign key
-        validated_data["image"] = validated_data.pop("image_id", None)
+        validated_data["image"] = validated_data.pop("image", None)
 
         note = Note.objects.create(
             created_by=self.context.get("request").user.username,