diff --git a/browser/templates/_types/auth/_bookings_panel.html b/browser/templates/_types/auth/_bookings_panel.html new file mode 100644 index 0000000..28f8280 --- /dev/null +++ b/browser/templates/_types/auth/_bookings_panel.html @@ -0,0 +1,44 @@ +
+
+ +

Bookings

+ + {% if bookings %} +
+ {% for booking in bookings %} +
+
+
+

{{ booking.name }}

+
+ {{ booking.start_at.strftime('%d %b %Y, %H:%M') }} + {% if booking.end_at %} + – {{ booking.end_at.strftime('%H:%M') }} + {% endif %} + {% if booking.calendar_name %} + · {{ booking.calendar_name }} + {% endif %} + {% if booking.cost %} + · £{{ booking.cost }} + {% endif %} +
+
+
+ {% if booking.state == 'confirmed' %} + confirmed + {% elif booking.state == 'provisional' %} + provisional + {% else %} + {{ booking.state }} + {% endif %} +
+
+
+ {% endfor %} +
+ {% else %} +

No bookings yet.

+ {% endif %} + +
+
diff --git a/browser/templates/_types/auth/_nav.html b/browser/templates/_types/auth/_nav.html index 3fb9f34..0324fdf 100644 --- a/browser/templates/_types/auth/_nav.html +++ b/browser/templates/_types/auth/_nav.html @@ -2,6 +2,12 @@ {% call links.link(coop_url('/auth/newsletters/'), hx_select_search, select_colours, True, aclass=styles.nav_button) %} newsletters {% endcall %} +{% call links.link(coop_url('/auth/tickets/'), hx_select_search, select_colours, True, aclass=styles.nav_button) %} + tickets +{% endcall %} +{% call links.link(coop_url('/auth/bookings/'), hx_select_search, select_colours, True, aclass=styles.nav_button) %} + bookings +{% endcall %}
orders diff --git a/browser/templates/_types/auth/_tickets_panel.html b/browser/templates/_types/auth/_tickets_panel.html new file mode 100644 index 0000000..69f7596 --- /dev/null +++ b/browser/templates/_types/auth/_tickets_panel.html @@ -0,0 +1,44 @@ +
+
+ +

Tickets

+ + {% if tickets %} +
+ {% for ticket in tickets %} +
+
+
+ + {{ ticket.entry_name }} + +
+ {{ ticket.entry_start_at.strftime('%d %b %Y, %H:%M') }} + {% if ticket.calendar_name %} + · {{ ticket.calendar_name }} + {% endif %} + {% if ticket.ticket_type_name %} + · {{ ticket.ticket_type_name }} + {% endif %} +
+
+
+ {% if ticket.state == 'checked_in' %} + checked in + {% elif ticket.state == 'confirmed' %} + confirmed + {% else %} + {{ ticket.state }} + {% endif %} +
+
+
+ {% endfor %} +
+ {% else %} +

No tickets yet.

