[feature #165412927] format return messages

src/controllers/TagController.js

@@ -15,7 +15,14 @@ class TagsController {
   static async update(req, res) {
     const action = req.method === 'DELETE' ? 'delete' : 'update';
     const response = await Tag.update(req.body.tagList, req.params.slug, action);
-    return res.status(action === 'update' ? status.CREATED : status.OK).send({
+
+    let statusCode = status.BAD_REQUEST;
+    if (action === 'update') {
+      statusCode = status.CREATED;
+    } else if (action === 'delete') {
+      statusCode = status.OK;
+    }
+    return res.status(statusCode).send({
       response
     });
   }

src/helpers/validation/createTag.js

@@ -0,0 +1,18 @@
+import Joi from 'joi';
+
+export default (input) => {
+  const schema = Joi.object().keys({
+    tagList: Joi.array()
+      .min(1)
+      .max(5)
+      .items(
+        Joi.string()
+          .min(2)
+          .max(25)
+          .label('Tag element')
+      )
+      .required()
+  });
+
+  return Joi.validate(input, schema, { abortEarly: false });
+};

src/helpers/validation/index.js

@@ -4,7 +4,8 @@ import password from './password';
 import createArticle from './createArticle';
 import updateArticle from './updateArticle';
 import newUser from './newUser';
+import createTag from './createTag';
 
 export {
-  isUser, email, password, createArticle, updateArticle, newUser
+  isUser, email, password, createArticle, updateArticle, createTag, newUser
 };

src/middlewares/validation/articles.js

@@ -28,8 +28,8 @@ class articles {
    * @returns {object} Object representing the response returned
    */
   static update(req, res, next) {
-    const result = validate.updateArticle(req.body);
-    return result.error ? Error.joiErrorHandler(res, result) : next();
+    const response = validate.updateArticle(req.body);
+    return !response.error ? next() : Error.joiErrorHandler(res, response);
   }
 
   /**

src/middlewares/validation/validateTags.js

@@ -1,5 +1,5 @@
-import Joi from 'joi';
 import Error from '../../helpers/errorHandler';
+import * as validate from '../../helpers/validation';
 
 /**
  * Author: Gilles Kagarama
@@ -13,17 +13,8 @@ class tags {
    * @returns {object} Object representing the response returned
    */
   static create(req, res, next) {
-    const schema = Joi.object().keys({
-      tagList: Joi.array()
-        .min(1)
-        .max(5)
-        .required()
-    });
-    const result = Joi.validate(req.body, schema, { abortEarly: false });
-    if (!result.error) {
-      return next();
-    }
-    return Error.joiErrorHandler(res, result);
+    const result = validate.createTag(req.body);
+    return result.error ? Error.joiErrorHandler(res, result) : next();
   }
 }
 

src/queries/articles/get.js

@@ -7,17 +7,14 @@ const { Op } = Sequelize;
  * @param {object} condition condition for query
  * @returns {object} Object representing the response returned
  */
-export default async (condition = {}) => {
-  condition = { ...condition, status: { [Op.ne]: 'deleted' } };
-  return db.Article.findOne({
-    where: condition,
-    logging: false,
-    include: [
-      {
-        model: db.User,
-        as: 'author',
-        attributes: ['username', 'bio', 'image']
-      }
-    ]
-  });
-};
+export default async (condition = {}) => db.Article.findOne({
+  where: { ...condition, status: { [Op.ne]: 'deleted' } },
+  logging: false,
+  include: [
+    {
+      model: db.User,
+      as: 'author',
+      attributes: ['username', 'bio', 'image']
+    }
+  ]
+});

src/seeders/20190509090036-users.js

@@ -9,7 +9,7 @@ module.exports = {
         password: '123123',
         username: 'johndoe',
         role: 'normal',
-        permissions: '{"can-edit"}',
+        permissions: ['read'],
         image: 'user.png',
         bio: 'I can do magic easy',
         createdAt: '2019-04-29T22:00:00',

src/tests/controllers/TagController.test.js

@@ -13,6 +13,7 @@ chai.should();
 const article = Factory.article.build();
 chai.use(chaiHttp);
 const token = 'token-string';
+let findArticle = '';
 describe('TAGS', () => {
   let response = '';
   before(async () => {
@@ -22,6 +23,7 @@ describe('TAGS', () => {
     article.slug = 'lorem-ipsum-foo-hasli234rhjav';
     article.userId = findUser[0].dataValues.id;
     response = await db.Article.create(article, { logging: false });
+    findArticle = await db.Article.findAll({ limit: 1, logging: false });
   });
   it('should create a tag', (done) => {
     chai
@@ -36,16 +38,16 @@ describe('TAGS', () => {
         done();
       });
   });
-  it('should not create tags if there are more than 5', (done) => {
+  it('should not create tags if they are more than 5', (done) => {
     chai
       .request(app)
       .put(`/api/v1/articles/${response.dataValues.slug}/tags`)
-      .send({ tagList: ['Morning', 'Bonjour', 'Bonjourno', 'Dias'] })
+      .send({ tagList: ['Morning', 'Bonjour', 'Bonjourno', 'Dias', 'Hakuna Matata', 'Energy'] })
       .set('Authorization', `Bearer ${token}`)
       .end((err, res) => {
-        expect(res).to.have.status(status.CREATED);
+        expect(res).to.have.status(status.BAD_REQUEST);
         res.body.should.be.an('object');
-        res.body.response.should.equal('You can not create more than 5 tags per article');
+        res.body.errors[0].should.equal('tagList must contain less than or equal to 5 items');
         done();
       });
   });
@@ -75,10 +77,11 @@ describe('TAGS', () => {
       });
   });
   it('should not create tags if it is a string', (done) => {
+    const tagList = 'text';
     chai
       .request(app)
       .put(`/api/v1/articles/${response.dataValues.slug}/tags`)
-      .send({ tagList: 'text' })
+      .send({ tagList })
       .set('Authorization', `Bearer ${token}`)
       .end((err, res) => {
         expect(res).to.have.status(status.BAD_REQUEST);
@@ -87,4 +90,17 @@ describe('TAGS', () => {
         done();
       });
   });
+  it('should not create tags if tagList is not provided', (done) => {
+    chai
+      .request(app)
+      .put(`/api/v1/articles/${response.dataValues.slug}/tags`)
+      .send()
+      .set('Authorization', `Bearer ${token}`)
+      .end((err, res) => {
+        expect(res).to.have.status(status.BAD_REQUEST);
+        res.body.should.be.an('object');
+        res.body.errors[0].should.equal('tagList is required');
+        done();
+      });
+  });
 });

src/tests/queries/index.js

@@ -1,3 +1,4 @@
 import './users';
 import './articles';
 import './tags';
+import './tokens';

src/tests/queries/tags/update.test.js

@@ -2,19 +2,31 @@
 import chai from 'chai';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import chaiHttp from 'chai-http';
-import { Tag } from '../../../queries';
+import { Tag, Article } from '../../../queries';
 import * as Factory from '../../../helpers/factory';
 import db from '../../../models';
 
 const article = Factory.article.build();
 delete article.id;
+const tagList = ['Morning', 'Bonjour', 'Bonjourno', 'Dias', 'Hakuna Matata'];
 chai.use(chaiHttp);
 describe('Tag query', () => {
+  let fetchArticle;
+  before(async () => {
+    fetchArticle = await db.Article.findAll({ limit: 1, logging: false });
+    return fetchArticle;
+  });
   it('should update tag', async () => {
     const action = 'update';
     const findArticle = await db.Article.findAll({ limit: 1, logging: false });
     const response = await Tag.update(article.tagList, findArticle[0].dataValues.slug, action);
     response.should.be.an('string');
     response.should.equal('Tag list has been updated');
   });
+  it('should not create tags if they are more than 5', async () => {
+    const action = 'update';
+    const { slug } = fetchArticle[0].dataValues;
+    const updateTags = await Tag.update(tagList, slug, action);
+    updateTags.should.be.an('string');
+  });
 });