fixed filtering on 'school' and 'classes' for /spells endpoint

Author: calumbell

api_v2/serializers/__init__.py

@@ -33,7 +33,7 @@
 
 from .condition import ConditionSerializer
 
-from .spell import SpellSerializer
+from .spell import SpellSerializer, SpellSchoolSerializer
 
 from .characterclass import CharacterClassSerializer
 from .characterclass import ClassFeatureSerializer

api_v2/serializers/spell.py

@@ -6,11 +6,12 @@
 
 from .abstracts import GameContentSerializer
 from .document import DocumentSerializer
+from .characterclass import CharacterClassSerializer
 
 from drf_spectacular.utils import extend_schema_field
 from drf_spectacular.types import OpenApiTypes
 
-class SpellSchoolSerializer(serializers.ModelSerializer):
+class SpellSchoolSerializer(GameContentSerializer):
     class Meta:
         model = models.SpellSchool
         fields='__all__'
@@ -27,6 +28,7 @@ class SpellSerializer(GameContentSerializer):
     key = serializers.ReadOnlyField()
     casting_options = SpellCastingOptionSerializer(many=True)
     school = SpellSchoolSerializer()
+    classes = CharacterClassSerializer(many=True)
 
     range_unit = serializers.SerializerMethodField()
     shape_size_unit = serializers.SerializerMethodField()

api_v2/urls.py

@@ -25,6 +25,7 @@
 router.register(r'alignments',views.AlignmentViewSet)
 router.register(r'conditions',views.ConditionViewSet)
 router.register(r'spells',views.SpellViewSet)
+router.register(r'spellschools', views.SpellSchoolViewSet)
 router.register(r'classes',views.CharacterClassViewSet)
 router.register(r'sizes',views.SizeViewSet)
 router.register(r'itemrarities',views.ItemRarityViewSet)

api_v2/views/__init__.py

@@ -30,7 +30,7 @@
 
 from .condition import ConditionViewSet
 
-from .spell import SpellViewSet
+from .spell import SpellViewSet, SpellSchoolViewSet
 
 from .characterclass import CharacterClassViewSet
 

api_v2/views/spell.py

@@ -61,3 +61,17 @@ def setup_eager_loading(queryset, depth):
         queryset = queryset.select_related(*selects).prefetch_related(*prefetches)
         return queryset
 
+class SpellSchoolFilterSet(FilterSet):
+    class Meta:
+        model = models.CreatureSet
+        fields = {
+            'key': ['in', 'iexact', 'exact' ],
+            'name': ['iexact', 'exact','contains'],
+            'document__key': ['in','iexact','exact'],
+            'document__gamesystem__key': ['in','iexact','exact'],
+        }
+
+class SpellSchoolViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = models.SpellSchool.objects.all().order_by('pk')
+    serializer_class = serializers.SpellSchoolSerializer
+    filterset_class = SpellSchoolFilterSet