#2136 fixed tests

Author: Aaryan1203

src/backend/tests/design-reviews.test.ts

@@ -178,7 +178,7 @@ describe('Design Reviews', () => {
 
       await expect(() =>
         DesignReviewsService.editDesignReview(
-          batman,
+          batman, 
           designReview1.designReviewId,
           designReview1.dateScheduled,
           designReview1.teamTypeId,

src/backend/tests/test-data/design-reviews.test-data.ts

@@ -182,11 +182,11 @@ export const prismaDesignReview5: Prisma.Design_ReviewGetPayload<typeof designRe
     {
       ...batman,
       drScheduleSettings: {
-        drScheduleSettingsId: '123',
-        personalGmail: 'batman@gmail.com',
-        personalZoomLink: 'https://zoom.us/j/123456789',
-        availability: [1, 2, 3],
-        userId: 1
+        drScheduleSettingsId: 'bmschedule',
+        personalGmail: 'brucewayne@gmail.com',
+        personalZoomLink: 'https://zoom.us/j/gotham',
+        availability: [],
+        userId: 69
       }
     }
   ],
@@ -213,7 +213,17 @@ export const designReview3: DesignReview = {
   wbsNum: { carNumber: 1, projectNumber: 2, workPackageNumber: 0 },
   requiredMembers: [sharedBatman],
   optionalMembers: [],
-  confirmedMembers: [sharedBatman],
+  confirmedMembers: [
+    {
+      ...sharedBatman,
+      scheduleSettings: {
+        drScheduleSettingsId: '123',
+        personalGmail: 'batman@gmail.com',
+        personalZoomLink: 'https://zoom.us/j/123456789',
+        availability: [1, 2, 3]
+      }
+    }
+  ],
   deniedMembers: [],
   attendees: [sharedBatman],
   userDeleted: undefined,
@@ -231,7 +241,17 @@ export const sharedDesignReview1: SharedDesignReview = {
   isInPerson: false,
   requiredMembers: [sharedBatman],
   optionalMembers: [],
-  confirmedMembers: [sharedBatman],
+  confirmedMembers: [
+    {
+      ...sharedBatman,
+      scheduleSettings: {
+        drScheduleSettingsId: '123',
+        personalGmail: 'batman@gmail.com',
+        personalZoomLink: 'https://zoom.us/j/123456789',
+        availability: [1, 2, 3]
+      }
+    }
+  ],
   deniedMembers: [],
   attendees: [sharedBatman],
   teamType: teamType1,
@@ -251,7 +271,17 @@ export const designReview5: DesignReview = {
   isInPerson: false,
   requiredMembers: [],
   optionalMembers: [wonderwomanMarkedWithScheduleSettings],
-  confirmedMembers: [sharedBatman],
+  confirmedMembers: [
+    {
+      ...sharedBatman,
+      scheduleSettings: {
+        drScheduleSettingsId: 'bmschedule',
+        personalGmail: 'brucewayne@gmail.com',
+        personalZoomLink: 'https://zoom.us/j/gotham',
+        availability: []
+      }
+    }
+  ],
   deniedMembers: [],
   attendees: [wonderwoman],
   wbsName: 'car',

src/frontend/src/pages/CalendarPage/DesignReviewDetailPage/DesignReviewDetailPage.tsx

@@ -41,7 +41,7 @@ const DesignReviewDetailPage: React.FC<DesignReviewDetailPageProps> = ({ designR
   const conflictingDesignReviews = allDesignReviews
     ? allDesignReviews.filter(
         (currDr) =>
-          currDr.dateScheduled.toLocaleDateString() === designReview.dateScheduled.toLocaleDateString() &&
+          currDr.dateScheduled.toLocaleDateString() === selectedStartDateTime.toLocaleDateString() &&
           allDesignReviews.some((designReview) =>
             designReview.meetingTimes.some((time) => currDr.meetingTimes.includes(time))
           ) &&

src/frontend/src/pages/CalendarPage/DesignReviewDetailPage/FinalizeDesignReviewDetailsModal.tsx

@@ -1,11 +1,4 @@
-import {
-  Box,
-  Grid,
-  TextField,
-  ToggleButton,
-  ToggleButtonGroup,
-  Typography
-} from '@mui/material';
+import { Box, Grid, TextField, ToggleButton, ToggleButtonGroup, Typography } from '@mui/material';
 import NERModal from '../../../components/NERModal';
 import { useState } from 'react';
 import { getHourFromDate } from '../../../utils/design-review.utils';
@@ -39,7 +32,9 @@ const FinalizeDesignReviewDetailsModal = ({
     return null;
   }
 
-  const title = `${designReviewName} on ${selectedStartDateTime?.toDateString()} at ${getHourFromDate(selectedStartDateTime)}`;
+  const title = `${designReviewName} on ${selectedStartDateTime?.toDateString()} at ${getHourFromDate(
+    selectedStartDateTime
+  )}`;
 
   const handleMeetingTypeChange = (_event: any, newMeetingType: string[]) => {
     setMeetingType(newMeetingType);

src/shared/src/types/design-review-types.ts

@@ -1,5 +1,5 @@
 import { WbsNumber } from './project-types';
-import { User } from './user-types';
+import { User, UserWithScheduleSettings } from './user-types';
 
 export interface DesignReview {
   designReviewId: string;
@@ -11,7 +11,7 @@ export interface DesignReview {
   teamType: TeamType;
   requiredMembers: User[];
   optionalMembers: User[];
-  confirmedMembers: User[];
+  confirmedMembers: UserWithScheduleSettings[];
   deniedMembers: User[];
   location?: string;
   isOnline: boolean;