Merge branch 'develop' into #1182-create-team-endpoint

Author: RChandler234

src/backend/src/controllers/teams.controllers.ts

@@ -73,4 +73,16 @@ export default class TeamsController {
       next(error);
     }
   }
+
+  static async setTeamLeads(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { userIds } = req.body;
+      const { teamId } = req.params;
+      const submitter = await getCurrentUser(res);
+      const team = await TeamsService.setTeamLeads(submitter, teamId, userIds);
+      return res.status(200).json(team);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

src/backend/src/prisma/seed.ts

@@ -12,6 +12,7 @@ import {
   Task_Priority,
   Task_Status,
   Team,
+  Vendor,
   WBS_Element_Status
 } from '@prisma/client';
 import { dbSeedAllUsers } from './seed-data/users.seed';
@@ -684,6 +685,10 @@ const performSeed: () => Promise<void> = async () => {
   );
 
   const vendor = await ReimbursementRequestService.createVendor(thomasEmrax, 'Tesla');
+  const vendor2 = await ReimbursementRequestService.createVendor(thomasEmrax, 'Amazon');
+  const vendor3 = await ReimbursementRequestService.createVendor(thomasEmrax, 'Google');
+
+  const vendors: Vendor[] = [vendor, vendor2, vendor3];
 
   const expenseType = await ReimbursementRequestService.createExpenseType(thomasEmrax, 'Equipment', 123, true);
 

src/backend/src/routes/teams.routes.ts

@@ -15,6 +15,13 @@ teamsRouter.post(
   validateInputs,
   TeamsController.setTeamMembers
 );
+teamsRouter.post(
+  '/:teamId/set-leads',
+  body('userIds').isArray(),
+  intMinZero(body('userIds.*')),
+  validateInputs,
+  TeamsController.setTeamLeads
+);
 teamsRouter.post(
   '/:teamId/edit-description',
   body('newDescription').isString(),

src/backend/src/services/teams.services.ts

@@ -217,4 +217,53 @@ export default class TeamsService {
 
     return teamTransformer(createdTeam);
   }
+
+  /*
+   * Update the given teamId's team's leads
+   * @param submitter a user who's making this request
+   * @param teamId a id of team to be updated
+   * @param userIds a array of user Ids that replaces team's old leads
+   * @returns an updated team
+   * @throws if the team is not found, the submitter has no privilege, or any user from the given userIds does not exist
+   */
+  static async setTeamLeads(submitter: User, teamId: string, userIds: number[]): Promise<Team> {
+    const team = await prisma.team.findUnique({
+      where: { teamId },
+      ...teamQueryArgs
+    });
+
+    const newLeads = await getUsers(userIds);
+
+    if (!team) throw new NotFoundException('Team', teamId);
+
+    if (!isAdmin(submitter.role) && submitter.userId !== team.headId) {
+      throw new AccessDeniedException('You must be an admin or the head to update the lead!');
+    }
+
+    if (newLeads.map((lead) => lead.userId).includes(team.headId)) {
+      throw new HttpException(400, 'A lead cannot be the head of the team!');
+    }
+
+    if (team.members.map((member) => member.userId).some((memberId) => userIds.includes(memberId))) {
+      throw new HttpException(400, 'A lead cannot be a member of the team!');
+    }
+
+    const transformedLeads = newLeads.map((lead) => {
+      return {
+        userId: lead.userId
+      };
+    });
+
+    const updateTeam = await prisma.team.update({
+      where: { teamId },
+      data: {
+        leads: {
+          set: transformedLeads
+        }
+      },
+      ...teamQueryArgs
+    });
+
+    return teamTransformer(updateTeam);
+  }
 }

src/backend/src/utils/google-integration.utils.ts

@@ -66,6 +66,18 @@ export const sendMailToAdvisor = async (subject: string, text: string) => {
   }
 };
 
