Optional Zoom and Gmail Links

Author: Peyton-McKee

src/backend/src/routes/users.routes.ts

@@ -34,8 +34,8 @@ userRouter.post(
 
 userRouter.post(
   '/schedule-settings/set',
-  nonEmptyString(body('personalGmail')).isEmail(),
-  nonEmptyString(body('personalZoomLink')).isURL(),
+  body('personalGmail').isString(),
+  body('personalZoomLink').isString(),
   body('availability').isArray(),
   intMinZero(body('availibility.*')),
   validateInputs,

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

@@ -506,12 +506,14 @@ export default class UsersService {
     personalZoomLink: string,
     availability: number[]
   ): Promise<UserScheduleSettings> {
-    const existingUser = await prisma.schedule_Settings.findFirst({
-      where: { personalGmail, userId: { not: user.userId } } // excludes the current user from check
-    });
+    if (personalGmail !== '') {
+      const existingUser = await prisma.schedule_Settings.findFirst({
+        where: { personalGmail, userId: { not: user.userId } } // excludes the current user from check
+      });
 
-    if (existingUser) {
-      throw new HttpException(400, 'Email already in use');
+      if (existingUser) {
+        throw new HttpException(400, 'Email already in use');
+      }
     }
 
     const newUserScheduleSettings = await prisma.schedule_Settings.upsert({

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

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

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

@@ -13,6 +13,7 @@ import AvailabilityEditModal from './Availability/AvailabilityEditModal';
 import { useState } from 'react';
 import { SetUserScheduleSettingsArgs } from 'shared';
 import ExternalLink from '../../../components/ExternalLink';
+import { useToast } from '../../../hooks/toasts.hooks';
 
 interface UserScheduleSettingsEditProps {
   onSubmit: (data: ScheduleSettingsPayload) => Promise<void>;
@@ -21,17 +22,19 @@ interface UserScheduleSettingsEditProps {
 
 const schema = yup.object().shape({
   personalGmail: yup.string().email('Must be an email address').optional(),
-  personalZoomLink: yup
-    .string()
-    .optional()
-    .test('zoom-link', 'Must be a valid zoom link', (value) => value!.includes('zoom.us/'))
+  personalZoomLink: yup.string().optional()
 });
 
 const UserScheduleSettingsEdit: React.FC<UserScheduleSettingsEditProps> = ({ onSubmit, defaultValues }) => {
   const [editAvailabilityOpen, setEditAvailability] = useState(false);
   const [availabilities, setAvailabilities] = useState<number[]>(defaultValues?.availability || []);
+  const toast = useToast();
 
   const onFormSubmit = (data: ScheduleSettingsFormInput) => {
+    if (data.personalZoomLink !== '' && !data.personalZoomLink.startsWith('https://zoom.us/j/')) {
+      toast.error('Invalid Zoom Link Format. Must start with "https://zoom.us/j/"');
+      return;
+    }
     onSubmit({ availability: availabilities, ...data });
   };
 
@@ -66,10 +69,8 @@ const UserScheduleSettingsEdit: React.FC<UserScheduleSettingsEditProps> = ({ onS
             <Controller
               name="personalGmail"
               control={control}
-              rules={{ required: true }}
               render={({ field: { onChange, value } }) => (
                 <TextField
-                  required
                   id="email-input"
                   autoComplete="off"
                   onChange={onChange}
@@ -93,10 +94,8 @@ const UserScheduleSettingsEdit: React.FC<UserScheduleSettingsEditProps> = ({ onS
             <Controller
               name="personalZoomLink"
               control={control}
-              rules={{ required: true }}
               render={({ field: { onChange, value } }) => (
                 <TextField
-                  required
                   id="zoom-link-input"
                   autoComplete="off"
                   onChange={onChange}

src/frontend/vite.config.js

@@ -17,5 +17,6 @@ export default defineConfig({
     globals: true,
     environment: 'jsdom',
     setupFiles: 'src/tests/setup-tests.ts'
-  }
+  },
+  optimizeDeps: { exclude: ['@shared'] },
 });

src/shared/src/date-utils.ts

@@ -64,6 +64,12 @@ const isWithinSameWeek = (date1: Date, date2: Date): boolean => {
 };
 
 const getMostRecentAvailability = (availabilities: Availability[]): Availability => {
+  if (availabilities.length === 0)
+    return {
+      availability: [],
+      dateSet: new Date()
+    };
+  console.log(availabilities);
   return availabilities.reduce((prev, current) => (prev.dateSet > current.dateSet ? prev : current));
 };