Add the tests for delete the entries method

Refactor to add conftest.py to share fixtures

.github/workflows/pylint.yml

@@ -1,24 +0,0 @@
-name: Pylint
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.10"]
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        pip install pylint
-    - name: Analysing the code with pylint
-      run: |
-        pylint --disable=C0114,C0115,C0116 --exit-zero $(git ls-files '*.py')

.github/workflows/pylint_sonarqube.yml

@@ -0,0 +1,63 @@
+name: Pylint and SonarCloud
+on: 
+  push:
+    branches: [ main, master, staging ]
+  pull_request:
+    branches: [ main, master, staging ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10"]
+    
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0  # Necessário para SonarCloud
+    
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        pip install pylint ruff coverage pytest
+    
+    - name: Analysing the code with pylint (console output)
+      run: |
+        pylint --disable=C0114,C0115,C0116 --exit-zero $(git ls-files '*.py') || true
+    
+    - name: Generate Pylint report for SonarCloud
+      run: |
+        pylint --disable=C0114,C0115,C0116 --output-format=json --exit-zero $(git ls-files '*.py') > pylint-report.json || true
+    
+    - name: Run Ruff
+      run: |
+        ruff check --output-format=json . > ruff-report.json || true
+    
+    - name: Run tests with coverage (if you have tests)
+      run: |
+        if [ -d "tests" ] || [ -f "test_*.py" ] || [ -f "*_test.py" ]; then
+          coverage run -m pytest || true
+          coverage xml || true
+        else
+          echo "No tests found, skipping coverage"
+        fi
+    
+    - name: SonarCloud Scan
+      uses: SonarSource/sonarqube-scan-action@v5.0.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      with:
+        args: >
+          -Dsonar.projectKey=gmbrax_Pilgrim
+          -Dsonar.organization=gmbrax
+          -Dsonar.python.pylint.reportPaths=pylint-report.json
+          -Dsonar.python.ruff.reportPaths=ruff-report.json
+          -Dsonar.python.coverage.reportPaths=coverage.xml

CHANGELOG.md

@@ -1,51 +1,68 @@
 # Changelog
 
 All notable changes to this project will be documented in this file.
+The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## Unreleased
 
-## [Unreleased]
+## Planned
+* Installation Method 1 (repository compilation)
+* Organization of trips by date, location, or theme
+* Enhanced photo management features
+* Search functionality
+* Export features
+* Testing implementation
 
-### Planned
+## [0.0.4] - 2025-07-19
 
-- Installation Method 1 (repository compilation)
-- Organization of trips by date, location, or theme
-- Enhanced photo management features
-- Search functionality
-- Export features
-- Testing implementation
+### 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
+
+### 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
+
+### 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
 
 ## [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
-
-[Unreleased]: https://github.com/username/pilgrim/compare/v0.0.1...HEAD
-
-[0.0.1]: https://github.com/username/pilgrim/releases/tag/v0.0.1
+* Installation Method 1 not yet implemented
+* No testing suite implemented yet
+* Some features may be unstable in an alpha version

pyproject.toml

@@ -1,36 +1,32 @@
-    [build-system]
-    requires = ["hatchling"]
-    build-backend = "hatchling.build"
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
+[project]
+name = "pilgrim"
+version = "0.0.4"
+authors = [
+  { name="Gustavo Henrique Santos Souza de Miranda", email="gustavohssmiranda@gmail.com" }
+]
+description = "Pilgrim's Travel Log"
+readme = "README.md"
+requires-python = ">=3.10"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: BSD License",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+    "sqlalchemy",
+    "textual",
+    "tomli",
+    "tomli_w",
+    "unidecode"
+]
 
