Merge branch 'develop' into #2131-drc-create-modal

Author: RChandler234

src/backend/index.ts

@@ -11,8 +11,8 @@ import changeRequestsRouter from './src/routes/change-requests.routes';
 import descriptionBulletsRouter from './src/routes/description-bullets.routes';
 import tasksRouter from './src/routes/tasks.routes';
 import reimbursementRequestsRouter from './src/routes/reimbursement-requests.routes';
-import designReviewRouter from './src/routes/design-review.routes';
 import notificationsRouter from './src/routes/notifications.routes';
+import designReviewsRouter from './src/routes/design-reviews.routes';
 
 const app = express();
 const port = process.env.PORT || 3001;
@@ -54,7 +54,7 @@ app.use('/change-requests', changeRequestsRouter);
 app.use('/description-bullets', descriptionBulletsRouter);
 app.use('/tasks', tasksRouter);
 app.use('/reimbursement-requests', reimbursementRequestsRouter);
-app.use('/design-reviews', designReviewRouter);
+app.use('/design-reviews', designReviewsRouter);
 app.use('/notifications', notificationsRouter);
 app.use('/', (_req, res) => {
   res.json('Welcome to FinishLine');

…controllers/design-review.controllers.ts …ontrollers/design-reviews.controllers.tssrc/backend/src/controllers/design-review.controllers.ts renamed to src/backend/src/controllers/design-reviews.controllers.ts src/backend/src/controllers/design-review.controllers.ts renamed to src/backend/src/controllers/design-reviews.controllers.ts

@@ -1,12 +1,12 @@
-import { User } from '@prisma/client';
-import { Request, Response, NextFunction } from 'express';
+import { NextFunction, Request, Response } from 'express';
+import DesignReviewsService from '../services/design-reviews.services';
 import { getCurrentUser } from '../utils/auth.utils';
-import DesignReviewService from '../services/design-review.services';
+import { User } from '@prisma/client';
 
-export default class DesignReviewController {
+export default class DesignReviewsController {
   static async getAllDesignReviews(_req: Request, res: Response, next: NextFunction) {
     try {
-      const designReviews = await DesignReviewService.getAllDesignReviews();
+      const designReviews = await DesignReviewsService.getAllDesignReviews();
       return res.status(200).json(designReviews);
     } catch (error: unknown) {
       next(error);
@@ -17,7 +17,7 @@ export default class DesignReviewController {
     try {
       const drId: string = req.params.designReviewId;
       const user: User = await getCurrentUser(res);
-      const deletedDesignReview = await DesignReviewService.deleteDesignReview(user, drId);
+      const deletedDesignReview = await DesignReviewsService.deleteDesignReview(user, drId);
       return res.status(200).json(deletedDesignReview);
     } catch (error: unknown) {
       next(error);
@@ -41,7 +41,7 @@ export default class DesignReviewController {
         meetingTimes
       } = req.body;
 
-      const createdDesignReview = await DesignReviewService.createDesignReview(
+      const createdDesignReview = await DesignReviewsService.createDesignReview(
         submitter,
         dateScheduled,
         teamTypeId,
@@ -65,10 +65,55 @@ export default class DesignReviewController {
     try {
       const drId: string = req.params.designReviewId;
       const user: User = await getCurrentUser(res);
-      const designReview = await DesignReviewService.getSingleDesignReview(user, drId);
+      const designReview = await DesignReviewsService.getSingleDesignReview(user, drId);
       return res.status(200).json(designReview);
     } catch (error: unknown) {
       next(error);
     }
   }
+
+  // Edit a work package to the given specifications
+  static async editDesignReviews(req: Request, res: Response, next: NextFunction) {
+    try {
+      const {
+        dateScheduled,
+        teamType,
+        requiredMembers,
+        optionalMembers,
+        isOnline,
+        isInPerson,
+        zoomLink,
+        location,
+        docTemplateLink,
+        status,
+        attendees,
+        meetingTimes
+      } = req.body;
+
+      const { designReviewId } = req.params;
+
+      // get the user from the submitter
+      const user = await getCurrentUser(res);
+
+      await DesignReviewsService.editDesignReview(
+        user,
+        designReviewId,
+        dateScheduled,
+        teamType.teamTypeId,
+        requiredMembers,
+        optionalMembers,
+        isOnline,
+        isInPerson,
+        zoomLink,
+        location,
+        docTemplateLink,
+        status,
+        attendees,
+        meetingTimes
+      );
+      return res.status(200).json({ message: 'Design Review updated successfully' });
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

src/backend/src/controllers/users.controllers.ts

@@ -146,6 +146,24 @@ export default class UsersController {
     }
   }
 
+  static async setUserScheduleSettings(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { personalGmail, personalZoomLink, availability } = req.body;
+      const user = await getCurrentUser(res);
+
+      const updatedScheduleSettings = await UsersService.setUserScheduleSettings(
+        user,
+        personalGmail,
+        personalZoomLink,
+        availability
+      );
+
+      return res.status(200).json(updatedScheduleSettings);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getUserScheduleSettings(req: Request, res: Response, next: NextFunction) {
     try {
       const userId: number = parseInt(req.params.userId);

…a-query-args/design-review.query-args.ts …-query-args/design-reviews.query-args.tssrc/backend/src/prisma-query-args/design-review.query-args.ts renamed to src/backend/src/prisma-query-args/design-reviews.query-args.ts src/backend/src/prisma-query-args/design-review.query-args.ts renamed to src/backend/src/prisma-query-args/design-reviews.query-args.ts

@@ -0,0 +1,55 @@
+import express from 'express';
+import { body } from 'express-validator';
+import { intMinZero, nonEmptyString, isDate, isDesignReviewStatus } from '../utils/validation.utils';
+import DesignReviewsController from '../controllers/design-reviews.controllers';
+import { validateInputs } from '../utils/utils';
+const designReviewsRouter = express.Router();
+
+designReviewsRouter.get('/', DesignReviewsController.getAllDesignReviews);
+
+designReviewsRouter.delete('/:designReviewId/delete', DesignReviewsController.deleteDesignReview);
+designReviewsRouter.get('/:designReviewId', DesignReviewsController.getSingleDesignReview);
+
+designReviewsRouter.post(
+  '/create',
+  isDate(body('dateScheduled')),
+  nonEmptyString(body('teamTypeId')),
+  body('requiredMemberIds').isArray(),
+  intMinZero(body('requiredMemberIds.*')),
+  body('optionalMemberIds').isArray(),
+  intMinZero(body('optionalMemberIds.*')),
+  nonEmptyString(body('location').optional()),
+  body('isOnline').isBoolean(),
+  body('isInPerson').isBoolean(),
+  nonEmptyString(body('zoomLink').optional()),
+  nonEmptyString(body('docTemplateLink')).optional(),
+  body('wbsNum'),
+  body('meetingTimes').isArray(),
+  intMinZero(body('meetingTimes.*')),
+  validateInputs,
+  DesignReviewsController.createDesignReview
+);
+
+designReviewsRouter.post(
+  '/:designReviewId/edit',
+  isDate(body('dateScheduled')),
+  nonEmptyString(body('teamTypeId')),
+  body('requiredMembersIds').isArray(),
+  intMinZero(body('requiredMembersIds.*')),
+  body('optionalMembersIds').isArray(),
+  intMinZero(body('optionalMembersIds.*')),
+  body('isOnline').isBoolean(),
+  body('isInPerson').isBoolean(),
+  nonEmptyString(body('zoomLink')).isURL().optional(),
+  nonEmptyString(body('location')).optional(),
+  nonEmptyString(body('docTemplateLink')).isURL().optional(),
+  isDesignReviewStatus(body('status')),
+  body('attendees').isArray(),
+  intMinZero(body('attendees.*')),
+  body('meetingTimes').isArray(),
+  intMinZero(body('meetingTimes.*')),
+  validateInputs,
+  DesignReviewsController.editDesignReviews
+);
+
+export default designReviewsRouter;

src/backend/src/routes/design-review.routes.ts

@@ -3,7 +3,7 @@ import express from 'express';
 import { body } from 'express-validator';
 import UsersController from '../controllers/users.controllers';
 import { validateInputs } from '../utils/utils';
-import { isRole, nonEmptyString } from '../utils/validation.utils';
+import { isRole, nonEmptyString, intMinZero } from '../utils/validation.utils';
 
 const userRouter = express.Router();
 
@@ -32,6 +32,18 @@ userRouter.post(
   nonEmptyString(body('phoneNumber')),
   UsersController.setUserSecureSettings
 );
+
+userRouter.post(
+  '/schedule-settings/set',
+  nonEmptyString(body('personalGmail')).isEmail(),
+  nonEmptyString(body('personalZoomLink')).isURL(),
+  body('availability').isArray(),
+  intMinZero(body('availibility.*')),
+  validateInputs,
+  UsersController.setUserScheduleSettings
+);
+
 userRouter.get('/:userId/secure-settings', UsersController.getUserSecureSettings);
 userRouter.get('/:userId/schedule-settings', UsersController.getUserScheduleSettings);
+
 export default userRouter;

src/backend/src/routes/design-reviews.routes.ts

@@ -1,18 +1,20 @@
-import { DesignReview, WbsNumber, isAdmin, isLeadership } from 'shared';
+import { Design_Review_Status, User } from '@prisma/client';
+import { DesignReview, WbsNumber, isAdmin, isLeadership, isNotLeadership } from 'shared';
 import prisma from '../prisma/prisma';
 import {
-  AccessDeniedAdminOnlyException,
-  DeletedException,
   NotFoundException,
+  AccessDeniedMemberException,
+  DeletedException,
   HttpException,
+  AccessDeniedAdminOnlyException,
   AccessDeniedException
 } from '../utils/errors.utils';
-import { User, Design_Review_Status } from '@prisma/client';
-import designReviewQueryArgs from '../prisma-query-args/design-review.query-args';
-import { designReviewTransformer } from '../transformers/design-review.transformer';
+import { getUsers, getPrismaQueryUserIds } from '../utils/users.utils';
+import { validateMeetingTimes } from '../utils/design-reviews.utils';
+import designReviewQueryArgs from '../prisma-query-args/design-reviews.query-args';
+import { designReviewTransformer } from '../transformers/design-reviews.transformer';
 import { sendSlackDesignReviewNotification } from '../utils/slack.utils';
-
-export default class DesignReviewService {
+export default class DesignReviewsService {
   /**
    * Gets all design reviews in the database
    * @returns All of the design reviews
@@ -207,4 +209,111 @@ export default class DesignReviewService {
 
     return designReviewTransformer(designReview);
   }
+
+  /**
+   * Edits a Design_Review in the database
+   * @param user the user editing the design review (must be leadership)
+   * @param designReviewId the id of the design review to edit
+   * @param dateScheduled the date of the design review
+   * @param teamTypeId the team that the design_review is for (software, electrical, etc.)
+   * @param requiredMembersIds required members Ids for the design review
+   * @param optionalMembersIds optional members Ids for the design review
+   * @param isOnline is the design review online (IF TRUE: zoom link should be requried))
+   * @param isInPerson is the design review in person (IF TRUE: location should be required)
+   * @param zoomLink the zoom link for the design review meeting
+   * @param location the location for the design review meeting
+   * @param docTemplateLink the document template link for the design review
+   * @param status see Design_Review_Status enum
+   * @param attendees the attendees for the design review (should they have any relation to the other shit / can't edit this after STATUS: DONE)
+   * @param meetingTimes meeting time must be between 0-83 (Monday 12am - Sunday 12am, 1hr minute increments)
+   */
+
+  static async editDesignReview(
+    user: User,
+    designReviewId: string,
+    dateScheduled: Date,
+    teamTypeId: string,
+    requiredMembersIds: number[],
+    optionalMembersIds: number[],
+    isOnline: boolean,
+    isInPerson: boolean,
+    zoomLink: string | null,
+    location: string | null,
+    docTemplateLink: string | null,
+    status: Design_Review_Status,
+    attendees: number[],
+    meetingTimes: number[]
+  ): Promise<DesignReview> {
+    // verify user is allowed to edit work package
+    if (isNotLeadership(user.role)) throw new AccessDeniedMemberException('edit design reviews');
+
+    // make sure the requiredMembersIds are not in the optionalMembers
+    if (requiredMembersIds.length > 0 && requiredMembersIds.some((rMemberId) => optionalMembersIds.includes(rMemberId))) {
+      throw new HttpException(400, 'required members cannot be in optional members');
+    }
+
+    // make sure there is a zoom link if the design review is online
+    if (isOnline && zoomLink === null) {
+      throw new HttpException(400, 'zoom link is required for online design reviews');
+    }
+    // make sure there is a location if the design review is in person
+    if (isInPerson && location === null) {
+      throw new HttpException(400, 'location is required for in person design reviews');
+    }
+
+    // throws if meeting times are not: consecutive and between 0-83
+    meetingTimes = validateMeetingTimes(meetingTimes);
+
+    // docTemplateLink is required if the status is scheduled or done
+    if (status === Design_Review_Status.SCHEDULED || status === Design_Review_Status.DONE) {
+      if (docTemplateLink == null) {
+        throw new HttpException(400, 'doc template link is required for scheduled and done design reviews');
+      }
+    }
+    // validate the design review exists and is not deleted
+    const originaldesignReview = await prisma.design_Review.findUnique({
+      where: { designReviewId }
+    });
+    if (!originaldesignReview) throw new NotFoundException('Design Review', designReviewId);
+    if (originaldesignReview.dateDeleted) throw new DeletedException('Design Review', designReviewId);
+
+    // validate the teamTypeId exists
+    const teamType = await prisma.teamType.findUnique({
+      where: { teamTypeId }
+    });
+    if (!teamType) throw new NotFoundException('Team Type', teamTypeId);
+
+    // throw if a user isn't found, then build prisma queries for connecting userIds
+    const updatedRequiredMembers = getPrismaQueryUserIds(await getUsers(requiredMembersIds));
+    const updatedOptionalMembers = getPrismaQueryUserIds(await getUsers(optionalMembersIds));
+    const updatedAttendees = getPrismaQueryUserIds(await getUsers(attendees));
+
+    // actually try to update the design review
+    const updateDesignReview = await prisma.design_Review.update({
+      where: { designReviewId },
+      ...designReviewQueryArgs,
+      data: {
+        designReviewId,
+        dateScheduled,
+        meetingTimes,
+        status,
+        teamTypeId,
+        requiredMembers: {
+          set: updatedRequiredMembers
+        },
+        optionalMembers: {
+          set: updatedOptionalMembers
+        },
+        location,
+        isOnline,
+        isInPerson,
+        zoomLink,
+        docTemplateLink,
+        attendees: {
+          set: updatedAttendees
+        }
+      }
+    });
+    return designReviewTransformer(updateDesignReview);
+  }
 }