Updated this to the latest version of develop, got rid of most of the duplication, might be missing some packages in toml, needs testing

app/api/grade.py

@@ -2,7 +2,8 @@ from dependency_injector.wiring import inject, Provide
 from fastapi import APIRouter, Depends, Path, Request
 
 from app.controllers.abc import IGradeController
-from app.dtos import WritingGradeTaskDTO
+from app.dtos.writing import WritingGradeTaskDTO
+from app.dtos.speaking import GradeSpeakingAnswersDTO, GradeSpeakingDTO
 from app.middlewares import Authorized, IsAuthenticatedViaBearerToken
 
 controller = "grade_controller"
@@ -22,18 +23,29 @@ async def grade_writing_task(
     return await grade_controller.grade_writing_task(task, data)
 
 
+@grade_router.post(
+    '/speaking/2',
+    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
+)
+@inject
+async def grade_speaking_task_2(
+    data: GradeSpeakingDTO,
+    grade_controller: IGradeController = Depends(Provide[controller])
+):
+    return await grade_controller.grade_speaking_task(2, [data.dict()])
+
+
 @grade_router.post(
     '/speaking/{task}',
     dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
 )
 @inject
-async def grade_speaking_task(
-    request: Request,
+async def grade_speaking_task_1_and_3(
+    data: GradeSpeakingAnswersDTO,
     task: int = Path(..., ge=1, le=3),
     grade_controller: IGradeController = Depends(Provide[controller])
 ):
-    data = await request.json()
-    return await grade_controller.grade_speaking_task(task, data)
+    return await grade_controller.grade_speaking_task(task, data.answers)
 
 
 @grade_router.post(
@@ -47,3 +59,16 @@ async def grading_summary(
 ):
     data = await request.json()
     return await grade_controller.grading_summary(data)
+
+
+@grade_router.post(
+    '/short_answers',
+    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
+)
+@inject
+async def grade_short_answers(
+    request: Request,
+    grade_controller: IGradeController = Depends(Provide[controller])
+):
+    data = await request.json()
+    return await grade_controller.grade_short_answers(data)