Skip to content

Commit fdc0617

Browse files
committed
#1509 Fixed linting issues
1 parent c25c247 commit fdc0617

2 files changed

Lines changed: 9 additions & 15 deletions

File tree

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -639,16 +639,7 @@ export default class ProjectsService {
639639

640640
const { teams, wbsElementId } = project;
641641

642-
if (
643-
!isAdmin(userCreated.role) &&
644-
!teams.some(
645-
(team) =>
646-
team.headId === userCreated.userId ||
647-
team.leads.map((lead) => lead.userId).includes(userCreated.userId) ||
648-
team.members.map((member) => member.userId).includes(userCreated.userId)
649-
)
650-
)
651-
//&& !isUserPartOfTeams(teams, userCreated))
642+
if (!isAdmin(userCreated.role) && !isUserPartOfTeams(teams, userCreated))
652643
throw new AccessDeniedException('Users must be admin, or assigned to the team to create assemblies');
653644

654645
const userCreatedId = userCreated.userId;

src/backend/tests/projects.test.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
prismaManufacturer1
1111
} from './test-data/projects.test-data';
1212
import { prismaChangeRequest1 } from './test-data/change-requests.test-data';
13-
import { justiceLeague, prismaTeam1 } from './test-data/teams.test-data';
13+
import { prismaTeam1 } from './test-data/teams.test-data';
1414
import * as projectTransformer from '../src/transformers/projects.transformer';
1515
import ProjectsService from '../src/services/projects.services';
1616
import {
@@ -290,8 +290,8 @@ describe('Projects', () => {
290290
test('createAssembly fails when project has been deleted', async () => {
291291
vi.spyOn(prisma.project, 'findFirst').mockResolvedValue({
292292
wbsElement: { ...prismaProject1.wbsElement, dateDeleted: new Date() },
293-
projectId: prismaProject1.projectId,
294-
teams: justiceLeague
293+
projectId: prismaProject1.projectId
294+
//teams: justiceLeague
295295
} as any);
296296
await expect(
297297
async () =>
@@ -336,8 +336,11 @@ describe('Projects', () => {
336336
});
337337

338338
test('createAssembly works if the submitter is admin', async () => {
339-
vi.spyOn(prisma.project, 'findFirst').mockResolvedValue({ ...prismaProject1, teams: [{ prismaTeam1 }] });
340-
//vi.spyOn(prisma.project, 'findFirst').mockResolvedValue(prismaProject1);
339+
vi.spyOn(prisma.project, 'findFirst').mockResolvedValue({
340+
wbsElement: { ...prismaProject1.wbsElement, dateDeleted: '' },
341+
projectId: prismaProject1.projectId,
342+
teams: [{ prismaTeam1, leads: [], members: [] }]
343+
} as any);
341344
vi.spyOn(prisma.assembly, 'create').mockResolvedValue(prismaAssembly1);
342345

343346
// no error, no return value

0 commit comments

Comments
 (0)