Add the tests for the new methods of deleting

Fix to add a photo list to the constructor of the entry model

CHANGELOG.md

@@ -6,63 +6,84 @@ The format is based on Keep a Changelog, and this project adheres to Semantic Ve
 ## Unreleased
 
 ## Planned
-* Installation Method 1 (repository compilation)
+* Restore from backup functionality
 * Organization of trips by date, location, or theme
 * Enhanced photo management features
 * Search functionality
 * Export features
-* Testing implementation
+* UI Testing with Textual Pilot
+
+## [0.0.5] - 2025-07-24
+
+### Added
+* **Backup Feature:** Introduced a full backup feature to export the database and all photos to a single ZIP file.
+* **Diary Settings Screen:** Added a dedicated settings screen per diary, accessible with the 's' key from the diary list.
+* **Advanced Deletion Options:** The new settings screen allows for deleting the entire diary, all of its entries, or all of its photos.
+* **Confirmation Modals:** Added confirmation modals that require the user to type the diary's name to proceed with critical delete operations, preventing accidental data loss.
+* **Comprehensive Test Suite:** Implemented a robust unit and integration test suite for the entire backend (services, models, utils, application), achieving high code coverage and ensuring stability.
+
+### Changed
+* **Architectural Refactor:** Service methods were refactored to be transactional, allowing for more complex operations to be executed safely and atomically.
+* **Configuration:** The "auto-open diary on startup" setting is now managed and persisted via the `config.toml` file.
+* **Project Structure:** Standardized project metadata and build configuration in `pyproject.toml` and converted all imports to use a consistent absolute path structure.
+
+### Fixed
+* **Directory Name Sanitization:** Fixed a bug where directory names were not correctly sanitized, now properly handling accented and special characters by using transliteration.
+* **Data Integrity:** Enforced `NOT NULL` constraints on `title` and `date` fields for entries in the database, preventing the creation of entries with invalid data.
+
+### Removed
+* **Obsolete Mocks:** Removed old and unused mock service files from the production codebase.
 
 ## [0.0.4] - 2025-07-19
 
 ### Added
-* Support for creating new diaries asynchronously, with an option to automatically open the newly created diary
-* Unified "Enter" key support for saving or creating diaries across relevant modals
-* Automatic diary list refresh when returning to the diary screen
-* Application configuration management with a new centralized config system
-* Database location and initialization now configurable via the new config manager
-* Automatic migration of database file to the configuration directory
-* Display of database URL on application startup for transparency
-* Duplicate photo detection before photo creation to prevent redundant entries
-* Photo hash indexing to improve photo lookup performance
+* Support for creating new diaries asynchronously, with an option to automatically open the newly created diary.
+* Unified "Enter" key support for saving or creating diaries across relevant modals.
+* Automatic diary list refresh when returning to the diary screen.
+* Application configuration management with a new centralized config system.
+* Database location and initialization now configurable via the new config manager.
+* Automatic migration of database file to the configuration directory.
+* Display of database URL on application startup for transparency.
+* Duplicate photo detection before photo creation to prevent redundant entries.
+* Photo hash indexing to improve photo lookup performance.
 
 ### Changed
-* Enhanced feedback and validation when editing or creating diary names
-* Streamlined and unified save logic for diary modals, reducing duplicated behavior
-* About screen now displays the actual installed application version dynamically
-* Sidebar and photo-related UI text updated to remove emoji icons for a cleaner appearance
-* Sidebar layout and scrolling behavior improved for better usability
-* Photo hash generation now relies on existing service-provided hashes instead of local computation
+* Enhanced feedback and validation when editing or creating diary names.
+* Streamlined and unified save logic for diary modals, reducing duplicated behavior.
+* About screen now displays the actual installed application version dynamically.
+* Sidebar and photo-related UI text updated to remove emoji icons for a cleaner appearance.
+* Sidebar layout and scrolling behavior improved for better usability.
+* Photo hash generation now relies on existing service-provided hashes instead of local computation.
 
 ### Improved
