Added status changing + history

- Status's for comments is now an array of objects

tests/.eslintrc.json

@@ -4,8 +4,12 @@
         "node": true,
         "mocha": true
     },
+    "plugins": [
+      "mocha"
+    ],
     "extends": "../.eslintrc.json",
     "rules": {
-        "no-undef": [0]
+        "no-undef": [0],
+        "mocha/no-exclusive-tests": "warn"
     }
 }

tests/models/action.js

@@ -1,35 +1,34 @@
 const Action = require('../../models/action');
 const expect = require('chai').expect;
 
-describe('Action: models', () => {
-  let mockActions;
+describe('models.Action', () => {
+  let mockActions = [];
 
-  beforeEach(() => {
-    return Action.create([{
-      action_type: 'flag',
-      item_id: '123',
-      item_type: 'comment',
-      user_id: 'flagginguserid'
-    }, {
-      action_type: 'flag',
-      item_id: '456',
-      item_type: 'comment'
-    }, {
-      action_type: 'flag',
-      item_id: '123',
-      item_type: 'comment'
-    }, {
-      action_type: 'like',
-      item_id: '123',
-      item_type: 'comment'
-    }]).then((actions) => {
-      mockActions = actions;
-    });
-  });
+  beforeEach(() => Action.create([{
+    action_type: 'flag',
+    item_id: '123',
+    item_type: 'comment',
+    user_id: 'flagginguserid'
+  }, {
+    action_type: 'flag',
+    item_id: '456',
+    item_type: 'comment'
+  }, {
+    action_type: 'flag',
+    item_id: '123',
+    item_type: 'comment'
+  }, {
+    action_type: 'like',
+    item_id: '123',
+    item_type: 'comment'
+  }]).then((actions) => {
+    mockActions = actions;
+  }));
 
   describe('#findById()', () => {
     it('should find an action by id', () => {
       return Action.findById(mockActions[0].id).then((result) => {
+        expect(result).to.not.be.null;
         expect(result).to.have.property('action_type', 'flag');
       });
     });

tests/models/asset.js

@@ -6,7 +6,7 @@ const expect = chai.expect;
 // Use the chai should.
 chai.should();
 
-describe('Asset: model', () => {
+describe('models.Asset', () => {
 
   beforeEach(() => {
     const defaults = {url:'http://test.com'};

tests/models/comment.js

@@ -7,35 +7,57 @@ const settings = {id: '1', moderation: 'pre'};
 
 const expect = require('chai').expect;
 
-describe('Comment: models', () => {
+describe('models.Comment', () => {
   const comments = [{
     body: 'comment 10',
     asset_id: '123',
-    status: '',
+    status: [],
     parent_id: '',
     author_id: '123',
     id: '1'
   }, {
     body: 'comment 20',
     asset_id: '123',
-    status: 'accepted',
+    status: [{
+      type: 'accepted'
+    }],
     parent_id: '',
     author_id: '123',
     id: '2'
   }, {
     body: 'comment 30',
     asset_id: '456',
-    status: '',
+    status: [],
     parent_id: '',
     author_id: '456',
     id: '3'
   }, {
     body: 'comment 40',
     asset_id: '123',
-    status: 'rejected',
+    status: [{
+      type: 'rejected'
+    }],
     parent_id: '',
     author_id: '456',
     id: '4'
+  }, {
+    body: 'comment 50',
+    asset_id: '1234',
+    status: [{
+      type: 'premod'
+    }],
+    parent_id: '',
+    author_id: '456',
+    id: '5'
+  }, {
+    body: 'comment 60',
+    asset_id: '1234',
+    status: [{
+      type: 'premod'
+    }],
+    parent_id: '',
+    author_id: '456',
+    id: '6'
   }];
 
   const users = [{
@@ -60,25 +82,69 @@ describe('Comment: models', () => {
     user_id: '456'
   }];
 
-  beforeEach(() => {
-    return Promise.all([
-      Setting.create(settings),
-      Comment.create(comments),
-      User.createLocalUsers(users),
-      Action.create(actions)
-    ]);
+  beforeEach(() => Promise.all([
+    Setting.init(settings),
+    Comment.create(comments),
+    User.createLocalUsers(users),
+    Action.create(actions)
+  ]));
+
+  describe('#publicCreate()', () => {
+
+    it('creates a new comment', () => {
+      return Comment.publicCreate({
+        body: 'This is a comment!',
+        status: 'accepted'
+      }).then((c) => {
+        expect(c).to.not.be.null;
+        expect(c.id).to.not.be.null;
+        expect(c.id).to.be.uuid;
+        expect(c.status).to.have.length(1);
+        expect(c.status[0]).to.have.property('type', 'accepted');
+      });
+    });
+
+    it('creates many new comments', () => {
+      return Comment.publicCreate([{
+        body: 'This is a comment!',
+        status: 'accepted'
+      }, {
+        body: 'This is another comment!'
+      }, {
+        body: 'This is a rejected comment!',
+        status: 'rejected'
+      }]).then(([c1, c2, c3]) => {
+        expect(c1).to.not.be.null;
+        expect(c1.id).to.be.uuid;
+        expect(c1.status).to.have.length(1);
+        expect(c1.status[0]).to.have.property('type', 'accepted');
+
+        expect(c2).to.not.be.null;
+        expect(c2.id).to.be.uuid;
+        expect(c2.status).to.have.length(0);
+
+        expect(c3).to.not.be.null;
+        expect(c3.id).to.be.uuid;
+        expect(c3.status).to.have.length(1);
+        expect(c3.status[0]).to.have.property('type', 'rejected');
+      });
+    });
+
   });
 
   describe('#findById()', () => {
+
     it('should find a comment by id', () => {
       return Comment.findById('1').then((result) => {
         expect(result).to.not.be.null;
         expect(result).to.have.property('body', 'comment 10');
       });
     });
+
   });
 
   describe('#findByAssetId()', () => {
+
     it('should find an array of all comments by asset id', () => {
       return Comment.findByAssetId('123').then((result) => {
         expect(result).to.have.length(3);
@@ -91,6 +157,7 @@ describe('Comment: models', () => {
         expect(result[2]).to.have.property('body', 'comment 40');
       });
     });
+
     it('should find an array of accepted comments by asset id', () => {
       return Comment.findAcceptedByAssetId('123').then((result) => {
         expect(result).to.have.length(1);
@@ -101,6 +168,7 @@ describe('Comment: models', () => {
         expect(result[0]).to.have.property('body', 'comment 20');
       });
     });
+
     it('should find an array of new and accepted comments by asset id', () => {
       return Comment.findAcceptedAndNewByAssetId('123').then((result) => {
         expect(result).to.have.length(2);
@@ -112,13 +180,16 @@ describe('Comment: models', () => {
       });
     });
   });
+
   describe('#moderationQueue()', () => {
+
     it('should find an array of new comments to moderate when pre-moderation', () => {
       return Comment.moderationQueue('pre').then((result) => {
         expect(result).to.not.be.null;
         expect(result).to.have.lengthOf(2);
       });
     });
+
     it('should find an array of new comments to moderate when post-moderation', () => {
       return Comment.moderationQueue('post').then((result) => {
         expect(result).to.not.be.null;
@@ -126,21 +197,49 @@ describe('Comment: models', () => {
         expect(result[0]).to.have.property('body', 'comment 30');
       });
     });
-    // it('should fail when the moderation is not pre or post', () => {
-    //   return Comment.moderationQueue('any').catch(function(error) {
-    //     expect(error).to.not.be.null;
-    //   });
-    // });
+
   });
 
   describe('#removeAction', () => {
+
     it('should remove an action', () => {
-      return Comment.removeAction('3', '123', 'flag').then(() => {
-        return Action.findByItemIdArray(['123']);
-      })
-      .then((actions) => {
-        expect(actions.length).to.equal(0);
-      });
+      return Comment.removeAction('3', '123', 'flag')
+        .then(() => {
+          return Action.findByItemIdArray(['123']);
+        })
+        .then((actions) => {
+          expect(actions.length).to.equal(0);
+        });
     });
   });
+
+  describe('#changeStatus', () => {
+
+    it('should change the status of a comment from no status', () => {
+      return Comment.changeStatus(comments[0].id, 'rejected')
+        .then(() => {
+
+          return Comment.findById(comments[0].id);
+        })
+        .then((c) => {
+          expect(c).to.have.property('status');
+          expect(c.status).to.have.length(1);
+          expect(c.status[0]).to.have.property('type', 'rejected');
+        });
+    });
+
+    it('should change the status of a comment from accepted', () => {
+      return Comment.changeStatus(comments[1].id, 'rejected')
+        .then(() => {
+
+          return Comment.findById(comments[1].id);
+        })
+        .then((c) => {
+          expect(c).to.have.property('status');
+          expect(c.status).to.have.length(2);
+          expect(c.status[1]).to.have.property('type', 'rejected');
+        });
+    });
+
+  });
 });

tests/models/setting.js

@@ -1,32 +1,29 @@
 const Setting = require('../../models/setting');
 const expect = require('chai').expect;
 
-describe('Setting: model', () => {
+describe('models.Setting', () => {
 
-  beforeEach(() => {
-    const defaults = {id: 1};
-    return Setting.update({id: '1'}, {$setOnInsert: defaults}, {upsert: true});
-  });
+  beforeEach(() => Setting.init({moderation: 'pre'}));
 
-  describe('#getSettings()', () => {
+  describe('#retrieve()', () => {
     it('should have a moderation field defined', () => {
-      return Setting.getSettings().then(settings => {
+      return Setting.retrieve().then(settings => {
         expect(settings).to.have.property('moderation').and.to.equal('pre');
       });
     });
 
     it('should have two infoBox fields defined', () => {
-      return Setting.getSettings().then(settings => {
+      return Setting.retrieve().then(settings => {
         expect(settings).to.have.property('infoBoxEnable').and.to.equal(false);
         expect(settings).to.have.property('infoBoxContent').and.to.equal('');
       });
     });
   });
 
-  describe('#updateSettings()', () => {
+  describe('#update()', () => {
     it('should update the settings with a passed object', () => {
       const mockSettings = {moderation: 'post', infoBoxEnable: true, infoBoxContent: 'yeah'};
-      return Setting.updateSettings(mockSettings).then(updatedSettings => {
+      return Setting.update(mockSettings).then(updatedSettings => {
         expect(updatedSettings).to.be.an('object');
         expect(updatedSettings).to.have.property('moderation').and.to.equal('post');
         expect(updatedSettings).to.have.property('infoBoxEnable', true);
@@ -35,9 +32,9 @@ describe('Setting: model', () => {
     });
   });
 
-  describe('#getModerationSetting', () => {
+  describe('#get', () => {
     it('should return the moderation settings', () => {
-      return Setting.getModerationSetting().then(({moderation}) => {
+      return Setting.retrieve().then(({moderation}) => {
         expect(moderation).not.to.be.null;
       });
     });

tests/models/user.js

@@ -1,7 +1,7 @@
 const User = require('../../models/user');
 const expect = require('chai').expect;
 
-describe('User: models', () => {
+describe('models.User', () => {
   let mockUsers;
   beforeEach(() => {
     return User.createLocalUsers([{

tests/routes/api/comments/index.js

@@ -10,6 +10,7 @@ chai.use(require('chai-http'));
 
 const wordlist = require('../../../../services/wordlist');
 const Comment = require('../../../../models/comment');
+const Asset = require('../../../../models/asset');
 const Action = require('../../../../models/action');
 const User = require('../../../../models/user');
 
@@ -17,62 +18,71 @@ const Setting = require('../../../../models/setting');
 const settings = {id: '1', moderation: 'pre'};
 
 describe('/api/v1/comments', () => {
-  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: 'def-rejected',
-    body: 'comment 20',
-    asset_id: 'asset',
-    author_id: '456',
-    status: 'rejected'
-  }, {
-    id: 'hij',
-    body: 'comment 30',
-    asset_id: '456',
-    status: 'accepted'
-  }];
-
-  const users = [{
-    displayName: 'Ana',
-    email: 'ana@gmail.com',
-    password: '123'
-  }, {
-    displayName: 'Maria',
-    email: 'maria@gmail.com',
-    password: '123'
-  }];
-
-  const actions = [{
-    action_type: 'flag',
-    item_id: 'abc',
-    item_type: 'comment'
-  }, {
-    action_type: 'like',
-    item_id: 'hij',
-    item_type: 'comment'
-  }];
-
-  beforeEach(() => {
-    return Promise.all([
-      Comment.create(comments),
-      User.createLocalUsers(users),
-      Action.create(actions),
-      wordlist.insert([
-        'bad words'
-      ]),
-      Setting.create(settings)
-    ]);
-  });
 
   describe('#get', () => {
+    const comments = [{
+      body: 'comment 10',
+      asset_id: 'asset',
+      author_id: '123'
+    }, {
+      body: 'comment 20',
+      asset_id: 'asset',
+      author_id: '456'
+    }, {
+      body: 'comment 20',
+      asset_id: 'asset',
+      author_id: '456',
+      status: [{
+        type: 'rejected'
+      }]
+    }, {
+      body: 'comment 30',
+      asset_id: '456',
+      status: [{
+        type: 'accepted'
+      }]
+    }];
+
+    const users = [{
+      displayName: 'Ana',
+      email: 'ana@gmail.com',
+      password: '123'
+    }, {
+      displayName: 'Maria',
+      email: 'maria@gmail.com',
+      password: '123'
+    }];
+
+    const actions = [{
+      action_type: 'flag',
+      item_id: 'abc',
+      item_type: 'comment'
+    }, {
+      action_type: 'like',
+      item_id: 'hij',
+      item_type: 'comment'
+    }];
+
+    beforeEach(() => {
+      return Promise.all([
+        Comment.create(comments).then((newComments) => {
+          newComments.forEach((comment, i) => {
+            comments[i].id = comment.id;
+          });
+
+          actions[0].item_id = comments[0].id;
+          actions[1].item_id = comments[1].id;
+
+          return Action.create(actions);
+        }),
+        User.createLocalUsers(users),
+        wordlist.insert([
+          'bad words'
+        ]),
+        Setting.init(settings)
+      ]);
+    });
+
     it('should return all the comments', () => {
       return chai.request(app)
         .get('/api/v1/comments')
@@ -90,7 +100,8 @@ describe('/api/v1/comments', () => {
         .set(passport.inject({roles: ['admin']}))
         .then((res) => {
           expect(res).to.have.status(200);
-          expect(res.body[0]).to.have.property('id', 'def-rejected');
+          expect(res.body).to.have.length(1);
+          expect(res.body[0]).to.have.property('id', comments[2].id);
         });
     });
 
@@ -101,7 +112,7 @@ describe('/api/v1/comments', () => {
         .then((res) => {
           expect(res).to.have.status(200);
           expect(res.body).to.have.length(1);
-          expect(res.body[0]).to.have.property('id', 'hij');
+          expect(res.body[0]).to.have.property('id', comments[3].id);
         });
     });
 
@@ -123,8 +134,7 @@ describe('/api/v1/comments', () => {
           expect(res).to.have.status(200);
 
           expect(res.body).to.have.length(1);
-          expect(res.body[0]).to.have.property('id', 'abc');
-
+          expect(res.body[0]).to.have.property('id', comments[0].id);
         });
     });
   });
@@ -150,7 +160,31 @@ describe('/api/v1/comments', () => {
         .then((res) => {
           expect(res).to.have.status(201);
           expect(res.body).to.have.property('id');
-          expect(res.body).to.have.property('status', 'rejected');
+          expect(res.body).to.have.property('status').and.to.have.length(1);
+          expect(res.body.status[0]).to.have.property('type', 'rejected');
+        });
+    });
+
+    it('should create a comment with a premod status if it\'s asset is has pre-moderation enabled', () => {
+      return Asset
+        .findOrCreateByUrl('https://coralproject.net/article1')
+        .then((asset) => {
+          return Asset
+            .overrideSettings(asset.id, {moderation: 'pre'})
+            .then(() => asset);
+        })
+        .then((asset) => {
+          return chai.request(app)
+            .post('/api/v1/comments')
+            .set(passport.inject({roles: []}))
+            .send({'body': 'Something body.', 'author_id': '123', 'asset_id': asset.id, 'parent_id': ''});
+        })
+        .then((res) => {
+          expect(res).to.have.status(201);
+          expect(res.body).to.have.property('id');
+          expect(res.body).to.have.property('asset_id');
+          expect(res.body).to.have.property('status').and.to.have.length(1);
+          expect(res.body.status[0]).to.have.property('type', 'premod');
         });
     });
   });

tests/routes/api/queue/index.js

@@ -21,17 +21,24 @@ describe('/api/v1/queue', () => {
     body: 'comment 10',
     asset_id: 'asset',
     author_id: '123',
-    status: 'rejected'
+    status: [{
+      type: 'rejected'
+    }]
   }, {
     id: 'def',
     body: 'comment 20',
     asset_id: 'asset',
-    author_id: '456'
+    author_id: '456',
+    status: [{
+      type: 'premod'
+    }]
   }, {
     id: 'hij',
     body: 'comment 30',
     asset_id: '456',
-    status: 'accepted'
+    status: [{
+      type: 'accepted'
+    }]
   }];
 
   const users = [{
@@ -59,7 +66,7 @@ describe('/api/v1/queue', () => {
       Comment.create(comments),
       User.createLocalUsers(users),
       Action.create(actions),
-      Setting.create(settings)
+      Setting.init(settings)
     ]);
   });
 

tests/routes/api/settings/index.js

@@ -12,7 +12,7 @@ const defaults = {id: '1', moderation: 'pre'};
 
 describe('/api/v1/settings', () => {
 
-  beforeEach(() => Setting.create(defaults));
+  beforeEach(() => Setting.init(defaults));
 
   describe('#get', () => {
 
@@ -40,7 +40,7 @@ describe('/api/v1/settings', () => {
         .then((res) => {
           expect(res).to.have.status(204);
 
-          return Setting.getSettings();
+          return Setting.retrieve();
         })
         .then((settings) => {
           expect(settings).to.have.property('moderation', 'post');

tests/routes/api/stream/index.js

@@ -25,25 +25,31 @@ describe('/api/v1/stream', () => {
     body: 'comment 10',
     author_id: '',
     parent_id: '',
-    status: 'accepted'
+    status: [{
+      type: 'accepted'
+    }]
   }, {
     id: 'def',
     body: 'comment 20',
     author_id: '',
     parent_id: '',
-    status: ''
+    status: []
   }, {
     id: 'uio',
     body: 'comment 30',
     asset_id: 'asset',
     author_id: '456',
     parent_id: '',
-    status: 'accepted'
+    status: [{
+      type: 'accepted'
+    }]
   }, {
     id: 'hij',
     body: 'comment 40',
     asset_id: '456',
-    status: 'rejected'
+    status: [{
+      type: 'rejected'
+    }]
   }];
 
   const users = [{
@@ -92,7 +98,7 @@ describe('/api/v1/stream', () => {
       return Promise.all([
         Comment.create(comments),
         Action.create(actions),
-        Setting.create(settings)
+        Setting.init(settings)
       ]);
     });
   });