Change the import to avoid importing by the folder

pyproject.toml

@@ -1,31 +1,36 @@
-[build-system]
+    [build-system]
-requires = ["hatchling"]
+    requires = ["hatchling"]
-build-backend = "hatchling.build"
+    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"
-]
 
-[project.urls]
+    [project]
-Homepage = "https://github.com/gmbrax/Pilgrim/"
+    name = "Pilgrim"
-Issues = "https://github.com/gmbrax/Pilgrim/issues"
+    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.scripts]
+
-pilgrim = "pilgrim.command:main"
+    ]
+    [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"

src/pilgrim/database.py

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

src/pilgrim/models/entry.py

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

src/pilgrim/models/photo.py

@@ -7,8 +7,7 @@ from sqlalchemy.orm import relationship
 from sqlalchemy.sql.schema import Index
 
 from pilgrim.models.photo_in_entry import photo_entry_association
-from pilgrim.database import Base
+from ..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 pilgrim.database import Base
+from ..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,11 +3,10 @@ from typing import Any
 from sqlalchemy import Column, Integer, String, UniqueConstraint
 from sqlalchemy.orm import relationship
 
-from pilgrim.database import Base
+from .. import database
 
 
-
+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 pilgrim.models.entry import Entry
+from ..models.entry import Entry
-from pilgrim.models.travel_diary import TravelDiary
+from ..models.travel_diary import TravelDiary
-from pilgrim.models.photo import Photo  # ✨ Importe o modelo Photo
+from ..models.photo import Photo  # ✨ Importe o modelo Photo
 
 
 class EntryService:

src/pilgrim/service/travel_diary_service.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from pilgrim.utils import DirectoryManager
 from sqlalchemy.exc import IntegrityError
 
-from pilgrim.models.travel_diary import TravelDiary
+from ..models.travel_diary import TravelDiary
 
 
 class TravelDiaryService:

tests/conftest.py

@@ -1,36 +0,0 @@
-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

@@ -1,88 +0,0 @@
-from unittest.mock import patch
-
-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()
-
-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) == "mochilão_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"

tests/test_database.py

@@ -0,0 +1,40 @@
+import pytest
+from unittest.mock import Mock  # A ferramenta para criar nosso "dublê"
+from pathlib import Path
+from sqlalchemy import inspect, Column, Integer, String
+from sqlalchemy.orm import Session
+
+from pilgrim.database import Database,Base
+
+class MockUser(Base):
+    __tablename__ = 'mock_users'
+    id = Column(Integer, primary_key=True)
+    name = Column(String)
+
+@pytest.fixture
+def db_instance(tmp_path: Path):
+    fake_db_path = tmp_path / "test_pilgrim.db"
+    mock_config_manager = Mock()
+    mock_config_manager.database_url = str(fake_db_path)
+    db = Database(mock_config_manager)
+    return db, fake_db_path
+
+def test_create_database(db_instance):
+    db, fake_db_path = db_instance
+    db.create()
+    assert fake_db_path.exists()
+
+def test_table_creation(db_instance):
+    db, _ = db_instance
+    db.create()
+    inspector = inspect(db.engine)
+    assert "mock_users" in inspector.get_table_names()
+
+def test_session_returned_corectly(db_instance):
+    db, _ = db_instance
+    session = db.session()
+    assert isinstance(session, Session)
+    session.close()
+
+
+