From e8941f5f188e0bdd96552d8778104deb3bb18e76 Mon Sep 17 00:00:00 2001 From: La_Felx <60652077+Flexla54@users.noreply.github.com> Date: Wed, 28 Dec 2022 01:06:58 +0100 Subject: [PATCH] moved deleteUnverifiedTeams to event router --- src/Controllers/team.controller.ts | 23 ++++++++++------------- src/Routes/event.routes.ts | 9 ++++++++- src/Routes/team.routes.ts | 5 ----- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/Controllers/team.controller.ts b/src/Controllers/team.controller.ts index 3d64fbb..a4d63e4 100644 --- a/src/Controllers/team.controller.ts +++ b/src/Controllers/team.controller.ts @@ -44,7 +44,7 @@ const detailedTeam = { const verified = { verified: { equals: true, - } + }, }; export const getTeams = async (req: Request, res: Response) => { @@ -66,7 +66,7 @@ export const getTeam = async (req: Request<{ pid: string }>, res: Response) => { } const team = await prisma.team.findUnique({ - where: {pid: pid}, + where: { pid: pid }, select: detailedTeam, }); @@ -150,13 +150,13 @@ export const deleteTeam = async (req: Request, res: Response) => { } }; -export const deleteUnverifiedTeams =async (req: Request, res: Response) => { +export const deleteUnverifiedTeams = async (req: Request, res: Response) => { const { pid } = req.params; await _deleteUnverifiedTeams(pid); res.status(204).end(); -} +}; export async function checkTeamExistence(teamPid: string) { const teamCount = await prisma.team.count({ @@ -165,7 +165,7 @@ export async function checkTeamExistence(teamPid: string) { if (teamCount == 0) { throw new NotFoundError("team", teamPid); } -}; +} export async function getGroupsByTeamPid(teamPid: string) { const team = await prisma.team.findUnique({ @@ -175,20 +175,17 @@ export async function getGroupsByTeamPid(teamPid: string) { let groups: string[] = []; - team?.participants.forEach((participant: { group: { pid: string; }; }) => { + team?.participants.forEach((participant: { group: { pid: string } }) => { groups.push(participant.group.pid); }); return groups; -}; +} export async function _deleteUnverifiedTeams(eventPid: string) { await prisma.team.deleteMany({ where: { - AND: [{discipline: {event: {pid: eventPid}}}, - {verified: {equals: false}} - ] - } - + AND: [{ discipline: { event: { pid: eventPid } } }, { verified: { equals: false } }], + }, }); -}; +} diff --git a/src/Routes/event.routes.ts b/src/Routes/event.routes.ts index ef6e6e4..525000b 100644 --- a/src/Routes/event.routes.ts +++ b/src/Routes/event.routes.ts @@ -1,7 +1,8 @@ import Express from "express"; import { string } from "zod"; import { addEvent, deleteEvent, getAllEvents, getEvent, updateEvent } from "../Controllers/event.controller"; -import { requireAuthentication } from "../Middleware/auth/auth"; +import { requireAuthentication, requireConfiguredAuthentication } from "../Middleware/auth/auth"; +import { deleteUnverifiedTeams } from "../Controllers/team.controller"; const router = Express.Router(); router.get("/", getAllEvents); @@ -14,4 +15,10 @@ router.patch<"/:pid/", { pid: string }>("/:pid/", requireAuthentication, updateE router.delete<"/:pid/", { pid: string }>("/:pid/", requireAuthentication, deleteEvent); +router.delete<"/:pid/deleteUnverified/", {pid: string}>( + "/:pid/deleteUnverified/", + requireConfiguredAuthentication({optional: false, type: "admin"}), + deleteUnverifiedTeams + ); + export default router; diff --git a/src/Routes/team.routes.ts b/src/Routes/team.routes.ts index aac4c2f..5f875a9 100644 --- a/src/Routes/team.routes.ts +++ b/src/Routes/team.routes.ts @@ -22,10 +22,5 @@ router.delete<"/:pid/", { pid: string }>( requireConfiguredAuthentication({ optional: false, type: { admin: true, teamleader: true } }), deleteTeam ); -router.delete<"/:pid/deleteUnverified/", {pid: string}>( - "/:pid/deleteUnverified/", - requireConfiguredAuthentication({optional: false, type: "admin"}), - deleteUnverifiedTeams -); export default router;