mirror of
https://github.com/gmbrax/Pilgrim.git
synced 2026-11-10 18:50:18 +00:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
819a2c7b6b | ||
|
|
92ee47cff3 | ||
|
|
8d45b4361e | ||
|
|
3db39eac71 |
@@ -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
|
||||
|
||||
|
||||
+24
-1
@@ -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
|
||||
@@ -61,4 +64,24 @@ def session_with_photos(session_with_one_diary):
|
||||
session.add_all([photo1, photo2])
|
||||
session.commit()
|
||||
|
||||
return session, [photo1, photo2]
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user