/api/exam refactor

This commit is contained in:
Carlos Mesquita
2024-09-07 16:39:07 +01:00
parent e3400e8564
commit 417c9176fe
5 changed files with 49 additions and 63 deletions

View File

@@ -1,12 +1,11 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type {NextApiRequest, NextApiResponse} from "next"; import type {NextApiRequest, NextApiResponse} from "next";
import {app} from "@/firebase"; import client from "@/lib/mongodb";
import {getFirestore, doc, getDoc, deleteDoc, setDoc} from "firebase/firestore";
import {withIronSessionApiRoute} from "iron-session/next"; import {withIronSessionApiRoute} from "iron-session/next";
import {sessionOptions} from "@/lib/session"; import {sessionOptions} from "@/lib/session";
import {PERMISSIONS} from "@/constants/userPermissions"; import {PERMISSIONS} from "@/constants/userPermissions";
const db = getFirestore(app); const db = client.db(process.env.MONGODB_DB);
export default withIronSessionApiRoute(handler, sessionOptions); export default withIronSessionApiRoute(handler, sessionOptions);
@@ -24,13 +23,11 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
const {module, id} = req.query as {module: string; id: string}; const {module, id} = req.query as {module: string; id: string};
const docRef = doc(db, module, id); const docSnap = await db.collection(module).findOne({ id: id});
const docSnap = await getDoc(docRef);
if (docSnap.exists()) { if (docSnap) {
res.status(200).json({ res.status(200).json({
id: docSnap.id, ...docSnap,
...docSnap.data(),
module, module,
}); });
} else { } else {
@@ -46,11 +43,13 @@ async function patch(req: NextApiRequest, res: NextApiResponse) {
const {module, id} = req.query as {module: string; id: string}; const {module, id} = req.query as {module: string; id: string};
const docRef = doc(db, module, id); const docSnap = await db.collection(module).findOne({ id: id});
const docSnap = await getDoc(docRef);
if (docSnap.exists()) { if (docSnap) {
await setDoc(docRef, req.body, {merge: true}); await db.collection(module).updateOne(
{ id: id},
{ $set: req.body }
);
res.status(200).json({ok: true}); res.status(200).json({ok: true});
} else { } else {
res.status(404).json({ok: false}); res.status(404).json({ok: false});
@@ -65,16 +64,15 @@ async function del(req: NextApiRequest, res: NextApiResponse) {
const {module, id} = req.query as {module: string; id: string}; const {module, id} = req.query as {module: string; id: string};
const docRef = doc(db, module, id); const docSnap = await db.collection(module).findOne({ id: id});
const docSnap = await getDoc(docRef);
if (docSnap.exists()) { if (docSnap) {
if (!PERMISSIONS.examManagement.delete.includes(req.session.user.type)) { if (!PERMISSIONS.examManagement.delete.includes(req.session.user.type)) {
res.status(403).json({ok: false}); res.status(403).json({ok: false});
return; return;
} }
await deleteDoc(docRef); await db.collection(module).deleteOne({ id: id });
res.status(200).json({ok: true}); res.status(200).json({ok: true});
} else { } else {

View File

@@ -1,17 +1,11 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type {NextApiRequest, NextApiResponse} from "next"; import type {NextApiRequest, NextApiResponse} from "next";
import {app} from "@/firebase";
import {getFirestore, collection, getDocs, query, where} from "firebase/firestore";
import {withIronSessionApiRoute} from "iron-session/next"; import {withIronSessionApiRoute} from "iron-session/next";
import {sessionOptions} from "@/lib/session"; import {sessionOptions} from "@/lib/session";
import {shuffle} from "lodash";
import {Difficulty, Exam} from "@/interfaces/exam"; import {Difficulty, Exam} from "@/interfaces/exam";
import {Stat} from "@/interfaces/user";
import {Module} from "@/interfaces"; import {Module} from "@/interfaces";
import axios from "axios"; import axios from "axios";
const db = getFirestore(app);
export default withIronSessionApiRoute(handler, sessionOptions); export default withIronSessionApiRoute(handler, sessionOptions);
async function handler(req: NextApiRequest, res: NextApiResponse) { async function handler(req: NextApiRequest, res: NextApiResponse) {

View File

@@ -1,17 +1,9 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type {NextApiRequest, NextApiResponse} from "next"; import type {NextApiRequest, NextApiResponse} from "next";
import {app} from "@/firebase";
import {getFirestore, collection, getDocs, query, where} from "firebase/firestore";
import {withIronSessionApiRoute} from "iron-session/next"; import {withIronSessionApiRoute} from "iron-session/next";
import {sessionOptions} from "@/lib/session"; import {sessionOptions} from "@/lib/session";
import {shuffle} from "lodash";
import {Difficulty, Exam} from "@/interfaces/exam";
import {Stat} from "@/interfaces/user";
import {Module} from "@/interfaces";
import axios from "axios"; import axios from "axios";
const db = getFirestore(app);
export default withIronSessionApiRoute(handler, sessionOptions); export default withIronSessionApiRoute(handler, sessionOptions);
async function handler(req: NextApiRequest, res: NextApiResponse) { async function handler(req: NextApiRequest, res: NextApiResponse) {

View File

@@ -1,14 +1,14 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type {NextApiRequest, NextApiResponse} from "next"; import type { NextApiRequest, NextApiResponse } from "next";
import {app} from "@/firebase"; import client from "@/lib/mongodb";
import {getFirestore, setDoc, doc, runTransaction, collection, query, where, getDocs} from "firebase/firestore"; import { withIronSessionApiRoute } from "iron-session/next";
import {withIronSessionApiRoute} from "iron-session/next"; import { sessionOptions } from "@/lib/session";
import {sessionOptions} from "@/lib/session"; import { Exam, InstructorGender, Variant } from "@/interfaces/exam";
import {Exam, InstructorGender, Variant} from "@/interfaces/exam"; import { getExams } from "@/utils/exams.be";
import {getExams} from "@/utils/exams.be"; import { Module } from "@/interfaces";
import {Module} from "@/interfaces"; import { getUserCorporate } from "@/utils/groups.be";
import {getUserCorporate} from "@/utils/groups.be";
const db = getFirestore(app); const db = client.db(process.env.MONGODB_DB);
export default withIronSessionApiRoute(handler, sessionOptions); export default withIronSessionApiRoute(handler, sessionOptions);
@@ -16,16 +16,16 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
if (req.method === "GET") return await GET(req, res); if (req.method === "GET") return await GET(req, res);
if (req.method === "POST") return await POST(req, res); if (req.method === "POST") return await POST(req, res);
res.status(404).json({ok: false}); res.status(404).json({ ok: false });
} }
async function GET(req: NextApiRequest, res: NextApiResponse) { async function GET(req: NextApiRequest, res: NextApiResponse) {
if (!req.session.user) { if (!req.session.user) {
res.status(401).json({ok: false}); res.status(401).json({ ok: false });
return; return;
} }
const {module, avoidRepeated, variant, instructorGender} = req.query as { const { module, avoidRepeated, variant, instructorGender } = req.query as {
module: Module; module: Module;
avoidRepeated: string; avoidRepeated: string;
variant?: Variant; variant?: Variant;
@@ -38,13 +38,15 @@ async function GET(req: NextApiRequest, res: NextApiResponse) {
async function POST(req: NextApiRequest, res: NextApiResponse) { async function POST(req: NextApiRequest, res: NextApiResponse) {
if (!req.session.user) { if (!req.session.user) {
res.status(401).json({ok: false}); res.status(401).json({ ok: false });
return; return;
} }
const {module} = req.query as {module: string}; const { module } = req.query as { module: string };
const corporate = await getUserCorporate(req.session.user.id); const corporate = await getUserCorporate(req.session.user.id);
const session = client.startSession();
try { try {
const exam = { const exam = {
...req.body, ...req.body,
@@ -57,20 +59,25 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
createdAt: new Date().toISOString(), createdAt: new Date().toISOString(),
}; };
await runTransaction(db, async (transaction) => { await session.withTransaction(async () => {
const docRef = doc(db, module, req.body.id); const docSnap = await db.collection(module).findOne({ id: req.body.id }, { session });
const docSnap = await transaction.get(docRef);
if (docSnap.exists()) { if (docSnap) {
throw new Error("Name already exists"); throw new Error("Name already exists");
} }
const newDocRef = doc(db, module, req.body.id); await db.collection(module).insertOne(
transaction.set(newDocRef, exam); { id: req.body.id, ...exam },
{ session }
);
}); });
res.status(200).json(exam); res.status(200).json(exam);
} catch (error) { } catch (error) {
console.error("Transaction failed: ", error); console.error("Transaction failed: ", error);
res.status(500).json({ok: false, error: (error as any).message}); res.status(500).json({ ok: false, error: (error as any).message });
} finally {
session.endSession();
} }
} }

View File

@@ -1,14 +1,13 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type {NextApiRequest, NextApiResponse} from "next"; import type {NextApiRequest, NextApiResponse} from "next";
import {app} from "@/firebase"; import client from "@/lib/mongodb";
import {getFirestore, collection, getDocs, query, where} from "firebase/firestore";
import {withIronSessionApiRoute} from "iron-session/next"; import {withIronSessionApiRoute} from "iron-session/next";
import {sessionOptions} from "@/lib/session"; import {sessionOptions} from "@/lib/session";
import {flatten} from "lodash"; import {flatten} from "lodash";
import {Exam} from "@/interfaces/exam"; import {Exam} from "@/interfaces/exam";
import {MODULE_ARRAY} from "@/utils/moduleUtils"; import {MODULE_ARRAY} from "@/utils/moduleUtils";
const db = getFirestore(app); const db = client.db(process.env.MONGODB_DB);
export default withIronSessionApiRoute(handler, sessionOptions); export default withIronSessionApiRoute(handler, sessionOptions);
@@ -25,16 +24,12 @@ async function GET(req: NextApiRequest, res: NextApiResponse) {
} }
const moduleExamsPromises = MODULE_ARRAY.map(async (module) => { const moduleExamsPromises = MODULE_ARRAY.map(async (module) => {
const moduleRef = collection(db, module); const snapshot = await db.collection(module).find<Exam>({ isDiagnostic: false }).toArray();
const q = query(moduleRef, where("isDiagnostic", "==", false)); return snapshot.map((doc) => ({
const snapshot = await getDocs(q); ...doc,
return snapshot.docs.map((doc) => ({
id: doc.id,
...doc.data(),
module, module,
})) as Exam[]; }));
}); });
const moduleExams = await Promise.all(moduleExamsPromises); const moduleExams = await Promise.all(moduleExamsPromises);