From 9916edc1277e3854d651a9ff2465ea1dfbfcd3e2 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Fri, 4 Nov 2016 15:10:28 -0700
Subject: [PATCH 01/22] Adds implementation for get all comments

---
 routes/api/comments/index.js       |  8 +++--
 tests/routes/api/comments/index.js | 54 ++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index df9bbc456..c468d427f 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -8,8 +8,12 @@ const router = express.Router();
 //==============================================================================
 
 
-router.get('/', (req, res) => {
-  res.send('Read all of the comments ever');
+router.get('/', (req, res, next) => {
+  Comment.find({}).then((comments) => {
+    res.status(200).json(comments);
+  }).catch(error => {
+    next(error);
+  });
 });
 
 router.get('/:comment_id', (req, res, next) => {
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index ad21e54ec..db986db0c 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -13,6 +13,60 @@ const Comment = require('../../../../models/comment');
 const Action = require('../../../../models/action');
 const User = require('../../../../models/user');
 
+
+describe('Get /:comment_id', () => {
+  const comments = [{
+    id: 'abc',
+    body: 'comment 10',
+    asset_id: 'asset',
+    author_id: '123'
+  },{
+    id: 'def',
+    body: 'comment 20',
+    asset_id: 'asset',
+    author_id: '456'
+  },{
+    id: 'hij',
+    body: 'comment 30',
+    asset_id: '456'
+  }]
+
+  const users = [{
+    id: '123',
+    display_name: 'John',
+  },{
+    id: '456',
+    display_name: 'Paul',
+  }]
+
+  const actions = [{
+    action_type: 'flag',
+    item_id: 'abc'
+  },{
+    action_type: 'like',
+    item_id: 'hij'
+  }]
+
+  beforeEach(() => {
+    return Comment.create(comments).then(() => {
+      return User.create(users)
+    }).then(() => {
+      return Action.create(actions)
+    })
+  })
+
+  it('should return all the comments', function(done){
+    chai.request(app)
+      .get('/api/v1/comments')
+      .end(function(err, res){
+        expect(err).to.be.null;
+        expect(res).to.have.status(200);
+        if (err) return done(err);
+        done();
+      });
+  })
+})
+
 describe('Post /comments', () => {
   const users = [{
     id: '123',

From f04e2505ec77dda0409d132b762b65f225335188 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 13:25:45 -0500
Subject: [PATCH 02/22] Adding title to iframe for screen readers.

---
 client/coral-embed-stream/public/samplearticle.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/public/samplearticle.html b/client/coral-embed-stream/public/samplearticle.html
index 493fc29fa..e973ee9be 100644
--- a/client/coral-embed-stream/public/samplearticle.html
+++ b/client/coral-embed-stream/public/samplearticle.html
@@ -9,7 +9,7 @@
 <div id='coralStreamEmbed'></div>
 <script type='text/javascript' src='http://pym.nprapps.org/pym.v1.min.js'></script>
 <script>
-var pymParent = new pym.Parent('coralStreamEmbed', 'index.html', {});
+var pymParent = new pym.Parent('coralStreamEmbed', 'index.html', {title: 'comments'});
 pymParent.onMessage('height', function(height) {document.querySelector('#coralStreamEmbed iframe').height = height + 'px'})</script>
 </div>
   </body>

From 108c50cb95c14721394b530de23de7269b635caf Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 7 Nov 2016 11:28:09 -0700
Subject: [PATCH 03/22] add tests to settings models/endpoints

---
 tests/models/setting.js            | 32 +++++++++++++++
 tests/routes/api/settings/index.js | 62 ++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 tests/models/setting.js
 create mode 100644 tests/routes/api/settings/index.js

diff --git a/tests/models/setting.js b/tests/models/setting.js
new file mode 100644
index 000000000..53d0d6386
--- /dev/null
+++ b/tests/models/setting.js
@@ -0,0 +1,32 @@
+/* eslint-env node, mocha */
+
+require('../utils/mongoose');
+
+const Setting = require('../../models/setting');
+const expect = require('chai').expect;
+
+describe('Setting: model', () => {
+
+  beforeEach(() => {
+    const defaults = {id: 1, moderation: 'pre'};
+    return Setting.update({id: '1'}, {$setOnInsert: defaults}, {upsert: true})
+  })
+
+  describe('#getSettings()', () => {
+    it('should have a moderation field defined', () => {
+      return Setting.getSettings().then(settings => {
+        expect(settings).to.have.property('moderation').and.to.equal('pre');
+      });
+    });
+  });
+
+  describe('#updateSettings()', () => {
+    it('should update the settings with a passed object', () => {
+      const mockSettings = {moderation: 'post'};
+      return Setting.updateSettings(mockSettings).then(updatedSettings => {
+        expect(updatedSettings).to.have.property('moderation').and.to.equal('post');
+      });
+    });
+  });
+
+});
diff --git a/tests/routes/api/settings/index.js b/tests/routes/api/settings/index.js
new file mode 100644
index 000000000..fbf55d95f
--- /dev/null
+++ b/tests/routes/api/settings/index.js
@@ -0,0 +1,62 @@
+process.env.NODE_ENV = 'test';
+
+require('../../../utils/mongoose');
+
+const app = require('../../../../app');
+const chai = require('chai');
+const chaiHttp = require('chai-http');
+chai.use(chaiHttp);
+const expect = chai.expect;
+
+const Setting = require('../../../../models/setting');
+const defaults = {id: '1', moderation: 'pre'};
+
+describe('GET /settings', () => {
+
+  beforeEach(() => {
+    return Setting.update({id: '1'}, {$setOnInsert: defaults}, {upsert: true});
+  });
+
+  it('should return a settings object', done => {
+    chai.request(app)
+      .get('/api/v1/settings')
+      .end((err, res) => {
+        expect(err).to.be.null;
+        expect(res).to.have.status(200);
+        expect(res).to.be.json;
+        expect(res.body).to.have.property('moderation');
+        expect(res.body.moderation).to.equal('pre');
+        done(err);
+      })
+  });
+});
+
+// update the settings.
+describe('update settings', () => {
+
+  before(() => {
+    return Setting.update({id: '1'}, {$setOnInsert: defaults}, {upsert: true});
+  });
+
+  it('should respond to a PUT with new settings', () => {
+    chai.request(app)
+    .put('/api/v1/settings')
+    .send({moderation: 'post'}, (err, res) => {
+      expect(err).to.be.null;
+      expect(res).to.have.status(204);
+      done(err);
+    });
+  });
+
+  it('should have updates settings', () => {
+    chai.request(app)
+    .get('/api/v1/settings')
+    .end((err, res) => {
+      expect(err).to.be.null;
+      expect(res).to.have.status(200);
+      expect(res).to.be.json;
+      expect(res.body).to.have.property('moderation');
+      expect(res.body.moderation).to.equal('post');
+    });
+  });
+});

From cb682981715f131f9d08604ad30578b683cc74b4 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 13:39:33 -0500
Subject: [PATCH 04/22] Adding temporary user name field to commentbox.

---
 client/coral-embed-stream/style/default.css  |  8 +++-
 client/coral-plugin-commentbox/CommentBox.js | 45 +++++++++++++-------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 219a7aef5..4421bfaed 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -56,7 +56,7 @@ hr {
 
 .coral-plugin-commentbox-textarea {
   flex: 1;
-  padding: 10px;
+  padding: 5px;
 }
 
 .coral-plugin-commentbox-button-container {
@@ -75,6 +75,12 @@ hr {
   border-radius: 2px;
 }
 
+.coral-plugin-commentbox-username {
+  width: 50%;
+  padding-left: 5px;
+  margin-bottom: 5px;
+}
+
 /* Comment styles */
 .comment {
   margin-bottom: 10px;
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index c893be075..1bd138af9 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -8,32 +8,34 @@ class CommentBox extends Component {
   static propTypes = {
     postItem: PropTypes.func,
     updateItem: PropTypes.func,
-    item_id: PropTypes.string,
+    id: PropTypes.string,
     comments: PropTypes.array,
     reply: PropTypes.bool
   }
 
   state = {
-    content: ''
+    body: '',
+    username: ''
   }
 
   postComment = () => {
-    const {postItem, updateItem, item_id, reply, addNotification, appendItemArray} = this.props
+    const {postItem, updateItem, id, reply, addNotification, appendItemArray} = this.props
     let comment = {
-      content: this.state.content
+      body: this.state.body,
+      asset_id: id,
+      username: this.state.username
     }
     let related
     if (reply) {
-      comment.parent_id = item_id
+      comment.parent_id = id
       related = 'children'
     } else {
-      comment.asset_id = item_id
       related = 'comments'
     }
-    updateItem(item_id, 'showReply', false)
+    updateItem(id, 'showReply', false)
     postItem(comment, 'comments')
-    .then((id) => {
-      appendItemArray(item_id, related, id)
+    .then((comment_id) => {
+      appendItemArray(id, related, comment_id)
       addNotification('success', 'Your comment has been posted.')
     }).catch((err) => console.error(err))
     this.setState({content: ''})
@@ -43,21 +45,30 @@ class CommentBox extends Component {
     const {styles, reply} = this.props
     // How to handle language in plugins? Should we have a dependency on our central translation file?
     return <div>
+        <div className={name + '-container'}>
+        <input type='text'
+          className={name + '-username'}
+          style={styles && styles.textarea}
+          value={this.state.content}
+          id={reply ? 'replyUser' : 'commentUser'}
+          placeholder='Name'
+          onChange={(e) => this.setState({username: e.target.value})}/>
+      </div>
       <div
-        className={name + '-container'}
-        style={styles && styles.container}>
+        className={name + '-container'}>
           <label
             htmlFor={ reply ? 'replyText' : 'commentText'}
             className="screen-reader-text"
             aria-hidden={true}>
-            {reply ? 'Reply': 'Comment'}
+            {reply ? lang.t('reply'): lang.t('comment')}
           </label>
           <textarea
             className={name + '-textarea'}
             style={styles && styles.textarea}
             value={this.state.content}
+            placeholder='Comment'
             id={reply ? 'replyText' : 'commentText'}
-            onChange={(e) => this.setState({content: e.target.value})}
+            onChange={(e) => this.setState({body: e.target.value})}
             rows={3}/>
         </div>
         <div className={name + '-button-container'}>
@@ -76,9 +87,13 @@ export default CommentBox
 
 const lang = new I18n({
   en: {
-    post: 'Post'
+    post: 'Post',
+    reply: 'Reply',
+    comment: 'Comment',
   },
   es: {
-    post: 'Publicar'
+    post: 'Publicar',
+    reply: 'Respuesta',
+    comment: 'Comentario'
   }
 })

From 3b754453096592e1853ede4ac4c66e9b5b032713 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 13:51:10 -0500
Subject: [PATCH 05/22] Displaying comment author names.

---
 client/coral-embed-stream/src/CommentStream.js | 3 +++
 client/coral-embed-stream/style/default.css    | 4 ++++
 client/coral-plugin-author-name/AuthorName.js  | 9 +++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 client/coral-plugin-author-name/AuthorName.js

diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js
index da5e25ff4..dae78f69d 100644
--- a/client/coral-embed-stream/src/CommentStream.js
+++ b/client/coral-embed-stream/src/CommentStream.js
@@ -11,6 +11,7 @@ import Content from '../../coral-plugin-commentcontent/CommentContent'
 import PubDate from '../../coral-plugin-pubdate/PubDate'
 import Count from '../../coral-plugin-comment-count/CommentCount'
 import Flag from '../../coral-plugin-flags/FlagButton'
+import AuthorName from '../../coral-plugin-author-name/AuthorName'
 import {ReplyBox, ReplyButton} from '../../coral-plugin-replies'
 import Pym from 'pym.js'
 
@@ -117,6 +118,7 @@ class CommentStream extends Component {
                 const comment = this.props.items[commentId]
                 return <div className="comment">
                   <hr aria-hidden={true}/>
+                  <AuthorName name={comment.username}/>
                   <PubDate created_at={comment.created_at}/>
                   <Content content={comment.body}/>
                   <div className="commentActions">
@@ -143,6 +145,7 @@ class CommentStream extends Component {
                       let reply = this.props.items[replyId]
                       return <div className="reply">
                         <hr aria-hidden={true}/>
+                        <AuthorName name={reply.username}/>
                         <PubDate created_at={reply.created_at}/>
                         <Content content={reply.body}/>
                         <div className="replyActions">
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 4421bfaed..6458ae749 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -90,6 +90,10 @@ hr {
   margin-bottom: 10px;
 }
 
+.coral-plugin-author-name-text {
+  font-weight: bold;
+}
+
 
 /* Reply styles */
 
diff --git a/client/coral-plugin-author-name/AuthorName.js b/client/coral-plugin-author-name/AuthorName.js
new file mode 100644
index 000000000..cb465db37
--- /dev/null
+++ b/client/coral-plugin-author-name/AuthorName.js
@@ -0,0 +1,9 @@
+import React from 'react'
+const name = 'coral-plugin-author-name'
+
+const AuthorName = ({name}) =>
+<div className={name + '-text'}>
+  {name}
+</div>
+
+export default AuthorName

From e5c04b5fd16021aa98d8857185cd206106ed88dd Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 13:51:40 -0500
Subject: [PATCH 06/22] Updating routes and adding dev webpack to package.json

---
 client/coral-embed-stream/webpack.config.dev.js | 5 +++--
 client/coral-framework/store/actions/items.js   | 5 +++--
 package.json                                    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/coral-embed-stream/webpack.config.dev.js b/client/coral-embed-stream/webpack.config.dev.js
index 977300ecd..250276915 100644
--- a/client/coral-embed-stream/webpack.config.dev.js
+++ b/client/coral-embed-stream/webpack.config.dev.js
@@ -9,13 +9,14 @@ module.exports = {
     path.join(__dirname, 'src', 'app')
   ],
   output: {
-    path: path.join(__dirname, 'dist'),
+    path: path.join(__dirname, '..', '..','dist', 'coral-embed-stream'),
     filename: 'bundle.js',
     publicPath: '/'
   },
   resolve: {
     root: [
-      path.resolve(__dirname, 'src')
+      path.resolve(__dirname, 'src'),
+      path.resolve(__dirname, '..')
     ],
     extensions: ['', '.js', '.jsx']
   },
diff --git a/client/coral-framework/store/actions/items.js b/client/coral-framework/store/actions/items.js
index 019b1bfbe..8aea884ad 100644
--- a/client/coral-framework/store/actions/items.js
+++ b/client/coral-framework/store/actions/items.js
@@ -180,7 +180,8 @@ export function postItem (item, type, id) {
       method: 'POST',
       body: JSON.stringify(item)
     }
-    return fetch('api/v1/' + type, options)
+    console.log('postItem', options);
+    return fetch('/api/v1/' + type, options)
       .then(
         response => {
           return response.ok ? response.json()
@@ -223,7 +224,7 @@ export function postAction (id, type, user_id) {
     }
 
     dispatch(appendItemArray(id, type, user_id))
-    return fetch('api/v1/comments/' + id + '/actions', options)
+    return fetch('/api/v1/comments/' + id + '/actions', options)
       .then(
         response => {
           return response.ok ? response.text()
diff --git a/package.json b/package.json
index 17a6bda02..8777bc457 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "pretest": "npm install",
     "test": "mocha tests --recursive",
     "test-watch": "mocha tests --recursive -w",
-    "embed-start": "node client/coral-embed-stream/dev-server.js"
+    "embed-start": "webpack --config ./client/coral-embed-stream/webpack.config.dev.js && ./bin/www"
   },
   "config": {
     "pre-git": {

From 6f0698b950d1cbfabb8fa137bfc124fcbac57d8f Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 7 Nov 2016 11:27:05 -0800
Subject: [PATCH 07/22] More endpoints

---
 models/comment.js                  |  23 +++--
 routes/api/comments/index.js       |  10 ++-
 tests/routes/api/comments/index.js | 135 ++++++++++++++++++++++++++---
 3 files changed, 146 insertions(+), 22 deletions(-)

diff --git a/models/comment.js b/models/comment.js
index 5cf9f2aa0..644ffb6d0 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -32,10 +32,10 @@ const CommentSchema = new Schema({
 
 /**
  * Finds a comment by the id.
- * @param {String} asset_id  identifier of comment (uuid)
+ * @param {String} id  identifier of comment (uuid)
 */
 CommentSchema.statics.findById = function(id) {
-  return Comment.findOne({id});
+  return Comment.findOne({'id': id});
 };
 
 /**
@@ -48,13 +48,19 @@ CommentSchema.statics.findByAssetId = function(asset_id) {
 
 /**
  * Change the status of a comment.
- * @param {String} comment_id  identifier of the comment  (uuid)
+ * @param {String} id  identifier of the comment  (uuid)
  * @param {String} status the new status of the comment
 */
 CommentSchema.statics.changeStatus = function(id, status) {
-  var comment = Comment.findOne({id});
-  comment.status = status;
-  return comment.save();
+  return Comment.update({'id': id}, {$set: {'status': status}}, {upsert: false}).then(() => {
+    Comment.findById(id).then((comment) => {
+      return comment;
+    }).catch((err) => {
+      console.log('Error updating status for the comment.', err);
+    });
+  }).catch((err) => {
+    console.log('Error updating status for the comment.', err);
+  });
 };
 
 /**
@@ -64,10 +70,9 @@ CommentSchema.statics.changeStatus = function(id, status) {
 */
 CommentSchema.statics.addAction = function(id, user_id, action_type) {
   // check that the comment exist
-  var item_type = 'comment';
-  let action  = new Action({
+  var action  = new Action({
     action_type: action_type,
-    item_type: item_type,
+    item_type: 'comment',
     item_id: id,
     user_id: user_id
   });
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 80107bad1..2c9daa73f 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -66,15 +66,19 @@ router.delete('/:comment_id', (req, res, next) => {
 });
 
 router.post('/:comment_id/status', (req, res, next) => {
-  Comment.changeStatus(req.params.comment_id, req.query.status).then((comment) => {
+  Comment.changeStatus(req.params.comment_id, req.body.status).then((comment) => {
     res.status(200).send(comment);
   }).catch(error => {
     next(error);
   });
 });
 
-router.post('/:comment_id/actions', (req, res) => {
-  res.send('Add a comment action');
+router.post('/:comment_id/actions', (req, res, next) => {
+  Comment.addAction(req.params.comment_id, req.body.user_id, req.body.action_type).then((action) => {
+    res.status(200).send(action);
+  }).catch(error => {
+    next(error);
+  });
 });
 
 module.exports = router;
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index 7cce20d85..ac8cc5327 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -33,10 +33,10 @@ describe('Get /:comment_id', () => {
 
   const users = [{
     id: '123',
-    display_name: 'John',
+    display_name: 'Ana',
   },{
     id: '456',
-    display_name: 'Paul',
+    display_name: 'Maria',
   }]
 
   const actions = [{
@@ -71,10 +71,10 @@ describe('Get /:comment_id', () => {
 describe('Post /comments', () => {
   const users = [{
     id: '123',
-    display_name: 'John',
+    display_name: 'Ana',
   },{
     id: '456',
-    display_name: 'Paul',
+    display_name: 'Maria',
   }]
 
   const actions = [{
@@ -121,10 +121,10 @@ describe('Get /:comment_id', () => {
 
   const users = [{
     id: '123',
-    display_name: 'John',
+    display_name: 'Ana',
   },{
     id: '456',
-    display_name: 'Paul',
+    display_name: 'Maria',
   }]
 
   const actions = [{
@@ -176,10 +176,10 @@ describe('Put /:comment_id', () => {
 
   const users = [{
     id: '123',
-    display_name: 'John',
+    display_name: 'Ana',
   },{
     id: '456',
-    display_name: 'Paul',
+    display_name: 'Maria',
   }]
 
   const actions = [{
@@ -229,10 +229,10 @@ describe('Delete /:comment_id', () => {
 
   const users = [{
     id: '123',
-    display_name: 'John',
+    display_name: 'Ana',
   },{
     id: '456',
-    display_name: 'Paul',
+    display_name: 'Maria',
   }]
 
   const actions = [{
@@ -260,3 +260,118 @@ describe('Delete /:comment_id', () => {
       })
   })
 })
+
+
+describe('Post /:comment_id/status', () => {
+
+  const comments = [{
+    id: 'abc',
+    body: 'comment 10',
+    asset_id: 'asset',
+    author_id: '123',
+    status: ''
+  },{
+    id: 'def',
+    body: 'comment 20',
+    asset_id: 'asset',
+    author_id: '456',
+    status: 'rejected'
+  },{
+    id: 'hij',
+    body: 'comment 30',
+    asset_id: '456',
+    status: 'accepted'
+  }]
+
+  const users = [{
+    id: '123',
+    display_name: 'Ana',
+  },{
+    id: '456',
+    display_name: 'Maria',
+  }]
+
+  const actions = [{
+    action_type: 'flag',
+    item_id: 'abc'
+  },{
+    action_type: 'like',
+    item_id: 'hij'
+  }]
+
+  beforeEach(() => {
+    return Comment.create(comments).then(() => {
+      return User.create(users)
+    }).then(() => {
+      return Action.create(actions)
+    })
+  })
+
+  it('it should update status', function(done) {
+    chai.request(app)
+      .post('/api/v1/comments/abc/status')
+      .send({'status': 'accepted'})
+      .end(function(res){
+        expect(res).to.have.status(200)
+        done()
+      })
+  })
+})
+
+
+
+describe('Post /:comment_id/actions', () => {
+
+  const comments = [{
+    id: 'abc',
+    body: 'comment 10',
+    asset_id: 'asset',
+    author_id: '123',
+    status: ''
+  },{
+    id: 'def',
+    body: 'comment 20',
+    asset_id: 'asset',
+    author_id: '456',
+    status: 'rejected'
+  },{
+    id: 'hij',
+    body: 'comment 30',
+    asset_id: '456',
+    status: 'accepted'
+  }]
+
+  const users = [{
+    id: '123',
+    display_name: 'Ana',
+  },{
+    id: '456',
+    display_name: 'Maria',
+  }]
+
+  const actions = [{
+    action_type: 'flag',
+    item_id: 'abc'
+  },{
+    action_type: 'like',
+    item_id: 'hij'
+  }]
+
+  beforeEach(() => {
+    return Comment.create(comments).then(() => {
+      return User.create(users)
+    }).then(() => {
+      return Action.create(actions)
+    })
+  })
+
+  it('it should update status', function(done) {
+    chai.request(app)
+      .post('/api/v1/comments/abc/actions')
+      .send({'user_id': '456', 'action_type': 'flag'})
+      .end(function(res){
+        expect(res).to.have.status(200)
+        done()
+      })
+  })
+})

From 38692ccd303a7842f66f8aaacbc024185e79bf3a Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 7 Nov 2016 11:28:41 -0800
Subject: [PATCH 08/22] Ignore dist for lint

---
 .eslintignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintignore b/.eslintignore
index b051c6c57..6cb6a3bc3 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,2 @@
 client
+dist

From 16e7a6c868c1dccaee449299ae333a3ef88ec4c0 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 7 Nov 2016 11:34:34 -0800
Subject: [PATCH 09/22] CHanges from query to body for post/put.

---
 routes/api/comments/index.js       | 22 +++++++++++-----------
 tests/routes/api/comments/index.js |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 2c9daa73f..428369ae1 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -26,11 +26,11 @@ router.get('/:comment_id', (req, res, next) => {
 
 router.post('/', (req, res, next) => {
   let comment  = new Comment({
-    body: req.query.body,
-    author_id: req.query.author_id,
-    asset_id: req.query.asset_id,
-    parent_id: req.query.parent_id,
-    status: req.query.status
+    body: req.body.body,
+    author_id: req.body.author_id,
+    asset_id: req.body.asset_id,
+    parent_id: req.body.parent_id,
+    status: req.body.status
   });
   comment.save().then(({id}) => {
     res.status(200).send(id);
@@ -39,13 +39,13 @@ router.post('/', (req, res, next) => {
   });
 });
 
-router.put('/:comment_id', (req, res, next) => {
+router.post('/:comment_id', (req, res, next) => {
   Comment.findById(req.params.comment_id).then((comment) => {
-    comment.body = req.query.body;
-    comment.author_id = req.query.author_id;
-    comment.asset_id = req.query.asset_id;
-    comment.parent_id = req.query.parent_id;
-    comment.status = req.query.status;
+    comment.body = req.body.body;
+    comment.author_id = req.body.author_id;
+    comment.asset_id = req.body.asset_id;
+    comment.parent_id = req.body.parent_id;
+    comment.status = req.body.status;
 
     comment.save().then((comment) => {
       res.status(200).send(comment);
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index ac8cc5327..c3694d95e 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -94,7 +94,7 @@ describe('Post /comments', () => {
   it('it should create a comment', function(done) {
     chai.request(app)
       .post('/api/v1/comments')
-      .query({'body': 'Something body.', 'author_id': '123', 'asset_id': '1', 'parent_id': ''})
+      .send({'body': 'Something body.', 'author_id': '123', 'asset_id': '1', 'parent_id': ''})
       .end(function(err, res){
         expect(res).to.have.status(200)
         done()
@@ -200,8 +200,8 @@ describe('Put /:comment_id', () => {
 
   it('it should update comment', function(done) {
     chai.request(app)
-      .put('/api/v1/comments/abc')
-      .query({'body': 'Something body.', 'author_id': '123', 'asset_id': '1', 'parent_id': ''})
+      .post('/api/v1/comments/abc')
+      .send({'body': 'Something body.', 'author_id': '123', 'asset_id': '1', 'parent_id': ''})
       .end(function(err, res){
         expect(res).to.have.status(200)
         done()

From fc80ea2c3ad0f8414c75839388545354f616b48f Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 7 Nov 2016 11:49:02 -0800
Subject: [PATCH 10/22] Check it has body

---
 tests/routes/api/comments/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index c3694d95e..4945195a0 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -313,6 +313,7 @@ describe('Post /:comment_id/status', () => {
       .send({'status': 'accepted'})
       .end(function(res){
         expect(res).to.have.status(200)
+        expect(res).to.have.body
         done()
       })
   })

From 601d36f2dfe604c23c5018a908ec13511b13b61b Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 7 Nov 2016 12:54:04 -0700
Subject: [PATCH 11/22] whoops missed some semicolons

---
 tests/models/setting.js            | 4 ++--
 tests/routes/api/settings/index.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/models/setting.js b/tests/models/setting.js
index 53d0d6386..e2600fb0f 100644
--- a/tests/models/setting.js
+++ b/tests/models/setting.js
@@ -9,8 +9,8 @@ describe('Setting: model', () => {
 
   beforeEach(() => {
     const defaults = {id: 1, moderation: 'pre'};
-    return Setting.update({id: '1'}, {$setOnInsert: defaults}, {upsert: true})
-  })
+    return Setting.update({id: '1'}, {$setOnInsert: defaults}, {upsert: true});
+  });
 
   describe('#getSettings()', () => {
     it('should have a moderation field defined', () => {
diff --git a/tests/routes/api/settings/index.js b/tests/routes/api/settings/index.js
index fbf55d95f..8c2cd221e 100644
--- a/tests/routes/api/settings/index.js
+++ b/tests/routes/api/settings/index.js
@@ -27,7 +27,7 @@ describe('GET /settings', () => {
         expect(res.body).to.have.property('moderation');
         expect(res.body.moderation).to.equal('pre');
         done(err);
-      })
+      });
   });
 });
 

From 9e70b86687879313c86eeb0dce74fd40c6bc736a Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 7 Nov 2016 12:29:07 -0800
Subject: [PATCH 12/22] Fix tests.

---
 tests/routes/api/comments/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index 5fb28a8e7..887ad679d 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -308,7 +308,8 @@ describe('Post /:comment_id/status', () => {
     chai.request(app)
       .post('/api/v1/comments/abc/status')
       .send({'status': 'accepted'})
-      .end(function(res){
+      .end(function(err, res){
+        expect(err).to.be.null;
         expect(res).to.have.status(200);
         expect(res).to.have.body;
         done();
@@ -365,7 +366,8 @@ describe('Post /:comment_id/actions', () => {
     chai.request(app)
       .post('/api/v1/comments/abc/actions')
       .send({'user_id': '456', 'action_type': 'flag'})
-      .end(function(res){
+      .end(function(err, res){
+        expect(err).to.be.null;
         expect(res).to.have.status(200);
         done();
       });

From 529a35044057cf2b1697020fe833db000a8d67f1 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 15:39:16 -0500
Subject: [PATCH 13/22] Adding keys to comments.

---
 client/coral-embed-stream/src/CommentStream.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js
index dae78f69d..787cba78a 100644
--- a/client/coral-embed-stream/src/CommentStream.js
+++ b/client/coral-embed-stream/src/CommentStream.js
@@ -116,7 +116,7 @@ class CommentStream extends Component {
             {
               rootItem.comments.map((commentId) => {
                 const comment = this.props.items[commentId]
-                return <div className="comment">
+                return <div className="comment" key={commentId}>
                   <hr aria-hidden={true}/>
                   <AuthorName name={comment.username}/>
                   <PubDate created_at={comment.created_at}/>
@@ -143,7 +143,7 @@ class CommentStream extends Component {
                       comment.children &&
                       comment.children.map((replyId) => {
                       let reply = this.props.items[replyId]
-                      return <div className="reply">
+                      return <div className="reply" key={replyId}>
                         <hr aria-hidden={true}/>
                         <AuthorName name={reply.username}/>
                         <PubDate created_at={reply.created_at}/>

From 82f8ed3b4af267d10a07780643ec8ffc29bfcf44 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 15:39:44 -0500
Subject: [PATCH 14/22] Adding headers to post function.

---
 client/coral-framework/store/actions/items.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/coral-framework/store/actions/items.js b/client/coral-framework/store/actions/items.js
index 8aea884ad..2caf96ce2 100644
--- a/client/coral-framework/store/actions/items.js
+++ b/client/coral-framework/store/actions/items.js
@@ -178,19 +178,22 @@ export function postItem (item, type, id) {
     }
     let options = {
       method: 'POST',
-      body: JSON.stringify(item)
+      body: JSON.stringify(item),
+      headers: {
+        'Content-Type':'application/json'
+      }
     }
     console.log('postItem', options);
     return fetch('/api/v1/' + type, options)
       .then(
         response => {
-          return response.ok ? response.json()
+          return response.ok ? response.text()
           : Promise.reject(response.status + ' ' + response.statusText)
         }
       )
-      .then((json) => {
-        dispatch(addItem(json))
-        return json.id
+      .then((id) => {
+        dispatch(addItem({...item, id}))
+        return id
       })
   }
 }

From 5a3d6ac2875c4c76b5c378d14f175c0da0242953 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 15:40:01 -0500
Subject: [PATCH 15/22] Adding styling authorname.

---
 client/coral-embed-stream/style/default.css   | 4 +++-
 client/coral-plugin-author-name/AuthorName.js | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 6458ae749..9cf0fa3e8 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -91,7 +91,9 @@ hr {
 }
 
 .coral-plugin-author-name-text {
-  font-weight: bold;
+  display: inline-block;
+  margin-right: 10px;
+  font-weight: bolder;
 }
 
 
diff --git a/client/coral-plugin-author-name/AuthorName.js b/client/coral-plugin-author-name/AuthorName.js
index cb465db37..04817da1c 100644
--- a/client/coral-plugin-author-name/AuthorName.js
+++ b/client/coral-plugin-author-name/AuthorName.js
@@ -1,8 +1,8 @@
 import React from 'react'
-const name = 'coral-plugin-author-name'
+const packagename = 'coral-plugin-author-name'
 
 const AuthorName = ({name}) =>
-<div className={name + '-text'}>
+<div className={packagename + '-text'}>
   {name}
 </div>
 

From 376d37f05e86f38e02c0b1560848addc52a9f479 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 15:44:49 -0500
Subject: [PATCH 16/22] Removing type dependency when hydrating comments.

---
 client/coral-framework/store/actions/items.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/coral-framework/store/actions/items.js b/client/coral-framework/store/actions/items.js
index 2caf96ce2..443a41e94 100644
--- a/client/coral-framework/store/actions/items.js
+++ b/client/coral-framework/store/actions/items.js
@@ -97,12 +97,10 @@ export function getStream (assetId) {
 
           /* Check for root and child comments. */
           if (
-            item.type === 'comment' &&
             item.asset_id === assetId &&
             !item.parent_id) {
             rootComments.push(item.id)
           } else if (
-            item.type === 'comment' &&
             item.asset_id === assetId
           ) {
             let children = childComments[item.parent_id] || []

From d911e5b30db562ac04a70ea7a3b23178c7e3acef Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 7 Nov 2016 13:08:23 -0800
Subject: [PATCH 17/22] Improve test.

---
 routes/api/comments/index.js       |  2 +-
 tests/routes/api/comments/index.js | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index b0458ada7..3acca5b3e 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -27,7 +27,7 @@ router.post('/', (req, res, next) => {
   const {body, author_id, asset_id, parent_id, status} = req.body;
   let comment  = new Comment({body, author_id, asset_id, parent_id, status});
   comment.save().then(({id}) => {
-    res.status(200).send(id);
+    res.status(200).send({'id': id});
   }).catch(error => {
     next(error);
   });
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index 887ad679d..f55ac98af 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -14,7 +14,7 @@ const Comment = require('../../../../models/comment');
 const Action = require('../../../../models/action');
 const User = require('../../../../models/user');
 
-describe('Get /:comment_id', () => {
+describe('Get /comments', () => {
   const comments = [{
     id: 'abc',
     body: 'comment 10',
@@ -95,6 +95,7 @@ describe('Post /comments', () => {
       .send({'body': 'Something body.', 'author_id': '123', 'asset_id': '1', 'parent_id': ''})
       .end(function(err, res){
         expect(res).to.have.status(200);
+        expect(res.body).to.have.property('id');
         done();
       });
   });
@@ -148,7 +149,8 @@ describe('Get /:comment_id', () => {
       .end(function(err, res){
         expect(err).to.be.null;
         expect(res).to.have.status(200);
-        if (err) {return done(err);}
+        expect(res.body[0]).to.have.property('body');
+        expect(res.body[0].body).to.equal('comment 10');
         done();
       });
   });
@@ -201,7 +203,10 @@ describe('Put /:comment_id', () => {
       .post('/api/v1/comments/abc')
       .send({'body': 'Something body.', 'author_id': '123', 'asset_id': '1', 'parent_id': ''})
       .end(function(err, res){
+        expect(err).to.be.null;
         expect(res).to.have.status(200);
+        expect(res.body).to.have.property('body');
+        expect(res.body.body).to.equal('Something body.');
         done();
       });
   });
@@ -312,6 +317,8 @@ describe('Post /:comment_id/status', () => {
         expect(err).to.be.null;
         expect(res).to.have.status(200);
         expect(res).to.have.body;
+        expect(res.body).to.have.property('status');
+        expect(res.body.status).to.equal('accepted');
         done();
       });
   });
@@ -369,6 +376,15 @@ describe('Post /:comment_id/actions', () => {
       .end(function(err, res){
         expect(err).to.be.null;
         expect(res).to.have.status(200);
+        expect(res).to.have.body;
+        expect(res.body).to.have.property('item_type');
+        expect(res.body.item_type).to.equal('comment');
+        expect(res.body).to.have.property('action_type');
+        expect(res.body.action_type).to.equal('flag');
+        expect(res.body).to.have.property('item_id');
+        expect(res.body.item_id).to.equal('abc');
+        expect(res.body).to.have.property('user_id');
+        expect(res.body.user_id).to.equal('456');
         done();
       });
   });

From 4737e846812dd30dce2fab935514b42be18d06ab Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 16:11:10 -0500
Subject: [PATCH 18/22] Displaying comments and replies appropriately.

---
 client/coral-embed-stream/src/CommentStream.js |  6 ++++--
 client/coral-plugin-commentbox/CommentBox.js   | 16 ++++++++--------
 client/coral-plugin-replies/ReplyBox.js        |  3 ++-
 client/coral-plugin-replies/ReplyButton.js     |  2 +-
 routes/api/comments/index.js                   |  1 +
 routes/api/stream/index.js                     |  1 +
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js
index 787cba78a..b8ec5c762 100644
--- a/client/coral-embed-stream/src/CommentStream.js
+++ b/client/coral-embed-stream/src/CommentStream.js
@@ -111,7 +111,8 @@ class CommentStream extends Component {
                 postItem={this.props.postItem}
                 appendItemArray={this.props.appendItemArray}
                 updateItem={this.props.updateItem}
-                id={rootItemId}/>
+                id={rootItemId}
+                reply={false}/>
             </div>
             {
               rootItem.comments.map((commentId) => {
@@ -137,7 +138,8 @@ class CommentStream extends Component {
                       postItem={this.props.postItem}
                       appendItemArray={this.props.appendItemArray}
                       updateItem={this.props.updateItem}
-                      id={commentId}
+                      id={rootItemId}
+                      parent_id={commentId}
                       showReply={comment.showReply}/>
                     {
                       comment.children &&
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 1bd138af9..b7d282f10 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -19,26 +19,26 @@ class CommentBox extends Component {
   }
 
   postComment = () => {
-    const {postItem, updateItem, id, reply, addNotification, appendItemArray} = this.props
+    const {postItem, updateItem, id, parent_id, addNotification, appendItemArray} = this.props
     let comment = {
       body: this.state.body,
       asset_id: id,
       username: this.state.username
     }
     let related
-    if (reply) {
-      comment.parent_id = id
+    if (parent_id) {
+      comment.parent_id = parent_id
       related = 'children'
     } else {
       related = 'comments'
     }
-    updateItem(id, 'showReply', false)
+    updateItem(parent_id, 'showReply', false)
     postItem(comment, 'comments')
     .then((comment_id) => {
-      appendItemArray(id, related, comment_id)
+      appendItemArray(parent_id || id, related, comment_id)
       addNotification('success', 'Your comment has been posted.')
     }).catch((err) => console.error(err))
-    this.setState({content: ''})
+    this.setState({body: ''})
   }
 
   render () {
@@ -49,7 +49,7 @@ class CommentBox extends Component {
         <input type='text'
           className={name + '-username'}
           style={styles && styles.textarea}
-          value={this.state.content}
+          value={this.state.username}
           id={reply ? 'replyUser' : 'commentUser'}
           placeholder='Name'
           onChange={(e) => this.setState({username: e.target.value})}/>
@@ -65,7 +65,7 @@ class CommentBox extends Component {
           <textarea
             className={name + '-textarea'}
             style={styles && styles.textarea}
-            value={this.state.content}
+            value={this.state.body}
             placeholder='Comment'
             id={reply ? 'replyText' : 'commentText'}
             onChange={(e) => this.setState({body: e.target.value})}
diff --git a/client/coral-plugin-replies/ReplyBox.js b/client/coral-plugin-replies/ReplyBox.js
index d496a63f7..6ecd9eef3 100644
--- a/client/coral-plugin-replies/ReplyBox.js
+++ b/client/coral-plugin-replies/ReplyBox.js
@@ -8,7 +8,8 @@ const ReplyBox = (props) => <div
    style={props.styles && props.styles.container}>
      {
        props.showReply && <CommentBox
-         item_id = {props.item_id}
+         id = {props.id}
+         parent_id = {props.parent_id}
          postItem = {props.postItem}
          addNotification = {props.addNotification}
          appendItemArray = {props.appendItemArray}
diff --git a/client/coral-plugin-replies/ReplyButton.js b/client/coral-plugin-replies/ReplyButton.js
index 33c6d4c3f..157d24aaf 100644
--- a/client/coral-plugin-replies/ReplyButton.js
+++ b/client/coral-plugin-replies/ReplyButton.js
@@ -5,7 +5,7 @@ const name = 'coral-plugin-replies'
 
 const ReplyButton = (props) => <button
     className={name + '-reply-button'}
-    onClick={(e) => props.updateItem(props.item_id || props.parent_id, 'showReply', true)}>
+    onClick={(e) => props.updateItem(props.id || props.parent_id, 'showReply', true)}>
     <i className={name + '-icon material-icons'}
       aria-hidden={true}>reply</i>
     {lang.t('reply')}
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 428369ae1..57c434a6f 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -46,6 +46,7 @@ router.post('/:comment_id', (req, res, next) => {
     comment.asset_id = req.body.asset_id;
     comment.parent_id = req.body.parent_id;
     comment.status = req.body.status;
+    comment.username = req.body.username;
 
     comment.save().then((comment) => {
       res.status(200).send(comment);
diff --git a/routes/api/stream/index.js b/routes/api/stream/index.js
index c63bf871d..5c3333ac8 100644
--- a/routes/api/stream/index.js
+++ b/routes/api/stream/index.js
@@ -17,6 +17,7 @@ router.get('/', (req, res, next) => {
       Action.findByItemIdArray(comments.map((comment) => comment.id))
     ]);
   }).then(([comments, users, actions]) => {
+    console.log(comments.length);
     res.json([...comments,...users,...actions]);
   }).catch(error => {
     next(error);

From 8154133fe20c235c370b0a7794c87bfc0bf28c4b Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 7 Nov 2016 13:11:43 -0800
Subject: [PATCH 19/22] Improve test to remove comment.

---
 tests/routes/api/comments/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index f55ac98af..4fbe52e94 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -259,6 +259,9 @@ describe('Delete /:comment_id', () => {
       .delete('/api/v1/comments/abc')
       .end(function(err, res){
         expect(res).to.have.status(201);
+        Comment.findById({'id': 'abc'}).then((comment) => {
+          expect(comment).to.be.null;
+        });
         done();
       });
   });

From 0e1e04d2a9cff57b5b95376bc0a66dd383f16652 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 16:19:20 -0500
Subject: [PATCH 20/22] Returning usernames.

---
 models/comment.js            | 1 +
 routes/api/comments/index.js | 4 ++--
 routes/api/stream/index.js   | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/models/comment.js b/models/comment.js
index 644ffb6d0..74e9aa059 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -17,6 +17,7 @@ const CommentSchema = new Schema({
   },
   asset_id: String,
   author_id: String,
+  username: String,
   status: {
     type: String,
     enum: ['accepted', 'rejected', ''],
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 57c434a6f..a19865964 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -30,7 +30,8 @@ router.post('/', (req, res, next) => {
     author_id: req.body.author_id,
     asset_id: req.body.asset_id,
     parent_id: req.body.parent_id,
-    status: req.body.status
+    status: req.body.status,
+    username: req.body.username
   });
   comment.save().then(({id}) => {
     res.status(200).send(id);
@@ -46,7 +47,6 @@ router.post('/:comment_id', (req, res, next) => {
     comment.asset_id = req.body.asset_id;
     comment.parent_id = req.body.parent_id;
     comment.status = req.body.status;
-    comment.username = req.body.username;
 
     comment.save().then((comment) => {
       res.status(200).send(comment);
diff --git a/routes/api/stream/index.js b/routes/api/stream/index.js
index 5c3333ac8..c63bf871d 100644
--- a/routes/api/stream/index.js
+++ b/routes/api/stream/index.js
@@ -17,7 +17,6 @@ router.get('/', (req, res, next) => {
       Action.findByItemIdArray(comments.map((comment) => comment.id))
     ]);
   }).then(([comments, users, actions]) => {
-    console.log(comments.length);
     res.json([...comments,...users,...actions]);
   }).catch(error => {
     next(error);

From b93ad47dca956c0c4eb491d0a5727ef7764d895f Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 16:33:56 -0500
Subject: [PATCH 21/22] Switching to local webpack.

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d8123f5b2..5c49dbbdb 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,12 @@
   "main": "app.js",
   "scripts": {
     "start": "./bin/www",
-    "build": "webpack --config ./client/coral-embed-stream/webpack.config.js",
+    "build": "./node_modules/webpack/bin/webpack.js --config ./client/coral-embed-stream/webpack.config.js",
     "lint": "eslint .",
     "pretest": "npm install",
     "test": "mocha tests --recursive",
     "test-watch": "mocha tests --recursive -w",
-    "embed-start": "webpack --config ./client/coral-embed-stream/webpack.config.dev.js && ./bin/www"
+    "embed-start": "./node_modules/webpack/bin/webpack.js --config ./client/coral-embed-stream/webpack.config.dev.js && ./bin/www"
   },
   "config": {
     "pre-git": {

From 167876ee3d56e7c3c7264d21e2e6472fcc9ffc59 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 16:35:46 -0500
Subject: [PATCH 22/22] Enabling build in dockerfile.

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cdb7652d5..985e55159 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN npm install
 COPY . /usr/src/app
 
 # Compile static assets
-# RUN npm run build
+RUN npm run build
 
 # Prune development dependancies
 RUN npm prune --production