|
4 | 4 | import pytest |
5 | 5 | from sqlmodel import Session |
6 | 6 |
|
7 | | -from kayman.crud.event import create_events, read_event, read_events, update_events |
| 7 | +from kayman.crud.event import create_events, read_events, update_events |
8 | 8 | from kayman.schemas.event import EventType, EventUpdate |
9 | 9 | from kayman.tests.factories import ( |
10 | 10 | CategoryFactory, |
@@ -56,27 +56,23 @@ def test_create_events_no_commit(session: Session, session_2: Session): |
56 | 56 | assert session_event.type == event.type |
57 | 57 |
|
58 | 58 | # The event should not be visible to other sessions (yet) |
59 | | - session_2_event = read_event(session_2, session_event.id) |
60 | | - assert session_2_event is None |
| 59 | + session_2_events = read_events(session_2, event_ids=[session_event.id]) |
| 60 | + assert len(session_2_events) == 0 |
61 | 61 |
|
62 | 62 | # Commit the event from main session |
63 | 63 | session.commit() |
64 | 64 |
|
65 | 65 | # The event should now be visible to other sessions |
66 | | - session_3_event = read_event(session_2, session_event.id) |
67 | | - assert session_3_event is not None |
| 66 | + session_3_events = read_events(session_2, event_ids=[session_event.id]) |
| 67 | + assert len(session_3_events) == 1 |
| 68 | + session_3_event = session_3_events[0] |
68 | 69 | assert session_3_event.id == session_event.id |
69 | 70 | assert session_3_event.description == session_event.description |
70 | 71 | assert session_3_event.timestamp == session_event.timestamp |
71 | 72 | assert session_3_event.timezone == session_event.timezone |
72 | 73 | assert session_3_event.type == session_event.type |
73 | 74 |
|
74 | 75 |
|
75 | | -def test_read_event(session: Session): |
76 | | - event = EventFactory() |
77 | | - assert read_event(session, event.id) == event |
78 | | - |
79 | | - |
80 | 76 | def test_read_events_by_ids(session: Session): |
81 | 77 | event_1 = EventFactory() |
82 | 78 | event_2 = EventFactory() |
|
0 commit comments