ENCOA-311

ielts_be/api/exam/listening.py

@@ -1,4 +1,5 @@
 import random
+from typing import List
 
 from dependency_injector.wiring import Provide, inject
 from fastapi import APIRouter, Depends, Path, Query, UploadFile
@@ -31,7 +32,7 @@ async def upload(
 @inject
 async def generate_listening_dialog(
     section: int = Path(..., ge=1, le=4),
-    difficulty: str = Query(default=None),
+    difficulty: List[str] = Query(default=None),
     topic: str = Query(default=None),
     listening_controller: IListeningController = Depends(Provide[controller])
 ):

ielts_be/api/exam/speaking.py

@@ -59,7 +59,7 @@ async def get_speaking_task(
     topic: Optional[str] = Query(None),
     first_topic: Optional[str] = Query(None),
     second_topic: Optional[str] = Query(None),
-    difficulty: Optional[str] = None,
+    difficulty: List[str] = Query(default=None),
     speaking_controller: ISpeakingController = Depends(Provide[controller])
 ):
     if not second_topic:
@@ -67,8 +67,7 @@ async def get_speaking_task(
     else:
         topic_or_first_topic = first_topic if first_topic else random.choice(EducationalContent.MTI_TOPICS)
 
-    if not difficulty:
-        difficulty = random.choice(random.choice(EducationalContent.DIFFICULTIES))
+    difficulty = [random.choice(EducationalContent.DIFFICULTIES)] if not difficulty else difficulty
 
     second_topic = second_topic if second_topic else random.choice(EducationalContent.MTI_TOPICS)
     return await speaking_controller.get_speaking_part(task, topic_or_first_topic, second_topic, difficulty)

ielts_be/api/exam/writing.py

@@ -20,10 +20,10 @@ writing_router = APIRouter()
 async def generate_writing_academic(
         task: int = Path(..., ge=1, le=2),
         file: UploadFile = File(...),
-        difficulty: Optional[List[str]] = None,
+        difficulty: List[str] = Query(default=None),
         writing_controller: IWritingController = Depends(Provide[controller])
 ):
-    difficulty = random.choice(EducationalContent.DIFFICULTIES) if not difficulty else difficulty
+    difficulty = [random.choice(EducationalContent.DIFFICULTIES)] if not difficulty else difficulty
     return await writing_controller.get_writing_task_academic_question(task, file, difficulty)
 
 
@@ -34,10 +34,10 @@ async def generate_writing_academic(
 @inject
 async def generate_writing(
     task: int = Path(..., ge=1, le=2),
-    difficulty: Optional[str] = None,
+    difficulty: List[str] = Query(default=None),
     topic: str = Query(default=None),
     writing_controller: IWritingController = Depends(Provide[controller])
 ):
-    difficulty = random.choice(EducationalContent.DIFFICULTIES) if not difficulty else difficulty
+    difficulty = [random.choice(EducationalContent.DIFFICULTIES)] if not difficulty else difficulty
     topic = random.choice(EducationalContent.MTI_TOPICS) if not topic else topic
     return await writing_controller.get_writing_task_general_question(task, topic, difficulty)