devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Speaking endpoints and polling fixed

Browse Source
This commit is contained in:
Carlos-Mesquita
2024-11-27 08:04:18 +00:00
parent a2a513077f
commit a96d4c6e52
5 changed files with 215 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/pages/(exam)/ExamPage.tsx
View File

@@ -11,17 +11,17 @@ import Reading from "@/exams/Reading";
import Selection from "@/exams/Selection";
import Speaking from "@/exams/Speaking";
import Writing from "@/exams/Writing";
import { Exam, ExerciseOnlyExam, LevelExam, PartExam, UserSolution, Variant } from "@/interfaces/exam";
import { Stat, User } from "@/interfaces/user";
import { Exam, LevelExam, UserSolution, Variant } from "@/interfaces/exam";
import { User } from "@/interfaces/user";
import { evaluateSpeakingAnswer, evaluateWritingAnswer } from "@/utils/evaluation";
import { defaultExamUserSolutions, getExam } from "@/utils/exams";
import { getExam } from "@/utils/exams";
import axios from "axios";
import { useRouter } from "next/router";
import { toast, ToastContainer } from "react-toastify";
import { v4 as uuidv4 } from "uuid";
import ShortUniqueId from "short-unique-id";
import { ExamProps } from "@/exams/types";
import useExamStore from "@/stores/exam";
import useEvaluationPolling from "@/hooks/useEvaluationPolling";
interface Props {
page: "exams" | "exercises";
@@ -128,7 +128,8 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
if (exercise.type === "writing")
await evaluateWritingAnswer(user.id, sessionId, exercise, index + 1, userSolutions.find((x) => x.exercise === exercise.id)!);
if (exercise.type === "interactiveSpeaking" || exercise.type === "speaking")
if (exercise.type === "interactiveSpeaking" || exercise.type === "speaking"){
console.log(userSolutions.find((x) => x.exercise === exercise.id)!);
await evaluateSpeakingAnswer(
user.id,
sessionId,
@@ -136,6 +137,7 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
userSolutions.find((x) => x.exercise === exercise.id)!,
index + 1,
);
}
}),
)
})();
@@ -143,53 +145,7 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
}
}, [exam, showSolutions, userSolutions, sessionId, user?.id, flags]);
useEffect(() => {
if (!flags.pendingEvaluation || pendingExercises.length === 0) return;
const pollStatus = async () => {
try {
// Will fetch evaluations that either were completed or had an error
const { data } = await axios.get('/api/evaluate/status', {
params: {
sessionId,
userId: user.id,
exerciseIds: pendingExercises.join(',')
}
});
if (data.finishedExerciseIds.length > 0) {
const remainingExercises = pendingExercises.filter(id => !data.finishedExerciseIds.includes(id));
setPendingExercises(remainingExercises);
if (remainingExercises.length === 0) {
const evaluatedData = await axios.post('/api/evaluate/fetchSolutions', {
sessionId,
userId: user.id,
userSolutions
});
const newEvaluations = evaluatedData.data.filter(
(newEval: UserSolution) => !evaluated.some(
existingEval => existingEval.exercise === newEval.exercise
)
);
setEvaluated([...evaluated, ...newEvaluations]);
setFlags({ pendingEvaluation: false });
return;
}
}
if (pendingExercises.length > 0) {
setTimeout(pollStatus, 5000);
}
} catch (error) {
console.error(error);
setTimeout(pollStatus, 5000);
}
};
pollStatus();
}, [sessionId, user.id, userSolutions, setFlags, setEvaluated, evaluated, flags, pendingExercises]);
useEvaluationPolling({pendingExercises, setPendingExercises});
useEffect(() => {
if (flags.finalizeExam && moduleIndex !== -1) {