1998- Set user schedule settings now returns all updated settings and small fixes

Author: caiodasilva2005

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

@@ -151,14 +151,14 @@ export default class UsersController {
       const { personalGmail, personalZoomLink, availability } = req.body;
       const user = await getCurrentUser(res);
 
-      const editedScheduleSettings = await UsersService.setUserScheduleSettings(
+      const updatedScheduleSettings = await UsersService.setUserScheduleSettings(
         user,
         personalGmail,
         personalZoomLink,
         availability
       );
 
-      return res.status(200).json(editedScheduleSettings);
+      return res.status(200).json(updatedScheduleSettings);
     } catch (error: unknown) {
       next(error);
     }

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

@@ -44,5 +44,6 @@ userRouter.post(
 );
 
 userRouter.get('/:userId/secure-settings', UsersController.getUserSecureSettings);
+userRouter.get('/:userId/schedule-settings', UsersController.getUserScheduleSettings);
 
 export default userRouter;

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

@@ -1,4 +1,4 @@
-import { User_Settings, User as PrismaUser } from '@prisma/client';
+import { User_Settings, User as PrismaUser, Schedule_Settings } from '@prisma/client';
 import { OAuth2Client } from 'google-auth-library/build/src/auth/oauth2client';
 import {
   AuthenticatedUser,
@@ -353,7 +353,7 @@ export default class UsersService {
     personalGmail: string,
     personalZoomLink: string,
     availability: number[]
-  ): Promise<string> {
+  ): Promise<Schedule_Settings> {
     const existingUser = await prisma.schedule_Settings.findFirst({
       where: { personalGmail, userId: { not: user.userId } } // excludes the current user from check
     });
@@ -376,6 +376,6 @@ export default class UsersService {
         availability
       }
     });
-    return newUserScheduleSettings.drScheduleSettingsId;
+    return newUserScheduleSettings;
   }
 }

src/backend/tests/users.test.ts

@@ -173,7 +173,7 @@ describe('Users', () => {
       vi.spyOn(prisma.schedule_Settings, 'upsert').mockResolvedValue(batmanScheduleSettings);
       const res = await UsersService.setUserScheduleSettings(batman, 'batman@gmail.com', 'https://zoom.com', [1, 2]);
 
-      expect(res).toBe(batmanUserScheduleSettings.drScheduleSettingsId);
+      expect(res).toBe(batmanScheduleSettings);
     });
 
     test('setting same email does not work', async () => {