Skip to content

Commit 72a6609

Browse files
committed
optimized checking wp lead, fixd error message and tests
1 parent deb9ebe commit 72a6609

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

.vscode/settings.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,5 @@
2121
"editor.defaultFormatter": "Prisma.prisma"
2222
},
2323
"editor.formatOnSave": true,
24-
"typescript.tsdk": "node_modules/typescript/lib",
25-
"githubPullRequests.ignoredPullRequestBranches": [
26-
"develop"
27-
]
24+
"typescript.tsdk": "node_modules/typescript/lib"
2825
}

src/backend/src/services/tasks.services.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ export default class TasksService {
5555
const isProjectLeadOrManager =
5656
createdBy.userId === requestedWbsElement.projectLeadId || createdBy.userId === requestedWbsElement.projectManagerId;
5757

58-
const curWorkPackages = requestedWbsElement.project?.workPackages;
58+
const curWorkPackages = project.workPackages;
5959

60-
const isWorkPackageLead = curWorkPackages?.some((workPackage) => {
60+
const isWorkPackageLead = curWorkPackages.some((workPackage) => {
6161
return workPackage.wbsElement.projectLeadId === createdBy.userId;
6262
});
6363

6464
if (
6565
!isLeadership(createdBy.role) &&
6666
!isProjectLeadOrManager &&
67-
isWorkPackageLead &&
67+
!isWorkPackageLead &&
6868
!teams.some((team) => isUserOnTeam(team, createdBy))
6969
) {
7070
throw new AccessDeniedException(
71-
'Only admins, app-admins, project leads, project managers, or current team users can create tasks'
71+
'Only admins, app-admins, project leads, project managers, work package leads, or current team users can create tasks'
7272
);
7373
}
7474

src/backend/tests/tasks.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe('Tasks', () => {
6363
TasksService.createTask(theVisitor, mockWBSNum, 'hellow world', '', mockDate, 'HIGH', 'DONE', [])
6464
).rejects.toThrow(
6565
new AccessDeniedException(
66-
'Only admins, app-admins, project leads, project managers, or current team users can create tasks'
66+
'Only admins, app-admins, project leads, project managers, work package leads, or current team users can create tasks'
6767
)
6868
);
6969

0 commit comments

Comments
 (0)