bugfix: ClassFeature serializer table_data/gained_at no longer mutually exclusive

Author: calumbell

api_v2/models/characterclass.py

@@ -50,15 +50,6 @@ class ClassFeature(HasName, HasDescription, FromDocument):
 
     parent = models.ForeignKey('CharacterClass', on_delete=models.CASCADE, related_name="features")
 
-    def gained_at(self):
-        return self.feature_items.filter(column_value__isnull=True)
-    
-    def table_data(self):
-        """Returns an array of tabular data relating to the feature. Each
-        array element is a table-row of data. Not needed for most features."""
-
-        return self.feature_items.filter(column_value__isnull=False)
-
     # Infer the type of this feature based on the `key`
     @property
     def feature_type(self):

api_v2/serializers/characterclass.py

@@ -28,28 +28,35 @@ class ClassFeatureSerializer(GameContentSerializer):
     feature_items = ClassFeaturePrefetchSerializer(many=True, read_only=True)
 
     def to_representation(self, instance):
+        """
+        'feature_items' field contains tabulated and non-tabulated data. These
+        have different uses and must be split into the 'gained_at' and 
+        'table_data' fields before being returned by the serializer
+        """
         # run 'to_representation' on super-class (GameContentSerializer)
         representation = super().to_representation(instance)
-
-        # Filters non-table data from FeatureItems
-        gained_at = [
-            ClassFeatureItemSerializer(item).data
-            for item in instance.feature_items.all()
-            if item.column_value is None
-        ]
-
-        # Filters table data from FeatureItems
-        table_data = [
-            ClassFeatureColumnItemSerializer(item).data
-            for item in instance.feature_items.all()
-            if item.column_value is not None
-        ]
-
-        # replace 'feature_items' with 'gained_at' and 'column_data' in representation
-        representation['gained_at'] = gained_at
-        representation['table_data'] = table_data
+        
+        # Split FeatureItems into tabulated and non-tabulated data arrays
+        table_data = []
+        non_table_data = []
+        for item in instance.feature_items.all():
+            if item.column_value is None:
+                non_table_data.append(item)
+            else:
+                table_data.append(item)
+
+        # If a feature has tabulated data AND a description, take its lowest 
+        # level FeatureItem and add it to the non-tabulated data.
+        if len(table_data) > 0 and instance.desc != '[Column data]':
+            first_level_gained = min(table_data, key=lambda x: x.level)
+            non_table_data.append(first_level_gained)
+
+        # serialize data and add it to representation
+        representation['gained_at'] = [ClassFeatureItemSerializer(item).data for item in non_table_data]
+        representation['table_data'] = [ClassFeatureColumnItemSerializer(item).data for item in table_data]
+
+        # remove feature_items field to avoid data duplication
         del representation['feature_items']
-
         return representation
 
     class Meta: