Merge branch 'develop'

Author: James Cori

config/default.js

@@ -58,6 +58,9 @@ module.exports = {
     ? process.env.COPILOT_RESOURCE_ROLE_IDS.split(',') : ['10ba038e-48da-487b-96e8-8d3b99b6d18b'],
   SUBMITTER_ROLE_ID: process.env.SUBMITTER_ROLE_ID || '732339e7-8e30-49d7-9198-cccf9451e221',
 
+  MANAGER_ROLE_ID: process.env.MANAGER_ROLE_ID || '0e9c6879-39e4-4eb6-b8df-92407890faf1',
+  OBSERVER_ROLE_ID: process.env.OBSERVER_ROLE_ID || '2a4dc376-a31c-4d00-b173-13934d89e286',
+
   // health check timeout in milliseconds
   HEALTH_CHECK_TIMEOUT: process.env.HEALTH_CHECK_TIMEOUT || 3000,
 

src/common/helper.js

@@ -87,24 +87,24 @@ function getPageLink (req, page) {
  */
 function setResHeaders (req, res, result) {
   const totalPages = Math.ceil(result.total / result.perPage)
-  if (result.page > 1) {
-    res.set('X-Prev-Page', result.page - 1)
+  if (parseInt(result.page, 10) > 1) {
+    res.set('X-Prev-Page', parseInt(result.page, 10) - 1)
   }
-  if (result.page < totalPages) {
-    res.set('X-Next-Page', result.page + 1)
+  if (parseInt(result.page, 10) < totalPages) {
+    res.set('X-Next-Page', parseInt(result.page, 10) + 1)
   }
-  res.set('X-Page', result.page)
+  res.set('X-Page', parseInt(result.page, 10))
   res.set('X-Per-Page', result.perPage)
   res.set('X-Total', result.total)
   res.set('X-Total-Pages', totalPages)
   // set Link header
   if (totalPages > 0) {
     let link = `<${getPageLink(req, 1)}>; rel="first", <${getPageLink(req, totalPages)}>; rel="last"`
-    if (result.page > 1) {
-      link += `, <${getPageLink(req, result.page - 1)}>; rel="prev"`
+    if (parseInt(result.page, 10) > 1) {
+      link += `, <${getPageLink(req, parseInt(result.page, 10) - 1)}>; rel="prev"`
     }
-    if (result.page < totalPages) {
-      link += `, <${getPageLink(req, result.page + 1)}>; rel="next"`
+    if (parseInt(result.page, 10) < totalPages) {
+      link += `, <${getPageLink(req, parseInt(result.page, 10) + 1)}>; rel="next"`
     }
     res.set('Link', link)
   }
@@ -410,6 +410,25 @@ async function getChallengeResources (challengeId) {
   return result
 }
 
+/**
+ * Create challenge resources
+ * @param {String} challengeId the challenge id
+ * @param {String} memberHandle the user's member handle
+ * @param {String} roleId the resource role ID to assign
+ */
+async function createResource (challengeId, memberHandle, roleId) {
+  const token = await getM2MToken()
+
+  const userObj = {
+    challengeId,
+    memberHandle,
+    roleId
+  }
+  const url = `${config.RESOURCES_API_URL}`
+  const res = await axios.post(url, userObj, { headers: { Authorization: `Bearer ${token}` } })
+  return res || false
+}
+
 /**
  * Get resource roles
  * @returns {Promise<Array>} the challenge resources
@@ -427,7 +446,7 @@ async function getResourceRoles () {
  */
 async function userHasFullAccess (challengeId, userId) {
   const resourceRoles = await getResourceRoles()
-  const rolesWithFullAccess = _.map(_.filter(resourceRoles, r => r.fullAccess), 'id')
+  const rolesWithFullAccess = _.map(_.filter(resourceRoles, r => r.fullWriteAccess), 'id')
   const challengeResources = await getChallengeResources(challengeId)
   return _.filter(challengeResources, r => _.toString(r.memberId) === _.toString(userId) && _.includes(rolesWithFullAccess, r.roleId)).length > 0
 }
@@ -763,6 +782,7 @@ module.exports = {
   downloadFromS3,
   deleteFromS3,
   getChallengeResources,
+  createResource,
   getUserGroups,
   ensureNoDuplicateOrNullElements,
   postBusEvent,

src/services/ChallengeService.js

@@ -174,7 +174,14 @@ async function searchChallenges (currentUser, criteria) {
       // Parse and use metadata key
       if (!_.isUndefined(criteria[key])) {
         const metaKey = key.split('meta.')[1]
-        boolQuery.push({ match_phrase: { [`metadata.${metaKey}`]: criteria[key] } })
+        boolQuery.push({
+          bool: {
+            must: [
+              { match_phrase: { 'metadata.name': metaKey } },
+              { match_phrase: { 'metadata.value': _.toString(criteria[key]) } }
+            ]
+          }
+        })
       }
     }
   })
@@ -843,9 +850,6 @@ async function createChallenge (currentUser, challenge, userToken) {
     ret.type = type.name
   }
 
-  // post bus event
-  await helper.postBusEvent(constants.Topics.ChallengeCreated, ret)
-
   // Create in ES
   await esClient.create({
     index: config.get('ES.ES_INDEX'),
@@ -854,6 +858,18 @@ async function createChallenge (currentUser, challenge, userToken) {
     id: ret.id,
     body: ret
   })
+
+  // if created by a user, add user as a manager
+  if (currentUser.handle) {
+    logger.debug(`Adding user as manager ${currentUser.handle}`)
+    await helper.createResource(ret.id, ret.createdBy, config.MANAGER_ROLE_ID)
+  } else {
+    logger.debug(`Not adding manager ${currentUser.sub} ${JSON.stringify(currentUser)}`)
+  }
+
+  // post bus event
+  await helper.postBusEvent(constants.Topics.ChallengeCreated, ret)
+
   return ret
 }