Dev - sync with master

.circleci/config.yml

@@ -86,7 +86,6 @@ workflows:
           branches:
             only:
             - dev
-            - feature/top-262-projectid-non-mandatory
 
     - "build-qa":
         context: org-global

config/default.js

@@ -130,6 +130,4 @@ module.exports = {
   GRPC_CHALLENGE_SERVER_PORT: process.env.GRPC_DOMAIN_CHALLENGE_SERVER_PORT || 8888,
   GRPC_ACL_SERVER_HOST: process.env.GRPC_ACL_SERVER_HOST || "localhost",
   GRPC_ACL_SERVER_PORT: process.env.GRPC_ACL_SERVER_PORT || 8889,
-
-  SKIP_PROJECT_ID_BY_TIMLINE_TEMPLATE_ID: process.env.SKIP_PROJECT_ID_BY_TIMLINE_TEMPLATE_ID || '517e76b0-8824-4e72-9b48-a1ebde1793a8'
 };

package.json

@@ -8,8 +8,6 @@
     "dev": "nodemon app.js",
     "lint": "prettier src/**/*.js",
     "lint:fix": "prettier --write src/**/*.js",
-    "standard-lint": "standard",
-    "standard-lint:fix": "standard --fix",
     "init-es": "node src/init-es.js",
     "init-db": "node src/init-db.js",
     "sync-es": "node src/scripts/sync-es.js",
@@ -39,14 +37,13 @@
     "mocha-prepare": "^0.1.0",
     "nodemon": "^2.0.20",
     "nyc": "^14.0.0",
-    "prettier": "^2.8.1",
-    "standard": "^17.1.0"
+    "prettier": "^2.8.1"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.8.12",
     "@opensearch-project/opensearch": "^2.2.0",
-    "@topcoder-framework/domain-acl": "^0.24.0",
     "@topcoder-framework/domain-challenge": "^0.24.1",
+    "@topcoder-framework/domain-acl": "^0.24.0",
     "@topcoder-framework/lib-common": "^0.24.1",
     "aws-sdk": "^2.1145.0",
     "axios": "^0.19.0",

src/common/challenge-helper.js

