#2136 - pretty much done

Author: RChandler234

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

@@ -69,7 +69,7 @@ export default class DesignReviewsController {
     try {
       const {
         dateScheduled,
-        teamType,
+        teamTypeId,
         requiredMembersIds,
         optionalMembersIds,
         isOnline,
@@ -91,7 +91,7 @@ export default class DesignReviewsController {
         user,
         designReviewId,
         dateScheduled,
-        teamType.teamTypeId,
+        teamTypeId,
         requiredMembersIds,
         optionalMembersIds,
         isOnline,

src/backend/src/services/users.services.ts

@@ -10,7 +10,8 @@ import {
   RoleEnum,
   isHead,
   UserSecureSettings,
-  UserScheduleSettings
+  UserScheduleSettings,
+  UserWithScheduleSettings
 } from 'shared';
 import authUserQueryArgs from '../prisma-query-args/auth-user.query-args';
 import prisma from '../prisma/prisma';
@@ -23,17 +24,22 @@ import projectQueryArgs from '../prisma-query-args/projects.query-args';
 import userSecureSettingsTransformer from '../transformers/user-secure-settings.transformer';
 import { validateUserIsPartOfFinanceTeam } from '../utils/reimbursement-requests.utils';
 import userScheduleSettingsTransformer from '../transformers/user-schedule-settings.transformer';
+import userWithScheduleSettingsTransformer from '../transformers/designReviewUser.transformer';
 
 export default class UsersService {
   /**
    * Gets all of the users from the database
    * @returns a list of all the users
    */
-  static async getAllUsers(): Promise<User[]> {
-    const users = await prisma.user.findMany();
+  static async getAllUsers(): Promise<UserWithScheduleSettings[]> {
+    const users = await prisma.user.findMany({
+      include: {
+        drScheduleSettings: true
+      }
+    });
     users.sort((a, b) => a.firstName.localeCompare(b.firstName));
 
-    return users.map(userTransformer);
+    return users.map(userWithScheduleSettingsTransformer);
   }
 
   /**

src/frontend/src/hooks/design-reviews.hooks.ts

@@ -56,9 +56,9 @@ export interface EditDesignReviewPayload {
   optionalMembersIds: number[];
   isOnline: boolean;
   isInPerson: boolean;
-  zoomLink: string | null;
-  location: string | null;
-  docTemplateLink: string | null;
+  zoomLink?: string;
+  location?: string;
+  docTemplateLink?: string;
   status: DesignReviewStatus;
   attendees: number[];
   meetingTimes: number[];

src/frontend/src/hooks/users.hooks.ts

@@ -26,7 +26,8 @@ import {
   UpdateUserRolePayload,
   Project,
   UserSecureSettings,
-  UserScheduleSettings
+  UserScheduleSettings,
+  UserWithScheduleSettings
 } from 'shared';
 import { useAuth } from './auth.hooks';
 import { useContext } from 'react';
@@ -45,7 +46,7 @@ export const useCurrentUser = (): AuthenticatedUser => {
  * Custom React Hook to supply all users.
  */
 export const useAllUsers = () => {
-  return useQuery<User[], Error>(['users'], async () => {
+  return useQuery<UserWithScheduleSettings[], Error>(['users'], async () => {
     const { data } = await getAllUsers();
     return data;
   });

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

@@ -47,9 +47,7 @@ const CalendarPage = () => {
 
   confirmedDesignReviews.forEach((designReview) => {
     // Accessing the date actually converts it to local time, which causes the date to be off. This is a workaround.
-    const date = datePipe(
-      new Date(designReview.dateScheduled.getTime() - designReview.dateScheduled.getTimezoneOffset() * -60000)
-    );
+    const date = datePipe(designReview.dateScheduled);
     if (eventDict.has(date)) {
       eventDict.get(date)?.push(designReview);
     } else {
@@ -134,10 +132,7 @@ const CalendarPage = () => {
                       ) : (
                         <CalendarDayCard
                           cardDate={cardDate}
-                          events={
-                            eventDict.get(datePipe(new Date(cardDate.getTime() - cardDate.getTimezoneOffset() * -60000))) ??
-                            []
-                          }
+                          events={eventDict.get(datePipe(cardDate)) ?? []}
                           teamTypes={allTeamTypes}
                         />
                       )}

src/frontend/src/pages/CalendarPage/DesignReviewCreateModal.tsx

@@ -83,7 +83,7 @@ export const DesignReviewCreateModal: React.FC<DesignReviewCreateModalProps> = (
   const onSubmit = async (data: CreateDesignReviewFormInput) => {
     const day = data.date.getDay();
     const times = [];
-    for (let i = day * 12 + data.startTime; i <= day * 12 + data.endTime; i++) {
+    for (let i = day * 12 + data.startTime; i < day * 12 + data.endTime; i++) {
       times.push(i);
     }
     try {

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

@@ -1,27 +1,26 @@
 import { Grid } from '@mui/material';
-import { DesignReview, User } from 'shared';
+import { DesignReview, DesignReviewStatus, User, UserWithScheduleSettings } from 'shared';
 import { useState } from 'react';
 import AvailabilityScheduleView from './AvailabilityScheduleView';
 import UserAvailabilites from './UserAvailabilitesView';
 import { getWeekDateRange } from '../../../utils/design-review.utils';
 import { dateRangePipe } from '../../../utils/pipes';
+import { DesignReviewEditData } from './DesignReviewDetailPage';
 
 interface AvailabilityViewProps {
-  usersToAvailabilities: Map<User, number[]>;
   designReview: DesignReview;
-  selectedDate: Date;
   allDesignReviews: DesignReview[];
+  allUsers: UserWithScheduleSettings[];
+  editPayload: DesignReviewEditData;
 }
 
-const AvailabilityView: React.FC<AvailabilityViewProps> = ({
-  usersToAvailabilities,
-  designReview,
-  selectedDate,
-  allDesignReviews
-}) => {
+const AvailabilityView: React.FC<AvailabilityViewProps> = ({ designReview, allDesignReviews, allUsers, editPayload }) => {
   const availableUsers = new Map<number, User[]>();
   const unavailableUsers = new Map<number, User[]>();
   const existingMeetingData = new Map<number, string>();
+  const usersToAvailabilities = new Map<User, number[]>();
+
+  const { selectedDate, requiredUserIds, optionalUserIds } = editPayload;
 
   const [currentAvailableUsers, setCurrentAvailableUsers] = useState<User[]>([]);
   const [currentUnavailableUsers, setCurrentUnavailableUsers] = useState<User[]>([]);
@@ -35,19 +34,33 @@ const AvailabilityView: React.FC<AvailabilityViewProps> = ({
     return drDate >= startRange && drDate <= endRange;
   });
 
-  const conflictingDesignReviews = allDesignReviews.filter(
-    (currDr) =>
-      currDr.dateScheduled.toLocaleDateString() === selectedDate.toLocaleDateString() &&
-      allDesignReviews.some((designReview) =>
-        designReview.meetingTimes.some((time) => currDr.meetingTimes.includes(time))
-      ) &&
+  const conflictingDesignReviews = allDesignReviews.filter((currDr) => {
+    const day = editPayload.selectedDate.getDay();
+    const times = [];
+    for (let i = day * 12 + editPayload.startTime; i <= day * 12 + editPayload.endTime; i++) {
+      times.push(i);
+    }
+    const cleanDate = new Date(currDr.dateScheduled.getTime() - currDr.dateScheduled.getTimezoneOffset() * -60000);
+    return (
+      currDr.status === DesignReviewStatus.SCHEDULED &&
+      cleanDate.toLocaleDateString() === selectedDate.toLocaleDateString() &&
+      times.some((time) => currDr.meetingTimes.includes(time)) &&
       currDr.designReviewId !== designReview.designReviewId
-  );
+    );
+  });
 
   currentWeekDesignReviews.forEach((designReview) =>
-    designReview.meetingTimes.forEach((meetingTime) => existingMeetingData.set(meetingTime, 'build'))
+    designReview.meetingTimes.forEach((meetingTime) => {
+      if (designReview.status === DesignReviewStatus.SCHEDULED) existingMeetingData.set(meetingTime, 'build');
+    })
   );
 
+  allUsers
+    .filter((user) => requiredUserIds.concat(optionalUserIds).includes(user.userId))
+    .forEach((user: UserWithScheduleSettings) => {
+      usersToAvailabilities.set(user, user.scheduleSettings?.availability ?? []);
+    });
+
   return (
     <Grid container>
       <Grid item xs={9}>
@@ -67,8 +80,8 @@ const AvailabilityView: React.FC<AvailabilityViewProps> = ({
           currentUnavailableUsers={currentUnavailableUsers}
           usersToAvailabilities={usersToAvailabilities}
           designReview={designReview}
-          selectedDate={selectedDate}
           conflictingDesignReviews={conflictingDesignReviews}
+          editPayload={editPayload}
         />
       </Grid>
     </Grid>