-    [project]
-    name = "Pilgrim"
-    version = "0.0.4"
-    authors = [
-      { name="Gustavo Henrique Santos Souza de Miranda", email="gustavohssmiranda@gmail.com" }
-    ]
-    description = "Pilgrim's Travel Log"
-    readme = "README.md"
-    requires-python = ">=3.10"
-    classifiers = [
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: BSD License",
-        "Operating System :: OS Independent",
-    ]
-    dependencies = [
-      "sqlalchemy",
-        "textual",
-        "tomli",
-        "tomli_w"
+[project.urls]
+Homepage = "https://github.com/gmbrax/Pilgrim/"
+Issues = "https://github.com/gmbrax/Pilgrim/issues"
 
-
-    ]
-    [template.plugins.default]
-    src-layout = true
-    [project.urls]
-    Homepage = "https://github.com/gmbrax/Pilgrim/"
-    Issues = "https://github.com/gmbrax/Pilgrim/issues"
-    [tool.hatch.build.targets.wheel]
-    packages = ["src/pilgrim"]
-    [project.scripts]
-    pilgrim = "pilgrim:main"
+[project.scripts]
+pilgrim = "pilgrim.command:main"

src/pilgrim/database.py

@@ -1,5 +1,5 @@
 from sqlalchemy import create_engine
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 from sqlalchemy.orm import sessionmaker
 from pathlib import Path
 import os

src/pilgrim/models/entry.py

@@ -4,15 +4,16 @@ from pilgrim.models.photo_in_entry import photo_entry_association
 from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
 from sqlalchemy.orm import relationship
 
-from ..database import Base
+from pilgrim.database import Base
+
 
 
 class Entry(Base):
     __tablename__ = "entries"
     id = Column(Integer, primary_key=True)
-    title = Column(String)
+    title = Column(String,nullable=False)
     text = Column(String)
-    date = Column(DateTime)
+    date = Column(DateTime,nullable=False)
     photos = relationship(
         "Photo",
         secondary=photo_entry_association,

src/pilgrim/models/photo.py

@@ -7,7 +7,8 @@ from sqlalchemy.orm import relationship
 from sqlalchemy.sql.schema import Index
 
 from pilgrim.models.photo_in_entry import photo_entry_association
-from ..database import Base
+from pilgrim.database import Base
+
 
 
 class Photo(Base):

src/pilgrim/models/photo_in_entry.py

@@ -1,6 +1,6 @@
 from sqlalchemy import Table, Column, Integer, ForeignKey
 
-from ..database import Base
+from pilgrim.database import Base
 
 photo_entry_association = Table('photo_entry_association', Base.metadata,
 Column('id', Integer, primary_key=True, autoincrement=True),

src/pilgrim/models/travel_diary.py

@@ -3,10 +3,11 @@ from typing import Any
 from sqlalchemy import Column, Integer, String, UniqueConstraint
 from sqlalchemy.orm import relationship
 
-from .. import database
+from pilgrim.database import Base
 
 
-class TravelDiary(database.Base):
+
+class TravelDiary(Base):
     __tablename__ = "travel_diaries"
     id = Column(Integer, primary_key=True)
     name = Column(String, nullable=False)

src/pilgrim/service/entry_service.py

@@ -1,9 +1,9 @@
 from datetime import datetime
 from typing import List
 
-from ..models.entry import Entry
-from ..models.travel_diary import TravelDiary
-from ..models.photo import Photo  # ✨ Importe o modelo Photo
+from pilgrim.models.entry import Entry
+from pilgrim.models.travel_diary import TravelDiary
+from pilgrim.models.photo import Photo  # ✨ Importe o modelo Photo
 
 
 class EntryService:

src/pilgrim/service/travel_diary_service.py

@@ -6,8 +6,8 @@ from pathlib import Path
 from pilgrim.utils import DirectoryManager
 from sqlalchemy.exc import IntegrityError
 
-from ..models.travel_diary import TravelDiary
-
+from pilgrim.models.travel_diary import TravelDiary
+from unidecode import unidecode
 
 class TravelDiaryService:
     def __init__(self, session):
@@ -20,8 +20,10 @@ class TravelDiaryService:
         - Replaces spaces with underscores
         - Ensures name is unique by adding a suffix if needed
         """
+        transliterated_name = unidecode(name)
+
         # Remove special characters and replace spaces
-        safe_name = re.sub(r'[^\w\s-]', '', name)
+        safe_name = re.sub(r'[^\w\s-]', '', transliterated_name)
         safe_name = safe_name.strip().replace(' ', '_').lower()
 
         # Ensure we have a valid name

tests/conftest.py

@@ -0,0 +1,36 @@
+import pytest
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+
+from pilgrim.database import Base
+from pilgrim.models.travel_diary import TravelDiary
+
+# Todos os imports necessários para as fixtures devem estar aqui
+# ...
+
+@pytest.fixture(scope="function")
+def db_session():
+    """Esta fixture agora está disponível para TODOS os testes."""
+    engine = create_engine("sqlite:///:memory:")
+    Base.metadata.create_all(engine)
+    Session = sessionmaker(bind=engine)
+    session = Session()
+    yield session
+    session.close()
+    Base.metadata.drop_all(engine)
+
+@pytest.fixture
+def populated_db_session(db_session):
+    """Esta também fica disponível para todos."""
+    travel_diary = TravelDiary(name="My Travel Diary", directory_name="viagem-teste")
+    db_session.add(travel_diary)
+    db_session.commit()
+    return db_session
+
+@pytest.fixture
+def session_with_one_diary(db_session):
+    diary = TravelDiary(name="Diário de Teste", directory_name="diario_de_teste")
+    db_session.add(diary)
+    db_session.commit()
+    db_session.refresh(diary)
+    return db_session, diary

tests/service/test_travel_diary_service.py

@@ -0,0 +1,143 @@
+from unittest.mock import patch, MagicMock
+from pathlib import Path
+
+import pytest
+
+from pilgrim import TravelDiary
+from pilgrim.service.travel_diary_service import TravelDiaryService
+
+@patch.object(TravelDiaryService, '_ensure_diary_directory')
+@pytest.mark.asyncio # Marca o teste para rodar código assíncrono
+async def test_create_diary_successfully(mock_ensure_dir, db_session):
+    service = TravelDiaryService(db_session)
+    new_diary = await service.async_create("Viagem para a Serra")
+    assert new_diary is not None
+    assert new_diary.id is not None
+    assert new_diary.name == "Viagem para a Serra"
+    assert new_diary.directory_name == "viagem_para_a_serra"
+
+@patch.object(TravelDiaryService, '_ensure_diary_directory')
+@patch.object(TravelDiaryService, '_sanitize_directory_name', return_value="nome_existente")
+@pytest.mark.asyncio
+async def test_create_diary_handles_integrity_error(mock_sanitize, mock_ensure_dir, db_session):
+    existing_diary = TravelDiary(name="Diário Antigo", directory_name="nome_existente")
+    db_session.add(existing_diary)
+    db_session.commit()
+    service = TravelDiaryService(db_session)
+    with pytest.raises(ValueError, match="Could not create diary"):
+        await service.async_create("Qualquer Nome Novo")
+    mock_ensure_dir.assert_not_called()
+
+@patch.object(TravelDiaryService, '_ensure_diary_directory')
+def test_read_by_id_successfully(mock_ensure_dir, session_with_one_diary):
+    session, diary_to_find = session_with_one_diary
+    service = TravelDiaryService(session)
+    found_diary = service.read_by_id(diary_to_find.id)
+    assert found_diary is not None
+    assert found_diary.id == diary_to_find.id
+    assert found_diary.name == "Diário de Teste"
+    mock_ensure_dir.assert_called_once_with(found_diary)
+
+@patch.object(TravelDiaryService, '_ensure_diary_directory')
+def test_read_by_id_returns_none_for_invalid_id(mock_ensure_dir, db_session):
+    service = TravelDiaryService(db_session)
+    result = service.read_by_id(999)
+    assert result is None
+    mock_ensure_dir.assert_not_called()
+
+@patch.object(TravelDiaryService, '_ensure_diary_directory')
+def test_read_all_returns_all_diaries(mock_ensure_dir, db_session):
+    d1 = TravelDiary(name="Diário 1", directory_name="d1")
+    d2 = TravelDiary(name="Diário 2", directory_name="d2")
+    db_session.add_all([d1, d2])
+    db_session.commit()
+    service = TravelDiaryService(db_session)
+    diaries = service.read_all()
+    assert isinstance(diaries, list)
+    assert len(diaries) == 2
+    assert mock_ensure_dir.call_count == 2
+
+@patch.object(TravelDiaryService, '_ensure_diary_directory')
+def test_read_all_returns_empty_list_for_empty_db(mock_ensure_dir, db_session):
+    service = TravelDiaryService(db_session)
+    diaries = service.read_all()
+    assert isinstance(diaries, list)
+    assert len(diaries) == 0
+    mock_ensure_dir.assert_not_called()
+
+@patch.object(TravelDiaryService, '_ensure_diary_directory')
+@patch('pathlib.Path.rename')
+@patch.object(TravelDiaryService, '_get_diary_directory')
+def test_update_diary_successfully(mock_get_dir, mock_path_rename, mock_ensure, session_with_one_diary):
+    session, diary_to_update = session_with_one_diary
+    service = TravelDiaryService(session)
+    old_path = MagicMock(spec=Path)  # Um mock que se parece com um objeto Path
+    old_path.exists.return_value = True  # Dizemos que o diretório antigo "existe"
+    new_path = Path("/fake/path/diario_atualizado")
+    mock_get_dir.side_effect = [old_path, new_path]
+    updated_diary = service.update(diary_to_update.id, "Diário Atualizado")
+    assert updated_diary is not None
+    assert updated_diary.name == "Diário Atualizado"
+    assert updated_diary.directory_name == "diario_atualizado"
+    old_path.rename.assert_called_once_with(new_path)
+
+def test_update_returns_none_for_invalid_id(db_session):
+    service = TravelDiaryService(db_session)
+    result = service.update(travel_diary_id=999, name="Nome Novo")
+    assert result is None
+
+@patch.object(TravelDiaryService, '_cleanup_diary_directory')
+def test_delete_diary_successfully(mock_cleanup, session_with_one_diary):
+    session, diary_to_delete = session_with_one_diary
+    service = TravelDiaryService(session)
+    result = service.delete(diary_to_delete)
+    assert result is not None
+    assert result.id == diary_to_delete.id
+    mock_cleanup.assert_called_once_with(diary_to_delete)
+    diary_in_db = service.read_by_id(diary_to_delete.id)
+    assert diary_in_db is None
+
+@patch.object(TravelDiaryService, '_cleanup_diary_directory')
+def test_delete_returns_none_for_non_existent_diary(mock_cleanup, db_session):
+    service = TravelDiaryService(db_session)
+    non_existent_diary = TravelDiary(name="dummy", directory_name="dummy")
+    non_existent_diary.id = 999
+    result = service.delete(non_existent_diary)
+    assert result is None
+    mock_cleanup.assert_not_called()
+
+@patch.object(TravelDiaryService, '_sanitize_directory_name')
+def test_update_raises_value_error_on_name_collision(mock_sanitize, db_session):
+
+    d1 = TravelDiary(name="Diário A", directory_name="diario_a")
+    d2 = TravelDiary(name="Diário B", directory_name="diario_b")
+    db_session.add_all([d1, d2])
+    db_session.commit()
+    db_session.refresh(d1)
+    mock_sanitize.return_value = "diario_b"
+    service = TravelDiaryService(db_session)
+    with pytest.raises(ValueError, match="Could not update diary"):
+        service.update(d1.id, "Diário B")
+
+def test_sanitize_directory_name_formats_string_correctly(db_session):
+    service = TravelDiaryService(db_session)
+    name1 = "Minha Primeira Viagem"
+    assert service._sanitize_directory_name(name1) == "minha_primeira_viagem"
+    name2 = "Viagem para o #Rio de Janeiro! @2025"
+    assert service._sanitize_directory_name(name2) == "viagem_para_o_rio_de_janeiro_2025"
+    name3 = "  Mochilão na Europa   "
+    assert service._sanitize_directory_name(name3) == "mochilao_na_europa"
+
+def test_sanitize_directory_name_handles_uniqueness(db_session):
+    existing_diary = TravelDiary(name="Viagem para a Praia", directory_name="viagem_para_a_praia")
+    db_session.add(existing_diary)
+    db_session.commit()
+    service = TravelDiaryService(db_session)
+    new_sanitized_name = service._sanitize_directory_name("Viagem para a Praia")
+    assert new_sanitized_name == "viagem_para_a_praia_1"
+    another_diary = TravelDiary(name="Outra Viagem", directory_name="viagem_para_a_praia_1")
+    db_session.add(another_diary)
+    db_session.commit()
+
+    third_sanitized_name = service._sanitize_directory_name("Viagem para a Praia")
+    assert third_sanitized_name == "viagem_para_a_praia_2"