Merge branch 'develop' into feature/restful-invites

# Conflicts:
#	src/util.js

Author: maxceem

src/events/projects/index.js

@@ -23,7 +23,7 @@ const eClient = util.getElasticSearchClient();
  */
 const indexProject = Promise.coroutine(function* (logger, msg) { // eslint-disable-line func-names
   const data = JSON.parse(msg.content.toString());
-  const userIds = data.members ? data.members.map(single => `userId:${single.userId}`) : [];
+  const userIds = data.members ? _.map(data.members, 'userId') : [];
   try {
     // retrieve member details
     const memberDetails = yield util.getMemberDetailsByUserIds(userIds, logger, msg.properties.correlationId);
@@ -197,7 +197,9 @@ async function projectUpdatedKafkaHandler(app, topic, payload) {
   // first get the existing document and than merge the updated changes and save the new document
   try {
     const doc = await eClient.get({ index: ES_PROJECT_INDEX, type: ES_PROJECT_TYPE, id: previousValue.id });
+    console.log(doc._source, 'Received project from ES');// eslint-disable-line no-underscore-dangle
     const merged = _.merge(doc._source, project.get({ plain: true }));        // eslint-disable-line no-underscore-dangle
+    console.log(merged, 'Merged project');
     // update the merged document
     await eClient.update({
       index: ES_PROJECT_INDEX,
@@ -207,6 +209,7 @@ async function projectUpdatedKafkaHandler(app, topic, payload) {
         doc: merged,
       },
     });
+    console.log(`Succesfully updated project document in ES (projectId: ${previousValue.id})`);
   } catch (error) {
     throw Error(`failed to updated project document in elasitcsearch index (projectId: ${previousValue.id})` +
       `. Details: '${error}'.`);

src/routes/admin/project-index-create.js

@@ -69,7 +69,7 @@ module.exports = [
           // check context for project members
           project.members = _.map(currentProjectMembers, m => _.pick(m, fields.project_members));
           logger.debug('project.members => ', project.members);
-          const userIds = project.members ? project.members.map(single => `userId:${single.userId}`) : [];
+          const userIds = project.members ? _.map(project.members, 'userId') : [];
           logger.debug('userIds => ', userIds);
           return util.getMemberDetailsByUserIds(userIds, logger, req.id)
           .then((memberDetails) => {

src/routes/projectMemberInvites/create.js

@@ -201,7 +201,7 @@ const sendInviteEmail = (req, projectId, invite) => {
       where: { id: projectId },
       raw: true,
     }),
-    util.getMemberDetailsByUserIds([`userId:${req.authUser.userId}`], req.log, req.id),
+    util.getMemberDetailsByUserIds([req.authUser.userId], req.log, req.id),
   ];
   return Promise.all(promises).then((responses) => {
     req.log.debug(responses);

src/services/lookerService.js

@@ -110,7 +110,7 @@ function generateEmbedUrl(authUser, project, member, reportUrl) {
     group_ids: [],
     first_name: member.firstName,
     last_name: member.lastName,
-    permissions: ['access_data', 'see_looks', 'see_user_dashboards'],
+    permissions: ['access_data', 'see_looks', 'see_user_dashboards', 'schedule_look_emails', 'download_with_limit'],
     models: ['projects_tc_employees'],
     access_filters: {
       projects_tc_employees: {