From ee26b50cf6b648e733f3dd8e20a4c63d2b059132 Mon Sep 17 00:00:00 2001 From: Tiago Ribeiro Date: Sun, 24 Mar 2024 03:18:00 +0000 Subject: [PATCH] Helped solve a bug where it would get stuck --- src/pages/api/evaluate/interactiveSpeaking.ts | 16 +++++++++++++++- src/pages/api/evaluate/speaking.ts | 15 ++++++++++++++- src/pages/api/evaluate/writing.ts | 16 +++++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/pages/api/evaluate/interactiveSpeaking.ts b/src/pages/api/evaluate/interactiveSpeaking.ts index 2ee90fdd..9612d5a7 100644 --- a/src/pages/api/evaluate/interactiveSpeaking.ts +++ b/src/pages/api/evaluate/interactiveSpeaking.ts @@ -14,6 +14,10 @@ import {speakingReverseMarking} from "@/utils/score"; const db = getFirestore(app); export default withIronSessionApiRoute(handler, sessionOptions); +function delay(ms: number) { + return new Promise((resolve) => setTimeout(resolve, ms)); +} + async function handler(req: NextApiRequest, res: NextApiResponse) { if (!req.session.user) { res.status(401).json({ok: false}); @@ -46,7 +50,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { const backendRequest = await evaluate({answers: uploadingAudios}); console.log("🌱 - Process complete"); - const correspondingStat = (await getDoc(doc(db, "stats", fields.id))).data() as Stat; + const correspondingStat = await getCorrespondingStat(fields.id, 1); + const solutions = correspondingStat.solutions.map((x) => ({...x, evaluation: backendRequest.data, solution: uploadingAudios})); await setDoc( doc(db, "stats", fields.id), @@ -65,6 +70,15 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { }); } +async function getCorrespondingStat(id: string, index: number): Promise { + console.log(`🌱 - Try number ${index} - ${id}`); + const correspondingStat = await getDoc(doc(db, "stats", id)); + + if (correspondingStat.exists()) return {...correspondingStat.data(), id} as Stat; + await delay(3 * 10000); + return getCorrespondingStat(id, index + 1); +} + async function evaluate(body: {answers: object[]}): Promise { const backendRequest = await axios.post(`${process.env.BACKEND_URL}/speaking_task_3`, body, { headers: { diff --git a/src/pages/api/evaluate/speaking.ts b/src/pages/api/evaluate/speaking.ts index fed39170..79293783 100644 --- a/src/pages/api/evaluate/speaking.ts +++ b/src/pages/api/evaluate/speaking.ts @@ -14,6 +14,10 @@ import {speakingReverseMarking} from "@/utils/score"; const db = getFirestore(app); export default withIronSessionApiRoute(handler, sessionOptions); +function delay(ms: number) { + return new Promise((resolve) => setTimeout(resolve, ms)); +} + async function handler(req: NextApiRequest, res: NextApiResponse) { if (!req.session.user) { res.status(401).json({ok: false}); @@ -38,7 +42,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { const backendRequest = await evaluate({answers: [{question: fields.question, answer: path}]}); console.log("🌱 - Process complete"); - const correspondingStat = (await getDoc(doc(db, "stats", fields.id))).data() as Stat; + const correspondingStat = await getCorrespondingStat(fields.id, 1); const solutions = correspondingStat.solutions.map((x) => ({ ...x, @@ -63,6 +67,15 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { }); } +async function getCorrespondingStat(id: string, index: number): Promise { + console.log(`🌱 - Try number ${index} - ${id}`); + const correspondingStat = await getDoc(doc(db, "stats", id)); + + if (correspondingStat.exists()) return {...correspondingStat.data(), id} as Stat; + await delay(3 * 10000); + return getCorrespondingStat(id, index + 1); +} + async function evaluate(body: {answers: object[]}): Promise { const backendRequest = await axios.post(`${process.env.BACKEND_URL}/speaking_task_3`, body, { headers: { diff --git a/src/pages/api/evaluate/writing.ts b/src/pages/api/evaluate/writing.ts index 787ba404..30ef34ec 100644 --- a/src/pages/api/evaluate/writing.ts +++ b/src/pages/api/evaluate/writing.ts @@ -14,6 +14,10 @@ interface Body { id: string; } +function delay(ms: number) { + return new Promise((resolve) => setTimeout(resolve, ms)); +} + const db = getFirestore(app); export default withIronSessionApiRoute(handler, sessionOptions); @@ -29,7 +33,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { const backendRequest = await evaluate(req.body as Body); console.log("🌱 - Process complete"); - const correspondingStat = (await getDoc(doc(db, "stats", req.body.id))).data() as Stat; + const correspondingStat = await getCorrespondingStat(req.body.id, 1); + const solutions = correspondingStat.solutions.map((x) => ({...x, evaluation: backendRequest.data})); await setDoc( doc(db, "stats", (req.body as Body).id), @@ -47,6 +52,15 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { console.log("🌱 - Updated the DB"); } +async function getCorrespondingStat(id: string, index: number): Promise { + console.log(`🌱 - Try number ${index} - ${id}`); + const correspondingStat = await getDoc(doc(db, "stats", id)); + + if (correspondingStat.exists()) return {...correspondingStat.data(), id} as Stat; + await delay(3 * 10000); + return getCorrespondingStat(id, index + 1); +} + async function evaluate(body: Body): Promise { const backendRequest = await axios.post(`${process.env.BACKEND_URL}/writing_task2`, body as Body, { headers: {