Merge pull request #642 from topcoder-platform/dev

feat: add phase transition functionality

Author: rakibansary

.circleci/config.yml

@@ -17,6 +17,7 @@ install_deploysuite: &install_deploysuite
     cp ./../buildscript/master_deploy.sh .
     cp ./../buildscript/buildenv.sh .
     cp ./../buildscript/awsconfiguration.sh .
+
 restore_cache_settings_for_build: &restore_cache_settings_for_build
   key: docker-node-modules-{{ checksum "yarn.lock" }}
 
@@ -32,8 +33,14 @@ builddeploy_steps: &builddeploy_steps
 - run: *install_deploysuite
 - restore_cache: *restore_cache_settings_for_build
 - run:
-    name: "Authenticate with CodeArtifact and build docker image"
-    command: "./awsconfiguration.sh ${CODEARTIFACT_ENV}\nsource awsenvconf\naws codeartifact login --tool npm --repository topcoder-framework --domain topcoder --domain-owner $AWS_ACCOUNT_ID --region $AWS_REGION --namespace @topcoder-framework\ncp ~/.npmrc .\nrm -f awsenvconf            \n./build.sh ${APPNAME}\n"
+    name: "Authenticate with CodeArtifact and build Docker image"
+    command: |
+      ./awsconfiguration.sh ${CODEARTIFACT_ENV}
+      source awsenvconf
+      aws codeartifact login --tool npm --repository topcoder-framework --domain topcoder --domain-owner $AWS_ACCOUNT_ID --region $AWS_REGION --namespace @topcoder-framework
+      cp ~/.npmrc .
+      rm -f awsenvconf
+      ./build.sh ${APPNAME}
 - save_cache: *save_cache_settings
 - deploy:
     name: Running MasterScript.
@@ -83,7 +90,7 @@ workflows:
           branches:
             only:
             - dev
-            - fix/plat-2985
+            - feature/phase-advance
 
     - "build-qa":
         context: org-global

package.json

@@ -42,8 +42,8 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.8.12",
     "@opensearch-project/opensearch": "^2.2.0",
-    "@topcoder-framework/domain-challenge": "^0.10.14",
-    "@topcoder-framework/lib-common": "^0.10.14",
+    "@topcoder-framework/domain-challenge": "^0.18.0",
+    "@topcoder-framework/lib-common": "^0.18.0",
     "aws-sdk": "^2.1145.0",
     "axios": "^0.19.0",
     "axios-retry": "^3.4.0",
@@ -53,6 +53,7 @@
     "cors": "^2.8.5",
     "decimal.js": "^10.4.3",
     "deep-equal": "^2.2.0",
+    "dompurify": "^3.0.2",
     "dotenv": "^8.2.0",
     "elasticsearch": "^16.7.3",
     "express": "^4.15.4",
@@ -62,8 +63,11 @@
     "http-aws-es": "^6.0.0",
     "http-status-codes": "^1.3.0",
     "joi": "^14.0.0",
+    "jsdom": "^21.1.2",
+    "json-rules-engine": "^6.1.2",
     "jsonwebtoken": "^8.3.0",
     "lodash": "^4.17.19",
+    "markdown-it": "^13.0.1",
     "moment": "^2.24.0",
     "node-cache": "^5.1.2",
     "swagger-ui-express": "^4.1.3",

src/common/helper.js

@@ -226,13 +226,18 @@ async function deleteFromS3(bucket, key) {
  * @param {String} challengeId the challenge id
  * @returns {Promise<Array>} the challenge resources
  */
-async function getChallengeResources(challengeId) {
+async function getChallengeResources(challengeId, roleId = null) {
   const token = await m2mHelper.getM2MToken();
   const perPage = 100;
   let page = 1;
   let result = [];
   while (true) {
-    const url = `${config.RESOURCES_API_URL}?challengeId=${challengeId}&perPage=${perPage}&page=${page}`;
+    const url = `${
+      config.RESOURCES_API_URL
+    }?challengeId=${challengeId}&perPage=${perPage}&page=${page}${
+      roleId ? `&roleId=${roleId}` : ""
+    }`;
+
     const res = await axios.get(url, {
       headers: { Authorization: `Bearer ${token}` },
     });
@@ -1020,7 +1025,7 @@ async function getGroupById(groupId) {
 /**
  * Get challenge submissions
  * @param {String} challengeId the challenge id
- * @returns {Array} the submission
+ * @returns {Promise<Array>} the submission
  */
 async function getChallengeSubmissions(challengeId) {
   const token = await m2mHelper.getM2MToken();

src/common/phase-helper.js

@@ -20,6 +20,7 @@ const phaseDomain = new PhaseDomain(GRPC_CHALLENGE_SERVER_HOST, GRPC_CHALLENGE_S
 class ChallengePhaseHelper {
   phaseDefinitionMap = {};
   timelineTemplateMap = {};
+
   async populatePhasesForChallengeCreation(phases, startDate, timelineTemplateId) {
     if (_.isUndefined(timelineTemplateId)) {
       throw new errors.BadRequestError(`Invalid timeline template ID: ${timelineTemplateId}`);
@@ -176,7 +177,10 @@ class ChallengePhaseHelper {
 
   handlePhasesAfterCancelling(phases) {
     return _.map(phases, (phase) => {
-      const shouldClosePhase = _.includes(["Registration", "Submission", "Checkpoint Submission"], phase.name);
+      const shouldClosePhase = _.includes(
+        ["Registration", "Submission", "Checkpoint Submission"],
+        phase.name
+      );
       return {
         ...phase,
         isOpen: shouldClosePhase ? false : phase.isOpen,

src/controllers/ChallengeController.js

@@ -116,6 +116,15 @@ async function deleteChallenge(req, res) {
   res.send(result);
 }
 
+/**
+ * Advance phase
+ * @param {Object} req the request
+ * @param {Object} res the response
+ */
+async function advancePhase(req, res) {
+  res.send(await service.advancePhase(req.authUser, req.params.challengeId, req.body));
+}
+
 module.exports = {
   searchChallenges,
   createChallenge,
@@ -124,4 +133,5 @@ module.exports = {
   deleteChallenge,
   getChallengeStatistics,
   sendNotifications,
+  advancePhase,
 };