chore: api routes for user check-ins and workshop check-ins created

Dockerfile

@@ -2,7 +2,7 @@
 
 ###########################################################
 # Base Python image. Set shared environment variables.
-FROM python:3.13-slim-bullseye AS base
+FROM python:3.12-slim-bullseye AS base
 ENV PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
     PIP_NO_CACHE_DIR=off \

src/api/docs.py

@@ -6,8 +6,8 @@
 VERSION = "0.1.0"
 
 # Info for OpenAPI specification
-TITLE = "FastAPI template"
-SUMMARY = "FastAPI template for InNoHassle ecosystem."
+TITLE = "Workshops API"
+SUMMARY = "Workshops API | InNoHassle ecosystem for InNoHassle ecosystem."
 
 DESCRIPTION = None
 

src/modules/workshops/repository.py

@@ -2,7 +2,9 @@
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from src.modules.users.schemes import ViewUserScheme
 from src.modules.workshops.schemes import CreateWorkshopScheme, ViewWorkshopScheme
+from src.storages.sql.models.users import User
 from src.storages.sql.models.workshops import CheckIn, Workshop
 
 
@@ -26,12 +28,6 @@ async def read_all(self) -> list[ViewWorkshopScheme]:
         workshops = workshops.scalars()
         return [ViewWorkshopScheme.model_validate(wk, from_attributes=True) for wk in workshops]
 
-    async def get_list_by_user_id(self, user_id: int) -> list[ViewWorkshopScheme]:
-        request = select(Workshop).join(Workshop.check_ins).where(CheckIn.user_id == user_id)
-        workshops = await self.session.execute(request)
-        workshops = workshops.scalars()
-        return [ViewWorkshopScheme.model_validate(wk, from_attributes=True) for wk in workshops]
-
     async def get_by_id(self, workshop_id: int) -> ViewWorkshopScheme | None:
         request = select(Workshop).where(Workshop.id == workshop_id)
         workshop = await self.session.execute(request)
@@ -40,12 +36,12 @@ async def get_by_id(self, workshop_id: int) -> ViewWorkshopScheme | None:
             return ViewWorkshopScheme.model_validate(workshop, from_attributes=True)
 
     async def update_remain_places(self, workshop_id: int, delta: int) -> None:
