Merged develop into feature/level-file-upload

src/pages/api/assignments/index.ts

@@ -12,7 +12,7 @@ import {capitalize, flatten, uniqBy} from "lodash";
 import {User} from "@/interfaces/user";
 import moment from "moment";
 import {sendEmail} from "@/email";
-import { release } from "os";
+import {release} from "os";
 
 const db = getFirestore(app);
 
@@ -57,6 +57,7 @@ const generateExams = async (
 	generateMultiple: Boolean,
 	selectedModules: Module[],
 	assignees: string[],
+	userId: string,
 	variant?: Variant,
 	instructorGender?: InstructorGender,
 ): Promise<ExamWithUser[]> => {
@@ -87,7 +88,7 @@ const generateExams = async (
 	}
 
 	const selectedModulePromises = selectedModules.map(async (module: Module) => {
-		const exams: Exam[] = await getExams(db, module, "false", undefined, variant, instructorGender);
+		const exams: Exam[] = await getExams(db, module, "false", userId, variant, instructorGender);
 		const exam = exams[getRandomIndex(exams)];
 
 		if (exam) {
@@ -122,11 +123,12 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 		endDate: string;
 		variant?: Variant;
 		instructorGender?: InstructorGender;
+		released: boolean;
 	};
 
 	const exams: ExamWithUser[] = !!examIDs
 		? examIDs.flatMap((e) => assignees.map((a) => ({...e, assignee: a})))
-		: await generateExams(generateMultiple, selectedModules, assignees, variant, instructorGender);
+		: await generateExams(generateMultiple, selectedModules, assignees, req.session.user!.id, variant, instructorGender);
 
 	if (exams.length === 0) {
 		res.status(400).json({ok: false, error: "No exams found for the selected modules"});
@@ -139,7 +141,6 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 		results: [],
 		exams,
 		instructorGender,
-		released: false,
 		...body,
 	});
 

src/pages/api/exam/[module]/index.ts

@@ -7,6 +7,7 @@ import {sessionOptions} from "@/lib/session";
 import {Exam, InstructorGender, Variant} from "@/interfaces/exam";
 import {getExams} from "@/utils/exams.be";
 import {Module} from "@/interfaces";
+import {getUserCorporate} from "@/utils/groups.be";
 const db = getFirestore(app);
 
 export default withIronSessionApiRoute(handler, sessionOptions);
@@ -42,11 +43,16 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 	}
 
 	const {module} = req.query as {module: string};
+	const corporate = await getUserCorporate(req.session.user.id);
 
 	try {
 		const exam = {
 			...req.body,
 			module: module,
+			owners: [
+				...(["mastercorporate", "corporate"].includes(req.session.user.type) ? [req.session.user.id] : []),
+				...(!!corporate ? [corporate.id] : []),
+			],
 			createdBy: req.session.user.id,
 			createdAt: new Date().toISOString(),
 		};