Add the tests for the service manager

Fix the photo and travel diary relationship to properly work

src/pilgrim/models/photo.py

@@ -26,6 +26,7 @@ class Photo(Base):
     )
 
     fk_travel_diary_id = Column(Integer, ForeignKey("travel_diaries.id"), nullable=False)
+    travel_diary = relationship("TravelDiary", back_populates="photos")
     __table_args__ = (
         Index('idx_photo_hash_diary', 'hash', 'fk_travel_diary_id'),
     )

src/pilgrim/models/travel_diary.py

@@ -13,6 +13,7 @@ class TravelDiary(Base):
     name = Column(String, nullable=False)
     directory_name = Column(String, nullable=False, unique=True)
     entries = relationship("Entry", back_populates="travel_diary", cascade="all, delete-orphan")
+    photos = relationship("Photo", back_populates="travel_diary", cascade="all, delete-orphan")
 
     __table_args__ = (
         UniqueConstraint('directory_name', name='uq_travel_diary_directory_name'),

tests/conftest.py

@@ -2,7 +2,6 @@ import pytest
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-from pilgrim import Photo
 from pilgrim.database import Base
 from pilgrim.models.travel_diary import TravelDiary
 
@@ -35,26 +34,3 @@ def session_with_one_diary(db_session):
     db_session.commit()
     db_session.refresh(diary)
     return db_session, diary
-
-
-@pytest.fixture
-def session_with_photos(session_with_one_diary):
-    """
-    Fixture que usa a session_with_one_diary e adiciona duas fotos a ela.
-    """
-    session, diary = session_with_one_diary
-
-    photo1 = Photo(
-        filepath=f"/fake/{diary.directory_name}/p1.jpg", name="Foto 1",
-        photo_hash="hash1", fk_travel_diary_id=diary.id
-    )
-    photo2 = Photo(
-        filepath=f"/fake/{diary.directory_name}/p2.jpg", name="Foto 2",
-        photo_hash="hash2", fk_travel_diary_id=diary.id
-    )
-
-    session.add_all([photo1, photo2])
-    session.commit()
-
-    # Retornamos a sessão e os objetos criados para que os testes possam usá-los
-    return session, [photo1, photo2]

tests/service/test_photo_service.py

@@ -1,108 +0,0 @@
-import pytest
-from pathlib import Path
-from pilgrim.service.photo_service import PhotoService
-import hashlib
-from unittest.mock import patch
-from pilgrim.models.photo import Photo
-
-@patch.object(PhotoService, '_copy_photo_to_diary')
-@patch.object(PhotoService, 'hash_file', return_value="fake_hash_123")
-def test_create_photo_successfully(mock_hash, mock_copy, session_with_one_diary):
-    session, diary = session_with_one_diary
-    service = PhotoService(session)
-    fake_source_path = Path("/path/original/imagem.jpg")
-    fake_copied_path = Path(f"~/.pilgrim/diaries/{diary.directory_name}/images/imagem.jpg")
-    mock_copy.return_value = fake_copied_path
-    new_photo = service.create(
-        filepath=fake_source_path,
-        name="Foto da Praia",
-        travel_diary_id=diary.id,
-        caption="Pôr do sol")
-    mock_hash.assert_called_once_with(fake_source_path)
-    mock_copy.assert_called_once_with(fake_source_path, diary)
-    assert new_photo is not None
-    assert new_photo.name == "Foto da Praia"
-    assert new_photo.photo_hash == "fake_hash_123"
-    assert new_photo.filepath == str(fake_copied_path)
-
-def test_hash_file_generates_correct_hash(tmp_path: Path):
-    original_content_bytes = b"um conteudo de teste para o hash"
-    file_on_disk = tmp_path / "test.jpg"
-    file_on_disk.write_bytes(original_content_bytes)
-    hash_from_file = PhotoService.hash_file(file_on_disk)
-    expected_hash_func = hashlib.new('sha3_384')
-    expected_hash_func.update(original_content_bytes)
-    hash_from_memory = expected_hash_func.hexdigest()
-    assert hash_from_file == hash_from_memory
-
-@patch.object(PhotoService, '_copy_photo_to_diary')
-@patch.object(PhotoService, 'hash_file', return_value="hash_ja_existente")
-def test_create_photo_returns_none_if_hash_exists(mock_hash, mock_copy, session_with_one_diary):
-    session, diary = session_with_one_diary
-    existing_photo = Photo(
-        filepath="/path/existente.jpg", name="Foto Antiga",
-        photo_hash="hash_ja_existente", fk_travel_diary_id=diary.id
-    )
-    session.add(existing_photo)
-    session.commit()
-
-    service = PhotoService(session)
-    new_photo = service.create(
-        filepath=Path("/path/novo/arquivo.jpg"),
-        name="Foto Nova",
-        travel_diary_id=diary.id
-    )
-    assert new_photo is None
-    mock_copy.assert_not_called()
-
-def test_read_by_id_successfully(session_with_photos):
-    session, photos = session_with_photos
-    service = PhotoService(session)
-    photo_to_find_id = photos[0].id
-    found_photo = service.read_by_id(photo_to_find_id)
-    assert found_photo is not None
-    assert found_photo.id == photo_to_find_id
-    assert found_photo.name == "Foto 1"
-
-def test_read_by_id_returns_none_for_invalid_id(db_session):
-    service = PhotoService(db_session)
-    result = service.read_by_id(999)
-    assert result is None
-
-def test_read_all_returns_all_photos(session_with_photos):
-    session, _ = session_with_photos
-    service = PhotoService(session)
-    all_photos = service.read_all()
-
-    assert isinstance(all_photos, list)
-    assert len(all_photos) == 2
-    assert all_photos[0].name == "Foto 1"
-    assert all_photos[1].name == "Foto 2"
-
-def test_read_all_returns_empty_list_for_empty_db(db_session):
-    service = PhotoService(db_session)
-    all_photos = service.read_all()
-    assert isinstance(all_photos, list)
-    assert len(all_photos) == 0
-
-def test_check_photo_by_hash_finds_existing_photo(session_with_photos):
-    session, photos = session_with_photos
-    service = PhotoService(session)
-    existing_photo = photos[0]
-    hash_to_find = existing_photo.photo_hash  # "hash1"
-    diary_id = existing_photo.fk_travel_diary_id  # 1
-    found_photo = service.check_photo_by_hash(hash_to_find, diary_id)
-    assert found_photo is not None
-    assert found_photo.id == existing_photo.id
-    assert found_photo.photo_hash == hash_to_find
-
-def test_check_photo_by_hash_returns_none_when_not_found(session_with_photos):
-    session, photos = session_with_photos
-    service = PhotoService(session)
-    existing_hash = photos[0].photo_hash  # "hash1"
-    existing_diary_id = photos[0].fk_travel_diary_id  # 1
-    result1 = service.check_photo_by_hash("hash_inexistente", existing_diary_id)
-    assert result1 is None
-    invalid_diary_id = 999
-    result2 = service.check_photo_by_hash(existing_hash, invalid_diary_id)
-    assert result2 is None

tests/service/test_service_manager.py

@@ -0,0 +1,33 @@
+from pilgrim.service.servicemanager import ServiceManager
+from unittest.mock import patch, MagicMock
+
+def test_initial_state_is_none():
+    manager = ServiceManager()
+    assert manager.get_session() is None
+    assert manager.get_entry_service() is None
+    assert manager.get_photo_service() is None
+    assert manager.get_travel_diary_service() is None
+
+@patch('pilgrim.service.servicemanager.TravelDiaryService')
+@patch('pilgrim.service.servicemanager.PhotoService')
+@patch('pilgrim.service.servicemanager.EntryService')
+def test_get_services_instantiates_with_correct_session(
+    mock_entry_service, mock_photo_service, mock_travel_diary_service
+):
+    manager = ServiceManager()
+    mock_session = MagicMock()
+    manager.set_session(mock_session)
+
+    entry_service_instance = manager.get_entry_service()
+    photo_service_instance = manager.get_photo_service()
+    travel_diary_service_instance = manager.get_travel_diary_service()
+
+    mock_entry_service.assert_called_once()
+    mock_photo_service.assert_called_once()
+    mock_travel_diary_service.assert_called_once()
+    mock_entry_service.assert_called_once_with(mock_session)
+    mock_photo_service.assert_called_once_with(mock_session)
+    mock_travel_diary_service.assert_called_once_with(mock_session)
+    assert entry_service_instance == mock_entry_service.return_value
+    assert photo_service_instance == mock_photo_service.return_value
+    assert travel_diary_service_instance == mock_travel_diary_service.return_value