bvandeusen
94b169f31c
A prod event surfaced today with `start_dt=2026-05-01T12:00Z` and `end_dt=2026-03-30T12:00Z` — end was 32 days BEFORE start, almost certainly from an earlier tool-call mishap (Fable #161). The list_events filter trusted the bogus end_dt and excluded the event from every read path that hit the upcoming window, even though start_dt was correctly in range. The event stayed visible in the calendar grid (different range) but vanished from "Upcoming", search, briefings, and journal prep events list. This is the hotfix half of the response. The structural follow-up is Fable #160 — replace end_dt with a duration column so invalid state becomes inexpressible. ## A. Filter robustness in list_events Treat `end_dt <= start_dt` as if no end_dt exists. The filter now splits into two branches: - valid duration: end_dt IS NOT NULL AND end_dt > start_dt AND end_dt >= date_from - no/invalid duration: (end_dt IS NULL OR end_dt <= start_dt) AND start_dt >= date_from Same change applied to the recurring-event expansion's `duration` calculation, which was producing negative timedeltas for corrupted rows and computing nonsensical occurrence end times. ## B. Write-side validation in create/update `create_event` and `update_event` now raise ValueError when the resulting state would have end_dt <= start_dt. Update validates against the *post-update* state, not just the field being changed — so pushing start_dt past an existing end_dt also fails loudly. Bad data shouldn't be persistable from any write path. Surfaced cleanly: - Calendar tool wrappers (create_event_tool / update_event_tool) catch ValueError and return `{success: false, error: ...}`, which the model can read and self-correct. - Route handlers (POST /api/events, PATCH /api/events/<id>) catch and return HTTP 400 with the validator's message instead of letting it bubble to a 500. 4 new tests in test_events_service.py: - create rejects end before start - create rejects equal start/end (zero duration) - update validates the post-update state (start pushed past existing end) - list_events surfaces an event whose end_dt is before its start_dt 34 event-related tests pass; ruff clean. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
228 lines
9.4 KiB
Python
228 lines
9.4 KiB
Python
import pytest
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
from datetime import datetime, timezone
|
|
|
|
|
|
def _make_mock_session():
|
|
mock_session = AsyncMock()
|
|
mock_session.__aenter__ = AsyncMock(return_value=mock_session)
|
|
mock_session.__aexit__ = AsyncMock(return_value=False)
|
|
mock_session.add = MagicMock()
|
|
mock_session.commit = AsyncMock()
|
|
mock_session.refresh = AsyncMock()
|
|
return mock_session
|
|
|
|
|
|
def _make_mock_event(id=1, user_id=1, uid="uid-abc", title="Meeting",
|
|
caldav_uid="", color=""):
|
|
e = MagicMock()
|
|
e.id = id
|
|
e.user_id = user_id
|
|
e.uid = uid
|
|
e.title = title
|
|
e.caldav_uid = caldav_uid
|
|
e.color = color
|
|
e.start_dt = datetime(2026, 3, 25, 10, 0, tzinfo=timezone.utc)
|
|
e.end_dt = datetime(2026, 3, 25, 11, 0, tzinfo=timezone.utc)
|
|
e.all_day = False
|
|
e.description = ""
|
|
e.location = ""
|
|
e.recurrence = None
|
|
e.project_id = None
|
|
e.to_dict.return_value = {
|
|
"id": id, "uid": uid, "title": title,
|
|
"caldav_uid": caldav_uid, "color": color,
|
|
"start_dt": datetime(2026, 3, 25, 10, 0, tzinfo=timezone.utc).isoformat(),
|
|
"end_dt": datetime(2026, 3, 25, 11, 0, tzinfo=timezone.utc).isoformat(),
|
|
}
|
|
return e
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_create_event_stores_to_db():
|
|
mock_session = _make_mock_session()
|
|
with patch("fabledassistant.services.events.async_session") as mock_cls, \
|
|
patch("fabledassistant.services.events.asyncio.create_task") as mock_task:
|
|
mock_cls.return_value = mock_session
|
|
from fabledassistant.services.events import create_event
|
|
result = await create_event(
|
|
user_id=1,
|
|
title="Dentist",
|
|
start_dt=datetime(2026, 3, 25, 10, 0, tzinfo=timezone.utc),
|
|
)
|
|
assert mock_session.add.called
|
|
assert mock_session.commit.called
|
|
# CalDAV push background task should be scheduled
|
|
assert mock_task.called
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_find_events_by_query_returns_ilike_results():
|
|
mock_event = _make_mock_event(title="Team Meeting")
|
|
mock_session = _make_mock_session()
|
|
mock_result = MagicMock()
|
|
mock_result.scalars.return_value.all.return_value = [mock_event]
|
|
mock_session.execute = AsyncMock(return_value=mock_result)
|
|
|
|
with patch("fabledassistant.services.events.async_session") as mock_cls:
|
|
mock_cls.return_value = mock_session
|
|
from fabledassistant.services.events import find_events_by_query
|
|
results = await find_events_by_query(user_id=1, query="meeting")
|
|
assert len(results) == 1
|
|
assert results[0].title == "Team Meeting"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_list_events_returns_events_in_range():
|
|
mock_event = _make_mock_event()
|
|
mock_session = _make_mock_session()
|
|
mock_result = MagicMock()
|
|
mock_result.scalars.return_value.all.return_value = [mock_event]
|
|
mock_session.execute = AsyncMock(return_value=mock_result)
|
|
|
|
with patch("fabledassistant.services.events.async_session") as mock_cls:
|
|
mock_cls.return_value = mock_session
|
|
from fabledassistant.services.events import list_events
|
|
results = await list_events(
|
|
user_id=1,
|
|
date_from=datetime(2026, 3, 1, tzinfo=timezone.utc),
|
|
date_to=datetime(2026, 3, 31, tzinfo=timezone.utc),
|
|
)
|
|
assert len(results) == 1
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_delete_event_fires_caldav_push_when_uid_set():
|
|
mock_event = _make_mock_event(caldav_uid="sync-uid")
|
|
mock_session = _make_mock_session()
|
|
mock_result = MagicMock()
|
|
mock_result.scalar_one_or_none.return_value = mock_event
|
|
mock_session.execute = AsyncMock(return_value=mock_result)
|
|
|
|
with patch("fabledassistant.services.events.async_session") as mock_cls, \
|
|
patch("fabledassistant.services.events.asyncio.create_task") as mock_task:
|
|
mock_cls.return_value = mock_session
|
|
from fabledassistant.services.events import delete_event
|
|
await delete_event(user_id=1, event_id=1)
|
|
# Push task fired because caldav_uid is set
|
|
assert mock_task.called
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_update_event_fires_caldav_push():
|
|
mock_event = _make_mock_event(caldav_uid="sync-uid")
|
|
mock_session = _make_mock_session()
|
|
mock_result = MagicMock()
|
|
mock_result.scalar_one_or_none.return_value = mock_event
|
|
mock_session.execute = AsyncMock(return_value=mock_result)
|
|
|
|
with patch("fabledassistant.services.events.async_session") as mock_cls, \
|
|
patch("fabledassistant.services.events.asyncio.create_task") as mock_task:
|
|
mock_cls.return_value = mock_session
|
|
from fabledassistant.services.events import update_event
|
|
await update_event(user_id=1, event_id=1, title="Updated Title")
|
|
assert mock_task.called
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_create_event_rejects_end_before_start():
|
|
"""Write-side validation: end_dt <= start_dt must raise rather than
|
|
persisting invalid data. Discovered 2026-04-29: a tool-call mishap
|
|
left an event with end_dt 32 days BEFORE start_dt; the bad data then
|
|
made the event invisible to the upcoming-list filter. Catching at
|
|
the boundary prevents the same shape from recurring."""
|
|
from fabledassistant.services.events import create_event
|
|
start = datetime(2026, 5, 1, 12, 0, tzinfo=timezone.utc)
|
|
end_before = datetime(2026, 3, 30, 12, 0, tzinfo=timezone.utc)
|
|
with pytest.raises(ValueError, match="must be after start_dt"):
|
|
await create_event(
|
|
user_id=1, title="Bad",
|
|
start_dt=start, end_dt=end_before,
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_create_event_rejects_end_equal_to_start():
|
|
"""Equal start/end is also invalid (zero-duration); pass end=None
|
|
for point events instead."""
|
|
from fabledassistant.services.events import create_event
|
|
same = datetime(2026, 5, 1, 12, 0, tzinfo=timezone.utc)
|
|
with pytest.raises(ValueError, match="must be after start_dt"):
|
|
await create_event(
|
|
user_id=1, title="Zero",
|
|
start_dt=same, end_dt=same,
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_update_event_rejects_post_state_with_end_before_start():
|
|
"""update_event must validate against the *post-update* state, not
|
|
just the field passed in. A user changing only start_dt to a value
|
|
after the existing end_dt would otherwise sneak past validation."""
|
|
mock_event = _make_mock_event() # start = 2026-03-25 10:00, end = 11:00
|
|
mock_session = _make_mock_session()
|
|
mock_result = MagicMock()
|
|
mock_result.scalar_one_or_none.return_value = mock_event
|
|
mock_session.execute = AsyncMock(return_value=mock_result)
|
|
|
|
with patch("fabledassistant.services.events.async_session") as mock_cls:
|
|
mock_cls.return_value = mock_session
|
|
from fabledassistant.services.events import update_event
|
|
# Push start_dt past the existing end_dt (without touching end_dt)
|
|
with pytest.raises(ValueError, match="must be after start_dt"):
|
|
await update_event(
|
|
user_id=1, event_id=1,
|
|
start_dt=datetime(2026, 3, 25, 12, 0, tzinfo=timezone.utc),
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_list_events_returns_event_with_invalid_end_dt():
|
|
"""Filter robustness: an event whose end_dt landed before start_dt
|
|
(corrupt data state from earlier bugs) must still surface in the
|
|
upcoming list when its start_dt is in range. Without this, the
|
|
event becomes invisible everywhere except via direct id lookup."""
|
|
mock_event = _make_mock_event()
|
|
# Corrupt state: end is 32 days BEFORE start
|
|
mock_event.start_dt = datetime(2026, 5, 1, 12, 0, tzinfo=timezone.utc)
|
|
mock_event.end_dt = datetime(2026, 3, 30, 12, 0, tzinfo=timezone.utc)
|
|
mock_event.to_dict.return_value = {
|
|
"id": 1, "title": "Corrupt event",
|
|
"start_dt": mock_event.start_dt.isoformat(),
|
|
"end_dt": mock_event.end_dt.isoformat(),
|
|
}
|
|
mock_session = _make_mock_session()
|
|
mock_result = MagicMock()
|
|
mock_result.scalars.return_value.all.return_value = [mock_event]
|
|
mock_session.execute = AsyncMock(return_value=mock_result)
|
|
|
|
with patch("fabledassistant.services.events.async_session") as mock_cls:
|
|
mock_cls.return_value = mock_session
|
|
from fabledassistant.services.events import list_events
|
|
# Window covers start_dt (May 1) but not end_dt (March 30).
|
|
results = await list_events(
|
|
user_id=1,
|
|
date_from=datetime(2026, 4, 29, tzinfo=timezone.utc),
|
|
date_to=datetime(2026, 5, 27, tzinfo=timezone.utc),
|
|
)
|
|
# Pre-fix: filter would exclude this event. Post-fix: present.
|
|
assert len(results) == 1
|
|
assert results[0]["id"] == 1
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_tools_calendar_always_available():
|
|
"""Calendar tools must appear in get_tools_for_user even without CalDAV."""
|
|
with patch("fabledassistant.services.tools._registry.is_caldav_configured", new_callable=AsyncMock) as mock_configured, \
|
|
patch("fabledassistant.services.settings.get_setting", new_callable=AsyncMock) as mock_setting:
|
|
mock_configured.return_value = False
|
|
mock_setting.return_value = "false"
|
|
from fabledassistant.services.tools import get_tools_for_user
|
|
tools = await get_tools_for_user(user_id=1)
|
|
tool_names = {t["function"]["name"] for t in tools}
|
|
assert "create_event" in tool_names
|
|
assert "list_events" in tool_names
|
|
assert "search_events" in tool_names
|
|
assert "update_event" in tool_names
|
|
assert "delete_event" in tool_names
|