From ed87d47399697b81b4e76505beb796653c348429 Mon Sep 17 00:00:00 2001 From: Mawoka Date: Fri, 8 Apr 2022 15:19:05 +0200 Subject: [PATCH] :goal_net: Added info why quiz can't get imported --- classquiz/routers/quiz.py | 7 ++++++- classquiz/tests/test_kahoot_get.py | 1 - frontend/src/routes/docs/develop.svelte | 2 +- frontend/src/routes/import.svelte | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/classquiz/routers/quiz.py b/classquiz/routers/quiz.py index db9b1ea..d3ccc24 100644 --- a/classquiz/routers/quiz.py +++ b/classquiz/routers/quiz.py @@ -3,6 +3,8 @@ import uuid from datetime import datetime from random import randint +from pydantic import ValidationError + from classquiz.kahoot_importer.import_quiz import import_quiz from fastapi import APIRouter, Depends, HTTPException from fastapi.responses import JSONResponse @@ -103,7 +105,10 @@ async def update_quiz(quiz_id: str, quiz_input: QuizInput, user: User = Depends( @router.post("/import/{quiz_id}") async def import_quiz_route(quiz_id: str, user: User = Depends(get_current_user)): - return await import_quiz(quiz_id, user) + try: + return await import_quiz(quiz_id, user) + except ValidationError: + raise HTTPException(status_code=400, detail="THis quiz in't (yet) supported") @router.delete("/delete/{quiz_id}") diff --git a/classquiz/tests/test_kahoot_get.py b/classquiz/tests/test_kahoot_get.py index e35b6a1..701b1c8 100644 --- a/classquiz/tests/test_kahoot_get.py +++ b/classquiz/tests/test_kahoot_get.py @@ -61,5 +61,4 @@ async def test_get(): rounds = 0 for i in quiz_list: rounds = rounds + 1 - print(f"Got {rounds} from {len(quiz_list)}") await get(i) diff --git a/frontend/src/routes/docs/develop.svelte b/frontend/src/routes/docs/develop.svelte index e3ed944..a55467b 100644 --- a/frontend/src/routes/docs/develop.svelte +++ b/frontend/src/routes/docs/develop.svelte @@ -25,7 +25,7 @@

Frontend

Setup

diff --git a/frontend/src/routes/import.svelte b/frontend/src/routes/import.svelte index a48b7c9..8d350ac 100644 --- a/frontend/src/routes/import.svelte +++ b/frontend/src/routes/import.svelte @@ -43,6 +43,8 @@ if (res.status === 200) { window.location.href = '/overview'; + } else if (res.status === 400) { + alert("This quiz isn't (yet) supported!"); } else { alert('Error importing quiz'); }