LobotomyLabs/classquiz-ai
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚑 Fixed Live-API

Browse Source
This commit is contained in:
Mawoka
2022-10-07 13:02:44 +02:00
parent dadddd57ed
commit 5fe55b722c
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classquiz/routers/live.py
+19 -9
View File
@@ -40,18 +40,22 @@ class _QuizQuestion(QuizQuestion):
@validator("answers") @validator("answers")
def answers_not_none_if_abcd_type(cls, v, values): def answers_not_none_if_abcd_type(cls, v, values):
if values["type"] == QuizQuestionType.ABCD and type(v[0]) != _ABCDQuizAnswer: # if values["type"] == QuizQuestionType.ABCD and type(v[0]) != _ABCDQuizAnswer:
print(type(v[0])) # print(type(v[0]), values)
raise ValueError("Answers can't be none if type is ABCD") # raise ValueError("Answers can't be none if type is ABCD")
if values["type"] == QuizQuestionType.RANGE and type(v) != RangeQuizAnswer: # if values["type"] == QuizQuestionType.RANGE and type(v) != RangeQuizAnswer:
raise ValueError("Answer must be from type RangeQuizAnswer if type is RANGE") # raise ValueError("Answer must be from type RangeQuizAnswer if type is RANGE")
if values["type"] == QuizQuestionType.VOTING and type(v[0]) != VotingQuizAnswer: # if values["type"] == QuizQuestionType.VOTING and type(v[0]) != VotingQuizAnswer:
raise ValueError("Answer must be from type VotingQuizAnswer if type is VOTING") # raise ValueError("Answer must be from type VotingQuizAnswer if type is VOTING")
# return v
return v return v
class _GetLivePlayGame(PlayGame): class _PlayGame(PlayGame):
questions: list[_QuizQuestion] questions: list[_QuizQuestion]
class _GetLivePlayGame(_PlayGame):
total_questions: int total_questions: int
@@ -76,15 +80,21 @@ async def get_live_game_data(
redis_res = await redis.get(f"game:{game_pin}") redis_res = await redis.get(f"game:{game_pin}")
if redis_res is None or user_id is None: if redis_res is None or user_id is None:
raise HTTPException(status_code=404, detail="Game not found or API key not found") raise HTTPException(status_code=404, detail="Game not found or API key not found")
game = PlayGame.parse_raw(redis_res) game = _PlayGame.parse_raw(redis_res)
if game.user_id != user_id: if game.user_id != user_id:
raise HTTPException(status_code=404, detail="Game not found or API key not found") raise HTTPException(status_code=404, detail="Game not found or API key not found")
for i, question in enumerate(game.questions): for i, question in enumerate(game.questions):
if question.type == QuizQuestionType.ABCD: if question.type == QuizQuestionType.ABCD:
for o, answer in enumerate(question.answers): for o, answer in enumerate(question.answers):
color = "#00F007" color = "#00F007"
try:
if not answer.right: if not answer.right:
color = "#FF0000" color = "#FF0000"
except AttributeError:
game.questions[i].answers[o] = VotingQuizAnswer(
answer=answer.answer, color=answer.color, image=answer.image
)
continue
game.questions[i].answers[o] = _ABCDQuizAnswer( game.questions[i].answers[o] = _ABCDQuizAnswer(
right=answer.right, answer=answer.answer, color=answer.color, color_code=color right=answer.right, answer=answer.answer, color=answer.color, color_code=color
) )