Merge branch 'develop'

Author: James Cori

config/default.js

@@ -23,6 +23,7 @@ module.exports = {
   // bus API config params
   BUSAPI_URL: process.env.BUSAPI_URL || 'https://api.topcoder-dev.com/v5',
   KAFKA_ERROR_TOPIC: process.env.KAFKA_ERROR_TOPIC || 'common.error.reporting',
+  SCHEDULING_TOPIC: process.env.SCHEDULING_TOPIC || 'challenge.notification.schedule.update',
 
   AMAZON: {
     // AWS_ACCESS_KEY_ID: process.env.AWS_FAKE_ID || 'FAKE_ACCESS_KEY',
@@ -75,5 +76,5 @@ module.exports = {
 
   DEFAULT_CONFIDENTIALITY_TYPE: process.env.DEFAULT_CONFIDENTIALITY_TYPE || 'public',
 
-  M2M_AUDIT_HANDLE: process.env.M2M_AUDIT_HANDLE || 'TopcoderService'
+  M2M_AUDIT_HANDLE: process.env.M2M_AUDIT_HANDLE || 'tcwebservice'
 }

docs/swagger.yaml

@@ -400,6 +400,11 @@ paths:
             Will be ignored for regular users or not authenticated users
           required: false
           type: string
+        - name: useSchedulingAPI
+          in: query
+          description: Search based on `legacy.useSchedulingAPI`
+          type: boolean
+          required: false
         - in: body
           name: body
           required: false
@@ -2095,7 +2100,7 @@ paths:
       tags:
         - Attachments
       description: >
-        Create a new attachment in the system.
+        Create a new attachment in the system. If you want to create multiple attachment, you can pass an array of objects instead of a single object.
       security:
         - bearer: []
       produces:

src/common/helper.js

@@ -639,13 +639,20 @@ function getESClient () {
 /**
  * Ensure project exist
  * @param {String} projectId the project id
- * @param {String} userToken the user token
+ * @param {String} currentUser the user
  */
-async function ensureProjectExist (projectId, userToken) {
+async function ensureProjectExist (projectId, currentUser) {
   let token = await getM2MToken()
   const url = `${config.PROJECTS_API_URL}/${projectId}`
   try {
-    await axios.get(url, { headers: { Authorization: `Bearer ${token}` } })
+    const res = await axios.get(url, { headers: { Authorization: `Bearer ${token}` } })
+    if (currentUser.isMachine || hasAdminRole(currentUser)) {
+      return res.data
+    }
+    if (!_.find(_.get(res, 'data.members', []), m => _.toString(m.userId) === _.toString(currentUser.userId))) {
+      throw new errors.ForbiddenError(`You don't have access to project with ID: ${projectId}`)
+    }
+    return res.data
   } catch (err) {
     if (_.get(err, 'response.status') === HttpStatus.NOT_FOUND) {
       throw new errors.BadRequestError(`Project with id: ${projectId} doesn't exist`)

src/controllers/AttachmentController.js

@@ -2,6 +2,7 @@
  * Controller for attachment endpoints
  */
 const HttpStatus = require('http-status-codes')
+const _ = require('lodash')
 const service = require('../services/AttachmentService')
 
 /**
@@ -10,7 +11,8 @@ const service = require('../services/AttachmentService')
  * @param {Object} res the response
  */
 async function createAttachment (req, res) {
-  const result = await service.createAttachment(req.authUser, req.params.challengeId, req.body)
+  const body = _.isArray(req.body) ? req.body : [req.body]
+  const result = await service.createAttachment(req.authUser, req.params.challengeId, body)
   res.status(HttpStatus.CREATED).send(result)
 }
 

src/controllers/ChallengeController.js

@@ -24,7 +24,7 @@ async function searchChallenges (req, res) {
  */
 async function createChallenge (req, res) {
   logger.debug(`createChallenge User: ${JSON.stringify(req.authUser)} - Body: ${JSON.stringify(req.body)}`)
-  const result = await service.createChallenge(req.authUser, req.body, req.userToken)
+  const result = await service.createChallenge(req.authUser, req.body)
   res.status(HttpStatus.CREATED).send(result)
 }
 
@@ -45,7 +45,7 @@ async function getChallenge (req, res) {
  */
 async function fullyUpdateChallenge (req, res) {
   logger.debug(`fullyUpdateChallenge User: ${JSON.stringify(req.authUser)} - ChallengeID: ${req.params.challengeId} - Body: ${JSON.stringify(req.body)}`)
-  const result = await service.fullyUpdateChallenge(req.authUser, req.params.challengeId, req.body, req.userToken)
+  const result = await service.fullyUpdateChallenge(req.authUser, req.params.challengeId, req.body)
   res.send(result)
 }
 
@@ -56,7 +56,7 @@ async function fullyUpdateChallenge (req, res) {
  */
 async function partiallyUpdateChallenge (req, res) {
   logger.debug(`partiallyUpdateChallenge User: ${JSON.stringify(req.authUser)} - ChallengeID: ${req.params.challengeId} - Body: ${JSON.stringify(req.body)}`)
-  const result = await service.partiallyUpdateChallenge(req.authUser, req.params.challengeId, req.body, req.userToken)
+  const result = await service.partiallyUpdateChallenge(req.authUser, req.params.challengeId, req.body)
   res.send(result)
 }
 

src/services/AttachmentService.js

@@ -52,36 +52,40 @@ async function _getChallengeAttachment (challengeId, attachmentId) {
 /**
  * Create attachment.
  * @param {String} challengeId the challenge id
- * @param {Object} attachment the attachment to created
+ * @param {Array} attachments the attachments to be created
  * @returns {Object} the created attachment
  */
-async function createAttachment (currentUser, challengeId, attachment) {
+async function createAttachment (currentUser, challengeId, attachments) {
   const challenge = await helper.getById('Challenge', challengeId)
   await helper.ensureUserCanModifyChallenge(currentUser, challenge)
-  validateUrl(attachment.url)
-  const attachmentObject = { id: uuid(), challengeId, ...attachment }
-  const ret = await helper.create('Attachment', attachmentObject)
+  const newAttachments = []
+  for (const attachment of attachments) {
+    validateUrl(attachment.url)
+    const attachmentObject = { id: uuid(), challengeId, ...attachment }
+    const newAttachment = await helper.create('Attachment', attachmentObject)
+    await helper.postBusEvent(constants.Topics.ChallengeAttachmentCreated, newAttachment)
+    newAttachments.push(newAttachment)
+  }
   // update challenge object
   await challengeService.partiallyUpdateChallenge(currentUser, challengeId, {
     attachments: [
       ..._.get(challenge, 'attachments', []),
-      ret
+      ...newAttachments
     ]
   })
   // post bus event
-  await helper.postBusEvent(constants.Topics.ChallengeAttachmentCreated, ret)
-  return ret
+  return newAttachments
 }
 
 createAttachment.schema = {
   currentUser: Joi.any(),
   challengeId: Joi.id(),
-  attachment: Joi.object().keys({
+  attachments: Joi.array().items(Joi.object().keys({
     name: Joi.string().required(),
     url: Joi.string().uri().required(),
     fileSize: Joi.fileSize(),
     description: Joi.string()
-  }).required()
+  })).required().min(1)
 }
 
 /**