Merge branch 'master' into order

classquiz/routers/community.py

@@ -0,0 +1,34 @@
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from fastapi import APIRouter, HTTPException
+from uuid import UUID
+
+from classquiz.db.models import User, Quiz
+
+router = APIRouter()
+
+
+#
+@router.get("/user/{user_id}", response_model_include={"username", "created_at", "id"}, response_model=User)
+async def get_user_by_user_id(user_id: UUID):
+    user = await User.objects.get_or_none(id=user_id)
+    # .select_related("quizs")
+    # print(user)
+    if user is None:
+        raise HTTPException(status_code=404, detail="user not found")
+    else:
+        return user
+
+
+@router.get("/quizzes/{user_id}", response_model_exclude={"questions", "user_id"}, response_model=list[Quiz])
+async def get_quizzes_from_user(user_id: UUID, imported: bool | None = None):
+    if imported is None:
+        quizzes = await Quiz.objects.all(user_id=user_id, public=True)
+    else:
+        quizzes = await Quiz.objects.all(user_id=user_id, public=True, imported_from_kahoot=imported)
+    if len(quizzes) == 0:
+        raise HTTPException(status_code=404, detail="no quizzes found")
+    else:
+        return quizzes

classquiz/routers/quiz.py

@@ -18,7 +18,7 @@ import bleach
 
 from classquiz.auth import get_current_user
 from classquiz.config import redis, settings, storage, meilisearch
-from classquiz.db.models import Quiz, QuizInput, User, PlayGame, GameInLobby
+from classquiz.db.models import Quiz, QuizInput, User, PlayGame, GameInLobby, QuizQuestion
 from classquiz.kahoot_importer.import_quiz import import_quiz
 import html
 import urllib.parse
@@ -75,17 +75,28 @@ async def get_quiz_from_id(quiz_id: str, user: User | None = Depends(get_current
         return quiz
 
 
-@router.get("/get/public/{quiz_id}", response_model=Quiz)
+class PublicQuizResponseUser(BaseModel):
+    username: str
+    id: uuid.UUID
+
+
+class PublicQuizResponse(Quiz.get_pydantic()):
+    user_id: PublicQuizResponseUser
+    questions: list[QuizQuestion]
+
+
+@router.get("/get/public/{quiz_id}")
 async def get_public_quiz(quiz_id: str):
     try:
         quiz_id = uuid.UUID(quiz_id)
     except ValueError:
         raise HTTPException(status_code=400, detail="badly formed quiz id")
-    quiz = await Quiz.objects.get_or_none(id=quiz_id)
+    quiz = await Quiz.objects.select_related("user_id").get_or_none(id=quiz_id)
+    print(quiz.dict(exclude={"user_id": {"avatar"}}))
     if quiz is None:
         return JSONResponse(status_code=404, content={"detail": "quiz not found"})
     else:
-        return quiz
+        return PublicQuizResponse(**quiz.dict())
 
 
 @router.post("/start/{quiz_id}")