Github Copilot service realignment & cleanup

tests/services/test_v2_crud.py

@@ -13,48 +13,50 @@ from transcription.db.models import Source
 from transcription.services.documents import DocumentDeleteBlockedError
 from transcription.services.documents import DocumentService
 from transcription.services.jobs import JobService
-from transcription.services.transcription import SourceDeleteBlockedError
-from transcription.services.transcription import TranscriptionService
+from transcription.services.people import PeopleService
+from transcription.services.sources import SourceDeleteBlockedError
+from transcription.services.sources import SourceService
 
 
 @pytest.mark.asyncio
-async def test_document_service_handles_person_and_document_person_crud(default_session_factory):
+async def test_people_service_handles_person_and_document_person_crud(default_session_factory):
     documents = DocumentService(session_factory=default_session_factory)
+    people_service = PeopleService(session_factory=default_session_factory)
 
     document = await documents.create_document(Document(id=uuid4(), name="person-doc"))
-    person = await documents.create_person(Person(full_name="Ada Lovelace"))
+    person = await people_service.create_person(Person(full_name="Ada Lovelace"))
 
     assert document.document_type_id is None
 
-    link = await documents.create_document_person(
+    link = await people_service.create_document_person(
         DocumentPerson(document_id=document.id, person_id=person.id, role=DocumentPersonRole.AUTHOR)
     )
 
-    fetched = await documents.read_document_person(link.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
 
-    updated_link = await documents.update_document_person(
+    updated_link = await people_service.update_document_person(
         DocumentPerson(id=link.id, document_id=document.id, person_id=person.id, role=DocumentPersonRole.RECIPIENT)
     )
     assert updated_link.role == DocumentPersonRole.RECIPIENT
     assert updated_link.role_id is not None
 
-    listed = await documents.list_document_people(document_id=document.id)
+    listed = await people_service.list_document_people(document_id=document.id)
     assert len(listed) == 1
 
-    people = await documents.list_people()
+    people = await people_service.list_people()
     assert len(people) == 1
 
-    await documents.delete_document_person(updated_link)
-    assert len(await documents.list_document_people(document_id=document.id)) == 0
+    await people_service.delete_document_person(updated_link)
+    assert len(await people_service.list_document_people(document_id=document.id)) == 0
 
 
 @pytest.mark.asyncio
 async def test_transcription_service_manages_source_crud(default_session_factory):
     documents = DocumentService(session_factory=default_session_factory)
-    transcriptions = TranscriptionService(session_factory=default_session_factory)
+    transcriptions = SourceService(session_factory=default_session_factory)
 
     document = await documents.create_document(Document(id=uuid4(), name="source-doc"))
     source = await transcriptions.create_source(
@@ -88,9 +90,7 @@ async def test_transcription_service_manages_source_crud(default_session_factory
 
 @pytest.mark.asyncio
 async def test_transcription_service_job_source_crud_uses_caller_session(default_session_factory):
-    documents = DocumentService(session_factory=default_session_factory)
-    jobs = JobService(session_factory=default_session_factory)
-    transcriptions = TranscriptionService(session_factory=default_session_factory)
+    transcriptions = SourceService(session_factory=default_session_factory)
 
     async with transcriptions._session_scope() as session:
         document = Document(id=uuid4(), name="job-source-doc")
@@ -138,10 +138,11 @@ async def test_transcription_service_job_source_crud_uses_caller_session(default
 @pytest.mark.asyncio
 async def test_document_detail_loads_linked_person_relationship(default_session_factory):
     documents = DocumentService(session_factory=default_session_factory)
+    people_service = PeopleService(session_factory=default_session_factory)
 
     document = await documents.create_document(Document(id=uuid4(), name="detail-person-doc"))
-    person = await documents.create_person(Person(full_name="Grace Hopper"))
-    await documents.create_document_person(
+    person = await people_service.create_person(Person(full_name="Grace Hopper"))
+    await people_service.create_document_person(
         DocumentPerson(
             document_id=document.id,
             person_id=person.id,
@@ -162,7 +163,7 @@ async def test_document_detail_loads_linked_person_relationship(default_session_
 async def test_document_delete_is_blocked_with_source_and_job_dependencies(default_session_factory):
     documents = DocumentService(session_factory=default_session_factory)
     jobs = JobService(session_factory=default_session_factory)
-    transcriptions = TranscriptionService(session_factory=default_session_factory)
+    transcriptions = SourceService(session_factory=default_session_factory)
 
     document = await documents.create_document(Document(id=uuid4(), name="blocked-by-deps"))
     job = await jobs.create_job(Job(document_id=document.id))
@@ -197,7 +198,7 @@ async def test_document_delete_is_blocked_with_source_and_job_dependencies(defau
 async def test_source_delete_blocks_when_linked_to_multiple_jobs(default_session_factory):
     documents = DocumentService(session_factory=default_session_factory)
     jobs = JobService(session_factory=default_session_factory)
-    transcriptions = TranscriptionService(session_factory=default_session_factory)
+    transcriptions = SourceService(session_factory=default_session_factory)
 
     document = await documents.create_document(Document(id=uuid4(), name="multi-job-source-doc"))
     job_one = await jobs.create_job(Job(document_id=document.id))
@@ -229,7 +230,7 @@ async def test_source_delete_blocks_when_linked_to_multiple_jobs(default_session
 async def test_update_job_source_transcription_persists_provider_json_payloads(default_session_factory):
     documents = DocumentService(session_factory=default_session_factory)
     jobs = JobService(session_factory=default_session_factory)
-    transcriptions = TranscriptionService(session_factory=default_session_factory)
+    transcriptions = SourceService(session_factory=default_session_factory)
 
     document = await documents.create_document(Document(id=uuid4(), name="provider-payloads-doc"))
     job = await jobs.create_job(Job(document_id=document.id))