Implemented rooms and items

museum_map/server/api/__init__.py

@@ -8,12 +8,13 @@
 
 from museum_map.__about__ import __tables__, __version__
 from museum_map.models import db_session
-from museum_map.server.api import floor_topics, floors, picks, rooms
+from museum_map.server.api import floor_topics, floors, items, picks, rooms
 
 logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/api")
 router.include_router(floors.router)
 router.include_router(floor_topics.router)
+router.include_router(items.router)
 router.include_router(picks.router)
 router.include_router(rooms.router)
 

museum_map/server/api/floors.py

@@ -18,6 +18,7 @@ async def get_floors(dbsession: Annotated[AsyncSession, Depends(db_session)]):
     """Retrieve all floors."""
     query = (
         select(Floor)
+        .order_by(Floor.level)
         .options(selectinload(Floor.rooms))
         .options(selectinload(Floor.samples))
         .options(selectinload(Floor.topics))

museum_map/server/api/items.py

@@ -0,0 +1,23 @@
+"""Routes for accessing the item data."""
+import logging
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Query
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import selectinload
+
+from museum_map.models import Item, ItemModel, db_session
+
+router = APIRouter(prefix="/items")
+logger = logging.getLogger(__name__)
+
+
+@router.get("/", response_model=list[ItemModel])
+async def get_items(
+    iid: Annotated[list[int] | None, Query()],
+    dbsession: Annotated[AsyncSession, Depends(db_session)],
+):
+    """Retrieve items."""
+    query = select(Item).filter(Item.id.in_(iid)).options(selectinload(Item.group)).options(selectinload(Item.room))
+    return (await dbsession.execute(query)).scalars()

museum_map/server/api/rooms.py

@@ -14,10 +14,10 @@
 
 
 @router.get("/", response_model=list[RoomModel])
-async def get_floors(
+async def get_rooms(
     dbsession: Annotated[AsyncSession, Depends(db_session)], rid: Annotated[list[int] | None, Query()] = None
 ):
-    """Retrieve all floors."""
+    """Retrieve rooms."""
     query = (
         select(Room)
         .options(selectinload(Room.group))