Merge pull request #39 from topcoder-platform/develop

Prod release 1.1.0

Author: vikasrohit

config/default.js

@@ -29,7 +29,7 @@ module.exports = {
   esConfig: {
     HOST: process.env.ES_HOST || 'localhost:9200',
     AWS_REGION: process.env.AWS_REGION || 'us-east-1', // AWS Region to be used if we use AWS ES
-    API_VERSION: process.env.ES_API_VERSION || '6.7',
+    API_VERSION: process.env.ES_API_VERSION || '6.8',
     ES_PROJECT_INDEX: process.env.ES_PROJECT_INDEX || 'projects',
     ES_TIMELINE_INDEX: process.env.ES_TIMELINE_INDEX || 'timelines',
     ES_METADATA_INDEX: process.env.ES_METADATA_INDEX || 'metadata',

migrations/elasticsearch_sync.js

@@ -56,7 +56,13 @@ function getRequestBody (indexName) {
           description: {
             type: 'string'
           },
-          filePath: {
+          path: {
+            type: 'string'
+          },
+          type: {
+            type: 'string'
+          },
+          tags: {
             type: 'string'
           },
           id: {
@@ -227,8 +233,7 @@ function getRequestBody (indexName) {
             type: 'string'
           },
           handle: {
-            type: 'string',
-            index: 'not_analyzed'
+            type: 'string'
           },
           id: {
             type: 'long'

package-lock.json

@@ -167,6 +167,29 @@ async function getMemberDetailsByUserIds (userIds) {
   }
 }
 
+/**
+ * Populate member with user details
+ *
+ * @param {Object} member the member object
+ * @returns {Object} the member object with details
+ */
+async function populateMemberWithUserDetails (member) {
+  try {
+    const membersDetails = await getMemberDetailsByUserIds([member.userId])
+    const memberDetails = membersDetails[0]
+    if (memberDetails) {
+      logger.debug(`Successfully got user details for member (userId:${member.userId})`)
+      return _.merge(member, _.pick(memberDetails, 'handle', 'firstName', 'lastName', 'email'))
+    } else {
+      throw new Error(`Didn't fine user details for member (userId:${member.userId})`)
+    }
+  } catch (err) {
+    logger.error(`Cannot populate member (userId:${member.userId}) with user details.`)
+    logger.debug(`Error during populating member (userId:${member.userId}) with user details`, err)
+    return member
+  }
+}
+
 /**
  * Reusable method to generate a function which would remove invite from the project ES document.
  *
@@ -188,5 +211,6 @@ module.exports = {
   updateTimelineESPromise,
   updateMetadadaESPromise,
   getMemberDetailsByUserIds,
+  populateMemberWithUserDetails,
   removeInvitePromise
 }

src/common/helper.js

@@ -67,12 +67,18 @@ const MILESTONE_TEMPLATE_REFERENCES = {
   PRODUCT_TEMPLATE: 'productTemplate'
 }
 
+const ATTACHMENT_TYPES = {
+  'FILE': 'file',
+  'LINK': 'link'
+}
+
 module.exports = {
   RESOURCES,
   REGEX,
   PROJECT_STATUS,
   TIMELINE_REFERENCES,
   INVITE_STATUS,
   PROJECT_MEMBER_ROLE,
-  MILESTONE_TEMPLATE_REFERENCES
+  MILESTONE_TEMPLATE_REFERENCES,
+  ATTACHMENT_TYPES
 }

src/constants.js

@@ -7,6 +7,7 @@ const _ = require('lodash')
 
 const logger = require('../common/logger')
 const helper = require('../common/helper')
+const constants = require('../constants')
 
 /**
  * create id schema
@@ -27,7 +28,8 @@ function updateSchema () {
   return createIdSchema().keys({
     title: Joi.string().required(),
     description: Joi.string().optional().allow(null).allow(''),
-    allowedUsers: Joi.array().items(Joi.number().integer().positive()).allow(null).default(null)
+    allowedUsers: Joi.array().items(Joi.number().integer().positive()).allow(null).default(null),
+    tags: Joi.array().items(Joi.string()).optional().allow(null)
   })
 }
 
@@ -39,8 +41,10 @@ function createSchema () {
   return updateSchema().keys({
     category: Joi.string().optional().allow(null).allow(''),
     size: Joi.number().optional().allow(null),
-    contentType: Joi.string().required(),
-    filePath: Joi.string().required()
+    contentType: Joi.string().optional().allow(null).when('type', { is: constants.ATTACHMENT_TYPES.FILE, then: Joi.string().required() }),
+    path: Joi.string().required(),
+    type: Joi.string().valid(_.values(constants.ATTACHMENT_TYPES)),
+    tags: Joi.array().items(Joi.string()).optional().allow(null)
   })
 }
 

src/services/ProcessorServiceAttachment.js

@@ -93,6 +93,9 @@ function createSchema () {
  * @return {Promise} promise result
  */
 async function create (message) {
+  const member = await helper.populateMemberWithUserDetails(message.members[0])
+  message.members = [member]
+
   await client.create({
     index: config.get('esConfig.ES_PROJECT_INDEX'),
     type: config.get('esConfig.ES_TYPE'),

src/services/ProcessorServiceProject.js

@@ -53,23 +53,7 @@ async function create (message) {
   async function updateDocPromise (doc) {
     const members = _.isArray(doc._source.members) ? doc._source.members : []
     const existingMemberIndex = _.findIndex(members, p => p.id === message.id)// if member does not exists already
-    let member = message
-
-    // try to populate member with user details
-    // the code should move on, as it's not critical and is only used for searching at the moment
-    try {
-      const membersDetails = await helper.getMemberDetailsByUserIds([message.userId])
-      const memberDetails = membersDetails[0]
-      if (memberDetails) {
-        member = _.merge(message, _.pick(memberDetails, 'handle', 'firstName', 'lastName', 'email'))
-        logger.debug(`Successfully got user details for member (userId:${message.userId})`)
-      } else {
-        throw new Error(`Didn't find user details for member (userId:${message.userId})`)
-      }
-    } catch (err) {
-      logger.error(`Cannot populate member (userId:${message.userId}) with user details.`)
-      logger.debug(`Error during populating member (userId:${message.userId}) with user details`, err)
-    }
+    const member = await helper.populateMemberWithUserDetails(message)
 
     if (existingMemberIndex === -1) {
       members.push(member)

src/services/ProcessorServiceProjectMember.js

@@ -22,7 +22,6 @@ function createSchema () {
       .email()
       .optional()
       .allow(null),
-    hashEmail: Joi.string().optional().allow(null),
     status: Joi.any()
       .valid(_.values(INVITE_STATUS))
       .required()

src/services/ProcessorServiceProjectMemberInvite.js

@@ -1 +1 @@
-{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:41:17.702Z","mime-type":"application/json","payload":{"resource":"attachment","createdAt":"2019-06-21T04:41:17.637Z","updatedAt":"2019-06-21T04:41:17.637Z","id":1,"projectId":1,"allowedUsers":null,"createdBy":40051333,"updatedBy":40051333,"title":"first attachment submission","size":null,"category":null,"description":null,"contentType":"application/png","deletedBy":null,"filePath":"projects/1/projects/asdasd.png"}}
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:41:17.702Z","mime-type":"application/json","payload":{"resource":"attachment","createdAt":"2019-06-21T04:41:17.637Z","updatedAt":"2019-06-21T04:41:17.637Z","id":1,"projectId":1,"allowedUsers":null,"createdBy":40051333,"updatedBy":40051333,"title":"first attachment submission","size":null,"category":null,"description":null,"contentType":"application/png","deletedBy":null,"path":"projects/1/projects/asdasd.png","type":"file","tags":["specification","design preview"]}}