Skip to content

[Ready Release] Issue Reviewer Role #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 23, 2022
Merged

[Ready Release] Issue Reviewer Role #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f6c278b
reviewer resource check
LieutenantRoger Mar 17, 2022
aec5010
ci:deploying
LieutenantRoger Mar 17, 2022
dae9ed7
restrict iterative reviewer role
LieutenantRoger Mar 21, 2022
9490e2c
ci:reset
LieutenantRoger Mar 21, 2022
cd068b7
using member filter
LieutenantRoger Mar 22, 2022
bc719d1
reset ci
LieutenantRoger Mar 22, 2022
08de922
avoid unnecessary call
Mar 23, 2022
dc7cc07
deploying
LieutenantRoger Mar 23, 2022
d34b61e
revert ci
LieutenantRoger Mar 23, 2022
05079f8
Merge pull request #91 from topcoder-platform/issue_reviewer_role
LieutenantRoger Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ workflows:
branches:
only:
- develop
- dev-circleci

# Production builds are exectuted only on tagged commits to the testing
# master branch.
Expand Down
3 changes: 3 additions & 0 deletions config/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ module.exports = {
VALID_ISSUERS: process.env.VALID_ISSUERS || '["https://api.topcoder-dev.com", "https://api.topcoder.com", "https://topcoder-dev.auth0.com/"]',

SUBMITTER_RESOURCE_ROLE_ID: process.env.SUBMITTER_RESOURCE_ROLE_ID || '732339e7-8e30-49d7-9198-cccf9451e221',
REVIEWER_RESOURCE_ROLE_ID: process.env.REVIEWER_RESOURCE_ROLE_ID || '318b9c07-079a-42d9-a81f-b96be1dc1099',
ITERATIVE_REVIEWER_RESOURCE_ROLE_ID: process.env.ITERATIVE_REVIEWER_RESOURCE_ROLE_ID || 'f6df7212-b9d6-4193-bfb1-b383586fce63',

AUTH0_URL: process.env.AUTH0_URL || 'https://topcoder-dev.auth0.com/oauth/token',
AUTH0_AUDIENCE: process.env.AUTH0_AUDIENCE || 'https://m2m.topcoder-dev.com/',
Expand All @@ -27,6 +29,7 @@ module.exports = {
USER_API_URL: process.env.USER_API_URL || 'https://api.topcoder-dev.com/v3/users',
CHALLENGE_API_URL: process.env.CHALLENGE_API_URL || 'http://localhost:4000/v5/challenges',
CHALLENGE_PHASES_API_URL: process.env.CHALLENGE_PHASES_API_URL || 'https://api.topcoder-dev.com/v5/challenge-phases',
SUBMISSIONS_API_URL: process.env.SUBMISSIONS_API_URL || 'https://api.topcoder-dev.com/v5/submissions',

DYNAMODB: {
AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID,
Expand Down
9 changes: 9 additions & 0 deletions src/services/ResourceService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,15 @@ async function init (currentUser, challengeId, resource, isCreated) {
const handle = resource.memberHandle
const memberId = await helper.getMemberIdByHandle(resource.memberHandle)

// check if the resource is reviewer role and has already made a submission in the challenge
if (resource.roleId === config.REVIEWER_RESOURCE_ROLE_ID || resource.roleId === config.ITERATIVE_REVIEWER_RESOURCE_ROLE_ID) {
const submissionsRes = await helper.getRequest(`${config.SUBMISSIONS_API_URL}`, { challengeId: challengeId, perPage: 100, memberId: memberId })
const submissions = submissionsRes.body
if (submissions.length !== 0) {
throw new errors.ConflictError(`The member has already submitted to the challenge and cannot have a Reviewer or Iterative Reviewer role`)
}
}

// ensure resource role existed
const resourceRole = await getResourceRole(resource.roleId, isCreated)

Expand Down