Validate Availabilities Working

Author: Peyton-McKee

src/backend/src/utils/users.utils.ts

@@ -123,17 +123,20 @@ export const updateUserAvailability = async (
   const availabilityInSameWeek = userSettings.availabilities.filter((availability) =>
     isWithinSameWeek(availability.dateSet, dateToCheckFor)
   );
+
   if (availabilityInSameWeek.length > 0) {
     await prisma.availability.update({
       where: { availabilityId: availabilityInSameWeek[0].availabilityId },
       data: {
-        availability
+        availability,
+        dateSet: dateToCheckFor
       }
     });
   } else {
     await prisma.availability.create({
       data: {
         availability,
+        dateSet: dateToCheckFor,
         scheduleSettings: {
           connect: {
             userId: submitter.userId

src/frontend/src/pages/SettingsPage/UserScheduleSettings/UserScheduleSettingsView.tsx

@@ -6,10 +6,9 @@
 import { Grid } from '@mui/material';
 import DetailDisplay from '../../../components/DetailDisplay';
 import { NERButton } from '../../../components/NERButton';
-import { DesignReview, getAvailabilityForGivenWeekOfDateOrMostRecent, isWithinSameWeek, UserScheduleSettings } from 'shared';
+import { DesignReview, getAvailabilityForGivenWeekOfDateOrMostRecent, UserScheduleSettings } from 'shared';
 import { useState } from 'react';
 import SingleAvailabilityModal from './Availability/SingleAvailabilityModal';
-import { useCurrentUser } from '../../../hooks/users.hooks';
 import AvailabilityEditModal from './Availability/AvailabilityEditModal';
 import { useMarkUserConfirmed } from '../../../hooks/design-reviews.hooks';
 import { useToast } from '../../../hooks/toasts.hooks';
@@ -21,15 +20,14 @@ const UserScheduleSettingsView = ({
   scheduleSettings: UserScheduleSettings;
   designReview?: DesignReview;
 }) => {
-  let availability = getAvailabilityForGivenWeekOfDateOrMostRecent(
+  const availability = getAvailabilityForGivenWeekOfDateOrMostRecent(
     scheduleSettings.availabilities,
     designReview?.dateScheduled ?? new Date()
   );
 
   const [availabilityOpen, setAvailabilityOpen] = useState(false);
   const toast = useToast();
-  const user = useCurrentUser();
-  const defaultOpen = designReview && !designReview.confirmedMembers.map((user) => user.userId).includes(user.userId);
+  const defaultOpen = designReview !== undefined;
   const [confirmAvailabilityOpen, setConfirmAvailabilityOpen] = useState(defaultOpen || false);
   const [confirmedAvailabilities, setConfirmedAvailabilities] = useState(availability.availability);
   const { mutateAsync } = useMarkUserConfirmed(designReview?.designReviewId || '');

src/shared/src/date-utils.ts

@@ -69,14 +69,14 @@ const getMostRecentAvailability = (availabilities: Availability[]): Availability
       availability: [],
       dateSet: new Date()
     };
-  console.log(availabilities);
+
   return availabilities.reduce((prev, current) => (prev.dateSet > current.dateSet ? prev : current));
 };
 
 const getAvailabilityForGivenWeekOfDateOrMostRecent = (availabilities: Availability[], date: Date): Availability => {
-  const availabilityForWeekOfDesignReview = availabilities.filter((availability) =>
-    isWithinSameWeek(availability.dateSet, date)
-  );
+  const availabilityForWeekOfDesignReview = availabilities.filter((availability) => {
+    return isWithinSameWeek(availability.dateSet, date);
+  });
 
   return availabilityForWeekOfDesignReview.length > 0
     ? availabilityForWeekOfDesignReview[0]