V4.4 Complete

tests/services/test_v2_crud.py

@@ -4,7 +4,6 @@ import pytest
 
 from transcription.db.models import Document
 from transcription.db.models import DocumentPerson
-from transcription.db.models import DocumentPersonRole
 from transcription.db.models import Job
 from transcription.db.models import JobSource
 from transcription.db.models import JobSourceStatus
@@ -27,23 +26,23 @@ async def test_people_service_handles_person_and_document_person_crud(default_se
 
     document = await documents.create_document(Document(id=uuid4(), name="person-doc"))
     person = await people_service.create_person(Person(full_name="Ada Lovelace"))
+    author_role = await people_service.create_person_role(label="Author")
+    recipient_role = await people_service.create_person_role(label="Recipient")
 
     assert document.document_type_id is None
 
     link = await people_service.create_document_person(
-        DocumentPerson(document_id=document.id, person_id=person.id, role=DocumentPersonRole.AUTHOR)
+        DocumentPerson(document_id=document.id, person_id=person.id, role_id=author_role.id)
     )
 
     fetched = await people_service.read_document_person(link.id)
     assert fetched.id == link.id
-    assert fetched.role == DocumentPersonRole.AUTHOR
-    assert fetched.role_id is not None
+    assert fetched.role_id == author_role.id
 
     updated_link = await people_service.update_document_person(
-        DocumentPerson(id=link.id, document_id=document.id, person_id=person.id, role=DocumentPersonRole.RECIPIENT)
+        DocumentPerson(id=link.id, document_id=document.id, person_id=person.id, role_id=recipient_role.id)
     )
-    assert updated_link.role == DocumentPersonRole.RECIPIENT
-    assert updated_link.role_id is not None
+    assert updated_link.role_id == recipient_role.id
 
     listed = await people_service.list_document_people(document_id=document.id)
     assert len(listed) == 1
@@ -59,21 +58,15 @@ async def test_people_service_handles_person_and_document_person_crud(default_se
 async def test_people_service_normalizes_and_rejects_duplicate_family_search_ids(default_session_factory):
     people_service = PeopleService(session_factory=default_session_factory)
 
-    created = await people_service.create_person(
-        Person(full_name="Hig Higgins", family_search_id=" g8t4-mdq ")
-    )
+    created = await people_service.create_person(Person(full_name="Hig Higgins", family_search_id=" g8t4-mdq "))
     assert created.family_search_id == "G8T4-MDQ"
 
     with pytest.raises(PeopleError) as duplicate:
-        await people_service.create_person(
-            Person(full_name="Duplicate Hig", family_search_id="G8T4-MDQ")
-        )
+        await people_service.create_person(Person(full_name="Duplicate Hig", family_search_id="G8T4-MDQ"))
     assert duplicate.value.category == ErrorCategory.CONFLICT
 
     with pytest.raises(PeopleError) as malformed:
-        await people_service.create_person(
-            Person(full_name="Malformed", family_search_id="not-an-id")
-        )
+        await people_service.create_person(Person(full_name="Malformed", family_search_id="not-an-id"))
     assert malformed.value.category == ErrorCategory.VALIDATION
 
 
@@ -202,11 +195,12 @@ async def test_document_detail_loads_linked_person_relationship(default_session_
 
     document = await documents.create_document(Document(id=uuid4(), name="detail-person-doc"))
     person = await people_service.create_person(Person(full_name="Grace Hopper"))
+    author_role = await people_service.create_person_role(label="Author")
     await people_service.create_document_person(
         DocumentPerson(
             document_id=document.id,
             person_id=person.id,
-            role=DocumentPersonRole.AUTHOR,
+            role_id=author_role.id,
         )
     )
 
@@ -216,7 +210,7 @@ async def test_document_detail_loads_linked_person_relationship(default_session_
     link = detail.document_people[0]
     assert link.person is not None
     assert link.person.full_name == "Grace Hopper"
-    assert link.role == DocumentPersonRole.AUTHOR
+    assert link.role_id == author_role.id
 
 
 @pytest.mark.asyncio