Merge branch 'staging' into bfrd-mechanist-class

Author: calumbell

api_v2/migrations/0062_alter_featbenefit_options_remove_featbenefit_id_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 5.2.1 on 2025-10-02 21:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0061_characterclass_desc_alter_abilitydescription_desc_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='featbenefit',
+            options={'ordering': ['parent', 'order']},
+        ),
+        migrations.RemoveField(
+            model_name='featbenefit',
+            name='id',
+        ),
+        migrations.AddField(
+            model_name='featbenefit',
+            name='key',
+            field=models.CharField(default='', help_text='Unique key for the Document.', max_length=100, primary_key=True, serialize=False),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='featbenefit',
+            name='order',
+            field=models.SmallIntegerField(blank=True, help_text='The position in the list of features that this feature appears in its source statblock', null=True),
+        ),
+    ]

api_v2/migrations/0062_classfeature_feature_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.1 on 2025-09-26 10:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0061_characterclass_desc_alter_abilitydescription_desc_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='classfeature',
+            name='feature_type',
+            field=models.CharField(choices=[('CORE_TRAITS_TABLE', 'CORE_TRAITS_TABLE'), ('CLASS_FEATURE', 'CLASS_FEATURE'), ('CLASS_TABLE_DATA', 'CLASS_TABLE_DATA'), ('PROFICIENCIES', 'PROFICIENCIES'), ('PROFICIENCY_BONUS', 'PROFICIENCY_BONUS'), ('SPELL_SLOTS', 'SPELL_SLOTS')], default='CLASS_FEATURE', help_text='The type that best represents this Class Feature', max_length=32),
+        ),
+    ]

api_v2/migrations/0062_remove_speciestrait_id_speciestrait_key.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.1 on 2025-10-01 12:12
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0061_characterclass_desc_alter_abilitydescription_desc_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='speciestrait',
+            name='id',
+        ),
+        migrations.AddField(
+            model_name='speciestrait',
+            name='key',
+            field=models.CharField(default=django.utils.timezone.now, help_text='Unique key for the Document.', max_length=100, primary_key=True, serialize=False),
+            preserve_default=False,
+        ),
+    ]

api_v2/migrations/0063_alter_classfeature_feature_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.1 on 2025-09-26 11:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0062_classfeature_feature_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classfeature',
+            name='feature_type',
+            field=models.CharField(choices=[('CORE_TRAITS_TABLE', 'CORE_TRAITS_TABLE'), ('CLASS_LEVEL_FEATURE', 'CLASS_LEVEL_FEATURE'), ('CLASS_TABLE_DATA', 'CLASS_TABLE_DATA'), ('PROFICIENCIES', 'PROFICIENCIES'), ('PROFICIENCY_BONUS', 'PROFICIENCY_BONUS'), ('SPELL_SLOTS', 'SPELL_SLOTS')], default='CLASS_FEATURE', help_text='The type that best represents this Class Feature', max_length=32),
+        ),
+    ]

api_v2/migrations/0063_speciestrait_order_alter_speciestrait_type.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.1 on 2025-10-02 09:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0062_remove_speciestrait_id_speciestrait_key'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='speciestrait',
+            name='order',
+            field=models.SmallIntegerField(blank=True, help_text='The position in the list of features that a feature appears in its source statblock', null=True),
+        ),
+        migrations.AlterField(
+            model_name='speciestrait',
+            name='type',
+            field=models.CharField(blank=True, choices=[('ABILITY_MODS', 'ABILITY_MODS'), ('SIZE', 'SIZE'), ('SPEED', 'SPEED')], max_length=16, null=True),
+        ),
+    ]

api_v2/migrations/0064_alter_classfeature_feature_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.1 on 2025-09-26 18:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0063_alter_classfeature_feature_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classfeature',
+            name='feature_type',
+            field=models.CharField(choices=[('CORE_TRAITS_TABLE', 'CORE_TRAITS_TABLE'), ('CLASS_LEVEL_FEATURE', 'CLASS_LEVEL_FEATURE'), ('CLASS_TABLE_DATA', 'CLASS_TABLE_DATA'), ('PROFICIENCIES', 'PROFICIENCIES'), ('PROFICIENCY_BONUS', 'PROFICIENCY_BONUS'), ('STARTING_EQUIPMENT', 'STARTING_EQUIPMENT'), ('SPELL_SLOTS', 'SPELL_SLOTS')], default='CLASS_LEVEL_FEATURE', help_text='The type that best represents this Class Feature', max_length=32),
+        ),
+    ]

