Creating function for validate groups by getGroupById

Author: sarojbehera1

src/common/helper.js

@@ -898,27 +898,7 @@ async function _filterChallengesByGroupsAccess(currentUser, challenges) {
   const needToCheckForGroupAccess = !currentUser
     ? true
     : !currentUser.isMachine && !hasAdminRole(currentUser);
-  if(!needToCheckForGroupAccess)
-  {
-    for (const challenge of challenges) {
-      if(challenge && challenge.groups && challenge.groups.length>0) {
-        const promises = [];
-        _.each(challenge.groups, (g) => {
-          promises.push(
-            (async () => {
-              const group = await getGroupById(g);
-              if ( !group || !group.status==='active') {
-                throw new errors.BadRequestError("The groups provided are invalid "+g);
-              }
-            })()
-          );
-        });
-        await Promise.all(promises);
-        res.push(challenge);
-      }
-    }
-    return res;
-  }
+  if (!needToCheckForGroupAccess) return challenges;
 
   let userGroups;
 

src/services/ChallengeService.js

@@ -910,6 +910,24 @@ 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.
@@ -921,6 +939,13 @@ searchChallenges.schema = {
 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) {
@@ -1443,6 +1468,13 @@ 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;