[feature (create)]feedback implemented again [166240826]

andela · Jun 30, 2019 · d8c3714 · d8c3714
1 parent 17f3849
commit d8c3714
Show file tree

Hide file tree

Showing 28 changed files with 301 additions and 441 deletions.
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "start": "babel-node src/index.js",
-    "test": "NODE_ENV=test nyc --reporter=html --reporter=text --reporter=lcov ./node_modules/.bin/mocha  ./tests/* --require @babel/register --timeout 4000 --exit",
+    "test": "npm run setup:test && NODE_ENV=test nyc --reporter=html --reporter=text --reporter=lcov ./node_modules/.bin/mocha  ./tests/* --require @babel/register --timeout 5000 --exit",
     "dev": "NODE_ENV=development nodemon --exec babel-node src/index.js",
     "setup:test": "NODE_ENV=test npm run migrate:undo  && NODE_ENV=test npm run migrate && NODE_ENV=test npm run seed",
     "setup:dev": "NODE_ENV=development npm run migrate:undo && NODE_ENV=development npm run migrate && NODE_ENV=development npm run seed",
@@ -55,24 +55,24 @@
     "expect": "^24.8.0",
     "express": "^4.16.4",
     "express-session": "^1.16.2",
+    "jsonwebtoken": "^8.5.1",
+    "lodash": "^4.17.11",
+    "moment": "^2.24.0",
+    "morgan": "^1.9.1",
+    "multer": "^1.4.1",
+    "passport": "^0.4.0",
     "passport-facebook": "^3.0.0",
     "passport-google-oauth": "^2.0.0",
+    "passport-jwt": "^4.0.0",
     "passport-pinterest": "^1.0.0",
     "passport-twitter": "^1.0.4",
-    "redis": "^2.8.0",
-    "sinon": "^7.3.2",
-    "sinon-chai": "^3.3.0",
-    "jsonwebtoken": "^8.5.1",
-    "lodash": "^4.17.11",
-    "morgan": "^1.9.1",
     "pg": "^7.11.0",
     "pino": "^5.12.6",
     "redis": "^2.8.0",
     "sequelize": "^5.8.7",
     "sequelize-cli": "^5.5.0",
-    "moment": "^2.24.0",
-    "multer": "^1.4.1",
-    "passport-jwt": "^4.0.0",
+    "sinon": "^7.3.2",
+    "sinon-chai": "^3.3.0",
     "slug": "^1.1.0",
     "swagger-node-express": "^2.1.3",
     "swagger-ui-express": "^4.0.6",