api_v2/migrations/0064_alter_speciestrait_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.1 on 2025-10-02 10:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0063_speciestrait_order_alter_speciestrait_type'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='speciestrait',
+            options={'ordering': ['parent', 'order']},
+        ),
+    ]

api_v2/models/characterclass.py

@@ -50,17 +50,22 @@ class ClassFeature(HasName, HasDescription, FromDocument):
 
     parent = models.ForeignKey('CharacterClass', on_delete=models.CASCADE, related_name="features")
 
-    # Infer the type of this feature based on the `key`
-    @property
-    def feature_type(self) -> str:
-        if "core-traits" in self.key:       return "CORE_TRAITS_TABLE"
-        if "proficiency-bonus" in self.key: return "PROFICIENCY_BONUS"
-        if "proficiencies" in self.key:     return "PROFICIENCIES"
-        if "equipment" in self.key:         return "STARTING_EQUIPMENT"
-        if "_slots-" in self.key:           return "SPELL_SLOTS"
-        if "_spells-known" in self.key:     return "SPELLS_KNOWN"
-        if "_cantrips-known" in self.key:   return "CANTRIPS_KNOWN"
-        return "CLASS_FEATURE"              # <- base-case
+    FEATURE_TYPES = [
+        ('CORE_TRAITS_TABLE', 'CORE_TRAITS_TABLE'),
+        ('CLASS_LEVEL_FEATURE', 'CLASS_LEVEL_FEATURE'),
+        ('CLASS_TABLE_DATA', 'CLASS_TABLE_DATA'),
+        ('PROFICIENCIES', 'PROFICIENCIES'),
+        ('PROFICIENCY_BONUS', 'PROFICIENCY_BONUS'),
+        ('STARTING_EQUIPMENT', 'STARTING_EQUIPMENT'),
+        ('SPELL_SLOTS', 'SPELL_SLOTS'),
+    ]
+
+    feature_type = models.CharField(
+        default='CLASS_LEVEL_FEATURE',
+        choices=FEATURE_TYPES,
+        max_length=32,
+        help_text="The type that best represents this Class Feature",
+    )
 
     def __str__(self):
         return "{} ({})".format(self.name,self.parent.name)

api_v2/models/feat.py

@@ -1,6 +1,6 @@
 """The model for a feat."""
 from django.db import models
-from .abstracts import HasName, HasDescription, HasPrerequisite, Modification
+from .abstracts import HasName, HasDescription, HasPrerequisite, Modification, key_field
 from .document import FromDocument
 
 FEAT_TYPES = [
@@ -12,8 +12,16 @@
 
 class FeatBenefit(Modification):
     """This is the model for an individual benefit of a feat."""
-
+    key = key_field()
     parent = models.ForeignKey('Feat', on_delete=models.CASCADE)
+    order = models.SmallIntegerField(
+        blank=True,
+        null=True,
+        help_text='The position in the list of features that this feature appears in its source statblock'
+    )
+
+    class Meta:
+        ordering = ['parent', 'order']
 
 
 class Feat(HasName, HasDescription, HasPrerequisite, FromDocument):

api_v2/models/species.py

@@ -1,8 +1,7 @@
 """The model for a species, sub-species, and it's traits."""
 
 from django.db import models
-from .abstracts import HasName, HasDescription, HasPrerequisite
-from .abstracts import Modification
+from .abstracts import HasName, HasDescription, HasPrerequisite, Modification, key_field
 from .document import FromDocument
 from drf_spectacular.utils import extend_schema_field
 from drf_spectacular.types import OpenApiTypes
@@ -12,9 +11,30 @@ class SpeciesTrait(Modification):
 
     It inherits from modification, which is an abstract concept.
     """
-
+    key = key_field()
     parent = models.ForeignKey('Species', on_delete=models.CASCADE)
 
+    SPECIES_FEATURE_TYPES = [
+        ('ABILITY_MODS', 'ABILITY_MODS'),
+        ('SIZE', 'SIZE'),
+        ('SPEED', 'SPEED'),
+    ]
+
+    type = models.CharField(
+        blank=True,
+        null=True,
+        max_length=16,
+        choices=SPECIES_FEATURE_TYPES,
+    )
+
+    order = models.SmallIntegerField(
+        blank=True,
+        null=True,
+        help_text='The position in the list of features that a feature appears in its source statblock'
+    )
+
+    class Meta:
+        ordering = ['parent', 'order']
 
 class Species(HasName, HasDescription, FromDocument):
     """