Feature: replace AgentDescriptionName with EntityDescription.designators

backend/core/admin.py

@@ -12,7 +12,7 @@
     "Source information",
     {
         "description": "Information about the source from which this description is taken.",
-        "fields": ["source", "source_mention", "book", "chapter", "page"],
+        "fields": ["source", "source_mention", "designators", "book", "chapter", "page"],
     },
 )
 
@@ -22,7 +22,6 @@
 
 description_field_fields = [
     "source_mention",
-    "source_terminology",
 ] + field_fields
 
 

backend/core/models.py

@@ -120,13 +120,24 @@ class EntityDescription(Named, models.Model):
         on_delete=models.PROTECT,
         help_text="Source text containing this description",
     )
+
     source_mention = models.CharField(
         max_length=32,
         blank=True,
         choices=[("direct", "directly mentioned"), ("implied", "implied")],
         help_text="How is this entity presented in the text?",
     )
 
+    designators = ArrayField(
+        models.CharField(
+            max_length=200,
+        ),
+        default=list,
+        blank=True,
+        size=5,
+        help_text="Relevant (Latin) terminology used to describe this entity in the source text",
+    )
+
     book = models.CharField(
         max_length=255,
         blank=True,
@@ -166,15 +177,6 @@ class DescriptionField(Field, models.Model):
         choices=[("direct", "directly mentioned"), ("implied", "implied")],
         help_text="How is this information presented in the text?",
     )
-    source_terminology = ArrayField(
-        models.CharField(
-            max_length=200,
-        ),
-        default=list,
-        blank=True,
-        size=5,
-        help_text="Relevant terminology used in the source text",
-    )
 
     class Meta:
         abstract = True

backend/event/migrations/0017_remove_eventdescriptionagent_source_terminology_and_more.py

@@ -0,0 +1,41 @@
+# Generated by Django 4.2.7 on 2024-05-17 13:15
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("event", "0016_remove_eventdescription_source_location_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="eventdescriptionagent",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="eventdescriptiongift",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="eventdescriptionletter",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="eventdescriptionspace",
+            name="source_terminology",
+        ),
+        migrations.AddField(
+            model_name="eventdescription",
+            name="designators",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=200),
+                blank=True,
+                default=list,
+                help_text="Relevant (Latin) terminology used to describe this entity in the source text",
+                size=5,
+            ),
+        ),
+    ]

backend/letter/migrations/0014_remove_giftdescriptionaddressee_source_terminology_and_more.py

@@ -0,0 +1,60 @@
+# Generated by Django 4.2.7 on 2024-05-17 13:15
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("letter", "0013_remove_giftdescription_source_location_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="giftdescriptionaddressee",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="giftdescriptioncategory",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="giftdescriptionsender",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="letterdescriptionaddressee",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="letterdescriptioncategory",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="letterdescriptionsender",
+            name="source_terminology",
+        ),
+        migrations.AddField(
+            model_name="giftdescription",
+            name="designators",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=200),
+                blank=True,
+                default=list,
+                help_text="Relevant (Latin) terminology used to describe this entity in the source text",
+                size=5,
+            ),
+        ),
+        migrations.AddField(
+            model_name="letterdescription",
+            name="designators",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=200),
+                blank=True,
+                default=list,
+                help_text="Relevant (Latin) terminology used to describe this entity in the source text",
+                size=5,
+            ),
+        ),
+    ]

backend/person/admin.py

@@ -29,10 +29,6 @@ class HistoricalPersonAdmin(admin.ModelAdmin):
     ]
 
 
-class AgentDescriptionNameAdmin(admin.StackedInline):
-    model = models.AgentDescriptionName
-    fields = ["name"] + core_admin.description_field_fields
-    extra = 0
 
 
 class AgentDescriptionGenderAdmin(admin.StackedInline):
@@ -56,7 +52,6 @@ class AgentDescriptionLocationAdmin(admin.StackedInline):
 @admin.register(models.AgentDescription)
 class AgentDescriptionAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin):
     inlines = [
-        AgentDescriptionNameAdmin,
         AgentDescriptionGenderAdmin,
         AgentDescriptionSocialStatusAdmin,
         AgentDescriptionLocationAdmin,

backend/person/migrations/0016_remove_agentdescriptiongender_source_terminology_and_more.py

@@ -0,0 +1,47 @@
+# Generated by Django 4.2.7 on 2024-05-17 13:15
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+def migrate_names_to_designators(apps, schema_editor):
+    AgentDescription = apps.get_model("person", "AgentDescription")
+    for agent_description in AgentDescription.objects.all():
+        if agent_description.names:
+            agent_description.designators = list(agent_description.names.values_list("name", flat=True))
+            agent_description.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("person", "0015_remove_agentdescription_source_location_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="agentdescriptiongender",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="agentdescriptionlocation",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="agentdescriptionsocialstatus",
+            name="source_terminology",
+        ),
+        migrations.AddField(
+            model_name="agentdescription",
+            name="designators",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=200),
+                blank=True,
+                default=list,
+                help_text="Relevant (Latin) terminology used to describe this entity in the source text",
+                size=5,
+            ),
+        ),
+        migrations.RunPython(code=migrate_names_to_designators, reverse_code=migrations.RunPython.noop),
+        migrations.DeleteModel(
+            name="AgentDescriptionName",
+        ),
+    ]

backend/person/models.py

@@ -143,31 +143,6 @@ def clean(self):
             raise ValidationError("Mixed gender can only be used for groups")
 
 
-class AgentDescriptionName(DescriptionField, models.Model):
-    """
-    A name used for an agent in a source text description
-    """
-
-    agent = models.ForeignKey(
-        to=AgentDescription,
-        on_delete=models.CASCADE,
-        related_name="names",
-    )
-    name = models.CharField(
-        max_length=256,
-    )
-
-    class Meta:
-        verbose_name = "name used in description"
-        verbose_name_plural = "names used in description"
-        constraints = [
-            models.UniqueConstraint("name", "agent", name="unique_names_for_agent")
-        ]
-
-    def __str__(self):
-        return self.name
-
-
 class AgentDescriptionSocialStatus(DescriptionField, models.Model):
     """
     A characterisation of an agent's social status in a source text.

backend/space/migrations/0010_remove_ecclesiasticalregionfield_source_terminology_and_more.py

@@ -0,0 +1,45 @@
+# Generated by Django 4.2.7 on 2024-05-17 13:15
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("space", "0009_remove_spacedescription_source_location_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="ecclesiasticalregionfield",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="geographicalregionfield",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="landscapefeature",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="politicalregionfield",
+            name="source_terminology",
+        ),
+        migrations.RemoveField(
+            model_name="structurefield",
+            name="source_terminology",
+        ),
+        migrations.AddField(
+            model_name="spacedescription",
+            name="designators",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=200),
+                blank=True,
+                default=list,
+                help_text="Relevant (Latin) terminology used to describe this entity in the source text",
+                size=5,
+            ),
+        ),
+    ]