✨ Game results can now be saved in db

classquiz/db/models.py

@@ -270,6 +270,19 @@ class UpdatePassword(BaseModel):
     new_password: str
 
 
+class AnswerData(BaseModel):
+    username: str
+    answer: str
+    right: bool
+    time_taken: float  # In milliseconds
+    score: int
+
+
+class AnswerDataList(BaseModel):
+    # Just a method to make a top-level list
+    __root__: list[AnswerData]
+
+
 class GameInLobby(BaseModel):
     game_pin: str
     quiz_title: str
@@ -283,3 +296,20 @@ class GameInLobby(BaseModel):
 #     github_username: str | None = ormar.Text(nullable=True)
 #     reddit_username: str | None = ormar.Text(nullable=True)
 #     kahoot_user_id: str | None = ormar.Text(nullable=True)
+
+
+class GameResults(ormar.Model):
+    id: uuid.UUID = ormar.UUID(primary_key=True)
+    quiz_id: uuid.UUID = ormar.ForeignKey(Quiz)
+    user_id: uuid.UUID = ormar.ForeignKey(User)
+    timestamp: datetime = ormar.DateTime(default=datetime.now(), nullable=False)
+    player_count: int = ormar.Integer(nullable=False, default=0)
+    note: str | None = ormar.Text(nullable=True)
+    answers: Json[AnswerDataList] = ormar.JSON(True)
+    player_scores: Json[dict[str, str]] = ormar.JSON(nullable=True)
+    custom_field_data: Json[dict[str, str]] | None = ormar.JSON(nullable=True)
+
+    class Meta:
+        tablename = "game_results"
+        metadata = metadata
+        database = database

classquiz/routers/live.py

@@ -20,9 +20,10 @@ from classquiz.db.models import (
     ABCDQuizAnswer,
     QuizQuestionType,
     VotingQuizAnswer,
+    AnswerDataList,
 )
 from classquiz.auth import check_api_key
-from classquiz.socket_server import ReturnQuestion, sio, _AnswerDataList
+from classquiz.socket_server import ReturnQuestion, sio
 
 settings = settings()
 
@@ -276,7 +277,7 @@ async def voting_results(game_pin: str, api_key: str, as_array: bool = False):
     answer_data = await redis.get(f"game_session:{game_pin}:{game.current_question}")
     if answer_data is None:
         return
-    answer_list = _AnswerDataList.parse_raw(answer_data)
+    answer_list = AnswerDataList.parse_raw(answer_data)
     answer_dict = {}
     for answer in game.questions[game.current_question].answers:
         answer_dict[answer.answer] = 0

classquiz/socket_server/__init__.py

@@ -12,7 +12,17 @@ import socketio
 from cryptography.fernet import Fernet
 
 from classquiz.config import redis, settings
-from classquiz.db.models import PlayGame, QuizQuestionType, GameSession, GamePlayer, QuizQuestion, VotingQuizAnswer
+from classquiz.db.models import (
+    PlayGame,
+    QuizQuestionType,
+    GameSession,
+    GamePlayer,
+    QuizQuestion,
+    VotingQuizAnswer,
+    AnswerDataList,
+    AnswerData,
+    GameResults,
+)
 from pydantic import BaseModel, ValidationError, validator
 from datetime import datetime
 
@@ -272,19 +282,6 @@ class _SubmitAnswerData(BaseModel):
     complex_answer: list[_SubmitAnswerDataOrderType] | None
 
 
-class _AnswerData(BaseModel):
-    username: str
-    answer: str
-    right: bool
-    time_taken: float  # In milliseconds
-    score: int
-
-
-class _AnswerDataList(BaseModel):
-    # Just a method to make a top-level list
-    __root__: list[_AnswerData]
-
-
 @sio.event
 async def submit_answer(sid: str, data: dict):
     now = datetime.now()
@@ -360,9 +357,9 @@ async def submit_answer(sid: str, data: dict):
     if answers is None:
         await redis.set(
             f"game_session:{session['game_pin']}:{data.question_index}",
-            _AnswerDataList(
+            AnswerDataList(
                 __root__=[
-                    _AnswerData(
+                    AnswerData(
                         username=session["username"],
                         answer=data.answer,
                         right=answer_right,
@@ -374,9 +371,9 @@ async def submit_answer(sid: str, data: dict):
             ex=7200,
         )
     else:
-        answers = _AnswerDataList.parse_raw(answers)
+        answers = AnswerDataList.parse_raw(answers)
         answers.__root__.append(
-            _AnswerData(
+            AnswerData(
                 username=session["username"],
                 answer=data.answer,
                 right=answer_right,
@@ -389,7 +386,7 @@ async def submit_answer(sid: str, data: dict):
             answers.json(),
             ex=7200,
         )
-    answers = _AnswerDataList.parse_raw(await redis.get(f"game_session:{session['game_pin']}:{data.question_index}"))
+    answers = AnswerDataList.parse_raw(await redis.get(f"game_session:{session['game_pin']}:{data.question_index}"))
     player_count = await redis.scard(f"game_session:{session['game_pin']}:players")
     if len(answers.__root__) == player_count:
         # await sio.emit(
@@ -510,3 +507,35 @@ async def set_control_visibility(sid: str, data: dict):
         return
     session: dict = await sio.get_session(sid)
     await sio.emit("control_visibility", {"visible": data.visible}, room=f"admin:{session['game_pin']}")
+
+
+@sio.event
+async def save_quiz(sid: str):
+    session: dict = await sio.get_session(sid)
+    if not session["admin"]:
+        return
+    game_pin = session["game_pin"]
+    game = PlayGame.parse_raw(await redis.get(f"game:{game_pin}"))
+    player_count = await redis.scard(f"game_session:{game_pin}:players")
+    answers = []
+    for i in range(len(game.questions)):
+        print("hiqq", i)
+        redis_res = await redis.get(f"game_session:{game_pin}:{i}")
+        try:
+            answers.append(AnswerDataList.parse_raw(redis_res).dict())
+        except ValidationError:
+            answers.append([])
+    player_scores = await redis.hgetall(f"game_session:{game_pin}:player_scores")
+    custom_field_data = await redis.hgetall(f"game:{game_pin}:players:custom_fields")
+    print(custom_field_data)
+    data = GameResults(
+        id=game.game_id,
+        quiz_id=game.quiz_id,
+        user_id=game.user_id,
+        timestamp=datetime.now(),
+        player_count=player_count,
+        answers=json.dumps(answers),
+        player_scores=json.dumps(player_scores),
+        custom_field_data=json.dumps(custom_field_data),
+    )
+    await data.save()