minor clean up

Author: ThomasKranitsas

README.md

@@ -57,8 +57,6 @@ if not provided, then SSL connection is not used, direct insecure connection is
 - AUTH0_CLIENT_SECRET: Auth0 client secret for M2M token
 - IS_CREATE_FORUM: Should create forum resource or not
 - CHALLENGE_ORIGINATOR: originator from challenge service
-- CHALLENGE_USER_UNREGISTRATION_TOPIC: unregistration topic from challenge service
-- CHALLENGE_USER_REGISTRATION_TOPIC: registration topic from challenge service
 
 Also note that there is a `/health` endpoint that checks for the health of the app. This sets up an expressjs server and listens on the environment variable `PORT`. It's not part of the configuration file and needs to be passed as an environment variable
 

config/default.js

@@ -28,8 +28,6 @@ module.exports = {
   DELETE_CHALLENGE_RESOURCE_TOPIC: process.env.DELETE_CHALLENGE_RESOURCE_TOPIC || 'challenge.action.resource.delete',
 
   CHALLENGE_ORIGINATOR: process.env.CHALLENGE_ORIGINATOR || 'app.challenge.service',
-  CHALLENGE_USER_UNREGISTRATION_TOPIC: process.env.CHALLENGE_USER_UNREGISTRATION_TOPIC || 'notifications.kafka.queue.java.test',
-  CHALLENGE_USER_REGISTRATION_TOPIC: process.env.CHALLENGE_USER_REGISTRATION_TOPIC || 'notifications.kafka.queue.java.test',
 
   CHALLENGE_API_V4_URL: process.env.CHALLENGE_API_V4_URL || 'https://api.topcoder-dev.com/v4/challenges',
   CHALLENGE_API_V5_URL: process.env.CHALLENGE_API_V5_URL || 'http://localhost:3001/v5/challenges',
@@ -50,7 +48,7 @@ module.exports = {
     DB_LOCALE: process.env.INFORMIX_DB_LOCALE || 'en_US.57372',
     USER: process.env.INFORMIX_USER || 'informix', // user
     PASSWORD: process.env.INFORMIX_PASSWORD || '1nf0rm1x', // password
-    POOL_MAX_SIZE: parseInt(process.env.MAXPOOL, 10) || 60,
+    POOL_MAX_SIZE: parseInt(process.env.INFORMIX_POOL_MAX_SIZE, 10) || 60,
     maxsize: parseInt(process.env.MAXSIZE) || 0,
     minpool: parseInt(process.env.MINPOOL, 10) || 1,
     idleTimeout: parseInt(process.env.IDLETIMEOUT, 10) || 3600,

src/services/ResourceDirectManager.js

@@ -1,7 +1,6 @@
 const ProjectServices = require('./ProjectService')
 const RegistrationDAO = require('../dao/RegistrationDAO')
 const config = require('config')
-const helper = require('../common/helper')
 const SequenceDAO = require('../dao/SequenceDAO')
 const Constants = require('../constants')
 const ForumsWrapper = require('../dao/ForumWrapper')
@@ -153,7 +152,6 @@ async function removeRole (operatorId, contestId, roleId, userId, phase, addNoti
  */
 async function addResource (operatorId, challengeId, resourceRoleId, isStudio) {
   await assignRole(operatorId, challengeId, resourceRoleId, operatorId, null, false, false, isStudio, false)
-  await fireEvent('ADD_RESOURCE', challengeId, operatorId, resourceRoleId, operatorId, isStudio)
 }
 
 /**
@@ -166,31 +164,6 @@ async function addResource (operatorId, challengeId, resourceRoleId, isStudio) {
  */
 async function removeResource (operatorId, challengeId, resourceRoleId, isStudio) {
   await removeRole(operatorId, challengeId, resourceRoleId, operatorId, null, false, false, isStudio, false)
-  await fireEvent('REMOVE_RESOURCE', challengeId, operatorId, resourceRoleId, operatorId, isStudio)
-}
-
-/**
- * Fire event
- *
- * @param type the message type
- * @param challengeId the challengeId to use
- * @param userId the user id
- * @param resourceRoleId the user id
- * @param operatorId the user id
- * @param isStudio is studio or not
- */
-async function fireEvent (type, challengeId, userId, resourceRoleId, operatorId, isStudio) {
-  const message = {
-    type,
-    detail: {
-      challengeId,
-      userId,
-      resourceRoleId,
-      operatorId,
-      isStudio
-    }
-  }
-  await helper.postBusEvent(config.CHALLENGE_USER_UNREGISTRATION_TOPIC, message)
 }
 
 module.exports = {

src/services/UnRegistrationManager.js

@@ -1,7 +1,5 @@
 const UnRegistrationDAO = require('../dao/UnRegistrationDAO')
 const logger = require('../common/logger')
-const helper = require('../common/helper')
-const config = require('../../config/default')
 const Constants = require('../constants')
 const ForumWrapper = require('../dao/ForumWrapper')
 const EsFeederServiceClient = require('../client/EsFeederServiceClient')
@@ -64,29 +62,9 @@ async function unregisterChallenge (userId, challengeId) {
       }
     }
   }
-  // TODO: implement following logic in nodejs
-  await fireEvent(challengeId, userId)
-  logger.info('notify es es')
   await EsFeederServiceClient.notifyChallengeChange(challengeId)
 }
 
-/**
- * Fire event
- *
- * @param challengeId the challengeId to use
- * @param userId the user id
- */
-async function fireEvent (challengeId, userId) {
-  const message = {
-    type: 'USER_UNREGISTRATION',
-    detail: {
-      challengeId,
-      userId
-    }
-  }
-  await helper.postBusEvent(config.CHALLENGE_USER_UNREGISTRATION_TOPIC, message)
-}
-
 module.exports = {
   unregisterChallenge
 }