integration changes

Author: gondzo

local/mock-services/server.js

@@ -44,6 +44,7 @@ server.get('/v3/members/_search', (req, res) => {
     return ret;
   });
   const userIds = _.map(criteria, 'userId');
+  const handles = _.map(criteria, 'handle');
   const cloned = _.cloneDeep(members);
   const response = {
     id: 'res1',
@@ -59,6 +60,12 @@ server.get('/v3/members/_search', (req, res) => {
         found = _.pick(found, fields);
       }
       return found;
+    } else if (_.indexOf(handles, single.result.content.handle) > -1) {
+      let found = single.result.content;
+      if (fields.length > 0) {
+        found = _.pick(found, fields);
+      }
+      return found;
     }
     return null;
   }).filter(_.identity);

src/models/projectMemberInvite.js

@@ -56,7 +56,7 @@ module.exports = function defineProjectMemberInvite(sequelize, DataTypes) {
         });
       },
       getPendingInviteByEmailOrUserId(projectId, email, userId) {
-        const where = { status: INVITE_STATUS.PENDING };
+        const where = { projectId, status: INVITE_STATUS.PENDING };
 
         if (email && userId) {
           _.assign(where, { $or: [{ email: { $eq: email } }, { userId: { $eq: userId } }] });

src/routes/projectMembers/update.js

@@ -17,7 +17,7 @@ const updateProjectMemberValdiations = {
     param: Joi.object().keys({
       isPrimary: Joi.boolean(),
       role: Joi.any().valid(PROJECT_MEMBER_ROLE.CUSTOMER, PROJECT_MEMBER_ROLE.MANAGER,
-        PROJECT_MEMBER_ROLE.COPILOT).required(),
+        PROJECT_MEMBER_ROLE.COPILOT, PROJECT_MEMBER_ROLE.OBSERVER).required(),
     }),
   },
 };

src/routes/projects/list.js

@@ -30,6 +30,10 @@ const PROJECT_MEMBER_ATTRIBUTES = _.without(
   _.keys(models.ProjectMember.rawAttributes),
   'deletedAt',
 );
+const PROJECT_MEMBER_INVITE_ATTRIBUTES = _.without(
+  _.keys(models.ProjectMemberInvite.rawAttributes),
+  'deletedAt'
+);
 const PROJECT_ATTACHMENT_ATTRIBUTES = _.without(
   _.keys(models.ProjectAttachment.rawAttributes),
   'deletedAt',
@@ -126,6 +130,10 @@ const parseElasticSearchCriteria = (criteria, fields, order) => {
     const memberFields = _.get(fields, 'project_members');
     sourceInclude = sourceInclude.concat(_.map(memberFields, single => `members.${single}`));
   }
+  if (_.get(fields, 'project_member_invites', null)) {
+    const memberFields = _.get(fields, 'project_member_invites');
+    sourceInclude = sourceInclude.concat(_.map(memberFields, single => `invites.${single}`));
+  }
   if (_.get(fields, 'project_phases', null)) {
     const phaseFields = _.get(fields, 'project_phases');
     sourceInclude = sourceInclude.concat(_.map(phaseFields, single => `phases.${single}`));
@@ -249,6 +257,7 @@ const retrieveProjects = (req, criteria, sort, ffields) => {
   fields = util.parseFields(fields, {
     projects: PROJECT_ATTRIBUTES,
     project_members: PROJECT_MEMBER_ATTRIBUTES,
+    project_member_invites: PROJECT_MEMBER_INVITE_ATTRIBUTES,
     project_phases: PROJECT_PHASE_ATTRIBUTES,
     project_phases_products: PROJECT_PHASE_PRODUCTS_ATTRIBUTES,
     attachments: PROJECT_ATTACHMENT_ATTRIBUTES,
@@ -321,16 +330,18 @@ module.exports = [
     const getProjectIds = !memberOnly && util.hasRole(req, USER_ROLE.COPILOT) ?
         models.Project.getProjectIdsForCopilot(req.authUser.userId) :
         models.ProjectMember.getProjectIdsForUser(req.authUser.userId);
+
     return getProjectIds
         .then((accessibleProjectIds) => {
-          let allowedProjectIds = accessibleProjectIds;
+          const allowedProjectIds = accessibleProjectIds;
           // get projects with pending invite for current user
           const invites = models.ProjectMemberInvite.getProjectInvitesForUser(
             req.authUser.email,
             req.authUser.userId);
-          if (invites) {
-            allowedProjectIds = _.union(allowedProjectIds, invites);
-          }
+
+          return invites.then((ids => _.union(allowedProjectIds, ids)));
+        })
+        .then((allowedProjectIds) => {
           // filter based on accessible
           if (_.get(criteria.filters, 'id', null)) {
             criteria.filters.id.$in = _.intersection(