Merge remote-tracking branch 'origin/master'

classquiz/__init__.py

@@ -3,7 +3,7 @@ from fastapi import FastAPI, Request
 from sentry_sdk.integrations.redis import RedisIntegration
 from socketio import ASGIApp
 
-from classquiz.config import settings
+from classquiz.config import settings, meilisearch
 from classquiz.db import database
 from classquiz.routers import users, quiz, utils, stats, storage, search
 from classquiz.socket_server import sio
@@ -32,6 +32,7 @@ async def startup() -> None:
     database_ = app.state.database
     if not database_.is_connected:
         await database_.connect()
+    meilisearch.index(settings.meilisearch_index).update_settings({"sortableAttributes": ["created_at"]})
 
 
 @app.on_event("shutdown")

classquiz/kahoot_importer/import_quiz.py

@@ -30,6 +30,8 @@ async def import_quiz(quiz_id: str, user: User) -> Quiz | str:
         return "quiz not found"
     quiz_questions: list[dict] = []
     quiz_id = uuid.uuid4()
+    meilisearch.delete_index(settings.meilisearch_index)
+    meilisearch.create_index(settings.meilisearch_index)
 
     for q in quiz.kahoot.questions:
         answers: list[QuizAnswer] = []

classquiz/routers/quiz.py

@@ -37,7 +37,8 @@ async def create_quiz_lol(quiz_input: QuizInput, user: User = Depends(get_curren
             raise HTTPException(status_code=400, detail="image url is not valid")
     quiz = Quiz(**quiz_input.dict(), user_id=user.id, id=uuid.uuid4())
     await redis.delete("global_quiz_count")
-    meilisearch.index(settings.meilisearch_index).add_documents([await get_meili_data(quiz)])
+    if quiz_input.public:
+        meilisearch.index(settings.meilisearch_index).add_documents([await get_meili_data(quiz)])
     return await quiz.save()
 
 

classquiz/routers/users.py

@@ -16,11 +16,11 @@ from classquiz.auth import (
     get_current_user,
 )
 from classquiz.cache import clear_cache_for_account
-from classquiz.config import redis, settings
+from classquiz.config import redis, settings, meilisearch
 import uuid
 import bleach
 from pydantic import BaseModel
-from classquiz.db.models import User, UserSession, UpdatePassword, Token
+from classquiz.db.models import User, UserSession, UpdatePassword, Token, Quiz
 from classquiz.emails import send_register_email, send_forgotten_password_email
 
 settings = settings()
@@ -259,3 +259,24 @@ async def delete_session(session_id: str, user: User = Depends(get_current_user)
 async def get_session(user: User = Depends(get_current_user)):
     session = await UserSession.objects.filter(user=user).first()
     return session
+
+
+class DeleteUserInput(BaseModel):
+    password: str
+
+
+@router.delete("/me")
+async def delete_user_account(input_data: DeleteUserInput, user: User = Depends(get_current_user)):
+    if not verify_password(input_data.password, user.password):
+        raise HTTPException(status_code=400, detail="Incorrect password")
+    user = await User.objects.filter(id=user.id).get_or_none()
+    await UserSession.objects.filter(user=user).delete()
+    quizzes = await Quiz.objects.filter(user_id=user).all()
+    quizzes_to_delete = []
+    for quiz in quizzes:
+        if quiz.is_public:
+            quizzes_to_delete.append(quiz.id)
+    if len(quizzes_to_delete) > 0:
+        meilisearch.index(settings.meilisearch_index).delete_documents(quizzes_to_delete)
+    await User.objects.filter(id=user.id).delete()
+    await user.delete()

classquiz/tests/test_kahoot_get.py

@@ -3,7 +3,7 @@ import pytest
 from classquiz.kahoot_importer.get import get
 
 
-@pytest.mark.order("last")
+@pytest.mark.order(-2)
 @pytest.mark.asyncio
 async def test_get():
     await get("1f95eb0b-fcf4-4db2-879b-5418ef75116b")

classquiz/tests/test_kahoot_search.py

@@ -4,7 +4,7 @@ from classquiz.kahoot_importer.search import search
 
 
 @pytest.mark.asyncio
-@pytest.mark.order("last")
+@pytest.mark.order(-2)
 async def test_search():
     res = await search(query="Python", limit=100)
     assert len(res.entities) == 100

classquiz/tests/test_server.py

@@ -359,3 +359,16 @@ class TestQuiz:
         ValueStorage.imported_quizzes.append(resp.json()["id"])
         resp = test_client.post("/api/v1/quiz/import/1f95eb0bdassdadasdas", cookies={"access_token": token})
         assert resp.text == '"quiz not found"'
+
+
+class TestDeleteUser:
+    @pytest.mark.asyncio
+    async def test_delete_user(self, test_client):
+        resp = test_client.post(
+            "/api/v1/users/token/cookie", data={"username": test_user_email, "password": test_user_password}
+        )
+        token = resp.cookies["access_token"]
+        resp = test_client.delete(
+            "/api/v1/users/me", cookies={"access_token": token}, json={"password": test_user_password}
+        )
+        assert resp.status_code == 200