1998-Added info to service and added json datat return

Author: caiodasilva2005

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

@@ -151,9 +151,14 @@ export default class UsersController {
       const { personalGmail, personalZoomLink, availability } = req.body;
       const user = await getCurrentUser(res);
 
-      await UsersService.setUserScheduleSettings(user, personalGmail, personalZoomLink, availability);
-
-      res.status(200).json({ message: `Successfully updated schedule settings for user ${user.userId}.` });
+      const editedScheduleSettings = await UsersService.setUserScheduleSettings(
+        user,
+        personalGmail,
+        personalZoomLink,
+        availability
+      );
+
+      return res.status(200).json(editedScheduleSettings);
     } catch (error: unknown) {
       next(error);
     }

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

@@ -32,14 +32,17 @@ userRouter.post(
   nonEmptyString(body('phoneNumber')),
   UsersController.setUserSecureSettings
 );
+
 userRouter.post(
   '/schedule-settings/set',
-  nonEmptyString(body('personalGmail')),
-  nonEmptyString(body('personalZoomLink')),
+  nonEmptyString(body('personalGmail')).isEmail(),
+  nonEmptyString(body('personalZoomLink')).isURL(),
   body('availability').isArray(),
   intMinZero(body('availibility.*')),
+  validateInputs,
   UsersController.setUserScheduleSettings
 );
+
 userRouter.get('/:userId/secure-settings', UsersController.getUserSecureSettings);
 
 export default userRouter;

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

@@ -340,12 +340,28 @@ export default class UsersService {
     return userScheduleSettingsTransformer(scheduleSettings);
   }
 
+  /**
+   *
+   * @param user the user to set the schedule settings for
+   * @param personalGmail the user's personal gmail
+   * @param personalZoomLink the user's personal zoom link
+   * @param availability the user's availibility
+   * @returns the id of the user's schedule settings
+   */
   static async setUserScheduleSettings(
     user: User,
     personalGmail: string,
     personalZoomLink: string,
     availability: number[]
   ): Promise<string> {
+    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');
+    }
+
     const newUserScheduleSettings = await prisma.schedule_Settings.upsert({
       where: { userId: user.userId },
       update: {

src/backend/tests/users.test.ts

@@ -175,5 +175,17 @@ describe('Users', () => {
 
       expect(res).toBe(batmanUserScheduleSettings.drScheduleSettingsId);
     });
+
+    test('setting same email does not work', async () => {
+      vi.spyOn(prisma.schedule_Settings, 'findFirst').mockResolvedValue(batmanScheduleSettings);
+      await expect(() =>
+        UsersService.setUserScheduleSettings(
+          batmanWithScheduleSettings,
+          batmanScheduleSettings.personalGmail,
+          batmanScheduleSettings.personalZoomLink,
+          batmanScheduleSettings.availability
+        )
+      ).rejects.toThrow(new HttpException(400, 'Email already in use'));
+    });
   });
 });