From 4926f2659df2e929ebc4876648550e7e5a132164 Mon Sep 17 00:00:00 2001 From: Flexla54 Date: Tue, 17 May 2022 14:37:08 +0000 Subject: [PATCH] [create-pull-request] push formatted files --- src/Controllers/discipline.controller.ts | 26 +++++----- src/Controllers/event.controller.ts | 59 ++++++++++++----------- src/Controllers/media.controller.ts | 6 +-- src/Controllers/role_schema.controller.ts | 28 +++++------ src/Routes/discipline.routes.ts | 12 ++++- src/Routes/event.routes.ts | 10 +++- src/Routes/role_schema.routes.ts | 9 ++-- 7 files changed, 86 insertions(+), 64 deletions(-) diff --git a/src/Controllers/discipline.controller.ts b/src/Controllers/discipline.controller.ts index 57aeb61..de8abbd 100644 --- a/src/Controllers/discipline.controller.ts +++ b/src/Controllers/discipline.controller.ts @@ -197,17 +197,17 @@ interface visualBody { } export const addVisual = async (req: Request, res: Response) => { - if (req.auth?.permission_level != "ELEVATED"){ + if (req.auth?.permission_level != "ELEVATED") { res.status(403).json(createInsufficientPermissionsError()); } const { disciplinePid } = req.params; - + const discipline = await prisma.discipline.update({ where: { pid: disciplinePid }, data: { - visual: {connect: {pid: req.body.mediaPid}} - } + visual: { connect: { pid: req.body.mediaPid } }, + }, }); if (!discipline) { @@ -216,25 +216,25 @@ export const addVisual = async (req: Request, res: return res.status(200).json({ type: "success", - payload: { } - }) + payload: {}, + }); }; export const deleteVisual = async (req: Request, res: Response) => { - if (req.auth?.permission_level != "ELEVATED"){ + if (req.auth?.permission_level != "ELEVATED") { res.status(403).json(createInsufficientPermissionsError()); } const { disciplinePid, pid } = req.params; try { - await prisma.discipline.update({ - where: { + await prisma.discipline.update({ + where: { pid: disciplinePid, - }, - data: { - visual: { disconnect: { pid } } - } + }, + data: { + visual: { disconnect: { pid } }, + }, }); return res.status(204).end(); } catch (e) { diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 5ebbdc9..3193c37 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -52,7 +52,7 @@ export const getEvent = async (req: Request, res: Response) => { date: true, pid: true, id: false, - visual: { select: { pid: true, description: true } } + visual: { select: { pid: true, description: true } }, }, }); @@ -100,14 +100,16 @@ export const addEvent = async (req: Request, res: Response) => { typeof req.body.name !== "string" || typeof req.body.date !== "string" || typeof req.body.briefDescription !== "string" || - req.body.fullDescription && typeof req.body.fullDescription !== "string" + (req.body.fullDescription && typeof req.body.fullDescription !== "string") ) { - return res.status(400).json(generateInvalidBodyError({ - name: DataType.STRING, - date: DataType.DATETIME, - briefDescription: DataType.STRING, - ["fullDescription?"]: DataType.STRING, - })); + return res.status(400).json( + generateInvalidBodyError({ + name: DataType.STRING, + date: DataType.DATETIME, + briefDescription: DataType.STRING, + ["fullDescription?"]: DataType.STRING, + }) + ); } //TODO: Check if date is valid @@ -141,8 +143,8 @@ const EventBody = z.object({ name: z.string(), date: z.string(), briefDescription: z.string(), - fullDescription: z.string() -}) + fullDescription: z.string(), +}); const UpdateBody = EventBody.partial(); @@ -156,12 +158,14 @@ export const updateEvent = async (req: Request<{ pid: string }>, res: Response) const result = UpdateBody.safeParse(req.body); if (result.success === false) { - return res.status(400).json(generateInvalidBodyError({ - name: DataType.STRING, - date: DataType.DATETIME, - briefDescription: DataType.STRING, - ["fullDescription?"]: DataType.STRING, - })); + return res.status(400).json( + generateInvalidBodyError({ + name: DataType.STRING, + date: DataType.DATETIME, + briefDescription: DataType.STRING, + ["fullDescription?"]: DataType.STRING, + }) + ); } const body = result.data; @@ -173,16 +177,16 @@ export const updateEvent = async (req: Request<{ pid: string }>, res: Response) name: body.name, date: body.date, briefDescription: body.briefDescription, - fullDescription: body.fullDescription + fullDescription: body.fullDescription, }, select: { pid: true, name: true, date: true, briefDescription: true, - fullDescription: true - } - }) + fullDescription: true, + }, + }); if (!event) { throw new NotFoundError("event", pid); @@ -191,7 +195,7 @@ export const updateEvent = async (req: Request<{ pid: string }>, res: Response) res.status(200).json({ type: "success", payload: { - event + event, }, }); } catch (e) { @@ -217,8 +221,7 @@ export const updateEvent = async (req: Request<{ pid: string }>, res: Response) throw e; } - -} +}; interface DeleteEventQueryParams { pid: string; @@ -269,8 +272,8 @@ export const addVisual = async (req: Request, res: const event = await prisma.event.update({ where: { pid: eventPid }, data: { - visual: { connect: { pid: req.body.mediaPid } } - } + visual: { connect: { pid: req.body.mediaPid } }, + }, }); if (!event) { @@ -279,8 +282,8 @@ export const addVisual = async (req: Request, res: return res.status(200).json({ type: "success", - payload: {} - }) + payload: {}, + }); }; export const deleteVisual = async (req: Request, res: Response) => { @@ -297,7 +300,7 @@ export const deleteVisual = async (req: Request, }, data: { visual: { disconnect: { pid } }, - } + }, }); return res.status(204).end(); } catch (e) { diff --git a/src/Controllers/media.controller.ts b/src/Controllers/media.controller.ts index 1246e2d..eb78bc3 100644 --- a/src/Controllers/media.controller.ts +++ b/src/Controllers/media.controller.ts @@ -132,9 +132,9 @@ export const getAllMedia = async (req: Request, res: Response) => { const medias = await prisma.media.findMany({ select: { description: true, - events: {select: {pid: true}}, - disciplines: {select: {pid: true}}, - roles: {select: {pid: true}}, + events: { select: { pid: true } }, + disciplines: { select: { pid: true } }, + roles: { select: { pid: true } }, pid: true, id: false, }, diff --git a/src/Controllers/role_schema.controller.ts b/src/Controllers/role_schema.controller.ts index 9f09f4b..36265de 100644 --- a/src/Controllers/role_schema.controller.ts +++ b/src/Controllers/role_schema.controller.ts @@ -133,17 +133,17 @@ interface visualBody { } export const addVisual = async (req: Request, res: Response) => { - if (req.auth?.permission_level != "ELEVATED"){ + if (req.auth?.permission_level != "ELEVATED") { res.status(403).json(createInsufficientPermissionsError()); } const { schemaPid } = req.params; - + const schema = await prisma.roleSchema.update({ where: { pid: schemaPid }, data: { - visual: { connect: { pid: req.body.mediaPid } } - } + visual: { connect: { pid: req.body.mediaPid } }, + }, }); if (!schema) { @@ -152,25 +152,25 @@ export const addVisual = async (req: Request, res: return res.status(200).json({ type: "success", - payload: { } - }) + payload: {}, + }); }; -export const deleteVisual = async (req: Request, res: Response) => { - if (req.auth?.permission_level != "ELEVATED"){ +export const deleteVisual = async (req: Request, res: Response) => { + if (req.auth?.permission_level != "ELEVATED") { res.status(403).json(createInsufficientPermissionsError()); } const { schemaPid, pid } = req.params; try { - await prisma.roleSchema.update({ - where: { + await prisma.roleSchema.update({ + where: { pid: schemaPid, - }, - data: { - visual: { disconnect: { pid } } - } + }, + data: { + visual: { disconnect: { pid } }, + }, }); return res.status(204).end(); } catch (e) { diff --git a/src/Routes/discipline.routes.ts b/src/Routes/discipline.routes.ts index acc2d76..2d97a8e 100644 --- a/src/Routes/discipline.routes.ts +++ b/src/Routes/discipline.routes.ts @@ -18,9 +18,17 @@ router.get("/:pid", getDiscipline); router.delete<"/:pid", { pid: string }>("/:pid", requireAuthentication, deleteDiscipline); -router.post<"/:disciplinePid/images", {disciplinePid: string}>("/:disciplinePid/images", requireAuthentication, addVisual); +router.post<"/:disciplinePid/images", { disciplinePid: string }>( + "/:disciplinePid/images", + requireAuthentication, + addVisual +); -router.delete<"/:disciplinePid/images/:pid", {disciplinePid: string, pid: string}>("/:disciplinePid/images/:pid", requireAuthentication, deleteVisual); +router.delete<"/:disciplinePid/images/:pid", { disciplinePid: string; pid: string }>( + "/:disciplinePid/images/:pid", + requireAuthentication, + deleteVisual +); eventRouter.post("/:eventPid/disciplines", requireAuthentication, createDiscipline); diff --git a/src/Routes/event.routes.ts b/src/Routes/event.routes.ts index bdf58ab..5e68bd8 100644 --- a/src/Routes/event.routes.ts +++ b/src/Routes/event.routes.ts @@ -1,6 +1,14 @@ import Express from "express"; import { string } from "zod"; -import { addEvent, addVisual, deleteEvent, deleteVisual, getAllEvents, getEvent, updateEvent } from "../Controllers/event.controller"; +import { + addEvent, + addVisual, + deleteEvent, + deleteVisual, + getAllEvents, + getEvent, + updateEvent, +} from "../Controllers/event.controller"; import { requireAuthentication } from "../Middleware/auth/auth"; const router = Express.Router(); diff --git a/src/Routes/role_schema.routes.ts b/src/Routes/role_schema.routes.ts index 0ec3f67..f6ada5f 100644 --- a/src/Routes/role_schema.routes.ts +++ b/src/Routes/role_schema.routes.ts @@ -20,9 +20,12 @@ disciplineRouter.get("/:disciplinePid/role-schemas", getAllRoleSchemasWithParam) disciplineRouter.post("/:disciplinePid/role-schemas", requireAuthentication, createRoleSchema); -router.post<"/:schemaPid/images", {schemaPid: string}>("/:schemaPid/images", requireAuthentication, addVisual); - -router.delete<"/:schemaPid/images/:pid", {schemaPid: string, pid: string}>("/:schemaPid/images/:pid", requireAuthentication, deleteVisual); +router.post<"/:schemaPid/images", { schemaPid: string }>("/:schemaPid/images", requireAuthentication, addVisual); +router.delete<"/:schemaPid/images/:pid", { schemaPid: string; pid: string }>( + "/:schemaPid/images/:pid", + requireAuthentication, + deleteVisual +); export default router;