Cleaning up. Removing ES. Fixing the GET return

Author: rootelement

config/default.js

@@ -44,17 +44,6 @@ module.exports = {
     idleTimeout: parseInt(process.env.IDLETIMEOUT, 10) || 3600,
     timeout: parseInt(process.env.TIMEOUT, 10) || 30000
   },
-
-  V4_ES: {
-    // above AWS_REGION is used if we use AWS ES
-    AWS_REGION: process.env.AWS_REGION || 'ap-northeast-1',
-    HOST: process.env.V4_ES_HOST,
-    API_VERSION: process.env.V4_ES_API_VERSION || '6.8',
-    CHALLENGE_ES_INDEX: process.env.CHALLENGE_ES_INDEX || 'challengeslisting', // challenge es index
-    CHALLENGE_ES_TYPE: process.env.CHALLENGE_ES_TYPE || 'challenges', // challenge es type
-    ES_REFRESH: process.env.ES_REFRESH || 'true'
-  },
-
   // Topcoder APIs
   V5_CHALLENGE_API_URL: process.env.V5_CHALLENGE_API_URL || 'http://localhost:4000/v5/challenges',
   V5_CHALLENGE_TYPE_API_URL: process.env.V5_CHALLENGE_TYPE_API_URL || 'http://localhost:4000/v5/challenge-types',

package.json

@@ -25,13 +25,10 @@
     "@topcoder-platform/topcoder-bus-api-wrapper": "^1.2.0",
     "@topcoder-platform/topcoder-healthcheck-dropin": "^1.1.0",
     "async-mutex": "^0.2.4",
-    "aws-sdk": "^2.729.0",
     "bluebird": "^3.7.2",
     "config": "^3.3.1",
-    "elasticsearch": "^16.7.1",
     "get-parameter-names": "^0.3.0",
     "gulp": "^4.0.2",
-    "http-aws-es": "^6.0.0",
     "http-json-response": "^1.0.1",
     "ifxnjs": "^10.0.5",
     "lodash": "^4.17.19",

src/common/helper.js

@@ -2,12 +2,9 @@
  * Contains generic helper methods
  */
 
-const elasticsearch = require('elasticsearch')
-const AWS = require('aws-sdk')
 const _ = require('lodash')
 const config = require('config')
 const ifxnjs = require('ifxnjs')
-const logger = require('./logger')
 const request = require('superagent')
 const m2mAuth = require('tc-core-library-js').auth.m2m
 const busApi = require('@topcoder-platform/topcoder-bus-api-wrapper')
@@ -18,53 +15,9 @@ const Pool = ifxnjs.Pool
 const pool = Promise.promisifyAll(new Pool())
 pool.setMaxPoolSize(config.get('INFORMIX.POOL_MAX_SIZE'))
 
-AWS.config.region = config.get('V4_ES.AWS_REGION')
-// ES Client
-let esClient
-
 // Bus API Client
 let busApiClient
 
