References #82, added activity stream and socket.

Introduces own events for action cases. Extended WebSocket and
ActivityStream logic to handle those. Socket defaults to sending out the
task:update event as the front-end will handle it like that for now
(might change to be more specific in the future). Extended activity
stream to handle the more advanced logic needed by multiple objects
being part of the action (participant and task, resource and task,
outcome and task). The logic got extended, not rewritten. This should
keep the compatibility with previous activities (already stored). In
case of some more drastic changes, the logic should probably be
rewritten in full, keeping it compatible with previous version is not
required (as no public instances exist, yet).

app/activity.js

@@ -3,21 +3,30 @@
 const Activity = require('mongoose').model('Activity');
 
 module.exports = function (app) {
-  const activityPopulateOptions = [{
-    path: 'actor',
-    model: 'User'
-  }];
+  const activityPopulateOptions = Activity.getPopulateOptions();
+
+  function extractModelFromData(data, type) {
+    if ( type ) {
+      return data.data[type];
+    }
 
-  function extractModelFromData(data) {
     return data.data;
   }
 
   function extractActorFromData(data) {
     return data.actor;
   }
 
+  function getModelTypeToExtract(actionType, objectType) {
+    if ( actionType === 'attach' || actionType === 'detach' ) {
+      return objectType;
+    }
+
+    return null;
+  }
+
   function createActivityFromEvent(activityType, objectType, data) {
-    const object = extractModelFromData(data);
+    const object = extractModelFromData(data, getModelTypeToExtract(activityType, objectType));
     const actor = extractActorFromData(data);
     let activityData = {};
 
@@ -35,10 +44,18 @@ module.exports = function (app) {
         activityData.end = object.end;
       }
     }
-    if ( objectType === 'participant' && ( activityType === 'invite' || activityType === 'remove' ) ) {
+    if ( objectType === 'participant' && ( activityType === 'invite' || activityType === 'remove' || activityType === 'attach' || activityType === 'detach' ) ) {
       activityData.user = ( object.user._id ) ? object.user._id : object.user;
     }
 
+    if ( activityType === 'attach' || activityType === 'detach' ) {
+      const taskObject = extractModelFromData(data, 'task');
+
+      activityData.task = {};
+      activityData.task.title = taskObject.title;
+      activityData.task._id = taskObject._id;
+    }
+
     new Activity({
       activityType: activityType,
       objectType: objectType,
@@ -166,4 +183,28 @@ module.exports = function (app) {
   app.on('remove:participant', function(data) {
     createActivityFromEvent('remove', 'participant', data);
   });
+
+  app.on('attach:participant', function(data) {
+    createActivityFromEvent('attach', 'participant', data);
+  });
+
+  app.on('detach:participant', function(data) {
+    createActivityFromEvent('detach', 'participant', data);
+  });
+
+  app.on('attach:resource', function(data) {
+    createActivityFromEvent('attach', 'resource', data);
+  });
+
+  app.on('detach:resource', function(data) {
+    createActivityFromEvent('detach', 'resource', data);
+  });
+
+  app.on('attach:outcome', function(data) {
+    createActivityFromEvent('attach', 'outcome', data);
+  });
+
+  app.on('detach:outcome', function(data) {
+    createActivityFromEvent('detach', 'outcome', data);
+  });
 };

app/models/activity.js

@@ -30,6 +30,17 @@ activitySchema.pre('save', function(done) {
   done();
 });
 
+activitySchema.statics.getPopulateOptions = function() {
+  return [{
+    path: 'actor',
+    model: 'User'
+  },
+  {
+    path: 'data.user',
+    model: 'User'
+  }];
+};
+
 const Activity = mongoose.model('Activity', activitySchema);
 
 module.exports = Activity;

app/routes/api/project/activity.js

@@ -7,13 +7,7 @@ const Middleware = require(__dirname + '/../../../lib/middleware');
 
 module.exports = function (projectRouter) {
 
-  const activityPopulateOptions = [{
-    path: 'actor',
-    model: 'User'
-  }, {
-    path: 'data.user',
-    model: 'User'
-  }];
+  const activityPopulateOptions = Activity.getPopulateOptions();
 
   const activityRouter = new Router({ prefix: '/:project/activities' });
 

app/routes/api/project/outcome.js

@@ -160,6 +160,8 @@ module.exports = function (projectRouter, config) {
     }
   });
 
+  // TODO This should run a query to remove any connections between for tasks
+  // It might also be needed to notify the front-end about the change (unless the logic is implemented there)
   outcomeRouter.delete('/:outcome', Auth.ensureAuthenticated, Auth.ensureUser, Middleware.ensureActiveProjectParticipant, function *() {
     let outcome;
 

app/routes/api/project/resource.js

@@ -222,6 +222,8 @@ module.exports = function (projectRouter, config) {
     }
   });
 
+  // TODO This should run a query to remove any connections between for tasks
+  // It might also be needed to notify the front-end about the change (unless the logic is implemented there)
   resourceRouter.delete('/:resource', Auth.ensureAuthenticated, Auth.ensureUser, Middleware.ensureActiveProjectParticipant, function *() {
     let resource;
 

app/routes/api/project/task.js

@@ -198,7 +198,7 @@ module.exports = function (projectRouter) {
 
       task = yield Task.populate(task, taskPopulateOptions);
 
-      this.emitApiAction('update', 'task', task, this.user);
+      this.emitApiAction('attach', 'participant', { task: task, participant: participant }, this.user);
 
       this.apiRespond(task);
     } catch(err) {
@@ -252,7 +252,7 @@ module.exports = function (projectRouter) {
 
       task = yield Task.populate(task, taskPopulateOptions);
 
-      this.emitApiAction('update', 'task', task, this.user);
+      this.emitApiAction('detach', 'participant', { task: task, participant: participant }, this.user);
 
       this.apiRespond(task);
     } catch(err) {
@@ -307,7 +307,7 @@ module.exports = function (projectRouter) {
 
       task = yield Task.populate(task, taskPopulateOptions);
 
-      this.emitApiAction('update', 'task', task, this.user);
+      this.emitApiAction('attach', 'resource', { task: task, resource: resource }, this.user);
 
       this.apiRespond(task);
     } catch(err) {
@@ -361,7 +361,7 @@ module.exports = function (projectRouter) {
 
       task = yield Task.populate(task, taskPopulateOptions);
 
-      this.emitApiAction('update', 'task', task, this.user);
+      this.emitApiAction('detach', 'resource', { task: task, resource: resource }, this.user);
 
       this.apiRespond(task);
     } catch(err) {
@@ -415,7 +415,7 @@ module.exports = function (projectRouter) {
 
       task = yield Task.populate(task, taskPopulateOptions);
 
-      this.emitApiAction('update', 'task', task, this.user);
+      this.emitApiAction('attach', 'outcome', { task: task, outcome: outcome }, this.user);
 
       this.apiRespond(task);
     } catch(err) {
@@ -469,7 +469,7 @@ module.exports = function (projectRouter) {
 
       task = yield Task.populate(task, taskPopulateOptions);
 
-      this.emitApiAction('update', 'task', task, this.user);
+      this.emitApiAction('detach', 'outcome', { task: task, outcome: outcome }, this.user);
 
       this.apiRespond(task);
     } catch(err) {

app/socket.js

@@ -55,7 +55,11 @@ module.exports = function (app) {
     return decodedToken.sub;
   }
 
-  function extractModelFromData(data) {
+  function extractModelFromData(data, key) {
+    if ( key ) {
+      return data.data[key];
+    }
+
     return data.data;
   }
   io.attach(app);
@@ -411,4 +415,40 @@ module.exports = function (app) {
     const participant = extractModelFromData(data);
     app._io.in(participant.project).emit('update:participant', participant);
   });
+
+  app.on('attach:participant', function(data) {
+    const participant = extractModelFromData(data, 'participant');
+    const task = extractModelFromData(data, 'task');
+    app._io.in(participant.project).emit('update:task', task);
+  });
+
+  app.on('detach:participant', function(data) {
+    const participant = extractModelFromData(data, 'participant');
+    const task = extractModelFromData(data, 'task');
+    app._io.in(participant.project).emit('update:task', task);
+  });
+
+  app.on('attach:resource', function(data) {
+    const resource = extractModelFromData(data, 'resource');
+    const task = extractModelFromData(data, 'task');
+    app._io.in(resource.project).emit('update:task', task);
+  });
+
+  app.on('detach:resource', function(data) {
+    const resource = extractModelFromData(data, 'resource');
+    const task = extractModelFromData(data, 'task');
+    app._io.in(resource.project).emit('update:task', task);
+  });
+
+  app.on('attach:outcome', function(data) {
+    const outcome = extractModelFromData(data, 'outcome');
+    const task = extractModelFromData(data, 'task');
+    app._io.in(outcome.project).emit('update:task', task);
+  });
+
+  app.on('detach:outcome', function(data) {
+    const outcome = extractModelFromData(data, 'outcome');
+    const task = extractModelFromData(data, 'task');
+    app._io.in(outcome.project).emit('update:task', task);
+  });
 };