{assignment.exams
+ .filter((e) => e.assignee === user.id)
.map((e) => e.module)
.sort(sortByModuleName)
.map((module) => (
diff --git a/src/dashboards/Teacher.tsx b/src/dashboards/Teacher.tsx
index 54dfede6..b166ed38 100644
--- a/src/dashboards/Teacher.tsx
+++ b/src/dashboards/Teacher.tsx
@@ -24,7 +24,6 @@ import {
BsPersonFill,
BsPersonFillGear,
BsPersonGear,
- BsPersonLinesFill,
BsPlus,
BsRepeat,
BsRepeat1,
diff --git a/src/interfaces/results.ts b/src/interfaces/results.ts
index 1acadec3..b3e6d9e3 100644
--- a/src/interfaces/results.ts
+++ b/src/interfaces/results.ts
@@ -19,7 +19,7 @@ export interface Assignment {
type: "academic" | "general";
stats: Stat[];
}[];
- exams: {id: string; module: Module}[];
+ exams: {id: string; module: Module, assignee: string}[];
startDate: Date;
endDate: Date;
}
diff --git a/src/pages/api/assignments/index.ts b/src/pages/api/assignments/index.ts
index eb59649e..f5a87acd 100644
--- a/src/pages/api/assignments/index.ts
+++ b/src/pages/api/assignments/index.ts
@@ -5,6 +5,10 @@ import {getFirestore, collection, getDocs, query, where, setDoc, doc} from "fire
import {withIronSessionApiRoute} from "iron-session/next";
import {sessionOptions} from "@/lib/session";
import {uuidv4} from "@firebase/util";
+import { Module } from "@/interfaces";
+import { getExams } from "@/utils/exams.be";
+import { Exam } from "@/interfaces/exam";
+import { flatten } from "lodash";
const db = getFirestore(app);
@@ -34,8 +38,107 @@ async function GET(req: NextApiRequest, res: NextApiResponse) {
res.status(200).json(docs);
}
-async function POST(req: NextApiRequest, res: NextApiResponse) {
- await setDoc(doc(db, "assignments", uuidv4()), {assigner: req.session.user?.id, ...req.body});
-
- res.status(200).json({ok: true});
+interface ExamWithUser {
+ module: Module;
+ id: string;
+ assignee: string;
+}
+
+function getRandomIndex(arr: any[]): number {
+ const randomIndex = Math.floor(Math.random() * arr.length);
+ return randomIndex;
+}
+
+const generateExams = async (
+ generateMultiple: Boolean,
+ selectedModules: Module[],
+ assignees: string[]
+): Promise => {
+ if (generateMultiple) {
+ // for optimization purposes, it would be better to create a new endpoint that returned the answers for all users at once
+ const allExams = await assignees.map(async (assignee) => {
+ const selectedModulePromises = await selectedModules.map(
+ async (module: Module) => {
+ try {
+ const exams: Exam[] = await getExams(db, module, "true", assignee);
+
+ const exam = exams[getRandomIndex(exams)];
+ if (exam) {
+ return { module: exam.module, id: exam.id, assignee };
+ }
+ return null;
+ } catch (e) {
+ console.error(e);
+ return null;
+ }
+ },
+ []
+ );
+ const newModules = await Promise.all(selectedModulePromises);
+
+ return newModules;
+ }, []);
+
+ const exams = flatten(await Promise.all(allExams)).filter(
+ (x) => x !== null
+ ) as ExamWithUser[];
+ return exams;
+ }
+
+ const selectedModulePromises = await selectedModules.map(
+ async (module: Module) => {
+ const exams: Exam[] = await getExams(db, module, "false", undefined);
+ const exam = exams[getRandomIndex(exams)];
+
+ if (exam) {
+ return { module: exam.module, id: exam.id };
+ }
+ return null;
+ }
+ );
+
+ const exams = await Promise.all(selectedModulePromises);
+ const examesFiltered = exams.filter((x) => x !== null) as ExamWithUser[];
+ return flatten(
+ assignees.map((assignee) =>
+ examesFiltered.map((exam) => ({ ...exam, assignee }))
+ )
+ );
+};
+
+async function POST(req: NextApiRequest, res: NextApiResponse) {
+ const {
+ selectedModules,
+ assignees,
+ // Generarte multiple true would generate an unique exam for eacah user
+ // false would generate the same exam for all usersa
+ generateMultiple = false,
+ ...body
+ } = req.body as {
+ selectedModules: Module[];
+ assignees: string[];
+ generateMultiple: Boolean;
+ };
+
+ const exams: ExamWithUser[] = await generateExams(
+ generateMultiple,
+ selectedModules,
+ assignees
+ );
+ if (exams.length === 0) {
+ res
+ .status(400)
+ .json({ ok: false, error: "No exams found for the selected modules" });
+ return;
+ }
+
+ await setDoc(doc(db, "assignments", uuidv4()), {
+ assigner: req.session.user?.id,
+ assignees,
+ results: [],
+ exams,
+ ...body,
+ });
+
+ res.status(200).json({ ok: true });
}
diff --git a/src/pages/api/exam/[module]/index.ts b/src/pages/api/exam/[module]/index.ts
index 87fd150b..c48a3d78 100644
--- a/src/pages/api/exam/[module]/index.ts
+++ b/src/pages/api/exam/[module]/index.ts
@@ -1,14 +1,11 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type {NextApiRequest, NextApiResponse} from "next";
import {app} from "@/firebase";
-import {getFirestore, collection, getDocs, query, where, setDoc, doc} from "firebase/firestore";
+import {getFirestore, setDoc, doc} from "firebase/firestore";
import {withIronSessionApiRoute} from "iron-session/next";
import {sessionOptions} from "@/lib/session";
-import {shuffle} from "lodash";
import {Exam} from "@/interfaces/exam";
-import {Stat} from "@/interfaces/user";
-import {v4} from "uuid";
-
+import { getExams } from "@/utils/exams.be";
const db = getFirestore(app);
export default withIronSessionApiRoute(handler, sessionOptions);
@@ -26,31 +23,12 @@ async function GET(req: NextApiRequest, res: NextApiResponse) {
return;
}
- const {module, avoidRepeated} = req.query as {module: string; avoidRepeated: string};
- const moduleRef = collection(db, module);
-
- const q = query(moduleRef, where("isDiagnostic", "==", false));
- const snapshot = await getDocs(q);
-
- const exams: Exam[] = shuffle(
- snapshot.docs.map((doc) => ({
- id: doc.id,
- ...doc.data(),
- module,
- })),
- ) as Exam[];
-
- if (avoidRepeated === "true") {
- const statsQ = query(collection(db, "stats"), where("user", "==", req.session.user.id));
- const statsSnapshot = await getDocs(statsQ);
-
- const stats: Stat[] = statsSnapshot.docs.map((doc) => ({id: doc.id, ...doc.data()})) as unknown as Stat[];
- const filteredExams = exams.filter((x) => !stats.map((s) => s.exam).includes(x.id));
-
- res.status(200).json(filteredExams.length > 0 ? filteredExams : exams);
- return;
- }
+ const {
+ module,
+ avoidRepeated,
+ } = req.query as {module: string; avoidRepeated: string};
+ const exams: Exam[] = await getExams(db, module, avoidRepeated, req.session.user.id);
res.status(200).json(exams);
}
diff --git a/src/utils/exams.be.ts b/src/utils/exams.be.ts
new file mode 100644
index 00000000..78ac1914
--- /dev/null
+++ b/src/utils/exams.be.ts
@@ -0,0 +1,52 @@
+import {
+ collection,
+ getDocs,
+ query,
+ where,
+ setDoc,
+ doc,
+ Firestore,
+} from "firebase/firestore";
+import { shuffle } from "lodash";
+import { Exam } from "@/interfaces/exam";
+import { Stat } from "@/interfaces/user";
+
+export const getExams = async (
+ db: Firestore,
+ module: string,
+ avoidRepeated: string,
+ // added userId as due to assignments being set from the teacher to the student
+ // we need to make sure we are serving exams not executed by the user and not
+ // by the teacher that performed the request
+ userId: string | undefined
+): Promise => {
+ const moduleRef = collection(db, module);
+
+ const q = query(moduleRef, where("isDiagnostic", "==", false));
+ const snapshot = await getDocs(q);
+
+ const exams: Exam[] = shuffle(
+ snapshot.docs.map((doc) => ({
+ id: doc.id,
+ ...doc.data(),
+ module,
+ }))
+ ) as Exam[];
+
+ if (avoidRepeated === "true") {
+ const statsQ = query(collection(db, "stats"), where("user", "==", userId));
+ const statsSnapshot = await getDocs(statsQ);
+
+ const stats: Stat[] = statsSnapshot.docs.map((doc) => ({
+ id: doc.id,
+ ...doc.data(),
+ })) as unknown as Stat[];
+ const filteredExams = exams.filter(
+ (x) => !stats.map((s) => s.exam).includes(x.id)
+ );
+
+ return filteredExams.length > 0 ? filteredExams : exams;
+ }
+
+ return exams;
+};