All tests passing

Author: jackturner106

src/backend/src/services/projects.services.ts

@@ -639,7 +639,16 @@ export default class ProjectsService {
 
     const { teams, wbsElementId } = project;
 
-    if (!isAdmin(userCreated.role) || !isUserPartOfTeams(teams, userCreated))
+    if (
+      !isAdmin(userCreated.role) &&
+      !teams.some(
+        (team) =>
+          team.headId === userCreated.userId ||
+          team.leads.map((lead) => lead.userId).includes(userCreated.userId) ||
+          team.members.map((member) => member.userId).includes(userCreated.userId)
+      )
+    )
+      //&& !isUserPartOfTeams(teams, userCreated))
       throw new AccessDeniedException('Users must be admin, or assigned to the team to create assemblies');
 
     const userCreatedId = userCreated.userId;

src/backend/tests/projects.test.ts

@@ -306,7 +306,8 @@ describe('Projects', () => {
     test('createAssembly fails when no permissions', async () => {
       vi.spyOn(prisma.project, 'findFirst').mockResolvedValue({
         wbsElement: { ...prismaProject1.wbsElement, dateDeleted: '' },
-        projectId: prismaProject1.projectId
+        projectId: prismaProject1.projectId,
+        teams: [{ prismaTeam1, leads: [], members: [] }]
       } as any);
       await expect(
         async () =>
@@ -321,7 +322,8 @@ describe('Projects', () => {
     test('createAssembly fails when no permissions - leadership', async () => {
       vi.spyOn(prisma.project, 'findFirst').mockResolvedValue({
         wbsElement: { ...prismaProject1.wbsElement, dateDeleted: '' },
-        projectId: prismaProject1.projectId
+        projectId: prismaProject1.projectId,
+        teams: [{ prismaTeam1, leads: [], members: [] }]
       } as any);
       await expect(
         async () =>
@@ -334,7 +336,8 @@ describe('Projects', () => {
     });
 
     test('createAssembly works if the submitter is admin', async () => {
-      vi.spyOn(prisma.project, 'findFirst').mockResolvedValue(prismaProject1);
+      vi.spyOn(prisma.project, 'findFirst').mockResolvedValue({ ...prismaProject1, teams: [{ prismaTeam1 }] });
+      //vi.spyOn(prisma.project, 'findFirst').mockResolvedValue(prismaProject1);
       vi.spyOn(prisma.assembly, 'create').mockResolvedValue(prismaAssembly1);
 
       // no error, no return value