V4.4 Complete

tests/services/test_document_service.py

@@ -5,15 +5,12 @@ from datetime import datetime
 from uuid import uuid4
 
 import pytest
-from sqlmodel import select
 
 from transcription.config import Settings
 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 Person
-from transcription.db.models import PersonRole
 from transcription.db.models import Source
 from transcription.services.documents import DocumentDeleteBlockedError
 from transcription.services.documents import DocumentError
@@ -132,11 +129,12 @@ async def test_delete_document_removes_person_links(default_session_factory, tmp
         )
     )
     person = await people_service.create_person(Person(full_name="Linked Person"))
+    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,
         )
     )
 
@@ -144,7 +142,7 @@ async def test_delete_document_removes_person_links(default_session_factory, tmp
     assert len(links_before_delete) == 1
     assert links_before_delete[0].role_id is not None
     assert links_before_delete[0].role_ref is not None
-    assert links_before_delete[0].role_ref.code == "author"
+    assert links_before_delete[0].role_ref.label == "Author"
 
     document_dir = service.settings.upload_dir / "documents" / str(document.id)
     document_dir.mkdir(parents=True, exist_ok=True)
@@ -196,11 +194,12 @@ async def test_read_person_detail_loads_document_links(default_session_factory):
         )
     )
     person = await people_service.create_person(Person(full_name="Linked Person"))
+    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,
         )
     )
 
@@ -243,11 +242,12 @@ async def test_delete_person_removes_links_when_linked_documents_exist(default_s
         )
     )
     person = await service.create_person(Person(full_name="Blocked Person"))
+    author_role = await service.create_person_role(label="Author")
     await service.create_document_person(
         DocumentPerson(
             document_id=document.id,
             person_id=person.id,
-            role=DocumentPersonRole.AUTHOR,
+            role_id=author_role.id,
         )
     )
 
@@ -285,19 +285,19 @@ async def test_create_document_uses_existing_document_type_registry(default_sess
 
 
 @pytest.mark.asyncio
-async def test_update_document_person_sets_role_id_from_legacy_role(default_session_factory):
+async def test_update_document_person_changes_role_id(default_session_factory):
     documents_service = DocumentService(session_factory=default_session_factory)
     service = PeopleService(session_factory=default_session_factory)
 
-    document = await documents_service.create_document(
-        Document(id=uuid4(), name="role-sync-doc", document_type="letter")
-    )
+    document = await documents_service.create_document(Document(id=uuid4(), name="role-sync-doc"))
     person = await service.create_person(Person(full_name="Role Sync Person"))
+    author_role = await service.create_person_role(label="Author")
+    recipient_role = await service.create_person_role(label="Recipient")
     link = await service.create_document_person(
         DocumentPerson(
             document_id=document.id,
             person_id=person.id,
-            role=DocumentPersonRole.AUTHOR,
+            role_id=author_role.id,
         )
     )
 
@@ -306,15 +306,8 @@ async def test_update_document_person_sets_role_id_from_legacy_role(default_sess
             id=link.id,
             document_id=document.id,
             person_id=person.id,
-            role=DocumentPersonRole.RECIPIENT,
-            role_id=None,
+            role_id=recipient_role.id,
         )
     )
 
-    assert updated.role == DocumentPersonRole.RECIPIENT
-    assert updated.role_id is not None
-
-    async with service._session_scope() as session:
-        recipient_role = (await session.exec(select(PersonRole).where(PersonRole.code == "recipient"))).first()
-    assert recipient_role is not None
     assert updated.role_id == recipient_role.id