-* Enhanced feedback and validation when editing or creating diary names
-* Streamlined and unified save logic for diary modals, reducing duplicated behavior
-* Sidebar layout and scrolling behavior for better usability
+* Enhanced feedback and validation when editing or creating diary names.
+* Streamlined and unified save logic for diary modals, reducing duplicated behavior.
+* Sidebar layout and scrolling behavior for better usability.
 
 ## [0.0.3] - 2025-07-07
 
 ### Changed
-* Removed the dependency on textual-dev from pyproject.toml
+* Removed the dependency on textual-dev from pyproject.toml.
 
 ## [0.0.2] - 2025-07-07
 
 ### Changed
-* Changed the license in pyproject.toml to BSD
+* Changed the license in pyproject.toml to BSD.
 
 ## [0.0.1] - 2025-07-06
 
 ### Added
-* Initial alpha release of Pilgrim travel diary application
-* Create and edit travel diaries
-* Create and edit diary entries
-* Photo ingestion system
-* Photo addition and reference via sidebar
-* Text User Interface (TUI) built with Textual framework
-* Pre-compiled binary installation method (Method 2)
-* Support for Linux operating systems
-* Basic project documentation (README)
+* Initial alpha release of Pilgrim travel diary application.
+* Create and edit travel diaries.
+* Create and edit diary entries.
+* Photo ingestion system.
+* Photo addition and reference via sidebar.
+* Text User Interface (TUI) built with Textual framework.
+* Pre-compiled binary installation method (Method 2).
+* Support for Linux operating systems.
+* Basic project documentation (README).
 
 ### Known Issues
-* Installation Method 1 not yet implemented
-* No testing suite implemented yet
-* Some features may be unstable in an alpha version
+* Installation Method 1 not yet implemented.
+* No testing suite implemented yet.
+* Some features may be unstable in an alpha version.

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
+

src/pilgrim/service/mocks/entry_service_mock.py

