Merge branch 'develop' of https://github.com/Northeastern-Electric-Racing/FinishLine into #2063-use-all-design-reviews-hook

Author: walker-sean

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');

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

@@ -0,0 +1,119 @@
+import { NextFunction, Request, Response } from 'express';
+import DesignReviewsService from '../services/design-reviews.services';
+import { getCurrentUser } from '../utils/auth.utils';
+import { User } from '@prisma/client';
+
+export default class DesignReviewsController {
+  static async getAllDesignReviews(_req: Request, res: Response, next: NextFunction) {
+    try {
+      const designReviews = await DesignReviewsService.getAllDesignReviews();
+      return res.status(200).json(designReviews);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async deleteDesignReview(req: Request, res: Response, next: NextFunction) {
+    try {
+      const drId: string = req.params.designReviewId;
+      const user: User = await getCurrentUser(res);
+      const deletedDesignReview = await DesignReviewsService.deleteDesignReview(user, drId);
+      return res.status(200).json(deletedDesignReview);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async createDesignReview(req: Request, res: Response, next: NextFunction) {
+    try {
+      const submitter: User = await getCurrentUser(res);
+      const {
+        dateScheduled,
+        teamTypeId,
+        requiredMemberIds,
+        optionalMemberIds,
+        location,
+        isOnline,
+        isInPerson,
+        zoomLink,
+        docTemplateLink,
+        wbsNum,
+        meetingTimes
+      } = req.body;
+
+      const createdDesignReview = await DesignReviewsService.createDesignReview(
+        submitter,
+        dateScheduled,
+        teamTypeId,
+        requiredMemberIds,
+        optionalMemberIds,
+        isOnline,
+        isInPerson,
+        docTemplateLink,
+        wbsNum,
+        meetingTimes,
+        zoomLink,
+        location
+      );
+      return res.status(200).json(createdDesignReview);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getSingleDesignReview(req: Request, res: Response, next: NextFunction) {
+    try {
+      const drId: string = req.params.designReviewId;
+      const user: User = await getCurrentUser(res);
+      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/design-reviews.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);

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

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `iconName` to the `TeamType` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "TeamType" ADD COLUMN     "iconName" TEXT NOT NULL;

…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

@@ -590,13 +590,14 @@ enum Design_Review_Status {
 model TeamType {
   teamTypeId     String          @id @default(uuid())
   name           String          @unique
+  iconName       String
   Design_Reviews Design_Review[]
 }
 
 model Design_Review {
   designReviewId   String               @id @default(uuid())
   dateScheduled    DateTime             @db.Date
-  // Meeting times are an integer between 0 and 48 representing time after 9am in 15 minute increments, eg. 0 = 9:00am, 5 = 10:15 am
+  // Meeting times are an integer between 0 and 83 representing time after 9am in 15 minute increments, eg. 0 = 9:00am, 5 = 10:15 am
   meetingTimes     Int[]
   dateCreated      DateTime             @default(now()) @db.Timestamp(3)
   userCreated      User                 @relation(fields: [userCreatedId], references: [userId], name: "designReviewCreator")

src/backend/src/prisma/migrations/20240313041159_add_iconname_to_teamtype/migration.sql

@@ -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/prisma/schema.prisma

@@ -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;