Merge branch 'develop'

Author: James Cori

src/common/helper.js

@@ -295,6 +295,23 @@ async function scan (modelName, scanParams) {
   })
 }
 
+/**
+ * Get all data collection (avoid default page limit of DynamoDB) by scan parameters
+ * @param {Object} modelName The dynamoose model name
+ * @param {Object} scanParams The scan parameters object
+ * @returns {Array}
+ */
+async function scanAll (modelName, scanParams) {
+  let results = await models[modelName].scan(scanParams).exec()
+  let lastKey = results.lastKey
+  while (!_.isUndefined(results.lastKey)) {
+    const newResult = await models[modelName].scan(scanParams).startAt(lastKey).exec()
+    results = [...results, ...newResult]
+    lastKey = newResult.lastKey
+  }
+  return results
+}
+
 /**
  * Test whether the given value is partially match the filter.
  * @param {String} filter the filter
@@ -918,6 +935,7 @@ module.exports = {
   create,
   update,
   scan,
+  scanAll,
   validateDuplicate,
   partialMatch,
   validatePhases,

src/controllers/ChallengeTimelineTemplateController.js

@@ -3,6 +3,7 @@
  */
 const HttpStatus = require('http-status-codes')
 const service = require('../services/ChallengeTimelineTemplateService')
