Updated the code to solve the double stats creation
This commit is contained in:
@@ -20,6 +20,9 @@ export default function Speaking({id, type, title, video_url, text, prompts, use
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (userSolutions && userSolutions.length > 0 && userSolutions[0].solution) {
|
if (userSolutions && userSolutions.length > 0 && userSolutions[0].solution) {
|
||||||
|
const solution = userSolutions[0].solution;
|
||||||
|
|
||||||
|
if (solution.startsWith("https://")) return setSolutionURL(solution);
|
||||||
axios.post(`/api/speaking`, {path: userSolutions[0].solution}, {responseType: "arraybuffer"}).then(({data}) => {
|
axios.post(`/api/speaking`, {path: userSolutions[0].solution}, {responseType: "arraybuffer"}).then(({data}) => {
|
||||||
const blob = new Blob([data], {type: "audio/wav"});
|
const blob = new Blob([data], {type: "audio/wav"});
|
||||||
const url = URL.createObjectURL(blob);
|
const url = URL.createObjectURL(blob);
|
||||||
|
|||||||
@@ -266,7 +266,7 @@ export default function ExamPage({page}: Props) {
|
|||||||
return Object.assign(exam, {exercises});
|
return Object.assign(exam, {exercises});
|
||||||
};
|
};
|
||||||
|
|
||||||
const onFinish = (solutions: UserSolution[]) => {
|
const onFinish = async (solutions: UserSolution[]) => {
|
||||||
const solutionIds = solutions.map((x) => x.exercise);
|
const solutionIds = solutions.map((x) => x.exercise);
|
||||||
const solutionExams = solutions.map((x) => x.exam);
|
const solutionExams = solutions.map((x) => x.exam);
|
||||||
|
|
||||||
@@ -276,7 +276,7 @@ export default function ExamPage({page}: Props) {
|
|||||||
setHasBeenUploaded(true);
|
setHasBeenUploaded(true);
|
||||||
setIsEvaluationLoading(true);
|
setIsEvaluationLoading(true);
|
||||||
|
|
||||||
Promise.all(
|
await Promise.all(
|
||||||
exam.exercises.map(async (exercise) => {
|
exam.exercises.map(async (exercise) => {
|
||||||
const evaluationID = uuidv4();
|
const evaluationID = uuidv4();
|
||||||
if (exercise.type === "writing")
|
if (exercise.type === "writing")
|
||||||
@@ -288,7 +288,7 @@ export default function ExamPage({page}: Props) {
|
|||||||
)
|
)
|
||||||
.then((responses) => {
|
.then((responses) => {
|
||||||
setStatsAwaitingEvaluation((prev) => [...prev, ...responses.filter((x) => !!x).map((r) => (r as any).id)]);
|
setStatsAwaitingEvaluation((prev) => [...prev, ...responses.filter((x) => !!x).map((r) => (r as any).id)]);
|
||||||
setUserSolutions([...userSolutions, ...responses.filter((x) => !!x)] as any);
|
setUserSolutions([...userSolutions.filter((x) => !solutionIds.includes(x.exercise)), ...responses.filter((x) => !!x)] as any);
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
setHasBeenUploaded(false);
|
setHasBeenUploaded(false);
|
||||||
@@ -297,6 +297,7 @@ export default function ExamPage({page}: Props) {
|
|||||||
|
|
||||||
axios.get("/api/stats/update");
|
axios.get("/api/stats/update");
|
||||||
|
|
||||||
|
if (exam && exam.module !== "writing" && exam.module !== "speaking")
|
||||||
setUserSolutions([...userSolutions.filter((x) => !solutionIds.includes(x.exercise)), ...solutions]);
|
setUserSolutions([...userSolutions.filter((x) => !solutionIds.includes(x.exercise)), ...solutions]);
|
||||||
setModuleIndex(moduleIndex + 1);
|
setModuleIndex(moduleIndex + 1);
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import {withIronSessionApiRoute} from "iron-session/next";
|
|||||||
import {sessionOptions} from "@/lib/session";
|
import {sessionOptions} from "@/lib/session";
|
||||||
import axios, {AxiosResponse} from "axios";
|
import axios, {AxiosResponse} from "axios";
|
||||||
import formidable from "formidable-serverless";
|
import formidable from "formidable-serverless";
|
||||||
import {ref, uploadBytes} from "firebase/storage";
|
import {getDownloadURL, ref, uploadBytes} from "firebase/storage";
|
||||||
import fs from "fs";
|
import fs from "fs";
|
||||||
import {app, storage} from "@/firebase";
|
import {app, storage} from "@/firebase";
|
||||||
import {doc, getDoc, getFirestore, setDoc} from "firebase/firestore";
|
import {doc, getDoc, getFirestore, setDoc} from "firebase/firestore";
|
||||||
@@ -25,16 +25,17 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
|||||||
if (err) console.log(err);
|
if (err) console.log(err);
|
||||||
|
|
||||||
const audioFile = files.audio;
|
const audioFile = files.audio;
|
||||||
const audioFileRef = ref(storage, `speaking_recordings/${(audioFile as any).path.replace("upload_", "")}`);
|
const audioFileRef = ref(storage, `speaking_recordings/${fields.id}.wav`);
|
||||||
|
|
||||||
const binary = fs.readFileSync((audioFile as any).path).buffer;
|
const binary = fs.readFileSync((audioFile as any).path).buffer;
|
||||||
const snapshot = await uploadBytes(audioFileRef, binary);
|
const snapshot = await uploadBytes(audioFileRef, binary);
|
||||||
|
const url = await getDownloadURL(snapshot.ref);
|
||||||
|
const path = snapshot.metadata.fullPath;
|
||||||
|
|
||||||
res.status(200).json(null);
|
res.status(200).json(null);
|
||||||
|
|
||||||
console.log("🌱 - Still processing");
|
console.log("🌱 - Still processing");
|
||||||
const backendRequest = await evaluate({answers: [{question: fields.question, answer: snapshot.metadata.fullPath}]});
|
const backendRequest = await evaluate({answers: [{question: fields.question, answer: path}]});
|
||||||
fs.rmSync((audioFile as any).path);
|
|
||||||
console.log("🌱 - Process complete");
|
console.log("🌱 - Process complete");
|
||||||
|
|
||||||
const correspondingStat = (await getDoc(doc(db, "stats", fields.id))).data() as Stat;
|
const correspondingStat = (await getDoc(doc(db, "stats", fields.id))).data() as Stat;
|
||||||
@@ -42,7 +43,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
|||||||
const solutions = correspondingStat.solutions.map((x) => ({
|
const solutions = correspondingStat.solutions.map((x) => ({
|
||||||
...x,
|
...x,
|
||||||
evaluation: backendRequest.data,
|
evaluation: backendRequest.data,
|
||||||
solution: snapshot.metadata.fullPath,
|
solution: url,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
await setDoc(
|
await setDoc(
|
||||||
|
|||||||
Reference in New Issue
Block a user