user should be able to update an article

andela · Jun 18, 2019 · 3450dc6 · 3450dc6
1 parent 0af167c
commit 3450dc6
Show file tree

Hide file tree

Showing 12 changed files with 215 additions and 140 deletions.
diff --git a/controllers/article.js b/controllers/article.js
@@ -37,8 +37,8 @@ class Article {
    */
   static async createArticle(req, res) {
     const {
- title, body, taglist, description 
-} = req.body;
+      title, body, taglist, description
+    } = req.body;
     let { category } = req.body;
     if (!category || category === '') {
       category = 0;
@@ -50,13 +50,13 @@ class Article {
         return helper.jsonResponse(res, 404, { error: 'Category not found' });
       }
     }
-
     const image = req.file ? req.file.url : 'null';
+
     if (!title) {
-      return res.status(400).json({ error: 'title can not be null' });
+      return res.status(400).json({ error: 'title can not be empty' });
     }
     if (!body) {
-      return res.status(400).json({ error: 'body can not be null' });
+      return res.status(400).json({ error: 'body can not be empty' });
     }
     const authorid = req.user;
     const checkuser = await UserModel.checkuserExistance(authorid);
@@ -212,8 +212,8 @@ class Article {
   static async updateArticle(req, res) {
     const { slug } = req.params;
     const {
- title, body, taglist, description 
-} = req.body;
+      title, body, taglist, description
+    } = req.body;
     let { category } = req.body;
     if (!category || category === '') {
       category = 0;
@@ -225,6 +225,7 @@ class Article {
         return helper.jsonResponse(res, 404, { error: 'Category not found' });
       }
     }
+    const image = req.file ? req.file.url : 'null';
     const authorid = req.user;
     const searchArticle = await ArticleModel.findArticleSlug(authorid, slug);
     if (!searchArticle) {
@@ -241,7 +242,8 @@ class Article {
       description: description || searchArticle.description,
       slug: newSlug.length === 8 ? searchArticle.slug : newSlug,
       authorid,
-      taglist: !taglist ? taglist : searchArticle.taglist,
+      taglist: taglist.length !== 0 ? taglist : searchArticle.taglist,
+      image,
       category
     };
     const updateArticle = await ArticleModel.updateFoundArticle(
@@ -272,8 +274,8 @@ class Article {
     const { slug } = req.params;
     const { user: userId } = req;
     const {
- comment, text, positionleft, positiontop 
-} = req.body;
+      comment, text, positionleft, positiontop
+    } = req.body;
 
     const article = await ArticleModel.findOne({ where: { slug } });
     if (!article) {
@@ -790,8 +792,8 @@ class Article {
       }
       const response = reported.map(
         ({
- id, description, name, articleid, title, slug 
-}) => ({
+          id, description, name, articleid, title, slug
+        }) => ({
           id,
           category: name,
           description,

diff --git a/index.js b/index.js
@@ -17,23 +17,26 @@ const swaggerDocument = YAML.load('./swagger.yaml');
 const app = express();
 app.use(cors());
 app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({
-  extended: true,
-}));
-app.use((express.json()));
-app.use(session({
-  secret: process.env.secretKey,
-  resave: false,
-  saveUninitialized: true,
-}));
+app.use(
+  bodyParser.urlencoded({
+    extended: true
+  })
+);
+app.use(express.json());
+app.use(
+  session({
+    secret: process.env.secretKey,
+    resave: false,
+    saveUninitialized: true
+  })
+);
 
 app.use(passport.initialize());
 app.use(passport.session());
 
 app.use('/api', routes);
 app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
 
-
 app.use(express.static(path.resolve(__dirname, 'view/')));
 
 const port = process.env.PORT || 5000;

diff --git a/middlewares/tokenValidation.js b/middlewares/tokenValidation.js
@@ -9,9 +9,13 @@ dotenv.config();
 const { user: UserModel } = model;
 
 const validateToken = async (req, res, next) => {
-  let token = req.headers['x-access-token'] || req.headers.authorization || req.headers['x-auth-token'];
+  let token = req.headers['x-access-token']
+    || req.headers.authorization
+    || req.headers['x-auth-token'];
   if (!token) {
-    return res.status(401).send({ status: 401, error: 'Token is not Supplied' });
+    return res
+      .status(401)
+      .send({ status: 401, error: 'Token is not Supplied' });
   }
 
   if (token.startsWith('Bearer ')) {

diff --git a/migrations/20190423150504-create-article-likes-and-dislikes.js b/migrations/20190423150504-create-article-likes-and-dislikes.js
@@ -1,30 +1,32 @@
+/* eslint-disable indent */
+/* eslint-disable no-unused-vars */
 module.exports = {
   up: (queryInterface, Sequelize) => queryInterface.createTable('ArticleLikesAndDislikes', {
-    id: {
-      allowNull: false,
-      autoIncrement: true,
-      primaryKey: true,
-      type: Sequelize.INTEGER
-    },
-    user_id: {
-      type: Sequelize.INTEGER
-    },
-    article_id: {
-      type: Sequelize.INTEGER,
-      allowNull: false
-    },
-    like_value: {
-      type: Sequelize.STRING,
-      allowNull: false
-    },
-    createdAt: {
-      allowNull: false,
-      type: Sequelize.DATE
-    },
-    updatedAt: {
-      allowNull: false,
-      type: Sequelize.DATE
-    }
-  }),
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      user_id: {
+        type: Sequelize.INTEGER
+      },
+      article_id: {
+        type: Sequelize.INTEGER,
+        allowNull: false
+      },
+      like_value: {
+        type: Sequelize.STRING,
+        allowNull: false
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    }),
   down: (queryInterface, Sequelize) => queryInterface.dropTable('ArticleLikesAndDislikes')
 };
diff --git a/models/article.js b/models/article.js
@@ -15,7 +15,10 @@ const ArticleModel = (sequelize, DataTypes) => {
         type: DataTypes.STRING,
         allowNull: false,
         trim: true,
-        validate: { len: { args: 5 }, notEmpty: true }
+        validate: {
+          len: { args: 5, msg: 'Title can not be under 5 characters' },
+          notEmpty: true
+        }
       },
       body: {
         type: DataTypes.TEXT,
@@ -43,15 +46,15 @@ const ArticleModel = (sequelize, DataTypes) => {
   sequelizeTrasform(Article);
   Article.createArticle = article => Article.create(article);
   Article.getAll = userModel => Article.findAll({
-      include: [
-        {
-          model: userModel,
-          attributes: {
-            exclude: ['password']
-          }
+    include: [
+      {
+        model: userModel,
+        attributes: {
+          exclude: ['password']
         }
-      ]
-    });
+      }
+    ]
+  });
   Article.getOneArticle = slug => Article.findOne({ where: { slug } });
   Article.findArticleSlug = (authorid, slug) => Article.findOne({ where: { authorid, slug } });
   Article.deleteArticle = slug => Article.destroy({ where: { id: slug } });
@@ -75,17 +78,17 @@ const ArticleModel = (sequelize, DataTypes) => {
   };
   Article.addViewer = id => Article.increment('views', { by: 1, where: { id } });
   Article.fetchLatest = userModel => Article.findAll({
-      order: [['createdAt', 'DESC']],
-      include: [
-        {
-          model: userModel,
-          attributes: {
-            exclude: ['password', 'email', 'role']
-          }
+    order: [['createdAt', 'DESC']],
+    include: [
+      {
+        model: userModel,
+        attributes: {
+          exclude: ['password', 'email', 'role']
         }
-      ],
-      limit: 6
-    });
+      }
+    ],
+    limit: 6
+  });
 
   Article.associate = (models) => {
     Article.belongsTo(models.user, {

diff --git a/models/user.js b/models/user.js
@@ -1,3 +1,6 @@
+/* eslint-disable arrow-parens */
+/* eslint-disable indent */
+/* eslint-disable max-len */
 /* eslint-disable camelcase */
 import helper from '../helpers/helper';
 
@@ -56,14 +59,11 @@ const UserModel = (Sequelize, DataTypes) => {
     return result[0].dataValues;
   };
   User.checkEmail = email => User.findOne({ where: { email } });
-  User.resetpassword = (password, id) =>
-    User.update({ password }, { where: { id } });
+  User.resetpassword = (password, id) => User.update({ password }, { where: { id } });
   User.checkUser = username => User.findOne({ where: { username } });
   User.findUser = id => User.findOne({ where: { id } });
-  User.emailNotifications = (id, email_notifications) =>
-    User.update({ email_notifications }, { where: { id } });
-  User.checkuserExistance = authorid =>
-    User.findOne({
+  User.emailNotifications = (id, email_notifications) => User.update({ email_notifications }, { where: { id } });
+  User.checkuserExistance = authorid => User.findOne({
       attributes: {
         exclude: [
           'id',
@@ -104,17 +104,14 @@ const UserModel = (Sequelize, DataTypes) => {
       onDelete: 'CASCADE'
     });
   };
-  User.allUsers = async () =>
-    User.findAll({ attributes: ['username', 'bio', 'image', 'role'] });
-  User.singleUser = async username =>
-    User.findOne({
+  User.allUsers = async () => User.findAll({ attributes: ['username', 'bio', 'image', 'role'] });
+  User.singleUser = async username => User.findOne({
       attributes: ['username', 'bio', 'image', 'role'],
       where: { username }
     });
   User.verifyUser = id => User.findOne({ where: { id } });
   User.checkEmail = email => User.findOne({ where: { email } });
-  User.resetpassword = (password, id) =>
-    User.update({ password }, { where: { id } });
+  User.resetpassword = (password, id) => User.update({ password }, { where: { id } });
   User.checkUser = username => User.findOne({ where: { username } });
   User.findUser = id => User.findOne({ where: { id } });
   User.checkuser = authorid => User.findOne({ where: { id: authorid } });

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "body-parser": "^1.18.3",
     "cloudinary": "^1.14.0",
     "config": "^3.0.1",
-    "cors": "^2.8.4",
+    "cors": "^2.8.5",
     "debug": "^4.1.1",
     "dotenv": "^6.0.0",
     "ejs": "^2.6.1",

diff --git a/routes/api/articles.js b/routes/api/articles.js
@@ -60,7 +60,12 @@ router.delete(
   AuthToken,
   errorHandler(articleController.deleteArticle)
 );
-router.put('/:slug', AuthToken, errorHandler(articleController.updateArticle));
+router.put(
+  '/:slug',
+  AuthToken,
+  imageUpload,
+  errorHandler(articleController.updateArticle)
+);
 router.get(
   '/rating/articles',
   errorHandler(articleController.articleRatingPagination)