Merge pull request #11 from gdsc-nits-org/fixes

Fix: Minor Bugs
gdsc-nits-org · Jan 17, 2024 · ee64a01 · ee64a01
2 parents 06a90d1 + 68c92f5
commit ee64a01
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/src/controllers/event/add.ts b/src/controllers/event/add.ts
@@ -51,6 +51,7 @@ const createEvent: Interfaces.Controller.Async = async (req, res, next) => {
   if (extraQuestions && !Array.isArray(extraQuestions)) {
     return next(Errors.Module.invalidInput);
   }
+  if (minTeamSize > maxTeamSize) return next(Errors.Module.invalidInput);
 
   if (
     !(registrationIncentive && typeof registrationIncentive === "number") ||
@@ -75,9 +76,13 @@ const createEvent: Interfaces.Controller.Async = async (req, res, next) => {
 
   const regStart = new Date(registrationStartTime);
   const regEnd = new Date(registrationEndTime);
+
   if (JSON.stringify(regStart) === "null" || JSON.stringify(regEnd) === "null")
     return next(Errors.Module.invalidInput);
 
+  if (regStart && regEnd && regStart > regEnd)
+    return next(Errors.Module.invalidInput);
+
   if (
     !(await prisma.module.findFirst({
       where: { id: moduleId },

diff --git a/src/controllers/event/update.ts b/src/controllers/event/update.ts
@@ -26,30 +26,36 @@ const updateEvent: Interfaces.Controller.Async = async (req, res, next) => {
 
   const { eventId: EID } = req.params;
   const eventId = String(EID);
-  if (
-    String(eventId + "") ||
-    typeof eventId !== "string" ||
-    eventId.length !== 24
-  )
+  if (typeof eventId !== "string" || eventId.length !== 24)
     return next(Errors.Module.invalidInput);
 
-  if (!(await prisma.event.findFirst({ where: { id: eventId } })))
-    return next(Errors.Module.eventNotFound);
+  const eventOriginal = await prisma.event.findFirst({
+    where: { id: eventId },
+  });
+  if (!eventOriginal) return next(Errors.Module.eventNotFound);
   if (moduleId) {
     if (!moduleId || typeof moduleId !== "string" || eventId.length !== 24)
       return next(Errors.Module.invalidInput);
     if (!(await prisma.module.findFirst({ where: { id: moduleId } })))
       return next(Errors.Module.moduleNotFound);
   }
-
+  if (minTeamSize > maxTeamSize) return next(Errors.Module.invalidInput);
   let regStart;
   if (registrationStartTime) regStart = new Date(registrationStartTime);
+  else {
+    regStart = new Date(eventOriginal.registrationStartTime);
+  }
   let regEnd;
   if (registrationEndTime) regEnd = new Date(registrationEndTime);
+  else {
+    regEnd = new Date(eventOriginal.registrationEndTime);
+  }
   if (registrationStartTime && JSON.stringify(regStart) === "null")
     return next(Errors.Module.invalidInput);
   if (registrationEndTime && JSON.stringify(regEnd) === "null")
     return next(Errors.Module.invalidInput);
+  if (regStart && regEnd && regStart > regEnd)
+    return next(Errors.Module.invalidInput);
 
   const { organizers, managers }: { organizers: [string]; managers: [string] } =
     req.body;

diff --git a/src/controllers/team/details.ts b/src/controllers/team/details.ts
@@ -86,6 +86,8 @@ const getAllTeamsOfEvent: Interfaces.Controller.Async = async (
       ],
     },
     select: {
+      teamName: true,
+      id: true,
       members: {
         select: {
           user: {