Update src/pilgrim/models/entry.py

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

src/pilgrim/models/entry.py

@@ -1,5 +1,6 @@
-from typing import Any
+from typing import Any, List
 
+from pilgrim.models.photo import Photo
 from pilgrim.models.photo_in_entry import photo_entry_association
 from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
 from sqlalchemy.orm import relationship
@@ -21,9 +22,12 @@ class Entry(Base):
     fk_travel_diary_id = Column(Integer, ForeignKey("travel_diaries.id"), nullable=False)
     travel_diary = relationship("TravelDiary", back_populates="entries")
 
-    def __init__(self, title: str, text: str, date: str, travel_diary_id: int, **kw: Any):
+    def __init__(self, title: str, text: str, date: Any, travel_diary_id: int, photos: List[Photo] = None, **kw: Any):
         super().__init__(**kw)
         self.title = title
         self.text = text
         self.date = date
         self.fk_travel_diary_id = travel_diary_id
+        if photos is not None:
+            self.photos = photos
+

tests/conftest.py

@@ -1,6 +1,3 @@
-from pathlib import Path
-from unittest.mock import patch
-
 import pytest
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
@@ -8,8 +5,6 @@ from sqlalchemy.orm import sessionmaker
 from pilgrim.database import Base
 from pilgrim.models.travel_diary import TravelDiary
 from pilgrim.models.photo import Photo
-from pilgrim.utils import DirectoryManager
-
 
 # Todos os imports necessários para as fixtures devem estar aqui
 # ...
@@ -66,39 +61,4 @@ def session_with_photos(session_with_one_diary):
     session.add_all([photo1, photo2])
     session.commit()
 
-    return session, [photo1, photo2]
-
-@pytest.fixture
-def backup_test_env_files_only(tmp_path):
-    fake_config_dir = tmp_path / "config"
-    fake_diaries_root = tmp_path / "diaries"
-    fake_db_path = fake_config_dir / "database.db"
-    fake_config_dir.mkdir()
-    fake_diaries_root.mkdir()
-    with patch.object(DirectoryManager, 'get_database_path', return_value=fake_db_path), \
-            patch.object(DirectoryManager, 'get_config_directory', return_value=fake_config_dir), \
-            patch.object(DirectoryManager, 'get_diaries_root', return_value=fake_diaries_root):
-        engine = create_engine(f"sqlite:///{fake_db_path}")
-        Base.metadata.create_all(engine)
-        Session = sessionmaker(bind=engine)
-        session = Session()
-
-        diary = TravelDiary(name="Viagem de Teste", directory_name="viagem_de_teste")
-        session.add(diary)
-        session.commit()
-        photo_file_path_str = str(fake_diaries_root / "viagem_de_teste" / "images" / "foto1.jpg")
-        photo = Photo(filepath=photo_file_path_str, name="Foto 1", photo_hash="hash123", fk_travel_diary_id=diary.id)
-        session.add(photo)
-        session.commit()
-        photo_file_path = Path(photo_file_path_str)
-        photo_file_path.parent.mkdir(parents=True)
-        photo_file_path.touch()
-        yield {
-            "session": session,
-            "db_path": fake_db_path,
-            "config_dir": fake_config_dir,
-            "diaries_root": fake_diaries_root,
-        }
-        session.close()
-
-
+    return session, [photo1, photo2]

tests/service/test_backup_service.py

@@ -1,39 +0,0 @@
-import zipfile
-from pathlib import Path
-from unittest.mock import patch, MagicMock
-from pilgrim.service.backup_service import BackupService
-from pilgrim.utils.directory_manager import DirectoryManager
-import pytest
-
-@patch.object(DirectoryManager, 'get_diaries_root')
-@patch.object(DirectoryManager, 'get_config_directory')
-@patch.object(DirectoryManager, 'get_database_path')
-def test_create_backup_success(mock_get_db_path, mock_get_config_dir, mock_get_diaries_root, backup_test_env_files_only):
-    env = backup_test_env_files_only
-    session = env["session"]
-    mock_get_db_path.return_value = env["db_path"]
-    mock_get_config_dir.return_value = env["config_dir"]
-    mock_get_diaries_root.return_value = env["diaries_root"]
-
-    service = BackupService(session)
-    backup_zip_path = env["config_dir"] / "backup.zip"
-    success, returned_path = service.create_backup()
-    assert success is True
-    assert returned_path == backup_zip_path
-    assert backup_zip_path.exists()
-
-    with zipfile.ZipFile(backup_zip_path, 'r') as zf:
-        file_list = zf.namelist()
-        assert "database.sql" in file_list
-        assert "diaries/viagem_de_teste/images/foto1.jpg" in file_list
-        sql_dump = zf.read("database.sql").decode('utf-8')
-        assert "Viagem de Teste" in sql_dump
-
-@patch.object(DirectoryManager, 'get_database_path')
-def test_create_backup_fails_if_db_not_found(mock_get_db_path, tmp_path: Path):
-    non_existent_db_path = tmp_path / "non_existent.db"
-    mock_get_db_path.return_value = non_existent_db_path
-    mock_session = MagicMock()
-    service = BackupService(mock_session)
-    with pytest.raises(FileNotFoundError, match="No Database Found"):
-        service.create_backup()