@@ -1,123 +0,0 @@
-from typing import List, Tuple
-import asyncio
-from pilgrim.service.entry_service import EntryService
-from pilgrim.models.entry import Entry
-
-
-class EntryServiceMock(EntryService):
-    def __init__(self):
-        super().__init__(None)
-
-        self.mock_data = {
-            1: Entry(title="The Adventure Begins", text="I'm hopping in the Plane to finally visit canadian lands",
-                     date="26/07/2025", travel_diary_id=1, id=1,
-                     photos=[]),
-            2: Entry(title="The Landing", text="Finally on Canadian Soil", date="27/07/2025",
-                     travel_diary_id=1, id=2,photos=[]),
-            3: Entry(title="The Mount Royal", text="The Mount Royal is fucking awesome", date="28/07/2025",
-                     travel_diary_id=1, id=3, photos=[]),
-            4: Entry(title="Old Montreal", text="Exploring the historic district", date="29/07/2025",
-                     travel_diary_id=1, id=4, photos=[]),
-            5: Entry(title="Notre-Dame Basilica", text="Beautiful architecture", date="30/07/2025",
-                     travel_diary_id=1, id=5, photos=[]),
-            6: Entry(title="Parc Jean-Drapeau", text="Great views of the city", date="31/07/2025",
-                     travel_diary_id=1, id=6, photos=[]),
-            7: Entry(title="La Ronde", text="Amusement park fun", date="01/08/2025",
-                     travel_diary_id=1, id=7, photos=[]),
-            8: Entry(title="Biodome", text="Nature and science", date="02/08/2025",
-                     travel_diary_id=1, id=8, photos=[]),
-            9: Entry(title="Botanical Gardens", text="Peaceful walk", date="03/08/2025",
-                     travel_diary_id=1, id=9, photos=[]),
-            10: Entry(title="Olympic Stadium", text="Historic venue", date="04/08/2025",
-                     travel_diary_id=1, id=10, photos=[]),
-        }
-        self._next_id = 11
-
-    # Synchronous methods (kept for compatibility)
-    def create(self, travel_diary_id: int, title: str, text: str, date: str) -> Entry:
-        """Synchronous version"""
-        new_entry = Entry(title, text, date, travel_diary_id, id=self._next_id)
-        self.mock_data[self._next_id] = new_entry
-        self._next_id += 1
-        return new_entry
-
-    def read_by_id(self, entry_id: int) -> Entry | None:
-        """Synchronous version"""
-        return self.mock_data.get(entry_id)
-
-    def read_all(self) -> List[Entry]:
-        """Synchronous version"""
-        return list(self.mock_data.values())
-
-    def read_by_travel_diary_id(self, travel_diary_id: int) -> List[Entry]:
-        """Synchronous version - reads entries by diary"""
-        return [entry for entry in self.mock_data.values() if entry.fk_travel_diary_id == travel_diary_id]
-
-    def read_paginated(self, travel_diary_id: int, page: int = 1, page_size: int = 5) -> Tuple[List[Entry], int, int]:
-        """Synchronous version - reads paginated entries by diary"""
-        entries = self.read_by_travel_diary_id(travel_diary_id)
-        entries.sort(key=lambda x: x.id, reverse=True)  # Most recent first
-        
-        total_entries = len(entries)
-        total_pages = (total_entries + page_size - 1) // page_size
-        
-        start_index = (page - 1) * page_size
-        end_index = start_index + page_size
-        
-        page_entries = entries[start_index:end_index]
-        
-        return page_entries, total_pages, total_entries
-
-    def update(self, entry_src: Entry, entry_dst: Entry) -> Entry | None:
-        """Synchronous version"""
-        item_to_update = self.mock_data.get(entry_src.id)
-        if item_to_update:
-            item_to_update.title = entry_dst.title if entry_dst.title is not None else item_to_update.title
-            item_to_update.text = entry_dst.text if entry_dst.text is not None else item_to_update.text
-            item_to_update.date = entry_dst.date if entry_dst.date is not None else item_to_update.date
-            item_to_update.fk_travel_diary_id = entry_dst.fk_travel_diary_id if (entry_dst.fk_travel_diary_id
-                                                                                 is not None) else entry_dst.id
-            item_to_update.photos.extend(entry_dst.photos)
-
-            return item_to_update
-        return None
-
-    def delete(self, entry_src: Entry) -> Entry | None:
-        """Synchronous version"""
-        return self.mock_data.pop(entry_src.id, None)
-
-    # Async methods (main)
-    async def async_create(self, travel_diary_id: int, title: str, text: str, date: str) -> Entry:
-        """Async version"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.create(travel_diary_id, title, text, date)
-
-    async def async_read_by_id(self, entry_id: int) -> Entry | None:
-        """Async version"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.read_by_id(entry_id)
-
-    async def async_read_all(self) -> List[Entry]:
-        """Async version"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.read_all()
-
-    async def async_read_by_travel_diary_id(self, travel_diary_id: int) -> List[Entry]:
-        """Async version - reads entries by diary"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.read_by_travel_diary_id(travel_diary_id)
-
-    async def async_read_paginated(self, travel_diary_id: int, page: int = 1, page_size: int = 5) -> Tuple[List[Entry], int, int]:
-        """Async version - reads paginated entries by diary"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.read_paginated(travel_diary_id, page, page_size)
-
-    async def async_update(self, entry_src: Entry, entry_dst: Entry) -> Entry | None:
-        """Async version"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.update(entry_src, entry_dst)
-
-    async def async_delete(self, entry_src: Entry) -> Entry | None:
-        """Async version"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.delete(entry_src)

src/pilgrim/service/mocks/photo_service_mock.py

@@ -1,48 +0,0 @@
-from pathlib import Path
-from typing import List
-
-from pilgrim.models.photo import Photo
-from pilgrim.service.photo_service import PhotoService
-
-
-class PhotoServiceMock(PhotoService):
-    def __init__(self):
-        super().__init__(None)
-        self.mock_data = {}
-        self._next_id = 1
-
-    def create(self, filepath: Path, name: str, travel_diary_id, addition_date=None, caption=None) -> Photo | None:
-        new_photo = Photo(
-            filepath=filepath, 
-            name=name, 
-            addition_date=addition_date, 
-            caption=caption,
-            fk_travel_diary_id=travel_diary_id
-        )
-        new_photo.id = self._next_id
-        self.mock_data[self._next_id] = new_photo
-        self._next_id += 1
-        return new_photo
-
-
-    def read_by_id(self, photo_id: int) -> Photo:
-        return self.mock_data.get(photo_id)
-
-    def read_all(self) -> List[Photo]:
-        return list(self.mock_data.values())
-
-    def update(self, photo_src: Photo, photo_dst: Photo) -> Photo | None:
-        item_to_update: Photo = self.mock_data.get(photo_src.id)
-        if item_to_update:
-            item_to_update.filepath = photo_dst.filepath if photo_dst.filepath else item_to_update.filepath
-            item_to_update.name = photo_dst.name if photo_dst.name else item_to_update.name
-            item_to_update.caption = photo_dst.caption if photo_dst.caption else item_to_update.caption
-            item_to_update.addition_date = photo_dst.addition_date if photo_dst.addition_date else item_to_update.addition_date
-            item_to_update.fk_travel_diary_id = photo_dst.fk_travel_diary_id if photo_dst.fk_travel_diary_id else item_to_update.fk_travel_diary_id
-            if photo_dst.entries:
-                item_to_update.entries = photo_dst.entries
-            return item_to_update
-        return None
-
-    def delete(self, photo_src: Photo) -> Photo | None:
-        return self.mock_data.pop(photo_src.id, None)

src/pilgrim/service/mocks/service_manager_mock.py

@@ -1,22 +0,0 @@
-from pilgrim.service.mocks.entry_service_mock import EntryServiceMock
-from pilgrim.service.mocks.photo_service_mock import PhotoServiceMock
-from pilgrim.service.mocks.travel_diary_service_mock import TravelDiaryServiceMock
-from pilgrim.service.servicemanager import ServiceManager
-
-
-class ServiceManagerMock(ServiceManager):
-    def __init__(self):
-        super().__init__()
-        # Cria instâncias únicas para manter estado consistente
-        self._travel_diary_service = TravelDiaryServiceMock()
-        self._entry_service = EntryServiceMock()
-        self._photo_service = PhotoServiceMock()
-
-    def get_entry_service(self):
-        return self._entry_service
-
-    def get_travel_diary_service(self):
-        return self._travel_diary_service
-
-    def get_photo_service(self):
-        return self._photo_service

src/pilgrim/service/mocks/travel_diary_service_mock.py

@@ -1,67 +0,0 @@
-from pilgrim.service.travel_diary_service import TravelDiaryService
-from pilgrim.models.travel_diary import TravelDiary
-import asyncio
-
-
-class TravelDiaryServiceMock(TravelDiaryService):
-    def __init__(self):
-        super().__init__(None)
-        self.mock_data = {
-            1: TravelDiary(id=1, name="Montreal"),
-            2: TravelDiary(id=2, name="Rio de Janeiro"),
-        }
-        self._next_id = 3
-
-    # Synchronous methods (original)
-    def create(self, name: str):
-        """Synchronous version"""
-        new_travel_diary = TravelDiary(id=self._next_id, name=name)
-        self.mock_data[self._next_id] = new_travel_diary
-        self._next_id += 1
-        return new_travel_diary
-
-    def read_by_id(self, travel_id: int):
-        """Synchronous version"""
-        return self.mock_data.get(travel_id)
-
-    def read_all(self):
-        """Synchronous version"""
-        return list(self.mock_data.values())
-
-    def update(self, travel_diary_id: int, name: str):
-        """Synchronous version"""
-        item_to_update = self.mock_data.get(travel_diary_id)
-        if item_to_update:
-            item_to_update.name = name
-            return item_to_update
-        return None
-
-    def delete(self, travel_diary_id: int):
-        """Synchronous version"""
-        return self.mock_data.pop(travel_diary_id, None)
-
-    # Async methods (new)
-    async def async_create(self, name: str):
-        """Async version"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.create(name)
-
-    async def async_read_by_id(self, travel_id: int):
-        """Async version"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.read_by_id(travel_id)
-
-    async def async_read_all(self):
-        """Async version"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.read_all()
-
-    async def async_update(self, travel_diary_id: int, name: str):
-        """Async version"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.update(travel_diary_id, name)
-
-    async def async_delete(self, travel_diary_id: int):
-        """Async version"""
-        await asyncio.sleep(0.01)  # Simulates I/O
-        return self.delete(travel_diary_id)

tests/conftest.py

@@ -1,7 +1,10 @@
+from datetime import datetime
+
 import pytest
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
+from pilgrim.models.entry import Entry
 from pilgrim.database import Base
 from pilgrim.models.travel_diary import TravelDiary
 from pilgrim.models.photo import Photo
@@ -62,3 +65,23 @@ def session_with_photos(session_with_one_diary):
     session.commit()
 
     return session, [photo1, photo2]
+
+@pytest.fixture
+def entry_with_photo_references(session_with_one_diary):
+    session, diary = session_with_one_diary
+    photo1 = Photo(filepath="p1.jpg", name="P1", photo_hash="aaaaaaaa", fk_travel_diary_id=diary.id)
+    photo2 = Photo(filepath="p2.jpg", name="P2", photo_hash="bbbbbbbb", fk_travel_diary_id=diary.id)
+    session.add_all([photo1, photo2])
+    session.flush()
+    entry = Entry(
+        title="Entrada com Fotos",
+        text="Texto com a foto A [[photo::aaaaaaaa]] e também a foto B [[photo::bbbbbbbb]].",
+        date=datetime.now(),
+        travel_diary_id=diary.id,
+        photos=[photo1, photo2]
+    )
+    session.add(entry)
+    session.commit()
+    session.refresh(entry)
+
+    return session, entry

tests/service/test_entry_service.py

@@ -261,3 +261,46 @@ def test_delete_returns_none_if_entry_does_not_exist(db_session):
     non_existent_entry.id = 999
     result = service.delete(non_existent_entry)
     assert result is None
+
+def test_delete_references_for_specific_photo(entry_with_photo_references):
+    session, entry = entry_with_photo_references
+    service = EntryService(session)
+    updated_entry = service.delete_references_for_specific_photo(entry, "aaaaaaaa")
+    assert "[[photo::aaaaaaaa]]" not in updated_entry.text
+    assert "[[photo::bbbbbbbb]]" in updated_entry.text
+
+def test_delete_specific_photo_reference_does_nothing_if_no_match(entry_with_photo_references):
+    session, entry = entry_with_photo_references
+    service = EntryService(session)
+
+    original_text = entry.text
+    updated_entry = service.delete_references_for_specific_photo(entry, "cccccccc")
+    assert updated_entry.text == original_text
+
+def test_delete_all_photo_references_removes_all_refs(entry_with_photo_references):
+    session, entry = entry_with_photo_references
+    service = EntryService(session)
+    updated_entry = service.delete_all_photo_references(entry)
+    assert "[[photo::aaaaaaaa]]" not in updated_entry.text
+    assert "[[photo::bbbbbbbb]]" not in updated_entry.text
+
+def test_delete_all_photo_references_uses_truncated_hash(session_with_one_diary):
+    session, diary = session_with_one_diary
+    service = EntryService(session)
+    long_hash_photo = Photo(
+        filepath="long.jpg", name="Long",
+        photo_hash="1234567890abcdef",  # Hash com 16 caracteres
+        fk_travel_diary_id=diary.id
+    )
+    entry = Entry(
+        title="Teste de Hash Curto",
+        text="Referência com hash truncado [[photo::12345678]].",  # Texto usa só os 8 primeiros
+        date=datetime.now(),
+        travel_diary_id=diary.id
+    )
+    entry.photos.append(long_hash_photo)
+    session.add_all([long_hash_photo, entry])
+    session.commit()
+    updated_entry = service.delete_all_photo_references(entry)
+    expected_text = "Referência com hash truncado                   ."
+    assert "[[photo::12345678]]" not in updated_entry.text