groups functional & bugfixes

backend/app/views/queue/schemas.py

@@ -4,10 +4,23 @@ from uuid import UUID
 from ..auth import schemas as auth_schemas
 
 
+class QueueGroup(BaseModel):
+    name: str
+    priority: int
+
+
+class QueueGroupDetail(QueueGroup):
+    id: UUID
+
+    class Config:
+        from_attributes = True
+
+
 class QueueUser(BaseModel):
     id: UUID
     position: int
     passed: bool
+    group_id: UUID | None = None
     user: auth_schemas.AnonUser
 
     class Config:
@@ -23,6 +36,7 @@ class ParticipantInfo(BaseModel):
 class Queue(BaseModel):
     name: str
     description: Union[str, None] = None
+    groups: List[QueueGroup] | None = None
 
 
 class QueueInList(Queue):
@@ -32,8 +46,10 @@ class QueueInList(Queue):
         from_attributes = True
 
 
-class QueueInDb(Queue):
+class QueueInDb(BaseModel):
     id: UUID
+    name: str
+    description: Union[str, None] = None
 
     class Config:
         from_attributes = True
@@ -44,6 +60,7 @@ class QueueDetail(Queue):
     status: str
     owner_id: UUID
     participants: ParticipantInfo
+    groups: List[QueueGroupDetail] | None
 
 
 class ActionResult(BaseModel):
@@ -52,3 +69,7 @@ class ActionResult(BaseModel):
 
     class Config:
         from_attributes = True
+
+
+class JoinRequest(BaseModel):
+    group_id: UUID | None = None