+interface GoogleDriveErrorListError {
+  domain: string;
+  reason: string;
+  message: string;
+}
+
+interface GoogleDriveError {
+  errors: GoogleDriveErrorListError[];
+  code: number;
+  message: string;
+}
+
 //tutorial used to set this up: https://www.labnol.org/google-drive-api-upload-220412
 export const uploadFile = async (fileObject: Express.Multer.File) => {
   const bufferStream = new stream.PassThrough();
@@ -101,7 +113,18 @@ export const uploadFile = async (fileObject: Express.Multer.File) => {
     const { id, name } = response.data;
     return { id, name };
   } catch (error: unknown) {
-    if (error instanceof Error) {
+    if ((error as GoogleDriveError).errors) {
+      const gError = error as GoogleDriveError;
+      throw new HttpException(
+        gError.code,
+        `Failed to Upload Receipt(s): ${gError.message}, ${gError.errors.reduce(
+          (acc: string, curr: GoogleDriveErrorListError) => {
+            return acc + ' ' + curr.message + ' ' + curr.reason;
+          },
+          ''
+        )}`
+      );
+    } else if (error instanceof Error) {
       throw new HttpException(500, `Failed to Upload Receipt(s): ${error.message}`);
     }
     console.log('error' + error);

src/backend/tests/teams.test.ts

@@ -1,9 +1,18 @@
 import TeamsService from '../src/services/teams.services';
 import prisma from '../src/prisma/prisma';
 import * as teamsTransformer from '../src/transformers/teams.transformer';
-import { prismaTeam1, sharedTeam1, justiceLeague } from './test-data/teams.test-data';
+import { prismaTeam1, sharedTeam1, justiceLeague, primsaTeam2 } from './test-data/teams.test-data';
 import teamQueryArgs from '../src/prisma-query-args/teams.query-args';
-import { batman, flash, greenlantern, superman, theVisitor, wonderwoman } from './test-data/users.test-data';
+import {
+  alfred,
+  aquaman,
+  batman,
+  flash,
+  greenlantern,
+  superman,
+  theVisitor,
+  wonderwoman
+} from './test-data/users.test-data';
 import * as userUtils from '../src/utils/users.utils';
 import { AccessDeniedException, HttpException } from '../src/utils/errors.utils';
 import teamTransformer from '../src/transformers/teams.transformer';
@@ -208,4 +217,77 @@ describe('Teams', () => {
       expect(res).toStrictEqual(sharedTeam1);
     });
   });
+
+  describe('setTeamLeads', () => {
+    test('setTeamLeads submitter is not the head or admin', async () => {
+      vi.spyOn(prisma.team, 'findUnique').mockResolvedValue(prismaTeam1);
+      vi.spyOn(prisma.user, 'findMany').mockResolvedValue([theVisitor]);
+      vi.spyOn(prisma.team, 'findMany').mockResolvedValue([prismaTeam1, primsaTeam2, justiceLeague]);
+
+      const callSetTeamLeads = async () =>
+        await TeamsService.setTeamLeads(wonderwoman, prismaTeam1.teamId, [theVisitor.userId]);
+
+      const expectedException = new HttpException(
+        400,
+        'Access Denied: You must be an admin or the head to update the lead!'
+      );
+
+      await expect(callSetTeamLeads).rejects.toThrow(expectedException);
+    });
+
+    test('setTeamLeads lead is a member', async () => {
+      vi.spyOn(prisma.team, 'findUnique').mockResolvedValue(prismaTeam1);
+      vi.spyOn(prisma.user, 'findMany').mockResolvedValue([aquaman]);
+      vi.spyOn(prisma.team, 'findMany').mockResolvedValue([prismaTeam1, primsaTeam2, justiceLeague]);
+
+      const callSetTeamLeads = async () => await TeamsService.setTeamLeads(flash, sharedTeam1.teamId, [aquaman.userId]);
+
+      const expectedException = new HttpException(400, 'A lead cannot be a member of the team!');
+
+      await expect(callSetTeamLeads).rejects.toThrow(expectedException);
+    });
+
+    test('setTeamLeads lead is a head', async () => {
+      vi.spyOn(prisma.team, 'findUnique').mockResolvedValue(justiceLeague);
+      vi.spyOn(userUtils, 'getUsers').mockResolvedValue([batman]);
+      vi.spyOn(prisma.team, 'findMany').mockResolvedValue([prismaTeam1, primsaTeam2, justiceLeague]);
+
+      const callSetTeamLeads = async () => await TeamsService.setTeamLeads(alfred, justiceLeague.teamId, [batman.userId]);
+
+      const expectedException = new HttpException(400, 'A lead cannot be the head of the team!');
+
+      await expect(callSetTeamLeads).rejects.toThrow(expectedException);
+    });
+
+    test('setTeamLeads works', async () => {
+      vi.spyOn(prisma.team, 'findUnique').mockResolvedValue(prismaTeam1);
+      vi.spyOn(prisma.team, 'update').mockResolvedValue(prismaTeam1);
+      vi.spyOn(userUtils, 'getUsers').mockResolvedValue([greenlantern, theVisitor]);
+      vi.spyOn(prisma.team, 'findMany').mockResolvedValue([prismaTeam1, primsaTeam2, justiceLeague]);
+
+      const teamId = 'id1';
+      const userIds = [
+        {
+          userId: 5
+        },
+        {
+          userId: 7
+        }
+      ];
+      const res = await TeamsService.setTeamLeads(flash, sharedTeam1.teamId, [5, 7]);
+
+      expect(prisma.team.findUnique).toHaveBeenCalledTimes(1);
+      expect(prisma.team.update).toHaveBeenCalledTimes(1);
+      expect(prisma.team.update).toHaveBeenCalledWith({
+        where: { teamId },
+        data: {
+          leads: {
+            set: userIds
+          }
+        },
+        ...teamQueryArgs
+      });
+      expect(res).toStrictEqual(sharedTeam1);
+    });
+  });
 });

