Merge pull request #6 from topcoder-platform/develop

Sync master with develop

Author: callmekatootie

group-members-with-skills.js

@@ -17,13 +17,13 @@
  * - attributeGroupName: The attribute group name under which the primary attributes are created (isAvailable, location, company and title)
  */
 
-//require('dotenv').config()
+// require('dotenv').config()
 const _ = require('lodash')
 const config = require('config')
 const { argv } = require('yargs')
 const axios = require('axios')
 const m2mAuth = require('tc-core-library-js').auth.m2m
-const qs = require('querystring');
+const qs = require('querystring')
 const { parse } = require('json2csv')
 const fs = require('fs')
 
@@ -33,8 +33,8 @@ const USAGE = 'node group-members-with-skills.js --groupName="<group_name>" --sk
 
 let token
 
-async function sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
+async function sleep (ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
 }
 
 /**
@@ -94,7 +94,7 @@ async function getMembersInGroup (groupId) {
       const res = await axios.get(url, {
         params: {
           page,
-          perPage,
+          perPage
         },
         headers: {
           Authorization: `Bearer ${token}`
@@ -150,7 +150,7 @@ async function getMemberRecord (memberId) {
       }
     })
     console.log(res.data.result.content)
-    const user = _.pick(_.get(res, 'data.result.content[0]', {}), ['handle', 'firstName', 'lastName', 'email'] )
+    const user = _.pick(_.get(res, 'data.result.content[0]', {}), ['handle', 'firstName', 'lastName', 'email'])
 
     return user
   } catch (error) {
@@ -165,7 +165,7 @@ async function getMemberRecord (memberId) {
  * Returns the member location for the member handle
  * @param {String} handle The member handle
  */
-async function getMemberLocation(handle) {
+async function getMemberLocation (handle) {
   const token = await getM2Mtoken()
 
   try {
@@ -250,7 +250,7 @@ async function getCSV (data) {
     'attributeValue3',
     'attributeName4',
     'attributeGroupName4',
-    'attributeValue4',
+    'attributeValue4'
   ]
 
   try {
@@ -305,11 +305,11 @@ async function start () {
   console.log('Fetching the member handles for each member found in the group...')
 
   const membersFiltered = _.filter(members, (m) => {
-    return (m.membershipType === 'user') 
+    return (m.membershipType === 'user')
   })
 
-  memberIds = membersFiltered.map(m => m.memberId)
-  //const memberIds = [8547899]
+  const memberIds = membersFiltered.map(m => m.memberId)
+  // const memberIds = [8547899]
 
   for (let i = 0; i < memberIds.length; i++) {
     const user = await getMemberRecord(memberIds[i])

update-groups-v2.js

@@ -222,15 +222,15 @@ async function updateGroupsForUser (userId, groups) {
   })
 
   const propertyName = config.get('ES.USER_GROUP_PROPERTY_NAME')
-  if (!user[propertyName]) {
-    user[propertyName] = []
-  }
+  // if (!user[propertyName]) {
+  //   user[propertyName] = []
+  // }
 
-  let groupsTotal = user[propertyName].concat(groups)
+  // let groupsTotal = user[propertyName].concat(groups)
 
-  groupsTotal = _.uniqBy(groupsTotal, (g) => g.groupId)
+  // groupsTotal = _.uniqBy(groupsTotal, (g) => g.id)
 
-  user[propertyName] = groupsTotal
+  user[propertyName] = _.uniqBy(groups, (g) => g.id)
 
   await client.index({
     index: config.get('ES.USER_INDEX'),
@@ -265,7 +265,7 @@ async function start () {
       const memberId = externalProfiles[j].externalId
       console.log(`Getting groups of user with id ${memberId}`)
       let groups = await getGroupsOfUser(memberId)
-      groups = groups.map(g => ({ groupId: g.id, name: g.name }))
+      groups = groups.map(g => ({ id: g.id, name: g.name }))
 
       if (groups.length > 0) {
         if (!final[userId]) {

update-groups.js

@@ -256,15 +256,15 @@ async function updateGroupsForUser (userId, groups) {
   })
 
   const propertyName = config.get('ES.USER_GROUP_PROPERTY_NAME')
-  if (!user[propertyName]) {
-    user[propertyName] = []
-  }
+  // if (!user[propertyName]) {
+  //   user[propertyName] = []
+  // }
 
-  let groupsTotal = user[propertyName].concat(groups)
+  // let groupsTotal = user[propertyName].concat(groups)
 
-  groupsTotal = _.uniqBy(groupsTotal, (g) => g.groupId)
+  // groupsTotal = _.uniqBy(groupsTotal, (g) => g.id)
 
-  user[propertyName] = groupsTotal
+  user[propertyName] = _.uniqBy(groups, (g) => g.id)
 
   await client.index({
     index: config.get('ES.USER_INDEX'),
@@ -317,7 +317,7 @@ async function start () {
       }
 
       final[ubahnuser[0].id].push({
-        groupId: groups[i].id,
+        id: groups[i].id,
         name: groups[i].name
       })
     }