note 2 self: switch all to /users, make /organization, investigate availability, rr

Author: walker-sean

src/backend/src/controllers/reimbursement-requests.controllers.ts

@@ -274,13 +274,16 @@ export default class ReimbursementRequestsController {
   }
 
   static async getAllReimbursementRequests(req: Request, res: Response, next: NextFunction) {
+    console.log('here');
     try {
       const reimbursementRequests: ReimbursementRequest[] = await ReimbursementRequestService.getAllReimbursementRequests(
         req.currentUser,
         req.organization
       );
+      console.log(reimbursementRequests);
       res.status(200).json(reimbursementRequests);
     } catch (error: unknown) {
+      console.error(error);
       next(error);
     }
   }

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

@@ -5,20 +5,13 @@ import { Task } from 'shared';
 export default class UsersController {
   static async getAllUsers(req: Request, res: Response, next: NextFunction) {
     try {
-      const users = await UsersService.getAllUsers(req.organization.organizationId);
-
-      res.status(200).json(users);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
-
-  static async getAllOrganizationUsers(req: Request, res: Response, next: NextFunction) {
-    try {
-      const users = await UsersService.getAllUsers(req.organization.organizationId);
-
+      const allOrgs = req.query.allOrgs === 'true';
+      const users = allOrgs
+        ? await UsersService.getAllUsers()
+        : await UsersService.getAllUsers(req.organization.organizationId);
       res.status(200).json(users);
     } catch (error: unknown) {
+      console.error(error);
       next(error);
     }
   }

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

@@ -1,13 +1,19 @@
 import { Theme } from '@prisma/client';
 import express from 'express';
-import { body } from 'express-validator';
+import { body, query } from 'express-validator';
 import UsersController from '../controllers/users.controllers';
 import { isRole, nonEmptyString, intMinZero, validateInputs, isDate } from '../utils/validation.utils';
 
 const userRouter = express.Router();
 
-userRouter.get('/', UsersController.getAllUsers);
-userRouter.post('/scheduleSettings', nonEmptyString(body('userIds.*')), UsersController.getManyUsersWithScheduleSettings);
+userRouter.get('/all', query('allOrgs').isBoolean().optional(), validateInputs, UsersController.getAllUsers);
+userRouter.post(
+  '/scheduleSettings',
+  body('userIds').isArray(),
+  nonEmptyString(body('userIds.*')),
+  validateInputs,
+  UsersController.getManyUsersWithScheduleSettings
+);
 userRouter.get('/:userId', UsersController.getSingleUser);
 userRouter.get('/:userId/settings', UsersController.getUserSettings);
 userRouter.get('/secure-settings/current-user', UsersController.getCurrentUserSecureSettings);

src/backend/src/services/reimbursement-requests.services.ts

@@ -896,6 +896,7 @@ export default class ReimbursementRequestService {
    * @returns an array of the prisma version of the reimbursement requests transformed to the shared version
    */
   static async getAllReimbursementRequests(user: User, organization: Organization): Promise<ReimbursementRequest[]> {
+    console.log(organization.organizationId);
     await isUserHeadOrOnFinance(user, organization.organizationId);
 
     const reimbursementRequests = await prisma.reimbursement_Request.findMany({

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

@@ -36,18 +36,20 @@ export default class UsersService {
    * @param organizationId the id of the organization to get the users for
    * @returns a list of all the users
    */
-  static async getAllUsers(organizationId: string): Promise<User[]> {
+  static async getAllUsers(organizationId?: string): Promise<User[]> {
     const users = await prisma.user.findMany({
-      where: organizationId
-        ? {
-            organizations: {
-              some: {
-                organizationId
-              }
+      ...(organizationId ? { where: { organizations: { some: { organizationId } } } } : {}),
+      ...(organizationId
+        ? getUserQueryArgs(organizationId)
+        : {
+            select: {
+              roles: true,
+              userId: true,
+              firstName: true,
+              lastName: true,
+              email: true
             }
-          }
-        : {},
-      ...getUserQueryArgs(organizationId)
+          })
     });
 
     users.sort((a, b) => a.firstName.localeCompare(b.firstName));

src/backend/src/utils/auth.utils.ts

@@ -64,7 +64,7 @@ export const requireJwtDev = (req: Request, res: Response, next: NextFunction) =
     req.path === '/users/auth/login/dev' || // logins dont have cookies yet
     req.path === '/' || // base route is available so aws can listen and check the health
     req.method === 'OPTIONS' || // this is a pre-flight request and those don't send cookies
-    req.path === '/users' || // dev login needs the list of users to log in
+    req.path === '/users/all' || // dev login needs the list of users to log in
     req.path === '/slack' // slack http endpoint is only used from slack api
   ) {
     next();
@@ -184,7 +184,7 @@ export const getUserAndOrganization = async (req: Request, res: Response, next:
     req.path === '/users/auth/login/dev' ||
     req.path === '/' || // base route is available so aws can listen and check the health
     req.method === 'OPTIONS' || // this is a pre-flight request and those don't send cookies
-    req.path === '/users' || // dev login needs the list of users to log in
+    req.path === '/users/all?allOrgs=true' || // dev login needs the list of users to log in
     req.path === '/slack' || // slack http endpoint is only used from slack api
     req.path.startsWith('/notifications') // Notifications route has its own auth, only called from gh
   ) {

src/frontend/src/apis/users.api.ts

@@ -28,8 +28,10 @@ import { taskTransformer } from './transformers/tasks.transformers';
 /**
  * Fetches all users.
  */
-export const getAllUsers = () => {
-  return axios.get<UserWithRole[]>(apiUrls.users());
+export const getAllUsers = (allOrgs?: boolean) => {
+  return axios.get<UserWithRole[]>(apiUrls.allUsers(allOrgs), {
+    transformResponse: (data) => JSON.parse(data).map(userTransformer)
+  });
 };
 
 /**

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

@@ -53,9 +53,9 @@ export const useCurrentUser = (): AuthenticatedUser => {
 /**
  * Custom React Hook to supply all users.
  */
-export const useAllUsers = () => {
-  return useQuery<UserWithRole[], Error>(['users'], async () => {
-    const { data } = await getAllUsers();
+export const useAllUsers = (allOrgs?: boolean) => {
+  return useQuery<UserWithRole[], Error>(['users', allOrgs], async () => {
+    const { data } = await getAllUsers(allOrgs);
     return data;
   });
 };
@@ -276,6 +276,11 @@ export const useManyUserTasks = (userIds: string[]) => {
   });
 };
 
+/**
+ * Custom react hook to get the users with their schedule settings for all users in the list
+ * @param userIds ids of users to get schedule settings from
+ * @returns users with their schedule settings
+ */
 export const useManyUsersWithScheduleSettings = (userIds: string[]) => {
   return useQuery<UserWithScheduleSettings[], Error>(['users', userIds, 'with-schedule-settings'], async () => {
     const { data } = await getManyUsersWithScheduleSettings(userIds);

src/frontend/src/pages/LoginPage/LoginDev.tsx

@@ -28,7 +28,7 @@ const LoginDev: React.FC<LoginDevProps> = ({ devSetUser, devFormSubmit }) => {
   if (import.meta.env.MODE !== 'development') return <></>;
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const { isLoading, data: usersList } = useAllUsers();
+  const { isLoading, data: usersList } = useAllUsers(true);
 
   if (!usersList || isLoading) return <LoadingIndicator />;
 

src/frontend/src/utils/urls.ts

@@ -14,6 +14,7 @@ const API_URL: string = import.meta.env.VITE_REACT_APP_BACKEND_URL || 'http://lo
 
 /**************** Users Endpoints ****************/
 const users = () => `${API_URL}/users`;
+const allUsers = (allOrgs?: boolean) => `${users()}/all?allOrgs=${allOrgs ? 'true' : 'false'}`;
 const usersById = (id: string) => `${users()}/${id}`;
 const usersLogin = () => `${users()}/auth/login`;
 const usersLoginDev = () => `${users()}/auth/login/dev`;
@@ -433,6 +434,7 @@ const version = () => `https://api.github.com/repos/Northeastern-Electric-Racing
 
 export const apiUrls = {
   users,
+  allUsers,
   usersById,
   usersLogin,
   usersLoginDev,