Merge pull request #54 from topcoder-platform/develop

v1.3

Author: jmgasper

config/template.json

@@ -14,7 +14,7 @@
               "urlcode": "$ { challenge.id }",
               "group": {
                 "name": "${ challenge.name }",
-                "description": "Welcome to Topcoder ${ challenge.track } challenge!\nPlease post your questions in this forum, thanks!",
+                "description": "Welcome to ${ challenge.name }.\nPlease post your questions in this forum, thank you!",
                 "privacy": "secret",
                 "type": "challenge"
               },
@@ -57,7 +57,7 @@
               "urlcode": "$ { challenge.id }",
               "group": {
                 "name": "${ challenge.name }",
-                "description": "Welcome to Topcoder ${ challenge.track } challenge!\nPlease post your questions in this chat group, thanks!",
+                "description": "Welcome to ${ challenge.name }.\nPlease post your questions in this forum, thank you!",
                 "privacy": "secret",
                 "type": "challenge"
               },
@@ -106,7 +106,7 @@
               "urlcode": "$ { challenge.id }",
               "group": {
                 "name": "${ challenge.name }",
-                "description": "Welcome to Topcoder ${ challenge.track } challenge!\nPlease post your questions in this chat group, thanks!",
+                "description": "Welcome to ${ challenge.name }.\nPlease post your questions in this forum, thank you!",
                 "privacy": "secret",
                 "type": "challenge"
               },
@@ -149,7 +149,7 @@
               "urlcode": "$ { challenge.id }",
               "group": {
                 "name": "${ challenge.name }",
-                "description": "Welcome to Topcoder ${ challenge.track } challenge!\nPlease post your questions in this chat group, thanks!",
+                "description": "Welcome to ${ challenge.name }.\nPlease post your questions in this forum, thank you!",
                 "privacy": "secret",
                 "type": "challenge"
               },

src/services/vanilla.js

@@ -22,7 +22,6 @@ async function manageVanillaUser (data) {
   const group = groups.length > 0 ? groups[0] : null
 
   const watch = shouldWatchCategories(projectRole, challengeRoles)
-  const follow = shouldFollowCategories(projectRole, challengeRoles)
 
   if (!group) {
     throw new Error('The group wasn\'t not found by challengeID')
@@ -96,10 +95,9 @@ async function manageVanillaUser (data) {
     case constants.USER_ACTIONS.INVITE: {
       await vanillaClient.addUserToGroup(group.groupID, {
         userID: vanillaUser.userID,
-        watch: watch,
-        follow: follow
+        watch: watch
       })
-      logger.info(`User [UserID=${vanillaUser.userID}, Name=${vanillaUser.name} was added to Group [GroupID=${group.groupID}, Name=${group.name}, Watch=${watch}, Follow=${follow}]`)
+      logger.info(`User [UserID=${vanillaUser.userID}, Name=${vanillaUser.name} was added to Group [GroupID=${group.groupID}, Name=${group.name}, Watch=${watch}]`)
       break
     }
     case constants.USER_ACTIONS.KICK: {
@@ -342,27 +340,6 @@ function shouldWatchCategories (projectRole, challengeRoles) {
   )
 }
 
-/**
- * Auto-follow categories
- * @param projectRole string
- * @param challengeRoles array
- * @returns {boolean}
- */
-function shouldFollowCategories (projectRole, challengeRoles) {
-  // New user
-  if (!projectRole && _.isEmpty(challengeRoles)) {
-    return true
-  }
-
-  // Project Copilots or Managers / Challenge Copilots,  Managers and Submitters
-  return projectRole === constants.TOPCODER.PROJECT_ROLES.COPILOT ||
-    projectRole === constants.TOPCODER.PROJECT_ROLES.MANAGER ||
-    (_.isArray(challengeRoles) && (_.includes(challengeRoles, constants.TOPCODER.CHALLENGE_ROLES.COPILOT) ||
-        _.includes(challengeRoles, constants.TOPCODER.CHALLENGE_ROLES.MANAGER) ||
-        _.includes(challengeRoles, constants.TOPCODER.CHALLENGE_ROLES.SUBMITTER))
-    )
-}
-
 module.exports = {
   manageVanillaUser,
   createVanillaGroup,

src/utils/vanilla-client.util.js

@@ -24,11 +24,6 @@ function getVanillaClient () {
           throw err
         })
     },
-    followCategory: (categoryId, data) => {
-      return request.put(`${config.VANILLA.API_URL}/categories/${categoryId}/follow`)
-        .query({ access_token: config.VANILLA.ADMIN_ACCESS_TOKEN })
-        .send(data)
-    },
     updateCategory: (categoryId, data) => {
       return request.patch(`${config.VANILLA.API_URL}/categories/${categoryId}`)
         .query({ access_token: config.VANILLA.ADMIN_ACCESS_TOKEN })