Merge pull request #371 from open5e/v2_better_race_view

V2 better race view

api_v2/models/race.py

@@ -29,17 +29,16 @@ class Race(HasName, HasDescription, FromDocument):
                                    null=True,
                                    on_delete=models.CASCADE)
 
+    @property
+    def subraces(self):
+        """Returns the set of subraces that are related to this race."""
+        return self.race_set.all()
+
     @property
     def is_subrace(self):
         """Returns whether the object is a subrace."""
         return self.subrace_of is not None
 
-    @property
-    def is_selectable(self):
-        """Returns whether or not this is a choosable race or subrace."""
-        # Returns true if this has 0 referencing children.
-        return len(self.race_set.all()) == 0
-
     @property
     def traits(self):
         """Returns the set of traits that are related to this race."""

api_v2/serializers/__init__.py

@@ -17,6 +17,7 @@
 from .feat import FeatSerializer
 
 from .race import TraitSerializer
+from .race import SubraceSerializer
 from .race import RaceSerializer
 
 from .creature import CreatureSerializer

api_v2/serializers/race.py

@@ -13,11 +13,19 @@ class Meta:
         model = models.Trait
         fields = ['name', 'desc']
 
+class SubraceSerializer(GameContentSerializer):
+    key = serializers.ReadOnlyField()
+    traits = TraitSerializer(
+        many=True)
+    class Meta:
+        model = models.Race
+        fields = '__all__'
 
 class RaceSerializer(GameContentSerializer):
     key = serializers.ReadOnlyField()
     is_subrace = serializers.ReadOnlyField()
-    is_selectable = serializers.ReadOnlyField()
+    subraces = SubraceSerializer(many=True, context={'request': {}})
+
     traits = TraitSerializer(
         many=True)
 

api_v2/views/race.py

@@ -13,6 +13,8 @@ class Meta:
             'key': ['in', 'iexact', 'exact'],
             'name': ['iexact', 'exact'],
             'document__key': ['in', 'iexact', 'exact'],
+            'subrace_of': ['isnull'],
+            'subrace_of__key':['in', 'iexact', 'exact'],
         }
 
 
@@ -24,4 +26,3 @@ class RaceViewSet(viewsets.ReadOnlyModelViewSet):
     queryset = models.Race.objects.all().order_by('pk')
     serializer_class = serializers.RaceSerializer
     filterset_class = RaceFilterSet
-