Merge pull request #49 from topcoder-platform/develop

Prod Release - Handling m2m tokens for traits and added new trait for onboarding_checklist

Author: vikasrohit

.circleci/config.yml

@@ -74,4 +74,4 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: master
+              only: master

config/default.js

@@ -116,5 +116,7 @@ module.exports = {
   // Public group id
   PUBLIC_GROUP_ID: process.env.PUBLIC_GROUP_ID || '10',
   // Private group ids will be excluded from results for non-admin users.
-  PRIVATE_GROUP_IDS: JSON.parse(process.env.PRIVATE_GROUP_IDS || '["20000000"]')
+  PRIVATE_GROUP_IDS: JSON.parse(process.env.PRIVATE_GROUP_IDS || '["20000000"]'),
+  // id of the tcwebservice user, used to audit fields in case of m2m tokens
+  TC_WEBSERVICE_USERID: process.env.TC_WEBSERVICE_USERID || 22838965
 }

src/services/MemberTraitService.js

@@ -13,7 +13,7 @@ const constants = require('../../app-constants')
 
 const esClient = helper.getESClient()
 
-const TRAIT_IDS = ['basic_info', 'education', 'work', 'communities', 'languages', 'hobby', 'organization', 'device', 'software', 'service_provider', 'subscription', 'personalization', 'connect_info']
+const TRAIT_IDS = ['basic_info', 'education', 'work', 'communities', 'languages', 'hobby', 'organization', 'device', 'software', 'service_provider', 'subscription', 'personalization', 'connect_info', 'onboarding_checklist']
 
 const TRAIT_FIELDS = ['userId', 'traitId', 'categoryName', 'traits', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy']
 
@@ -123,7 +123,7 @@ async function createTraits (currentUser, handle, data) {
     const trait = data[i]
     trait.userId = member.userId
     trait.createdAt = new Date().toISOString()
-    trait.createdBy = Number(currentUser.userId || currentUser.sub)
+    trait.createdBy = Number(currentUser.userId || config.TC_WEBSERVICE_USERID) // currentUser.sub is a string, we can not store it Number column
     if (trait.traits) {
       trait.traits = { 'traitId': trait.traitId, 'data': trait.traits.data }
     } else {
@@ -184,7 +184,7 @@ async function updateTraits (currentUser, handle, data) {
       existing.categoryName = trait.categoryName
     }
     existing.updatedAt = new Date().toISOString()
-    existing.updatedBy = Number(currentUser.userId || currentUser.sub)
+    existing.updatedBy = Number(currentUser.userId || config.TC_WEBSERVICE_USERID) // currentUser.sub is a string, we can not store it Number column
     if (trait.traits) {
       existing.traits = { 'traitId': trait.traitId, 'data': trait.traits.data }
     } else {