+ {% endif %} + +
+
diff --git a/contracts/dtos.py b/contracts/dtos.py index fd1916f..b6dad4c 100644 --- a/contracts/dtos.py +++ b/contracts/dtos.py @@ -43,6 +43,20 @@ class CalendarDTO: description: str | None = None +@dataclass(frozen=True, slots=True) +class TicketDTO: + id: int + code: str + state: str + entry_name: str + entry_start_at: datetime + entry_end_at: datetime | None = None + ticket_type_name: str | None = None + calendar_name: str | None = None + created_at: datetime | None = None + checked_in_at: datetime | None = None + + @dataclass(frozen=True, slots=True) class CalendarEntryDTO: id: int diff --git a/contracts/protocols.py b/contracts/protocols.py index d6a0574..e514ea5 100644 --- a/contracts/protocols.py +++ b/contracts/protocols.py @@ -13,6 +13,7 @@ from .dtos import ( PostDTO, CalendarDTO, CalendarEntryDTO, + TicketDTO, MarketPlaceDTO, ProductDTO, CartItemDTO, @@ -69,6 +70,14 @@ class CalendarService(Protocol): self, session: AsyncSession, order_id: int, ) -> list[CalendarEntryDTO]: ... + async def user_tickets( + self, session: AsyncSession, *, user_id: int, + ) -> list[TicketDTO]: ... + + async def user_bookings( + self, session: AsyncSession, *, user_id: int, + ) -> list[CalendarEntryDTO]: ... + @runtime_checkable class MarketService(Protocol): diff --git a/services/calendar_impl.py b/services/calendar_impl.py index d78531b..048d39d 100644 --- a/services/calendar_impl.py +++ b/services/calendar_impl.py @@ -9,8 +9,8 @@ from sqlalchemy import select, update, func from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm import selectinload -from shared.models.calendars import Calendar, CalendarEntry, CalendarEntryPost -from shared.contracts.dtos import CalendarDTO, CalendarEntryDTO +from shared.models.calendars import Calendar, CalendarEntry, CalendarEntryPost, Ticket +from shared.contracts.dtos import CalendarDTO, CalendarEntryDTO, TicketDTO def _cal_to_dto(cal: Calendar) -> CalendarDTO: @@ -47,6 +47,24 @@ def _entry_to_dto(entry: CalendarEntry) -> CalendarEntryDTO: ) +def _ticket_to_dto(ticket: Ticket) -> TicketDTO: + entry = getattr(ticket, "entry", None) + tt = getattr(ticket, "ticket_type", None) + cal = getattr(entry, "calendar", None) if entry else None + return TicketDTO( + id=ticket.id, + code=ticket.code, + state=ticket.state, + entry_name=entry.name if entry else "", + entry_start_at=entry.start_at if entry else ticket.created_at, + entry_end_at=entry.end_at if entry else None, + ticket_type_name=tt.name if tt else None, + calendar_name=cal.name if cal else None, + created_at=ticket.created_at, + checked_in_at=ticket.checked_in_at, + ) + + class SqlCalendarService: # -- reads ---------------------------------------------------------------- @@ -210,6 +228,38 @@ class SqlCalendarService: ) return [_entry_to_dto(e) for e in result.scalars().all()] + async def user_tickets( + self, session: AsyncSession, *, user_id: int, + ) -> list[TicketDTO]: + result = await session.execute( + select(Ticket) + .where( + Ticket.user_id == user_id, + Ticket.state != "cancelled", + ) + .order_by(Ticket.created_at.desc()) + .options( + selectinload(Ticket.entry).selectinload(CalendarEntry.calendar), + selectinload(Ticket.ticket_type), + ) + ) + return [_ticket_to_dto(t) for t in result.scalars().all()] + + async def user_bookings( + self, session: AsyncSession, *, user_id: int, + ) -> list[CalendarEntryDTO]: + result = await session.execute( + select(CalendarEntry) + .where( + CalendarEntry.user_id == user_id, + CalendarEntry.deleted_at.is_(None), + CalendarEntry.state.in_(("ordered", "provisional", "confirmed")), + ) + .order_by(CalendarEntry.start_at.desc()) + .options(selectinload(CalendarEntry.calendar)) + ) + return [_entry_to_dto(e) for e in result.scalars().all()] + # -- batch reads (not in protocol — convenience for blog service) --------- async def confirmed_entries_for_posts( diff --git a/services/stubs.py b/services/stubs.py index 4502cc4..3284797 100644 --- a/services/stubs.py +++ b/services/stubs.py @@ -13,6 +13,7 @@ from shared.contracts.dtos import ( PostDTO, CalendarDTO, CalendarEntryDTO, + TicketDTO, MarketPlaceDTO, ProductDTO, CartItemDTO, @@ -82,6 +83,16 @@ class StubCalendarService: ) -> list[CalendarEntryDTO]: return [] + async def user_tickets( + self, session: AsyncSession, *, user_id: int, + ) -> list[TicketDTO]: + return [] + + async def user_bookings( + self, session: AsyncSession, *, user_id: int, + ) -> list[CalendarEntryDTO]: + return [] + class StubMarketService: async def marketplaces_for_container(