Merge pull request #52 from topcoder-platform/hot-fix-master/clean-up-legacy-events

Remove challenge.notification.events

Author: rootelement

docker-compose.yml

@@ -17,4 +17,4 @@ services:
       KAFKA_ADVERTISED_HOST_NAME: localhost
       KAFKA_ADVERTISED_PORT: 9092
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_CREATE_TOPICS: "challenge.notification.create:1:1,challenge.notification.update:1:1,challenge.notification.events:1:1,challenge.action.resource.create:1:1,challenge.action.resource.delete:1:1"
+      KAFKA_CREATE_TOPICS: "challenge.notification.create:1:1,challenge.notification.update:1:1,challenge.action.resource.create:1:1,challenge.action.resource.delete:1:1"

package-lock.json

@@ -11,16 +11,9 @@ module.exports = {
       CHALLENGE_CREATE_TOPIC: 'challenge.notification.create',
       // For challenge update
       CHALLENGE_UPDATE_TOPIC: 'challenge.notification.update',
-      // For member registrations and de-registrations
-      CHALLENGE_NOTIFICATION_TOPIC: 'challenge.notification.events',
-      // For co-pilots,PMs,etc.
+      // For member registrations and de-registrations, co-pilots,PMs,etc.
       RESOURCE_CREATE_TOPIC: 'challenge.action.resource.create',
       RESOURCE_DELETE_TOPIC: 'challenge.action.resource.delete'
-    },
-    // Values of `type` in payload of challenge.notification.events
-    CHALLENGE_NOTIFICATION_EVENT_TYPES: {
-      USER_REGISTRATION: 'USER_REGISTRATION',
-      USER_UNREGISTRATION: 'USER_UNREGISTRATION'
     }
   },
   TEMPLATES: {

sample-data/challenge.notification.events-registeration.json

@@ -22,17 +22,10 @@ if (config.VANILLA_ENABLED) {
   services.push(manageVanillaUser)
 }
 
-function canProcessEvent (payload, topic) {
-  if (topic === constants.KAFKA.TOPICS.CHALLENGE_NOTIFICATION_TOPIC) {
-    const eventTypes = constants.KAFKA.CHALLENGE_NOTIFICATION_EVENT_TYPES
-    const actionMap = {
-      [eventTypes.USER_REGISTRATION]: constants.USER_ACTIONS.INVITE,
-      [eventTypes.USER_UNREGISTRATION]: constants.USER_ACTIONS.KICK
-    }
-    if (!(payload.type in actionMap)) {
-      logger.debug(`Not supported ${payload.type}. Only message types ${JSON.stringify(Object.keys(eventTypes))} are processed from '${topic}'`)
-      return false
-    }
+function canProcessEvent (topic) {
+  if (!_.includes([constants.KAFKA.TOPICS.RESOURCE_CREATE_TOPIC, constants.KAFKA.TOPICS.RESOURCE_DELETE_TOPIC], topic)) {
+    logger.debug('Not supported topic.')
+    return false
   }
   return true
 }
@@ -65,7 +58,7 @@ async function handler (messageSet, topic) {
     return
   }
   for (const item of messageSet) {
-    if (!canProcessEvent(item, topic)) {
+    if (!canProcessEvent(topic)) {
       continue
     }
     if (_.isArray(item)) {

sample-data/challenge.notification.events-unregisteration.json

@@ -9,11 +9,6 @@ const topcoderApi = require('../../utils/topcoder-api.util')
  * @param {String} topic
  */
 function processPayload (payload, topic) {
-  const eventTypes = constants.KAFKA.CHALLENGE_NOTIFICATION_EVENT_TYPES
-  const actionMap = {
-    [eventTypes.USER_REGISTRATION]: constants.USER_ACTIONS.INVITE,
-    [eventTypes.USER_UNREGISTRATION]: constants.USER_ACTIONS.KICK
-  }
   switch (topic) {
     case constants.KAFKA.TOPICS.RESOURCE_CREATE_TOPIC:
       return {
@@ -29,20 +24,6 @@ function processPayload (payload, topic) {
         handle: payload.memberHandle,
         action: constants.USER_ACTIONS.KICK
       }
-    case constants.KAFKA.TOPICS.CHALLENGE_NOTIFICATION_TOPIC:
-      if (payload.detail && payload.detail.challengeId) {
-        // hack due to inconsistent payload from USER_UNREGISTRATION event
-        return {
-          challengeId: payload.detail.challengeId,
-          userId: payload.detail.userId,
-          action: actionMap[payload.type]
-        }
-      }
-      return {
-        challengeId: payload.data.challengeId,
-        userId: payload.data.userId,
-        action: actionMap[payload.type]
-      }
     default:
       throw new Error(`Received message from unrecognized '${topic}'`)
   }

src/constants.js

@@ -4,7 +4,6 @@ const handler = require('./handler')
 
 module.exports = {
   topics: [
-    constants.KAFKA.TOPICS.CHALLENGE_NOTIFICATION_TOPIC,
     constants.KAFKA.TOPICS.RESOURCE_CREATE_TOPIC,
     constants.KAFKA.TOPICS.RESOURCE_DELETE_TOPIC
   ],