Merge branch 'hotfix/search-fix' into dev

Author: Parth Shah

src/models/projectMember.js

@@ -42,7 +42,7 @@ module.exports = function(sequelize, DataTypes) {
           raw: true
         })
         .then((res) => {
-          return _.map(res, 'projectId')
+          return  _.without(_.map(res, 'projectId'), null)
         })
       },
       getActiveProjectMembers: function(projectId) {

src/routes/attachments/create.js

@@ -37,7 +37,6 @@ module.exports = [
    * Add project attachment
    */
   (req, res, next) => {
-    console.log('here1')
     var data = req.body.param
     // default values
     var projectId = req.params.projectId

src/routes/projectMembers/update.js

@@ -56,8 +56,6 @@ module.exports = [
           _.assign(projectMember, updatedProps)
           newValue = projectMember.get({plain: true})
 
-          console.log('Prev Value:', previousValue)
-          console.log('New Value:', newValue)
           // no updates if no change
           if(updatedProps.role === previousValue.role &&
               (_.isUndefined(updatedProps.isPrimary) || updatedProps.isPrimary === previousValue.isPrimary)) {
@@ -73,6 +71,7 @@ module.exports = [
             operations.push(models.ProjectMember.update({ isPrimary: false, updatedBy: req.authUser.userId },
                 {
                   where: {
+                    projectId,
                     isPrimary: true,
                     role: updatedProps.role,
                     id: {

src/routes/projects/create.js

@@ -111,13 +111,18 @@ module.exports = [
               body.billingAccountId = newProject.billingAccountId
             }
             return directProject.createDirectProject(req, body)
-          })
-          .then((resp) => {
-            newProject.directProjectId = resp.data.result.content.projectId
-            return newProject.save()
-          })
-          .then(() => {
-            return newProject.reload(newProject.id)
+              .then((resp) => {
+                newProject.directProjectId = resp.data.result.content.projectId
+                return newProject.save()
+              })
+              .then(() => {
+                return newProject.reload(newProject.id)
+              })
+              .catch(err => {
+                // log the error and continue
+                req.log.error('Error creating direct project')
+                req.log.error(err)
+              })
           })
           .then(() => {
             newProject = newProject.get({plain: true})