Merge pull request #34 from topcoder-platform/develop

Shapeup4 :  CQRS standards update, part 1

Author: sachin-maheshwari

.circleci/config.yml

@@ -70,12 +70,12 @@ workflows:
             branches:
               only:
                 - develop
-                - dev-circleci
+                - feature/shapeup-cqrs-update
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.
       - "build-prod":
           context : org-global
           filters:
             branches:
-              only: master
+              only: master

src/services/ProcessorService.js

@@ -20,7 +20,11 @@ const config = require('config')
  */
 async function processCreate (message, transactionId) {
   const resource = message.payload.resource
-  if (_.includes(_.keys(topResources), resource)) {
+
+  // shapeup - CQRS standards update
+  const fixedTopResources = _.filter(_.keys(topResources), (key) => key !== 'user')
+  
+  if (_.includes(_.keys(fixedTopResources), resource)) {
     // process the top resources such as user, skill...
     helper.validProperties(message.payload, ['id'])
     const client = await helper.getESClient()
@@ -82,7 +86,7 @@ async function processCreate (message, transactionId) {
       await helper.updateOrg(message.payload.organizationId, org, seqNo, primaryTerm, transactionId)
     }
   } else {
-    logger.info(`Ignore this message since resource is not in [${_.union(_.keys(topResources), _.keys(userResources), _.keys(organizationResources))}]`)
+    logger.info(`Ignore this message since resource is not in [${_.union(_.values(fixedTopResources), _.keys(userResources), _.keys(organizationResources))}]`)
   }
 }
 
@@ -107,7 +111,11 @@ processCreate.schema = {
  */
 async function processUpdate (message, transactionId) {
   const resource = message.payload.resource
-  if (_.includes(_.keys(topResources), resource)) {
+
+  // shapeup - CQRS standards update
+  const fixedTopResources = _.filter(_.keys(topResources), (key) => key !== 'user')
+ 
+  if (_.includes(fixedTopResources, resource)) {
     logger.info(`Processing top level resource: ${resource}`)
     // process the top resources such as user, skill...
     helper.validProperties(message.payload, ['id'])
@@ -171,7 +179,7 @@ async function processUpdate (message, transactionId) {
       await helper.updateOrg(message.payload.organizationId, org, seqNo, primaryTerm, transactionId)
     }
   } else {
-    logger.info(`Ignore this message since resource is not in [${_.union(_.keys(topResources), _.keys(userResources), _.keys(organizationResources))}]`)
+    logger.info(`Ignore this message since resource is not in [${_.union(_.values(fixedTopResources), _.keys(userResources), _.keys(organizationResources))}]`)
   }
 }