-        request = (
+        query = (
             update(Workshop)
             .where(Workshop.id == workshop_id)
             .values({Workshop.remain_places: Workshop.remain_places + delta})
         )
-        await self.session.execute(request)
+        await self.session.execute(query)
 
 
 class SqlCheckInRepository:
@@ -86,3 +82,22 @@ async def delete(self, workshop_id: int, user_id: int) -> bool:
         await self.session.commit()
 
         return True
+
+    async def get_check_inned_users_by_workshop_id(self, workshop_id: int) -> list[ViewUserScheme] | None:
+        workshop = await self.workshops_repository.get_by_id(workshop_id)
+        if workshop is None:
+            return
+        query = select(CheckIn, User).join(User, User.id == CheckIn.user_id).where(CheckIn.workshop_id == workshop_id)
+        results = await self.session.execute(query)
+        results = results.all()
+        return [ViewUserScheme.model_validate(user, from_attributes=True) for _, user in results]
+
+    async def get_check_inned_workshops_by_user_id(self, user_id: int) -> list[ViewWorkshopScheme]:
+        query = (
+            select(CheckIn, Workshop)
+            .join(Workshop, Workshop.id == CheckIn.workshop_id)
+            .where(CheckIn.user_id == user_id)
+        )
+        results = await self.session.execute(query)
+        results = results.all()
+        return [ViewWorkshopScheme.model_validate(wk, from_attributes=True) for _, wk in results]

src/modules/workshops/routes.py

@@ -2,6 +2,7 @@
 
 from src.api.dependencies import CurrentUserIdDep
 from src.api.exceptions import IncorrectCredentialsException
+from src.modules.users.schemes import ViewUserScheme
 from src.modules.workshops.dependencies import SqlCheckInRepositoryDep, SqlWorkshopRepositoryDep
 from src.modules.workshops.schemes import CreateWorkshopScheme, ViewWorkshopScheme
 
@@ -42,6 +43,19 @@ async def create_workshop(
     return Response(status_code=status.HTTP_400_BAD_REQUEST)
 
 
+@router.get(
+    "/my-check-ins",
+    status_code=status.HTTP_200_OK,
+    responses={
+        status.HTTP_200_OK: {"description": "List of workshops"},
+    },
+)
+async def get_my_check_ins(
+    user_id: CurrentUserIdDep, check_in_repository: SqlCheckInRepositoryDep
+) -> list[ViewWorkshopScheme]:
+    return await check_in_repository.get_check_inned_workshops_by_user_id(user_id)
+
+
 @router.post(
     "/check-in/{workshop_id}",
     status_code=status.HTTP_200_OK,
@@ -77,13 +91,30 @@ async def check_out_workshop(
 
 
 @router.get(
-    "/my-check-ins",
+    "/{workshop_id}",
     status_code=status.HTTP_200_OK,
     responses={
-        status.HTTP_200_OK: {"description": "List of workshops", "model": ViewWorkshopScheme},
+        status.HTTP_200_OK: {"description": "Workshop information"},
+        status.HTTP_404_NOT_FOUND: {"description": "Workshop is not found"},
     },
 )
-async def get_my_check_ins(
-    user_id: CurrentUserIdDep, workshops_repository: SqlWorkshopRepositoryDep
-) -> list[ViewWorkshopScheme]:
-    return await workshops_repository.get_list_by_user_id(user_id)
+async def read_workshop_by_id(workshop_repository: SqlWorkshopRepositoryDep, workshop_id: int) -> ViewWorkshopScheme:
+    workshop = await workshop_repository.get_by_id(workshop_id)
+    if workshop:
+        return workshop
+    return Response(status_code=status.HTTP_404_NOT_FOUND)
+
+
+@router.get(
+    "/{workshop_id}/check-ins",
+    status_code=status.HTTP_200_OK,
+    responses={
+        status.HTTP_200_OK: {"description": "List of users"},
+        status.HTTP_404_NOT_FOUND: {"description": "Workshop is not found"},
+    },
+)
+async def read_check_in_users(check_in_repository: SqlCheckInRepositoryDep, workshop_id: int) -> list[ViewUserScheme]:
+    users = await check_in_repository.get_check_inned_users_by_workshop_id(workshop_id)
+    if users is None:
+        return Response(status_code=status.HTTP_404_NOT_FOUND)
+    return users

src/modules/workshops/schemes.py

@@ -30,3 +30,9 @@ def order_times(self):
         if self.dtstart >= self.dtend:
             raise ValueError("`dtstart` must be less than `dtend`")
         return self
+
+    @model_validator(mode="after")
+    def validate_capacity(self):
+        if self.capacity <= 0:
+            raise ValueError("`capacity` must be greater than zero")
+        return self

src/storages/sql/models/users.py

@@ -26,4 +26,4 @@ class User(Base):
     "User's name"
     role: Mapped[UserRole] = mapped_column(Enum(UserRole), default=UserRole.DEFAULT)
     "User's role"
-    check_ins = relationship("CheckIn", back_populates="user")
+    check_ins = relationship("CheckIn", back_populates="user", lazy="selectin")

src/storages/sql/models/workshops.py

@@ -23,7 +23,7 @@ class Workshop(Base):
     capacity: Mapped[int] = mapped_column()
     remain_places: Mapped[int] = mapped_column()
 
-    check_ins = relationship("CheckIn", back_populates="workshop")
+    check_ins = relationship("CheckIn", back_populates="workshop", lazy="selectin")
 
 
 class CheckIn(Base):