@@ -169,11 +169,7 @@ class ChallengeHelper {
 
   async validateCreateChallengeRequest(currentUser, challenge) {
     // projectId is required for non self-service challenges
-    if (
-      challenge.legacy.selfService == null &&
-      challenge.projectId == null &&
-      this.isProjectIdRequired(challenge.timelineTemplateId)
-    ) {
+    if (challenge.legacy.selfService == null && challenge.projectId == null) {
       throw new errors.BadRequestError("projectId is required for non self-service challenges.");
     }
 
@@ -528,12 +524,6 @@ class ChallengeHelper {
       delete overview.totalPrizesInCents;
     }
   }
-
-  isProjectIdRequired(timelineTemplateId) {
-    const template = _.get(config, "SKIP_PROJECT_ID_BY_TIMLINE_TEMPLATE_ID", '517e76b0-8824-4e72-9b48-a1ebde1793a8');
-
-    return template !== timelineTemplateId;
-  }
 }
 
 module.exports = new ChallengeHelper();

src/services/ChallengeService.js

@@ -941,7 +941,7 @@ async function createChallenge(currentUser, challenge, userToken) {
   console.log("TYPE", prizeTypeTmp);
   if (challenge.legacy.selfService) {
     // if self-service, create a new project (what about if projectId is provided in the payload? confirm with business!)
-    if (!challenge.projectId && challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)) {
+    if (!challenge.projectId) {
       const selfServiceProjectName = `Self service - ${currentUser.handle} - ${challenge.name}`;
       challenge.projectId = await helper.createSelfServiceProject(
         selfServiceProjectName,
@@ -963,18 +963,14 @@ async function createChallenge(currentUser, challenge, userToken) {
   }
 
   /** Ensure project exists, and set direct project id, billing account id & markup */
-  if (challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)) {
-    const { projectId } = challenge;
+  const { projectId } = challenge;
 
-    const { directProjectId } = await projectHelper.getProject(projectId, currentUser);
-    const { billingAccountId, markup } = await projectHelper.getProjectBillingInformation(
-      projectId
-    );
+  const { directProjectId } = await projectHelper.getProject(projectId, currentUser);
+  const { billingAccountId, markup } = await projectHelper.getProjectBillingInformation(projectId);
 
-    _.set(challenge, "legacy.directProjectId", directProjectId);
-    _.set(challenge, "billing.billingAccountId", billingAccountId);
-    _.set(challenge, "billing.markup", markup || 0);
-  }
+  _.set(challenge, "legacy.directProjectId", directProjectId);
+  _.set(challenge, "billing.billingAccountId", billingAccountId);
+  _.set(challenge, "billing.markup", markup || 0);
 
   if (!_.isUndefined(_.get(challenge, "legacy.reviewType"))) {
     _.set(challenge, "legacy.reviewType", _.toUpper(_.get(challenge, "legacy.reviewType")));
@@ -1520,22 +1516,19 @@ async function updateChallenge(currentUser, challengeId, data) {
     convertPrizeSetValuesToDollars(challenge.prizeSets, challenge.overview);
   }
 
-  let projectId, billingAccountId, markup;
-  if (challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)) {
-    projectId = _.get(challenge, "projectId");
+  const projectId = _.get(challenge, "projectId");
 
-    ({ billingAccountId, markup } = await projectHelper.getProjectBillingInformation(projectId));
+  const { billingAccountId, markup } = await projectHelper.getProjectBillingInformation(projectId);
 
-    if (billingAccountId && _.isUndefined(_.get(challenge, "billing.billingAccountId"))) {
-      _.set(data, "billing.billingAccountId", billingAccountId);
-      _.set(data, "billing.markup", markup || 0);
-    }
+  if (billingAccountId && _.isUndefined(_.get(challenge, "billing.billingAccountId"))) {
+    _.set(data, "billing.billingAccountId", billingAccountId);
+    _.set(data, "billing.markup", markup || 0);
+  }
 
-    // Make sure the user cannot change the direct project ID
-    if (data.legacy) {
-      data.legacy = _.assign({}, challenge.legacy, data.legacy);
-      _.set(data, "legacy.directProjectId", challenge.legacy.directProjectId);
-    }
+  // Make sure the user cannot change the direct project ID
+  if (data.legacy) {
+    data.legacy = _.assign({}, challenge.legacy, data.legacy);
+    _.set(data, "legacy.directProjectId", challenge.legacy.directProjectId);
   }
 
   // Remove fields from data that are not allowed to be updated and that match the existing challenge
@@ -1578,8 +1571,7 @@ async function updateChallenge(currentUser, challengeId, data) {
     if (
       (data.status === constants.challengeStatuses.Approved ||
         data.status === constants.challengeStatuses.Active) &&
-      challenge.status !== constants.challengeStatuses.Active &&
-      challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)
+      challenge.status !== constants.challengeStatuses.Active
     ) {
       try {
         const selfServiceProjectName = `Self service - ${challenge.createdBy} - ${challenge.name}`;
@@ -1615,10 +1607,7 @@ async function updateChallenge(currentUser, challengeId, data) {
       }
     }
 
-    if (
-      data.status === constants.challengeStatuses.Draft &&
-      challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)
-    ) {
+    if (data.status === constants.challengeStatuses.Draft) {
       try {
         await helper.updateSelfServiceProjectInfo(
           projectId,
@@ -1631,9 +1620,8 @@ async function updateChallenge(currentUser, challengeId, data) {
     }
 
     if (
-      (data.status === constants.challengeStatuses.CancelledRequirementsInfeasible ||
-        data.status === constants.challengeStatuses.CancelledPaymentFailed) &&
-      challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)
+      data.status === constants.challengeStatuses.CancelledRequirementsInfeasible ||
+      data.status === constants.challengeStatuses.CancelledPaymentFailed
     ) {
       try {
         await helper.cancelProject(challenge.projectId, data.cancelReason, currentUser);
@@ -1653,8 +1641,7 @@ async function updateChallenge(currentUser, challengeId, data) {
       // if activating a challenge, the challenge must have a billing account id
       if (
         (!billingAccountId || billingAccountId === null) &&
-        challenge.status === constants.challengeStatuses.Draft &&
-        challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)
+        challenge.status === constants.challengeStatuses.Draft
       ) {
         throw new errors.BadRequestError(
           "Cannot Activate this project, it has no active billing account."