Skip to content

Commit 1b03646

Browse files
committed
πŸ—„ [chore][backend] Remove read_event in favor of read_events
1 parent f85e115 commit 1b03646

3 files changed

Lines changed: 9 additions & 18 deletions

File tree

β€Žbackend/kayman/crud/event.pyβ€Ž

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ def create_events(
2626
return db_events
2727

2828

29-
def read_event(session: Session, event_id: int) -> Event | None:
30-
return session.get(Event, event_id)
31-
32-
3329
def read_events(
3430
session: Session,
3531
event_ids: Collection[int] | None = None,

β€Žbackend/kayman/routers/event.pyβ€Ž

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from kayman.core.db import get_session
99
from kayman.crud.event import (
1010
create_events,
11-
read_event,
1211
read_events,
1312
)
1413
from kayman.schemas.api_models import EventReadDetailed
@@ -40,10 +39,10 @@ def create(*, session: Session = Depends(get_session), event: EventCreate) -> Ev
4039

4140
@event_router.get("/{event_id}", name="Read Event", response_model=EventReadDetailed)
4241
def read(*, session: Session = Depends(get_session), event_id: int) -> EventBase:
43-
event = read_event(session, event_id)
44-
if event is None:
42+
events = read_events(session, event_ids=[event_id])
43+
if not events:
4544
raise HTTPException(status_code=404, detail="Event not found")
46-
return event
45+
return events[0]
4746

4847

4948
@event_router.get("", name="Read Events", response_model=list[EventReadDetailed])

β€Žbackend/kayman/tests/crud/test_event.pyβ€Ž

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pytest
55
from sqlmodel import Session
66

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
88
from kayman.schemas.event import EventType, EventUpdate
99
from kayman.tests.factories import (
1010
CategoryFactory,
@@ -56,27 +56,23 @@ def test_create_events_no_commit(session: Session, session_2: Session):
5656
assert session_event.type == event.type
5757

5858
# 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
6161

6262
# Commit the event from main session
6363
session.commit()
6464

6565
# 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]
6869
assert session_3_event.id == session_event.id
6970
assert session_3_event.description == session_event.description
7071
assert session_3_event.timestamp == session_event.timestamp
7172
assert session_3_event.timezone == session_event.timezone
7273
assert session_3_event.type == session_event.type
7374

7475

75-
def test_read_event(session: Session):
76-
event = EventFactory()
77-
assert read_event(session, event.id) == event
78-
79-
8076
def test_read_events_by_ids(session: Session):
8177
event_1 = EventFactory()
8278
event_2 = EventFactory()

0 commit comments

Comments
Β (0)