This commit is contained in:
Leo Wen
2025-12-06 17:06:46 -08:00
parent d848595488
commit d0cd39434f
2 changed files with 391 additions and 346 deletions
+13 -7
View File
@@ -14,12 +14,12 @@ router.get("/", async (req, res) => {
return res.status(400).json({ msg: "Multiple files uploaded" }); return res.status(400).json({ msg: "Multiple files uploaded" });
const file = req.files.upload as fileUpload.UploadedFile; const file = req.files.upload as fileUpload.UploadedFile;
if (![mime.lookup(".pdf"), mime.lookup(".docx")].includes(file.mimetype)) return res.status(400).json({ msg: "Invalid file type" }); if (![mime.lookup(".pdf"), mime.lookup(".docx")].includes(file.mimetype))
return res.status(400).json({ msg: "Invalid file type" });
if (file.size > 5_000_000) { if (file.size > 5_000_000) {
return res.status(400).json({ msg: "File too large (max 5MB)" }); return res.status(400).json({ msg: "File too large (max 5MB)" });
} }
// Add error handling for missing required fields // Add error handling for missing required fields
if (!req.body.schoolName || !req.body.className || !req.body.professor) { if (!req.body.schoolName || !req.body.className || !req.body.professor) {
return res.status(400).json({ msg: "Missing required fields" }); return res.status(400).json({ msg: "Missing required fields" });
@@ -35,7 +35,8 @@ router.get("/", async (req, res) => {
return res.status(404).json({ msg: "School not found" }); return res.status(404).json({ msg: "School not found" });
} }
let classRecord = await prisma.class.findFirst({ // Change findUnique to findFirst let classRecord = await prisma.class.findFirst({
// Change findUnique to findFirst
where: { where: {
className: req.body.className, className: req.body.className,
schoolId: school.id, schoolId: school.id,
@@ -61,15 +62,18 @@ router.get("/", async (req, res) => {
let { id } = await prisma.syllabus.create({ let { id } = await prisma.syllabus.create({
data: { data: {
mimeType: file.mimetype, mimeType: file.mimetype,
professor: req.body.professor, // Required string field
createdByName: req.body.name || undefined, createdByName: req.body.name || undefined,
createdByEmail: req.body.email || undefined, createdByEmail: req.body.email || undefined,
fullClassName: req.body.fullClassName || undefined, fullClassName: req.body.fullClassName || undefined,
classLength: req.body.classLength ? parseInt(req.body.classLength, 10) : undefined, classLength: req.body.classLength
? parseInt(req.body.classLength, 10)
: undefined,
textbookCost: req.body.textbookCost || undefined, textbookCost: req.body.textbookCost || undefined,
description: req.body.description || undefined, description: req.body.description || undefined,
content: "", // Add the content property content: "", // Add the content property
class: { connect: { id: classRecord.id } }, class: { connect: { id: classRecord.id } },
professorObject: { connect: { id: professorObject.id } }, Professor: { connect: { id: professorObject.id } },
school: { connect: { id: school.id } }, school: { connect: { id: school.id } },
}, },
}); });
@@ -77,9 +81,11 @@ router.get("/", async (req, res) => {
await file.mv(`./syllabi/${id}.${mime.extension(file.mimetype)}`); await file.mv(`./syllabi/${id}.${mime.extension(file.mimetype)}`);
return res.status(200).json({ id }); return res.status(200).json({ id });
} catch (error) { } catch (error) {
console.error('Error creating syllabus:', error); console.error("Error creating syllabus:", error);
if (error instanceof Error) { if (error instanceof Error) {
return res.status(500).json({ msg: "Internal server error", error: error.message }); return res
.status(500)
.json({ msg: "Internal server error", error: error.message });
} }
return res.status(500).json({ msg: "Internal server error" }); return res.status(500).json({ msg: "Internal server error" });
} }
+92 -53
View File
@@ -5,26 +5,28 @@ import fileUpload from "express-fileupload";
import http from "node:http"; import http from "node:http";
import fuzzysort from "fuzzysort"; import fuzzysort from "fuzzysort";
import mime from "mime-types"; import mime from "mime-types";
import jwt from 'jsonwebtoken'; import jwt from "jsonwebtoken";
import argon2 from 'argon2'; import argon2 from "argon2";
import { idText } from "typescript"; import { idText } from "typescript";
import 'dotenv/config'; import "dotenv/config";
import { jwtMiddleware } from "./authMiddleware"; import { jwtMiddleware } from "./authMiddleware";
const app = express(); const app = express();
const httpServer = http.createServer(app); const httpServer = http.createServer(app);
const prisma = new PrismaClient(); export const prisma = new PrismaClient();
app.use(cors({ app.use(
cors({
origin: "*", // TODO change this to the actual domain origin: "*", // TODO change this to the actual domain
})) }),
);
app.use(express.json()); app.use(express.json());
app.use(fileUpload()); app.use(fileUpload());
app.use('/files', express.static('syllabi')); app.use("/files", express.static("syllabi"));
app.post("/create", async (req, res) => { app.post("/create", async (req, res) => {
console.debug(req.body); console.debug(req.body);
@@ -36,12 +38,12 @@ app.post("/create", async (req, res) => {
return res.status(400).json({ msg: "Multiple files uploaded" }); return res.status(400).json({ msg: "Multiple files uploaded" });
const file = req.files.upload as fileUpload.UploadedFile; const file = req.files.upload as fileUpload.UploadedFile;
if (![mime.lookup(".pdf"), mime.lookup(".docx")].includes(file.mimetype)) return res.status(400).json({ msg: "Invalid file type" }); if (![mime.lookup(".pdf"), mime.lookup(".docx")].includes(file.mimetype))
return res.status(400).json({ msg: "Invalid file type" });
if (file.size > 5_000_000) { if (file.size > 5_000_000) {
return res.status(400).json({ msg: "File too large (max 5MB)" }); return res.status(400).json({ msg: "File too large (max 5MB)" });
} }
// Add error handling for missing required fields // Add error handling for missing required fields
if (!req.body.schoolName || !req.body.className || !req.body.professor) { if (!req.body.schoolName || !req.body.className || !req.body.professor) {
return res.status(400).json({ msg: "Missing required fields" }); return res.status(400).json({ msg: "Missing required fields" });
@@ -57,7 +59,8 @@ app.post("/create", async (req, res) => {
return res.status(404).json({ msg: "School not found" }); return res.status(404).json({ msg: "School not found" });
} }
let classRecord = await prisma.class.findFirst({ // Change findUnique to findFirst let classRecord = await prisma.class.findFirst({
// Change findUnique to findFirst
where: { where: {
className: req.body.className, className: req.body.className,
schoolId: school.id, schoolId: school.id,
@@ -83,15 +86,18 @@ app.post("/create", async (req, res) => {
let { id } = await prisma.syllabus.create({ let { id } = await prisma.syllabus.create({
data: { data: {
mimeType: file.mimetype, mimeType: file.mimetype,
professor: req.body.professor, // Required string field
createdByName: req.body.name || undefined, createdByName: req.body.name || undefined,
createdByEmail: req.body.email || undefined, createdByEmail: req.body.email || undefined,
fullClassName: req.body.fullClassName || undefined, fullClassName: req.body.fullClassName || undefined,
classLength: req.body.classLength ? parseInt(req.body.classLength, 10) : undefined, classLength: req.body.classLength
? parseInt(req.body.classLength, 10)
: undefined,
textbookCost: req.body.textbookCost || undefined, textbookCost: req.body.textbookCost || undefined,
description: req.body.description || undefined, description: req.body.description || undefined,
content: "", // Add the content property content: "", // Add the content property
class: { connect: { id: classRecord.id } }, class: { connect: { id: classRecord.id } },
professorObject: { connect: { id: professorObject.id } }, Professor: { connect: { id: professorObject.id } },
school: { connect: { id: school.id } }, school: { connect: { id: school.id } },
}, },
}); });
@@ -99,9 +105,11 @@ app.post("/create", async (req, res) => {
await file.mv(`./syllabi/${id}.${mime.extension(file.mimetype)}`); await file.mv(`./syllabi/${id}.${mime.extension(file.mimetype)}`);
return res.status(200).json({ id }); return res.status(200).json({ id });
} catch (error) { } catch (error) {
console.error('Error creating syllabus:', error); console.error("Error creating syllabus:", error);
if (error instanceof Error) { if (error instanceof Error) {
return res.status(500).json({ msg: "Internal server error", error: error.message }); return res
.status(500)
.json({ msg: "Internal server error", error: error.message });
} }
return res.status(500).json({ msg: "Internal server error" }); return res.status(500).json({ msg: "Internal server error" });
} }
@@ -110,13 +118,18 @@ app.post("/create", async (req, res) => {
app.get("/schools", async (req, res) => { app.get("/schools", async (req, res) => {
let colleges = await prisma.school.findMany({}); let colleges = await prisma.school.findMany({});
res.json(colleges); res.json(colleges);
}) });
app.post("/search/class/", async (req, res) => { app.post("/search/class/", async (req, res) => {
let take = req.body.take || 10; let take = req.body.take || 10;
let skip = req.body.skip || 0; let skip = req.body.skip || 0;
if (await prisma.school.findUnique({ where: { name: req.query.s as string } }) === null) return res.status(404).json({ msg: "School not found" }); if (
(await prisma.school.findUnique({
where: { name: req.query.s as string },
})) === null
)
return res.status(404).json({ msg: "School not found" });
let classes = await prisma.class.findMany({ let classes = await prisma.class.findMany({
where: { where: {
@@ -126,14 +139,16 @@ app.post("/search/class/", async (req, res) => {
}, },
}); });
let results = classes; let results = classes;
if (req.query.q) { if (req.query.q) {
results = fuzzysort.go(req.query.q as string, classes, { keys: ["className", "fullClassName"] }).map(i => i.obj); results = fuzzysort
.go(req.query.q as string, classes, {
keys: ["className", "fullClassName"],
})
.map((i) => i.obj);
} }
res.json(results.slice(skip, skip + take)); res.json(results.slice(skip, skip + take));
}); });
@@ -141,7 +156,12 @@ app.post("/search/professor/", async (req, res) => {
let take = req.body.take || 10; let take = req.body.take || 10;
let skip = req.body.skip || 0; let skip = req.body.skip || 0;
if (await prisma.school.findUnique({ where: { name: req.query.s as string } }) === null) return res.status(404).json({ msg: "School not found" }); if (
(await prisma.school.findUnique({
where: { name: req.query.s as string },
})) === null
)
return res.status(404).json({ msg: "School not found" });
let professors = await prisma.professor.findMany({ let professors = await prisma.professor.findMany({
where: { where: {
@@ -154,7 +174,9 @@ app.post("/search/professor/", async (req, res) => {
let results = professors; let results = professors;
if (req.query.q) { if (req.query.q) {
results = fuzzysort.go(req.query.q as string, professors, { keys: ["name"] }).map(i => i.obj); results = fuzzysort
.go(req.query.q as string, professors, { keys: ["name"] })
.map((i) => i.obj);
} }
res.json(results.slice(skip, skip + take)); res.json(results.slice(skip, skip + take));
@@ -172,11 +194,12 @@ app.get("/professor/:id", async (req, res) => {
}, },
}, },
}); });
if (professor === null) return res.status(404).json({ msg: "Professor not found" }); if (professor === null)
return res.status(404).json({ msg: "Professor not found" });
return res.json({ return res.json({
name: professor.name, name: professor.name,
school: professor.school?.name, school: professor.school?.name,
syllabi: professor.syllabi.map(i => { syllabi: professor.syllabi.map((i) => {
return { return {
id: i.id, id: i.id,
className: i.class?.className, className: i.class?.className,
@@ -200,10 +223,11 @@ app.get("/syllabus/:id", async (req, res) => {
discipline: true, discipline: true,
}, },
}, },
professorObject: true, Professor: true,
}, },
}); });
if (syllabus === null) return res.status(404).json({ msg: "Syllabus not found" }); if (syllabus === null)
return res.status(404).json({ msg: "Syllabus not found" });
return res.json({ return res.json({
className: syllabus.class?.className, className: syllabus.class?.className,
description: syllabus.description, description: syllabus.description,
@@ -211,13 +235,13 @@ app.get("/syllabus/:id", async (req, res) => {
textbookCost: syllabus.textbookCost, textbookCost: syllabus.textbookCost,
content: syllabus.content, content: syllabus.content,
classLength: syllabus.classLength, classLength: syllabus.classLength,
professor: syllabus.professorObject?.name, professor: syllabus.Professor?.[0]?.name,
dateCreated: syllabus.dateCreated.toISOString(), dateCreated: syllabus.dateCreated.toISOString(),
fileName: `${syllabus.id}.${mime.extension(syllabus.mimeType)}`, fileName: `${syllabus.id}.${mime.extension(syllabus.mimeType)}`,
class: { class: {
className: syllabus.class?.className ?? '', className: syllabus.class?.className ?? "",
fullClassName: syllabus.class?.fullClassName ?? '', fullClassName: syllabus.class?.fullClassName ?? "",
discipline: syllabus.class?.discipline?.name ?? '', discipline: syllabus.class?.discipline?.name ?? "",
}, },
}); });
}); });
@@ -229,7 +253,8 @@ app.get("/syllabus/:id/download", async (req, res) => {
class: true, class: true,
}, },
}); });
if (syllabus === null) return res.status(404).json({ msg: "Syllabus not found" }); if (syllabus === null)
return res.status(404).json({ msg: "Syllabus not found" });
res.download(`./syllabi/${syllabus.id}.${mime.extension(syllabus.mimeType)}`); res.download(`./syllabi/${syllabus.id}.${mime.extension(syllabus.mimeType)}`);
}); });
@@ -242,7 +267,7 @@ app.get("/search/", async (req, res) => {
discipline: true, discipline: true,
}, },
}, },
professorObject: true, Professor: true,
school: true, school: true,
}, },
}); });
@@ -250,29 +275,35 @@ app.get("/search/", async (req, res) => {
let results = syllabi; let results = syllabi;
if (req.query.s) { if (req.query.s) {
results = results.filter(i => i.school?.name === req.query.s); results = results.filter((i) => i.school?.name === req.query.s);
} }
if (req.query.c) { if (req.query.c) {
results = results.filter(i => i.class?.className === req.query.c); results = results.filter((i) => i.class?.className === req.query.c);
} }
if (req.query.p) { if (req.query.p) {
results = results.filter(i => i.professorObject?.name === req.query.p); results = results.filter((i) => i.Professor?.[0]?.name === req.query.p);
} }
if (req.query.q) { if (req.query.q) {
results = fuzzysort.go(req.query.q as string, results, { keys: ["class.className", "professorObject.name", "class.fullClassName"] }).map(i => i.obj); results = fuzzysort
.go(req.query.q as string, results, {
keys: ["class.className", "Professor.0.name", "class.fullClassName"],
})
.map((i) => i.obj);
} }
let take = req.query.take as unknown as number || 10; let take = (req.query.take as unknown as number) || 10;
let skip = req.query.skip as unknown as number || 0; let skip = (req.query.skip as unknown as number) || 0;
res.json(results.map(i => { res.json(
results
.map((i) => {
return { return {
id: i.id, id: i.id,
className: i.class?.className, className: i.class?.className,
professor: i.professorObject?.name ?? '', professor: i.Professor?.[0]?.name ?? "",
fullClassName: i.fullClassName, fullClassName: i.fullClassName,
textbookCost: i.textbookCost, textbookCost: i.textbookCost,
description: i.description, description: i.description,
@@ -280,18 +311,21 @@ app.get("/search/", async (req, res) => {
dateCreated: i.dateCreated.toISOString(), dateCreated: i.dateCreated.toISOString(),
fileName: `${i.id}.${mime.extension(i.mimeType)}`, fileName: `${i.id}.${mime.extension(i.mimeType)}`,
class: { class: {
className: i.class?.className ?? '', className: i.class?.className ?? "",
fullClassName: i.class?.fullClassName ?? '', fullClassName: i.class?.fullClassName ?? "",
discipline: i.class?.discipline?.name ?? '', discipline: i.class?.discipline?.name ?? "",
}, },
professorId: i.professorObject?.id ?? '', professorId: i.Professor?.[0]?.id ?? "",
school: { school: {
name: i.school?.name ?? '', name: i.school?.name ?? "",
id: i.school?.id ?? '', id: i.school?.id ?? "",
fullName: i.school?.fullName ?? '', fullName: i.school?.fullName ?? "",
} },
}; };
}).slice(skip).slice(0, take)); })
.slice(skip)
.slice(0, take),
);
} catch (e) { } catch (e) {
console.error(e); console.error(e);
res.status(500).json({ msg: "Internal server error" }); res.status(500).json({ msg: "Internal server error" });
@@ -304,7 +338,9 @@ app.post("/report/:id", async (req, res) => {
const syllabusId = req.params.id; const syllabusId = req.params.id;
// Check if the syllabus exists // Check if the syllabus exists
const syllabus = await prisma.syllabus.findUnique({ where: { id: syllabusId } }); const syllabus = await prisma.syllabus.findUnique({
where: { id: syllabusId },
});
if (!syllabus) { if (!syllabus) {
return res.status(404).json({ msg: "Syllabus not found" }); return res.status(404).json({ msg: "Syllabus not found" });
} }
@@ -325,7 +361,7 @@ app.post("/report/:id", async (req, res) => {
console.error(e); console.error(e);
res.status(500).json({ msg: `Internal Server Error ${e}` }); res.status(500).json({ msg: `Internal Server Error ${e}` });
} }
}) });
app.post("/moderator/login", async (req, res) => { app.post("/moderator/login", async (req, res) => {
const { username, password } = req.body; const { username, password } = req.body;
@@ -344,7 +380,11 @@ app.post("/moderator/login", async (req, res) => {
return res.status(401).json({ msg: "Invalid username or password" }); return res.status(401).json({ msg: "Invalid username or password" });
} }
const token = jwt.sign({ id: moderator.id }, process.env.SECRET_KEY as string, { expiresIn: '2h' }); const token = jwt.sign(
{ id: moderator.id },
process.env.SECRET_KEY as string,
{ expiresIn: "2h" },
);
res.json({ token }); res.json({ token });
return; return;
@@ -355,6 +395,5 @@ app.post("/moderator/flag", jwtMiddleware, async (req, res) => {
}); });
await new Promise<void>((resolve) => await new Promise<void>((resolve) =>
httpServer.listen({ port: 4000, host: "0.0.0.0" }, resolve) httpServer.listen({ port: 4000, host: "0.0.0.0" }, resolve),
); );