Merge branch 'develop'

Author: James Cori

src/services/challengeService.js

@@ -87,7 +87,7 @@ async function updateChallenge (challenge) {
       id: challenge.id,
       body: {
         doc: {
-          ...challenge,
+          ..._.omit(challenge, ['created', 'createdBy']),
           groups: _.filter(challenge.groups, g => _.toString(g).toLowerCase() !== 'null')
         }
       }

src/services/resourceService.js

@@ -230,6 +230,24 @@ async function getResourcesFromV5API (challengeId, roleId) {
   return { result: [], total: 0 }
 }
 
+async function createResourceInV5 (challengeId, memberHandle, roleId) {
+  const token = await getM2MToken()
+  const url = `${config.RESOURCES_API_URL}`
+  const data = {
+    challengeId,
+    memberHandle,
+    roleId
+  }
+  let res = null
+  try {
+    logger.debug(`Creating Resource ${challengeId}, ${memberHandle}, ${roleId}`)
+    res = await axios.post(url, data, { headers: { Authorization: `Bearer ${token}` } })
+  } catch (e) {
+    logger.error(`get from v5 error ${JSON.stringify(e)}`)
+  }
+  return res
+}
+
 module.exports = {
   createMissingResourceRoles,
   migrateResourcesForChallenge,
@@ -239,5 +257,6 @@ module.exports = {
   saveResourceRoles,
   saveResource,
   getResourcesFromV5API,
-  deleteAllResourcesForChallenge
+  deleteAllResourcesForChallenge,
+  createResourceInV5
 }

src/services/syncService.js

@@ -140,7 +140,10 @@ async function processResources (legacyId, challengeId, force) {
     // logger.debug(`Find resource in V5 ${JSON.stringify(v4Obj)}`)
     if (!_.find(currentV5Array.result, { memberId: _.toString(v4Obj.memberId), roleId: v4Obj.roleId })) {
       logger.debug(`Sync :: ++ Resource Not Found, adding ${JSON.stringify({ memberHandle: v4Obj.memberHandle, roleId: v4Obj.roleId })}`)
-      await resourceService.saveResource(v4Obj)
+      // await resourceService.saveResource(v4Obj)
+      // Changing to use the v5 api so events are thrown and members get added to the forum
+      await resourceService.createResourceInV5(challengeId, v4Obj.memberHandle, v4Obj.roleId)
+
       resourcesAdded += 1
     }
   }