diff --git a/src/api/controllers/articleController.js b/src/api/controllers/articleController.js
@@ -30,23 +30,23 @@ export default class ArticleController {
    * @returns {Object} res
    */
   static async create(req, res) {
-    const { id: author } = req.user;
-    const valid = await articleValidator(req.body);
-    const { category: name } = req.body;
-    let image = '';
+    const { id: author } = req.user.user;
 
+    const isArticleValid = await articleValidator(req.body);
+    const { category: id } = req.body;
+    let coverImage;
     if (req.file) {
-      const saved = await cloudinary.v2.uploader.upload(req.file.path);
-      image = saved.secure_url;
+      const savedFile = await cloudinary.v2.uploader.upload(req.file.path);
+      coverImage = savedFile.secure_url;
     }
-    const createdCat = await Category.findOrCreate({ where: { name } });
-    const { id: category } = createdCat[0].get();
+    const getCategory = await Category.findOne({ where: { id } });
+    const { id: category } = getCategory.dataValues;
     const article = await Article.create({
-      ...valid,
+      ...isArticleValid,
       slug: '',
       author,
       category,
-      image
+      coverImage
     });
     if (article) {
       return res.status(CREATED).json({
@@ -69,7 +69,7 @@ export default class ArticleController {
   static async updateArticle(req, res) {
     const { slug } = req.params;
     const {
-      title, description, body, tagList, category
+      title, description, body, category
     } = req.body;
 
     let { coverImage } = req.Existing;
@@ -85,16 +85,15 @@ export default class ArticleController {
       title: title || req.Existing.title,
       description: description || req.Existing.description,
       body: body || req.Existing.body,
-      tagList: tagList || req.Existing.tagList,
       category: category || req.Existing.category
     };
+
     await Article.update({
       slug: updateContent.slug,
       title: updateContent.title,
       description: updateContent.description,
       body: updateContent.body,
       coverImage,
-      tagList: updateContent.tagList,
       category: updateContent.category
     },
     {

diff --git a/src/api/controllers/verifyEmail.js b/src/api/controllers/verifyEmail.js
@@ -8,20 +8,21 @@ import errorMessages from '../../helpers/constants/error.messages';
  */
 export default class {
   /**
-     * @description verification link controller
-     * @param {*} req
-     * @param {*} res
-     * @returns {*} void
-     */
+   * @description verification link controller
+   * @param {*} req
+   * @param {*} res
+   * @returns {*} void
+   */
   static async verifyEmail(req, res) {
     const { token } = req.params;
     const result = decodejwt(token);
     if (result !== undefined) {
-      const action = await models.User.update({ verified: true }, {
-        where: {
-          email: result.user.email,
-        }
-      });
+      const action = await models.User.update({ verified: true },
+        {
+          where: {
+            email: result.user.email
+          }
+        });
       const ZERO = 0;
       if (!action.includes(ZERO)) {
         res.status(status.OK).json({

diff --git a/src/api/migrations/20190620193548-create-token.js b/src/api/migrations/20190620193548-create-token.js
diff --git a/src/api/migrations/20190622195901-create-category.js b/src/api/migrations/20190622195901-create-category.js
@@ -1,5 +1,5 @@
 export default {
-  up: (queryInterface, Sequelize) => queryInterface.createTable('categories', {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Categories', {
     id: {
       allowNull: false,
       autoIncrement: true,
@@ -18,5 +18,5 @@ export default {
       type: Sequelize.DATE
     }
   }),
-  down: (queryInterface, Sequelize) => queryInterface.dropTable('categories')
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('Categories')
 };
diff --git a/src/api/migrations/20190622195902-create-article.js b/src/api/migrations/20190622195902-create-article.js
@@ -1,5 +1,5 @@
 export default {
-  up: (queryInterface, Sequelize) => queryInterface.createTable('articles', {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Articles', {
     id: {
       allowNull: false,
       autoIncrement: true,
@@ -10,7 +10,7 @@ export default {
     description: { type: Sequelize.TEXT, allowNull: false },
     body: { type: Sequelize.TEXT, allowNull: false },
     slug: { type: Sequelize.STRING, allowNull: false },
-    image: { type: Sequelize.TEXT, allowNull: false },
+    coverImage: { type: Sequelize.TEXT, allowNull: false },
     author: {
       allowNull: false,
       type: Sequelize.INTEGER,
@@ -19,7 +19,7 @@ export default {
     category: {
       allowNull: false,
       type: Sequelize.INTEGER,
-      references: { model: 'categories', key: 'id' }
+      references: { model: 'Categories', key: 'id' }
     },
     createdAt: {
       allowNull: false,
@@ -28,7 +28,11 @@ export default {
     updatedAt: {
       allowNull: false,
       type: Sequelize.DATE
+    },
+    deletedAt: {
+      allowNull: true,
+      type: Sequelize.DATE
     }
   }),
-  down: (queryInterface, Sequelize) => queryInterface.dropTable('articles')
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('Articles')
 };
diff --git a/src/api/migrations/20190624184203-create-article.js b/src/api/migrations/20190624184203-create-article.js
diff --git a/src/api/migrations/20190625141012-create-token-table.js b/src/api/migrations/20190625141012-create-token-table.js
diff --git a/src/api/migrations/20190625141140-drop-token-table.js b/src/api/migrations/20190625141140-drop-token-table.js
diff --git a/src/api/models/article.js b/src/api/models/article.js
@@ -26,11 +26,12 @@ export default (sequelize, DataTypes) => {
       category: {
         allowNull: false,
         type: DataTypes.INTEGER,
-        references: { model: 'categories', key: 'id' }
+        references: { model: 'Categories', key: 'id' }
       }
     },
     {
-      tableName: 'articles',
+      tableName: 'Articles',
+      timestamps: true,
       paranoid: true,
       hooks: {
         beforeCreate(article) {

diff --git a/src/api/models/category.js b/src/api/models/category.js
@@ -1,5 +1,5 @@
 export default (sequelize, DataTypes) => {
-  const Category = sequelize.define('Category',
+  const Category = sequelize.define('Categories',
     {
       id: {
         allowNull: false,
@@ -10,7 +10,7 @@ export default (sequelize, DataTypes) => {
       name: { type: DataTypes.STRING, allowNull: false }
     },
     {
-      tableName: 'categories',
+      tableName: 'Categories',
       hooks: {
         beforeCreate(category) {
           category.name = category.name.toUpperCase();
@@ -19,7 +19,7 @@ export default (sequelize, DataTypes) => {
     });
 
   Category.associate = (models) => {
-    Category.hasMany(models.Article, {
+    Category.hasMany(models.Articles, {
       foreignKey: 'categoryId',
       as: 'category',
       onDelete: 'CASCADE',

diff --git a/src/api/models/token.js b/src/api/models/token.js
diff --git a/src/api/routes/articleRouter.js b/src/api/routes/articleRouter.js
@@ -5,6 +5,7 @@ import checkValidToken from '../../middlewares/checkValidToken';
 import bodyVerifier from '../../middlewares/validations/body.verifier';
 import checkArticle from '../../middlewares/getOneArticle';
 import uploadImage from '../../middlewares/upload';
+import errorHandler from '../../middlewares/errorHandler';
 
 const articleRouter = new Router();
 
@@ -15,5 +16,9 @@ articleRouter.patch('/:slug',
   checkArticle.getArticle,
   checkArticleOwner.checkOwner,
   articleController.updateArticle);
+articleRouter.post('/',
+  checkValidToken,
 
+  uploadImage.single('coverImage'),
+  errorHandler(articleController.create));
 export default articleRouter;