added get /messages/messageId

app/controllers/messages.js

@@ -9,3 +9,13 @@ exports.index = function(req, res){
   });
 };
 
+exports.show = function(req, res){
+  User.readMessage(req.params.messageId, res.locals.user._id, function(err, message){
+    if(message){
+      res.render('messages/show', {message:message, moment:moment});
+    }else{
+      res.redirect('/messages');
+    }
+  });
+};
+

app/models/message.js

@@ -1,5 +1,8 @@
 'use strict';
 
+var Mongo = require('mongodb'),
+    _     = require('lodash');
+
 function Message(fromId, toId, body){
   this.fromId = fromId;
   this.toId = toId;
@@ -19,8 +22,24 @@ Message.find = function(toId, query, cb){
   Message.collection.find(filter).sort(sort).toArray(cb);
 };
 
-Message.findOne = function(query, cb){
-  Message.collection.findOne(query, cb);
+Message.findOne = function(messageId, userId, cb){
+  var _id = Mongo.ObjectID(messageId);
+  Message.collection.findOne({_id:_id, toId:userId}, function(err, obj){
+    if(!obj){return cb();}
+
+    cb(err, _.create(Message.prototype, obj));
+  });
+};
+
+Message.read = function(messageId, userId, cb){
+  Message.findOne(messageId, userId, function(err, m){
+    if(!m){return cb();}
+
+    m.isRead = true;
+    m.save(function(){
+      cb(null, m);
+    });
+  });
 };
 
 Message.prototype.save = function(cb){

app/models/user.js

@@ -74,6 +74,18 @@ User.fetchMessages = function(userId, query, cb){
   });
 };
 
+User.readMessage = function(messageId, userId, cb){
+  Message.read(messageId, userId, function(err, m){
+    if(!m){return cb();}
+
+    User.findById(m.fromId, function(err2, u){
+      m.fromName = u.name;
+      m.fromEmail = u.email;
+      cb(err2, m);
+    });
+  });
+};
+
 User.prototype.send = function(receiver, data, cb){
   switch(data.mtype){
     case 'text':

app/routes/routes.js

@@ -38,6 +38,7 @@ module.exports = function(app, express){
   app.get('/users/:email', users.showProfile);
   app.post('/message/:userId', users.message);
   app.get('/messages', messages.index);
+  app.get('/messages/:messageId', messages.show);
 
   console.log('Express: Routes Loaded');
 };

app/static/css/style.css

@@ -1 +1 @@
-.photo{height:275px;width:400px;background-size:cover;margin:10px 0}
+.photo{height:275px;width:400px;background-size:cover;margin:10px 0}.message-text{margin-top:10px}

app/static/css/style.less

@@ -8,3 +8,7 @@ body{
   background-size: cover;
   margin: 10px 0;
 }
+
+.message-text {
+  margin-top: 10px;
+}

app/views/messages/show.jade

@@ -0,0 +1,20 @@
+extends ../shared/template
+block content
+  h2 Message
+  .panel.panel-default
+    .panel-body
+      .row
+        .col-xs-12
+          .row.message-from
+            .col-xs-1 From:
+            .col-xs-3: a(href='/users/#{message.fromEmail}')= message.fromName
+            .col-xs-7
+          .row.message-sent
+            .col-xs-1 Sent:
+            .col-xs-3= moment(message.sent).format('MMM Do YY')
+            .col-xs-7
+          .row.message-text
+            .col-xs-12= message.body
+
+block scripts
+

test/acceptance/message.js

@@ -42,5 +42,18 @@ describe('messages', function(){
     });
   });
 
+  describe('get /messages/messageId', function(){
+    it('should show an individual users message', function(done){
+      request(app)
+      .get('/messages/a00000000000000000000002')
+      .set('cookie', cookie)
+      .end(function(err, res){
+        expect(res.status).to.equal(200);
+        expect(res.text).to.include('drinks after work');
+        done();
+      });
+    });
+  });
+
 });
 

test/unit/user.js

@@ -84,6 +84,18 @@ describe('User', function(){
     });
   });
 
+  describe('.readMessage', function(){
+    it('should return a message and update it\'s isRead status', function(done){
+      var userId    = Mongo.ObjectID('000000000000000000000001'),
+          messageId = 'a00000000000000000000002';
+      User.readMessage(messageId, userId, function(err, message){
+        expect(message.isRead).to.equal(true);
+        expect(message.fromName).to.equal('Sue');
+        done();
+      });
+    });
+  });
+
   describe('#send', function(){
     it('should send a text message to a user', function(done){
       User.findById('000000000000000000000001', function(err, sender){