Merge pull request #794 from open5e/461-determine-a-structure-for-equivalent-concepts-across-systems

461 determine a structure for equivalent concepts across systems

Author: augustjohnson

api_v2/admin.py

@@ -90,6 +90,7 @@ class LanguageAdmin(admin.ModelAdmin):
 admin.site.register(GameSystem)
 
 admin.site.register(DamageType)
+admin.site.register(DamageTypeDescription)
 
 admin.site.register(Language)
 
@@ -100,13 +101,6 @@ class LanguageAdmin(admin.ModelAdmin):
 
 admin.site.register(Condition)
 
-class ConditionConceptAdmin(admin.ModelAdmin):
-    list_display = ['key', 'name']
-    filter_horizontal = ['conditions']
-    search_fields = ['key', 'name', 'desc']
-    
-admin.site.register(ConditionConcept, ConditionConceptAdmin)
-
 admin.site.register(ClassFeatureItem)
 admin.site.register(ClassFeature, admin_class=ClassFeatureAdmin)
 admin.site.register(CharacterClass)

api_v2/management/commands/export.py

@@ -124,7 +124,6 @@ def handle(self, *args, **options) -> None:
 
                 for model in app_models:
                     SKIPPED_MODEL_NAMES = ['Document', 'GameSystem', 'License', 'Publisher','SearchResult']
-                    CONCEPT_MODEL_NAMES = ['ConditionConcept']  # These are synthetic/concept models not tied to documents
                     CHILD_MODEL_NAMES = ['SpeciesTrait', 'FeatBenefit', 'BackgroundBenefit', 'ClassFeatureItem', 'SpellCastingOption','CreatureAction', 'CreatureTrait']
                     CHILD_CHILD_MODEL_NAMES = ['CreatureActionAttack']
 
@@ -148,23 +147,6 @@ def handle(self, *args, **options) -> None:
                 self.stdout.write(self.style.SUCCESS(
                     'Wrote {} to {}'.format(doc.key, doc_path)))
 
-        # Export concept models (synthetic objects that aggregate across systems)
-        concept_models = ['ConditionConcept']  # Add other concept models here as they're created
-        for concept_model_name in concept_models:
-            try:
-                model = apps.get_model('api_v2', concept_model_name)
-                concept_queryset = model.objects.all().order_by('pk')
-                concept_path = get_filepath_by_model(
-                    concept_model_name,
-                    'api_v2',
-                    base_path=options['dir'],
-                    format=options['format'])
-                write_queryset_data(concept_path, concept_queryset, format=options['format'])
-                self.stdout.write(self.style.SUCCESS(f'Exported {concept_model_name} concept objects'))
-            except LookupError:
-                # Model doesn't exist yet, skip it
-                self.stdout.write(self.style.WARNING(f'Concept model {concept_model_name} not found, skipping'))
-
         self.stdout.write(self.style.SUCCESS('Data for v2 data complete.'))
 
 
@@ -176,7 +158,7 @@ def get_filepath_by_model(model_name, app_label, pub_key=None, doc_key=None, bas
 
     if app_label == "api_v2":
         root_folder_name = 'v2'
-        root_models = ['License', 'GameSystem', 'ConditionConcept']  # Concept models are exported at root level
+        root_models = ['License', 'GameSystem']  # Concept models are exported at root level
         pub_models = ['Publisher']
 
         if model_name in root_models:

api_v2/management/commands/populate_concepts.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.2.1 on 2025-09-01 11:12
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0052_merge_20250615_2121'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='damagetype',
+            name='desc',
+        ),
+        migrations.CreateModel(
+            name='DamageTypeDescription',
+            fields=[
+                ('desc', models.TextField(help_text='Description of the game content item. Markdown.')),
+                ('key', models.CharField(help_text='Unique key for the Item.', max_length=100, primary_key=True, serialize=False)),
+                ('describes', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.damagetype')),
+                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.document')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

api_v2/migrations/0053_remove_damagetype_desc_damagetypedescription.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.2.1 on 2025-09-01 11:55
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0053_remove_damagetype_desc_damagetypedescription'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='creaturetype',
+            name='desc',
+        ),
+        migrations.CreateModel(
+            name='CreatureTypeDescription',
+            fields=[
+                ('desc', models.TextField(help_text='Description of the game content item. Markdown.')),
+                ('key', models.CharField(help_text='Unique key for the Item.', max_length=100, primary_key=True, serialize=False)),
+                ('describes', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.creaturetype')),
+                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.document')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

api_v2/migrations/0054_remove_creaturetype_desc_creaturetypedescription.py

@@ -0,0 +1,46 @@
+# Generated by Django 5.2.1 on 2025-09-01 12:13
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0054_remove_creaturetype_desc_creaturetypedescription'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ability',
+            name='desc',
+        ),
+        migrations.RemoveField(
+            model_name='skill',
+            name='desc',
+        ),
+        migrations.CreateModel(
+            name='AbilityDescription',
+            fields=[
+                ('desc', models.TextField(help_text='Description of the game content item. Markdown.')),
+                ('key', models.CharField(help_text='Unique key for the Item.', max_length=100, primary_key=True, serialize=False)),
+                ('describes', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.ability')),
+                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.document')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='SkillDescription',
+            fields=[
+                ('desc', models.TextField(help_text='Description of the game content item. Markdown.')),
+                ('key', models.CharField(help_text='Unique key for the Item.', max_length=100, primary_key=True, serialize=False)),
+                ('describes', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.skill')),
+                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.document')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

api_v2/migrations/0055_remove_ability_desc_remove_skill_desc_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.2.1 on 2025-09-01 12:37
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0055_remove_ability_desc_remove_skill_desc_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='alignment',
+            name='desc',
+        ),
+        migrations.CreateModel(
+            name='AlignmentTypeDescription',
+            fields=[
+                ('desc', models.TextField(help_text='Description of the game content item. Markdown.')),
+                ('key', models.CharField(help_text='Unique key for the Item.', max_length=100, primary_key=True, serialize=False)),
+                ('describes', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.alignment')),
+                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.document')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

api_v2/migrations/0056_remove_alignment_desc_alignmenttypedescription.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.1 on 2025-09-01 12:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0056_remove_alignment_desc_alignmenttypedescription'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='AlignmentTypeDescription',
+            new_name='AlignmentDescription',
+        ),
+    ]

api_v2/migrations/0057_rename_alignmenttypedescription_alignmentdescription.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.2.1 on 2025-09-20 20:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0057_rename_alignmenttypedescription_alignmentdescription'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='ConditionConcept',
+        ),
+    ]

api_v2/migrations/0058_delete_conditionconcept.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.2.1 on 2025-09-20 21:05
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0058_delete_conditionconcept'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ConditionDescription',
+            fields=[
+                ('desc', models.TextField(help_text='Description of the game content item. Markdown.')),
+                ('key', models.CharField(help_text='Unique key for the Item.', max_length=100, primary_key=True, serialize=False)),
+                ('describes', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.condition')),
+                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.document')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]