Moving code to challenge-helper

Author: sarojbehera1

src/common/challenge-helper.js

@@ -80,6 +80,25 @@ class ChallengeHelper {
     }
   }
 
+  /**
+   * Validate Challenge groups.
+   * @param {Object} groups the group of a challenge
+   */
+  async validateGroups(groups) {
+    const promises = [];
+    _.each(groups, (g) => {
+      promises.push(
+        (async () => {
+          const group = await helper.getGroupById(g);
+          if (!group || group.status !== "active") {
+            throw new errors.BadRequestError("The groups provided are invalid " + g);
+          }
+        })()
+      );
+    });
+    await Promise.all(promises);
+  }
+
   async validateCreateChallengeRequest(currentUser, challenge) {
     // projectId is required for non self-service challenges
     if (challenge.legacy.selfService == null && challenge.projectId == null) {
@@ -98,7 +117,13 @@ class ChallengeHelper {
     // helper.ensureNoDuplicateOrNullElements(challenge.events, 'events')
 
     // check groups authorization
-    await helper.ensureAccessibleByGroupsAccess(currentUser, challenge);
+    if (challenge.groups && challenge.groups.length > 0) {
+      if (currentUser.isMachine || hasAdminRole(currentUser)) {
+        await this.validateGroups(challenge.groups);
+      } else {
+        await helper.ensureAccessibleByGroupsAccess(currentUser, challenge);
+      }
+    }
 
     if (challenge.constraints) {
       await ChallengeHelper.validateChallengeConstraints(challenge.constraints);
@@ -118,8 +143,12 @@ class ChallengeHelper {
     }
 
     // check groups access to be updated group values
-    if (data.groups) {
-      await ensureAcessibilityToModifiedGroups(currentUser, data, challenge);
+    if (data.groups && data.groups.length > 0) {
+      if (currentUser.isMachine || hasAdminRole(currentUser)) {
+        await this.validateGroups(data.groups);
+      } else {
+        await ensureAcessibilityToModifiedGroups(currentUser, data, challenge);
+      }
     }
 
     // Ensure descriptionFormat is either 'markdown' or 'html'

src/services/ChallengeService.js

@@ -910,24 +910,6 @@ searchChallenges.schema = {
     })
     .unknown(true),
 };
-/**
- * Validate Challenge groups.
- * @param {Object} groups the group of a challenge
- */
-async function validateGroups(groups) {
-  const promises = [];
-  _.each(groups, (g) => {
-    promises.push(
-      (async () => {
-        const group = await helper.getGroupById(g);
-        if (!group || group.status !== "active") {
-          throw new errors.BadRequestError("The groups provided are invalid " + g);
-        }
-      })()
-    );
-  });
-  await Promise.all(promises);
-}
 
 /**
  * Create challenge.
@@ -939,15 +921,6 @@ async function validateGroups(groups) {
 async function createChallenge(currentUser, challenge, userToken) {
   await challengeHelper.validateCreateChallengeRequest(currentUser, challenge);
 
-  //Validate the groups if Valid or Not
-  if (
-    challenge.groups &&
-    challenge.groups.length > 0 &&
-    (currentUser.isMachine || hasAdminRole(currentUser))
-  ) {
-    await validateGroups(challenge.groups);
-  }
-
   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) {
@@ -1470,15 +1443,6 @@ async function updateChallenge(currentUser, challengeId, data) {
 
   await validateChallengeUpdateRequest(currentUser, challenge, data);
 
-  //Validate the groups if Valid or Not
-  if (
-    data.groups &&
-    data.groups.length > 0 &&
-    (currentUser.isMachine || hasAdminRole(currentUser))
-  ) {
-    await validateGroups(data.groups);
-  }
-
   let sendActivationEmail = false;
   let sendSubmittedEmail = false;
   let sendCompletedEmail = false;