+const helper = require('../common/helper')
 
 /**
  * Search challenge type timeline templates.
@@ -11,7 +12,8 @@ const service = require('../services/ChallengeTimelineTemplateService')
  */
 async function searchChallengeTimelineTemplates (req, res) {
   const result = await service.searchChallengeTimelineTemplates(req.query)
-  res.send(result)
+  helper.setResHeaders(req, res, result)
+  res.send(result.result)
 }
 
 /**

src/services/AuditLogService.js

@@ -15,7 +15,7 @@ const helper = require('../common/helper')
 async function searchAuditLogs (criteria) {
   const page = criteria.page || 1
   const perPage = criteria.perPage || 50
-  let records = await helper.scan('AuditLog')
+  let records = await helper.scanAll('AuditLog')
   // TODO this needs to be in ES
   if (criteria.fieldName) records = _.filter(records, e => helper.partialMatch(criteria.fieldName, e.fieldName))
   if (criteria.createdDateStart) records = _.filter(records, e => criteria.createdDateStart.getTime() <= e.created.getTime())

src/services/ChallengeService.js

@@ -640,7 +640,7 @@ searchChallenges.schema = {
     tags: Joi.array().items(Joi.string()),
     includeAllTags: Joi.boolean().default(true),
     projectId: Joi.number().integer().positive(),
-    forumId: Joi.number().integer().positive(),
+    forumId: Joi.number().integer(),
     legacyId: Joi.number().integer().positive(),
     status: Joi.string().valid(_.values(constants.challengeStatuses)),
     group: Joi.string(),
@@ -722,13 +722,19 @@ async function validateChallengeData (challenge) {
  * @param {String} timelineTemplateId the timeline template id
  */
 async function populatePhases (phases, startDate, timelineTemplateId) {
-  if (!phases || phases.length === 0) {
-    return
-  }
   if (_.isUndefined(timelineTemplateId)) {
     throw new errors.BadRequestError(`Invalid timeline template ID: ${timelineTemplateId}`)
   }
   const template = await helper.getById('TimelineTemplate', timelineTemplateId)
+  if (!phases || phases.length === 0) {
+    // auto populate phases
+    for (const p of template.phases) {
+      phases.push({
+        phaseId: p.phaseId,
+        duration: p.defaultDuration
+      })
+    }
+  }
   const phaseDefinitions = await helper.scan('Phase')
   // generate phase instance ids
   for (let i = 0; i < phases.length; i += 1) {
@@ -861,7 +867,11 @@ async function createChallenge (currentUser, challenge, userToken) {
       throw new errors.BadRequestError(`trackId and typeId are required to create a challenge`)
     }
   }
-  if (challenge.timelineTemplateId && challenge.phases && challenge.phases.length > 0) {
+
+  if (challenge.timelineTemplateId) {
+    if (!challenge.phases) {
+      challenge.phases = []
+    }
     await populatePhases(challenge.phases, challenge.startDate, challenge.timelineTemplateId)
   }
 
@@ -1072,7 +1082,7 @@ async function getChallenge (currentUser, id) {
   // Remove privateDescription for unregistered users
   let memberChallengeIds
   if (currentUser) {
-    if (!currentUser.isMachine) {
+    if (!currentUser.isMachine && !helper.hasAdminRole(currentUser)) {
       memberChallengeIds = await helper.listChallengesByMember(currentUser.userId)
       if (!_.includes(memberChallengeIds, challenge.id)) {
         _.unset(challenge, 'privateDescription')
@@ -1306,11 +1316,13 @@ async function update (currentUser, challengeId, data, userToken, isFull) {
         }
       }
     }
-    const newPhases = challenge.phases
+
+    const newPhases = _.cloneDeep(challenge.phases) || []
     const newStartDate = data.startDate || challenge.startDate
 
     await helper.validatePhases(newPhases)
     // populate phases
+
     await populatePhases(newPhases, newStartDate, data.timelineTemplateId || challenge.timelineTemplateId)
     data.phases = newPhases
     data.startDate = newStartDate
@@ -1793,7 +1805,7 @@ partiallyUpdateChallenge.schema = {
       reviewType: Joi.string(),
       confidentialityType: Joi.string().default(config.DEFAULT_CONFIDENTIALITY_TYPE),
       directProjectId: Joi.number(),
-      forumId: Joi.number().integer().positive(),
+      forumId: Joi.number().integer(),
       isTask: Joi.boolean()
     }).unknown(true),
     task: Joi.object().keys({

src/services/ChallengeTimelineTemplateService.js

@@ -16,12 +16,17 @@ const constants = require('../../app-constants')
  * @returns {Array} the search result
  */
 async function searchChallengeTimelineTemplates (criteria) {
-  let records = await helper.scan('ChallengeTimelineTemplate')
+  let records = await helper.scanAll('ChallengeTimelineTemplate')
   if (criteria.typeId) records = _.filter(records, e => (criteria.typeId === e.typeId))
   if (criteria.trackId) records = _.filter(records, e => (criteria.trackId === e.trackId))
   if (criteria.timelineTemplateId) records = _.filter(records, e => (criteria.timelineTemplateId === e.timelineTemplateId))
   if (!_.isUndefined(criteria.isDefault)) records = _.filter(records, e => (e.isDefault === (criteria.isDefault === 'true')))
-  return records
+  return {
+    total: records.length,
+    page: 1,
+    perPage: Math.max(records.length, 10),
+    result: records
+  }
 }
 
 searchChallengeTimelineTemplates.schema = {

src/services/ChallengeTrackService.js

@@ -16,7 +16,7 @@ const constants = require('../../app-constants')
  */
 async function searchChallengeTracks (criteria) {
   // TODO - move this to ES
-  let records = await helper.scan('ChallengeTrack')
+  let records = await helper.scanAll('ChallengeTrack')
   const page = criteria.page || 1
   const perPage = criteria.perPage || 50
 

src/services/ChallengeTypeService.js

@@ -15,7 +15,7 @@ const constants = require('../../app-constants')
  */
 async function searchChallengeTypes (criteria) {
   // TODO - move this to ES
-  let records = await helper.scan('ChallengeType')
+  let records = await helper.scanAll('ChallengeType')
   const page = criteria.page || 1
   const perPage = criteria.perPage || 50
 

src/services/PhaseService.js

@@ -17,7 +17,7 @@ const constants = require('../../app-constants')
 async function searchPhases (criteria) {
   const page = criteria.page || 1
   const perPage = criteria.perPage || 50
-  const list = await helper.scan('Phase')
+  const list = await helper.scanAll('Phase')
   const records = _.filter(list, e => helper.partialMatch(criteria.name, e.name))
   const total = records.length
   const result = records.slice((page - 1) * perPage, page * perPage)

src/services/TimelineTemplateService.js

@@ -17,7 +17,7 @@ const constants = require('../../app-constants')
 async function searchTimelineTemplates (criteria) {
   const page = criteria.page || 1
   const perPage = criteria.perPage || 50
-  const list = await helper.scan('TimelineTemplate')
+  const list = await helper.scanAll('TimelineTemplate')
   const records = _.filter(list, e => helper.partialMatch(criteria.name, e.name))
   const total = records.length
   const result = records.slice((page - 1) * perPage, page * perPage)