update challenge for non mandatory project id

Author: Aranyajit

package.json

@@ -8,6 +8,8 @@
     "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",
@@ -37,13 +39,14 @@
     "mocha-prepare": "^0.1.0",
     "nodemon": "^2.0.20",
     "nyc": "^14.0.0",
-    "prettier": "^2.8.1"
+    "prettier": "^2.8.1",
+    "standard": "^17.1.0"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.8.12",
     "@opensearch-project/opensearch": "^2.2.0",
-    "@topcoder-framework/domain-challenge": "^0.24.1",
     "@topcoder-framework/domain-acl": "^0.24.0",
+    "@topcoder-framework/domain-challenge": "^0.24.1",
     "@topcoder-framework/lib-common": "^0.24.1",
     "aws-sdk": "^2.1145.0",
     "axios": "^0.19.0",

src/common/challenge-helper.js

@@ -172,7 +172,7 @@ class ChallengeHelper {
     if (
       challenge.legacy.selfService == null &&
       challenge.projectId == null &&
-      !_.includes(config.SKIP_PROJECT_ID_BY_TIMLINE_TEMPLATE_ID, challenge.timelineTemplateId)
+      this.isProjectIdRequired(challenge.timelineTemplateId)
     ) {
       throw new errors.BadRequestError("projectId is required for non self-service challenges.");
     }
@@ -528,6 +528,11 @@ class ChallengeHelper {
       delete overview.totalPrizesInCents;
     }
   }
+
+  isProjectIdRequired(timelineTemplateId) {
+    if (!_.includes(config.SKIP_PROJECT_ID_BY_TIMLINE_TEMPLATE_ID, timelineTemplateId)) return true;
+    return false;
+  }
 }
 
 module.exports = new ChallengeHelper();

src/services/ChallengeService.js

@@ -941,10 +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 &&
-      !_.includes(config.SKIP_PROJECT_ID_BY_TIMLINE_TEMPLATE_ID, challenge.timelineTemplateId)
-    ) {
+    if (!challenge.projectId && challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)) {
       const selfServiceProjectName = `Self service - ${currentUser.handle} - ${challenge.name}`;
       challenge.projectId = await helper.createSelfServiceProject(
         selfServiceProjectName,
@@ -966,7 +963,7 @@ async function createChallenge(currentUser, challenge, userToken) {
   }
 
   /** Ensure project exists, and set direct project id, billing account id & markup */
-  if (!_.includes(config.SKIP_PROJECT_ID_BY_TIMLINE_TEMPLATE_ID, challenge.timelineTemplateId)) {
+  if (challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)) {
     const { projectId } = challenge;
 
     const { directProjectId } = await projectHelper.getProject(projectId, currentUser);
@@ -1523,13 +1520,18 @@ async function updateChallenge(currentUser, challengeId, data) {
     convertPrizeSetValuesToDollars(challenge.prizeSets, challenge.overview);
   }
 
-  const projectId = _.get(challenge, "projectId");
+  let projectId;
+  if (challengeHelper.isProjectIdRequired(challenge.timelineTemplateId ?? "")) {
+    projectId = _.get(challenge, "projectId");
 
-  const { 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
@@ -1578,7 +1580,8 @@ async function updateChallenge(currentUser, challengeId, data) {
     if (
       (data.status === constants.challengeStatuses.Approved ||
         data.status === constants.challengeStatuses.Active) &&
-      challenge.status !== constants.challengeStatuses.Active
+      challenge.status !== constants.challengeStatuses.Active &&
+      challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)
     ) {
       try {
         const selfServiceProjectName = `Self service - ${challenge.createdBy} - ${challenge.name}`;
@@ -1614,7 +1617,10 @@ async function updateChallenge(currentUser, challengeId, data) {
       }
     }
 
-    if (data.status === constants.challengeStatuses.Draft) {
+    if (
+      data.status === constants.challengeStatuses.Draft &&
+      challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)
+    ) {
       try {
         await helper.updateSelfServiceProjectInfo(
           projectId,
@@ -1648,7 +1654,8 @@ 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
+        challenge.status === constants.challengeStatuses.Draft &&
+        challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)
       ) {
         throw new errors.BadRequestError(
           "Cannot Activate this project, it has no active billing account."