mirror of
https://github.com/gmbrax/Pilgrim.git
synced 2026-11-10 18:50:18 +00:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
736c0f160f | ||
|
|
de27485c98 | ||
|
|
e9162ab25c | ||
|
|
88a0b9cf80 | ||
|
|
4dda85d8a3 | ||
|
|
5a28afc540 |
+2
-1
@@ -20,7 +20,8 @@ dependencies = [
|
||||
"sqlalchemy",
|
||||
"textual",
|
||||
"tomli",
|
||||
"tomli_w"
|
||||
"tomli_w",
|
||||
"unidecode"
|
||||
]
|
||||
|
||||
[project.urls]
|
||||
|
||||
@@ -11,9 +11,9 @@ 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,
|
||||
|
||||
@@ -7,7 +7,7 @@ from pilgrim.utils import DirectoryManager
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
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
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
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
|
||||
@@ -1,93 +0,0 @@
|
||||
import pytest
|
||||
from datetime import datetime
|
||||
from unittest.mock import Mock
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
from pilgrim.database import Base
|
||||
from pilgrim.models.travel_diary import TravelDiary
|
||||
from pilgrim.models.entry import Entry
|
||||
from pilgrim.models.photo import Photo
|
||||
|
||||
from pilgrim.service.entry_service import EntryService
|
||||
|
||||
@pytest.fixture(scope="function")
|
||||
def db_session():
|
||||
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):
|
||||
travel_diary = TravelDiary(name="My Travel Diary", directory_name="viagem-teste")
|
||||
db_session.add(travel_diary)
|
||||
db_session.commit()
|
||||
return db_session
|
||||
|
||||
def test_create_entry_successfully(populated_db_session):
|
||||
session = populated_db_session
|
||||
service = EntryService(session)
|
||||
diary_id = 1 # Sabemos que o ID é 1 por causa da nossa fixture
|
||||
title = "Primeiro Dia na Praia"
|
||||
text = "O dia foi ensolarado e o mar estava ótimo."
|
||||
date = datetime(2025, 7, 20)
|
||||
photos = [Photo(filepath="/path/to/photo1.jpg",name="Photo 1",photo_hash="hash_12345678",fk_travel_diary_id=diary_id), Photo(filepath="/path/to/photo2.jpg",name="Photo 1",photo_hash="hash_87654321",fk_travel_diary_id=diary_id)]
|
||||
created_entry = service.create(
|
||||
travel_diary_id=diary_id,
|
||||
title=title,
|
||||
text=text,
|
||||
date=date,
|
||||
photos=photos
|
||||
)
|
||||
assert created_entry is not None
|
||||
assert created_entry.id is not None # Garante que foi salvo no BD e tem um ID
|
||||
assert created_entry.title == title
|
||||
assert created_entry.text == text
|
||||
assert len(created_entry.photos) == 2
|
||||
assert created_entry.photos[0].filepath == "/path/to/photo1.jpg"
|
||||
|
||||
entry_in_db = session.query(Entry).filter_by(id=created_entry.id).one()
|
||||
assert entry_in_db.title == "Primeiro Dia na Praia"
|
||||
|
||||
def test_create_entry_fails_when_diary_id_is_invalid(db_session):
|
||||
session = db_session
|
||||
service = EntryService(session)
|
||||
invalid_id = 666
|
||||
|
||||
result = service.create(
|
||||
travel_diary_id=invalid_id,
|
||||
title="Título de Teste",
|
||||
text="Texto de Teste",
|
||||
date=datetime(2025, 7, 20),
|
||||
photos=[]
|
||||
)
|
||||
|
||||
assert result is None
|
||||
|
||||
def test_create_entry_successfully_without_photo(populated_db_session):
|
||||
session = populated_db_session
|
||||
service = EntryService(session)
|
||||
diary_id = 1 # Sabemos que o ID é 1 por causa da nossa fixture
|
||||
title = "Primeiro Dia na Praia"
|
||||
text = "O dia foi ensolarado e o mar estava ótimo."
|
||||
date = datetime(2025, 7, 20)
|
||||
photos = []
|
||||
created_entry = service.create(
|
||||
travel_diary_id=diary_id,
|
||||
title=title,
|
||||
text=text,
|
||||
date=date,
|
||||
photos=photos
|
||||
)
|
||||
assert created_entry is not None
|
||||
assert created_entry.id is not None # Garante que foi salvo no BD e tem um ID
|
||||
assert created_entry.title == title
|
||||
assert created_entry.text == text
|
||||
assert len(created_entry.photos) == 0
|
||||
entry_in_db = session.query(Entry).filter_by(id=created_entry.id).one()
|
||||
assert entry_in_db.title == "Primeiro Dia na Praia"
|
||||
Reference in New Issue
Block a user