src/frontend/src/apis/teams.api.ts

@@ -41,3 +41,9 @@ export const setTeamHead = (id: string, userId: number) => {
 export const createTeam = (payload: CreateTeamPayload) => {
   return axios.post<Team>(apiUrls.teamsCreate(), payload);
 };
+
+export const setTeamLeads = (id: string, userIds: number[]) => {
+  return axios.post<Team>(apiUrls.teamsSetLeads(id), {
+    userIds
+  });
+};

src/frontend/src/components/NERAutocomplete.tsx

@@ -7,13 +7,11 @@ import {
   Autocomplete,
   AutocompleteRenderInputParams,
   FormHelperText,
-  InputAdornment,
   SxProps,
   TextField,
   Theme,
   useTheme
 } from '@mui/material';
-import SearchIcon from '@mui/icons-material/Search';
 import { HTMLAttributes } from 'react';
 import { FieldError } from 'react-hook-form';
 
@@ -48,15 +46,8 @@ const NERAutocomplete: React.FC<NERAutocompleteProps> = ({
     height: '40px',
     backgroundColor: theme.palette.background.default,
     width: '100%',
-    borderRadius: '25px',
     border: 0,
-    '.MuiOutlinedInput-notchedOutline': {
-      borderColor: 'black',
-      borderRadius: '25px'
-    },
-    '&.Mui-focused .MuiOutlinedInput-notchedOutline': {
-      borderColor: 'red'
-    },
+    borderColor: 'black',
     ...sx
   };
 
@@ -65,12 +56,7 @@ const NERAutocomplete: React.FC<NERAutocompleteProps> = ({
       <TextField
         {...params}
         InputProps={{
-          ...params.InputProps,
-          startAdornment: (
-            <InputAdornment position="start">
-              <SearchIcon />
-            </InputAdornment>
-          )
+          ...params.InputProps
         }}
         placeholder={placeholder}
         required

src/frontend/src/components/ReactHookTextField.tsx

@@ -4,6 +4,8 @@
  */
 import { Control, Controller, FieldError } from 'react-hook-form';
 import { TextField, InputAdornment, SxProps, Theme, SvgIconProps } from '@mui/material';
+import { kMaxLength } from 'buffer';
+import { countWords, isUnderWordCount } from 'shared';
 
 interface ReactHookTextFieldProps {
   name: string;
@@ -20,6 +22,7 @@ interface ReactHookTextFieldProps {
   rows?: number;
   endAdornment?: React.ReactElement;
   errorMessage?: FieldError;
+  maxLength?: number;
 }
 
 const ReactHookTextField: React.FC<ReactHookTextFieldProps> = ({
@@ -36,7 +39,8 @@ const ReactHookTextField: React.FC<ReactHookTextFieldProps> = ({
   multiline,
   rows,
   endAdornment,
-  errorMessage
+  errorMessage,
+  maxLength
 }) => {
   const defaultRules = { required: true };
 
@@ -70,10 +74,11 @@ const ReactHookTextField: React.FC<ReactHookTextFieldProps> = ({
           sx={sx}
           type={type}
           InputProps={inputProps}
+          inputProps={maxLength ? { ...inputProps, maxLength: isUnderWordCount(value, maxLength) ? null : 0 } : undefined}
           multiline={multiline}
           rows={rows}
           error={!!errorMessage}
-          helperText={errorMessage?.message}
+          helperText={errorMessage ? errorMessage.message : maxLength ? `${countWords(value)}/300 words` : undefined}
         />
       )}
     />

src/frontend/src/hooks/teams.hooks.ts

@@ -5,7 +5,15 @@
 
 import { useQuery, useQueryClient, useMutation } from 'react-query';
 import { Team } from 'shared';
-import { getAllTeams, getSingleTeam, setTeamMembers, setTeamDescription, setTeamHead, createTeam } from '../apis/teams.api';
+import {
+  getAllTeams,
+  getSingleTeam,
+  setTeamMembers,
+  setTeamDescription,
+  setTeamHead,
+  createTeam,
+  setTeamLeads
+} from '../apis/teams.api';
 
 export interface CreateTeamPayload {
   teamName: string;
@@ -90,3 +98,19 @@ export const useCreateTeam = () => {
     }
   );
 };
+
+export const useSetTeamLeads = (teamId: string) => {
+  const queryClient = useQueryClient();
+  return useMutation<Team, Error, any>(
+    ['teams', 'edit'],
+    async (userIds: number[]) => {
+      const { data } = await setTeamLeads(teamId, userIds);
+      return data;
+    },
+    {
+      onSuccess: () => {
+        queryClient.invalidateQueries(['teams']);
+      }
+    }
+  );
+};