#47 - Read groups info from elasticsearch instead of group api

Author: callmekatootie

README.md

@@ -28,7 +28,6 @@ Configuration for the application is at config/default.js and config/production.
 - AUTH0_CLIENT_ID: Auth0 client id, used to get TC M2M token
 - AUTH0_CLIENT_SECRET: Auth0 client secret, used to get TC M2M token
 - AUTH0_PROXY_SERVER_URL: Proxy Auth0 URL, used to get TC M2M token
-- GROUP_API_URL: Topcoder Group API URL
 - BUSAPI_URL: Topcoder Bus API URL
 - KAFKA_ERROR_TOPIC: The error topic at which bus api will publish any errors
 - KAFKA_MESSAGE_ORIGINATOR: The originator value for the kafka messages

config/default.js

@@ -26,7 +26,6 @@ module.exports = {
   AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET,
   AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL,
 
-  GROUP_API_URL: process.env.GROUP_API_URL || 'https://api.topcoder-dev.com/v5/groups',
   BUSAPI_URL: process.env.BUSAPI_URL || 'https://api.topcoder-dev.com/v5',
 
   KAFKA_ERROR_TOPIC: process.env.KAFKA_ERROR_TOPIC || 'common.error.reporting',

src/common/es-helper.js

@@ -2,7 +2,6 @@ const config = require('config')
 const _ = require('lodash')
 const querystring = require('querystring')
 const logger = require('../common/logger')
-const groupApi = require('./group-api')
 const appConst = require('../consts')
 const esClient = require('./es-client').getESClient()
 
@@ -499,8 +498,6 @@ async function getFromElasticSearch (resource, ...args) {
 
   if (params.enrich && resource === 'user') {
     const user = await enrichUser(result)
-    const groups = await groupApi.getGroups(user.id)
-    user.groups = groups
     return user
   } else if (subUserDoc) {
     // find top sub doc by sub.id
@@ -1305,11 +1302,6 @@ async function searchElasticSearch (resource, ...args) {
   if (resource === 'user' && params.enrich) {
     const users = docs.hits.hits.map(hit => hit._source)
     result = await enrichUsers(users)
-    // enrich groups
-    for (const user of users) {
-      const groups = await groupApi.getGroups(user.id)
-      user.groups = groups
-    }
   } else if (topUserSubDoc) {
     result = docs.hits.hits[0]._source[topUserSubDoc.userField]
     // for sub-resource query, it returns all sub-resource items in one user,
@@ -1430,11 +1422,6 @@ async function searchUsers (authUser, filter, params) {
   logger.debug('Enrich users')
 
   const result = await enrichUsers(users)
-  // enrich groups
-  for (const user of users) {
-    const groups = await groupApi.getGroups(user.id)
-    user.groups = groups
-  }
 
   return {
     total: getTotalCount(docs.hits.total),