added CreatureLanguageSerializer/LanguageSummarySerializer for handling Creature languages

Author: calumbell

api_v2/serializers/creature.py

@@ -10,7 +10,7 @@
 from .damagetype import DamageTypeSerializer
 from .condition import ConditionSerializer
 from .document import DocumentSummarySerializer
-from .language import LanguageSerializer
+from .language import LanguageSummarySerializer
 from .environment import EnvironmentSerializer
 from .size import SizeSerializer
 from drf_spectacular.utils import extend_schema_field, inline_serializer
@@ -56,6 +56,14 @@ class Meta:
         model = models.CreatureTrait
         fields = '__all__'
 
+class CreatureLanguageSerializer(GameContentSerializer):
+    as_string = serializers.CharField(source="languages_desc")
+    data = LanguageSummarySerializer(source="languages", many=True)
+
+    class Meta:
+        model = models.Creature
+        fields = ['as_string', 'data']
+
 class CreatureSerializer(GameContentSerializer):
     '''The serializer for the Creature object.'''
 
@@ -79,7 +87,7 @@ class CreatureSerializer(GameContentSerializer):
     document = DocumentSummarySerializer()
     type = CreatureTypeSerializer()
     size = SizeSerializer()
-    languages = LanguageSerializer(many=True)
+    languages = CreatureLanguageSerializer(source='*')
     environments = EnvironmentSerializer(many=True)
     initiative_bonus = serializers.SerializerMethodField()
 

api_v2/serializers/language.py

@@ -13,3 +13,14 @@ class LanguageSerializer(GameContentSerializer):
     class Meta:
         model = models.Language
         fields = '__all__'
+
+class LanguageSummarySerializer(GameContentSerializer):
+    """
+    This serializer is used for FKs to the Language model from other 
+    serializers. ie. for the languages spoken by creatures on the 
+    CreatureSerializer.
+    """
+    key = serializers.ReadOnlyField()
+    class Meta:
+        model = models.Language
+        fields = ['name', 'key', 'url', 'desc']

api_v2/views/creature.py

@@ -73,6 +73,8 @@ class CreatureViewSet(EagerLoadingMixin, viewsets.ReadOnlyModelViewSet):
         'actions__attacks',
         'creaturesets',
         'condition_immunities',
+        'condition_immunities__icon',
+        'condition_immunities__document',
         'damage_immunities',
         'damage_resistances',
         'damage_vulnerabilities',
@@ -81,7 +83,6 @@ class CreatureViewSet(EagerLoadingMixin, viewsets.ReadOnlyModelViewSet):
         'document__gamesystem',
         'environments',
         'languages',
-        'languages__document',
         'type',
         'size',
         'size__document',