-/**
- * Get ES Client
- * @return {Object} Elastic Host Client Instance
- */
-function getESClient () {
-  logger.debug('getES Client Called')
-  const esHost = config.get('V4_ES.HOST')
-  if (esClient) {
-    // logger.debug(`Cached ES Client: ${JSON.stringify(esClient)}`)
-    return esClient
-  } else {
-    // logger.debug(`No ES Client, building.... ${esClient}`)
-  }
-
-  try {
-    // AWS ES configuration is different from other providers
-    logger.debug('getES Client in try')
-    if (/.*amazonaws.*/.test(esHost)) {
-      esClient = elasticsearch.Client({
-        apiVersion: config.get('V4_ES.API_VERSION'),
-        hosts: esHost,
-        connectionClass: require('http-aws-es'), // eslint-disable-line global-require
-        amazonES: {
-          region: config.get('V4_ES.AWS_REGION'),
-          credentials: new AWS.EnvironmentCredentials('AWS')
-        }
-      })
-    } else {
-      esClient = new elasticsearch.Client({
-        apiVersion: config.get('V4_ES.API_VERSION'),
-        hosts: esHost
-      })
-    }
-    // logger.debug(`ES Client: ${JSON.stringify(esClient)}`)
-  } catch (e) {
-    logger.error(`Get ES Client Error ${e}`)
-  }
-  return esClient
-}
-
 /**
  * Get Informix connection using the configured parameters
  * @return {Object} Informix connection
@@ -205,6 +158,5 @@ module.exports = {
   getRequest,
   putRequest,
   postRequest,
-  postBusEvent,
-  getESClient
+  postBusEvent
 }

src/services/ProcessorService.js

@@ -389,50 +389,8 @@ async function processUpdate (message) {
     return
   }
 
-  // let challengeV4FromEs
-  // let esClient
-  // const esQuery = {
-  //   index: config.get('V4_ES.CHALLENGE_ES_INDEX'),
-  //   type: config.get('V4_ES.CHALLENGE_ES_TYPE'),
-  //   size: 1,
-  //   from: 0,
-  //   body: {
-  //     _source: ['groupIds'],
-  //     query: {
-  //       match_phrase: {
-  //         _id: message.payload.legacyId
-  //       }
-  //     }
-  //   }
-  // }
-
   const v4GroupIds = await groupService.getGroupsForChallenge(message.payload.legacyId)
   logger.info(`GroupIDs Found in Informix: ${JSON.stringify(v4GroupIds)}`)
-  // try {
-  //   // Search with constructed query
-  //   // logger.debug(`Looking Up Challenge in V4 - index: ${config.get('V4_ES.CHALLENGE_ES_INDEX')} type: ${config.get('V4_ES.CHALLENGE_ES_TYPE')} - Query: ${JSON.stringify(esQuery)}`)
-  //   esClient = helper.getESClient()
-  //   const docs = await esClient.search(esQuery)
-  //   logger.debug(`Docs: ${JSON.stringify(docs)}`)
-  //   // Extract data from hits
-  //   if (docs.hits.total === 0) {
-  //     throw new Error('Challenge does not exist yet on ES')
-  //   }
-  //   challengeV4FromEs = _.map(docs.hits.hits, item => item._source)[0]
-  //   if (!challengeV4FromEs) {
-  //     throw new Error(`Could not find challenge ${message.payload.legacyId} on ES`)
-  //   }
-  // } catch (e) {
-  //   // postpone kafka event
-  //   logger.info(`Challenge does not exist yet on ES. Will post the same message back to the bus API, ${e}`)
-  //   await new Promise((resolve) => {
-  //     setTimeout(async () => {
-  //       await helper.postBusEvent(config.UPDATE_CHALLENGE_TOPIC, message.payload)
-  //       resolve()
-  //     }, config.RETRY_TIMEOUT)
-  //   })
-  //   return
-  // }
 
   const saveDraftContestDTO = await parsePayload(message.payload, m2mToken, false, v4GroupIds)
   logger.debug('Parsed Payload', saveDraftContestDTO)

src/services/groupsService.js

@@ -120,12 +120,7 @@ async function getChallengeEligibilityId (connection, challengeLegacyId) {
   logger.info(`getChallengeEligibilityId Query: ${util.format(QUERY_GET_ELIGIBILITY_ID, challengeLegacyId)}`)
   const result = await connection.queryAsync(util.format(QUERY_GET_ELIGIBILITY_ID, challengeLegacyId))
   logger.info(`getChallengeEligibilityId Result: ${JSON.stringify(result)}`)
-  // if (result.length === 0) {
-  //   logger.debug(`getChallengeEligibility not found, creating ${challengeLegacyId}`)
-  //   await createChallengeEligibilityRecord(connection, challengeLegacyId)
-  //   result = await connection.queryAsync(util.format(QUERY_GET_ELIGIBILITY_ID, challengeLegacyId))
-  // }
-  return result[0].contest_eligibility_id || false
+  return (result && result[0]) ? result[0].contest_eligibility_id : false
 }
 
 /**