feature(get single article):get single article

get single article [finishes #167222364]
andela · Jul 22, 2019 · b2d0019 · b2d0019
1 parent adf3832
commit b2d0019
Show file tree

Hide file tree

Showing 15 changed files with 226 additions and 129 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,6 @@ lib
 
 .nyc_output/
 lcov.info
+
+# Ignore index.html
+src/test.html
diff --git a/src/controllers/articleController.js b/src/controllers/articleController.js
@@ -1,11 +1,11 @@
-import { Article, Tag, User } from '../db/models';
+import { Article, Tag, User, Category } from '../db/models';
 import slugGen from '../helpers/slugGen';
 import urlExtractor from '../helpers/urlExtractor';
 import tagExtractor from '../helpers/tagExtractor';
 import searchHelper, { searchOutcome } from '../helpers/searchHelper';
 
 /**
- * Article controller class
+ * @description Article Controller
  * @class ArticleController
  */
 class ArticleController {
@@ -153,6 +153,62 @@ class ArticleController {
       });
     }
   }
+
+  /**
+   * @description - Get a single article
+   * @static
+   * @async
+   * @param {object} req - request
+   * @param {object} res - response
+   * @returns {object} article
+   *
+   */
+  static async getArticle(req, res) {
+    try {
+      const { slug } = req.params;
+
+      const getArticle = await Article.findOne({
+        where: {
+          slug
+        },
+        attributes: {
+          exclude: ['createdAt', 'updatedAt']
+        },
+        include: [
+          {
+            model: Category,
+            attributes: ['id', 'name']
+          },
+          {
+            model: User,
+            attributes: ['id', 'firstName', 'lastName', 'userName', 'bio', 'imageUrl']
+          }
+        ]
+      });
+
+      const getTags = await Tag.findAll({
+        where: {
+          articleId: getArticle.id
+        }
+      })
+
+      const allTags = [];
+      getTags.map(tag => allTags.push(tag.tagName))
+
+      const article = {};
+      article.article = getArticle;
+      article.tag = allTags;
+      return res.status(200).json({
+        status: 200,
+        message: [article]
+      });
+    } catch (error) {
+      return res.status(500).json({
+        status: 500,
+        message: error.message
+      });
+    }
+  }
 }
 
 export default ArticleController;
diff --git a/src/controllers/Auth.js → src/controllers/authController.js b/src/controllers/Auth.js → src/controllers/authController.js
@@ -100,12 +100,10 @@ class AuthController {
     }
   }
 
-
   /**
  *
  *@description logs in autheticated user
  * @static
- *@description logs in autheticated user
  * @param {object} req the request body
  * @param {object} res the response body
  * @returns {object} res

diff --git a/src/controllers/ratingController.js b/src/controllers/ratingController.js
@@ -16,7 +16,7 @@ class RatingController {
   static async rateArticle(req, res) {
     const value = Number(req.body.value);
     const id = req.user;
-    const {article} = res.locals;
+    const { article } = res.locals;
     const articleId = article.id
 
     try {
@@ -71,7 +71,7 @@ class RatingController {
  * @memberof RatingController
  */
 static async getAllArticlesRating(req, res){
-    const {article} = res.locals;
+    const { article } = res.locals;
     const articleId = article.id
     try{
       let offset = 0;

diff --git a/src/db/migrations/20190716060554-create-report.js b/src/db/migrations/20190716060554-create-report.js
@@ -1,39 +1,39 @@
 'use strict';
 module.exports = {
-    up: (queryInterface, Sequelize) => {
-      return queryInterface.createTable('Reports', {
-        id: {
-          allowNull: false,
-          autoIncrement: true,
-          primaryKey: true,
-          type: Sequelize.INTEGER
-        },
-        body: {
-          type: Sequelize.TEXT,
-          required: true,
-          allowNull: false
-        },
-        reportType: {
-          type: Sequelize.ENUM(['article', 'comment']),
-          required: true,
-          allowNull: false
-        },
-        reportTypeId: {
-          type: Sequelize.INTEGER,
-          required: true,
-          allowNull: false
-        },
-        createdAt: {
-          allowNull: false,
-          type: Sequelize.DATE
-        },
-        updatedAt: {
-          allowNull: false,
-          type: Sequelize.DATE
-        }
-      });
-    },
-    down: (queryInterface, Sequelize) => {
-      return queryInterface.dropTable('Reports');
-    }
-  };
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('Reports', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      body: {
+        type: Sequelize.TEXT,
+        required: true,
+        allowNull: false
+      },
+      reportType: {
+        type: Sequelize.ENUM(['article', 'comment']),
+        required: true,
+        allowNull: false
+      },
+      reportTypeId: {
+        type: Sequelize.INTEGER,
+        required: true,
+        allowNull: false
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('Reports');
+  }
+};
diff --git a/src/db/migrations/30181008085213-create-commentLike.js b/src/db/migrations/30181008085213-create-commentLike.js
@@ -38,4 +38,4 @@ module.exports = {
     }
   }),
   down: queryInterface => queryInterface.dropTable('CommentLikes'),
-};
+};  
diff --git a/src/db/migrations/30181008085230-create-bookmark.js b/src/db/migrations/30181008085230-create-bookmark.js
@@ -1,41 +1,41 @@
 module.exports = {
-    up: (queryInterface, Sequelize) => queryInterface.createTable('Bookmarks', {
-      id: {
-        allowNull: false,
-        autoIncrement: true,
-        primaryKey: true,
-        type: Sequelize.INTEGER
-      },
-      userId: {
-        type: Sequelize.INTEGER,
-        required: true,
-        onUpdate: 'CASCADE',
-        onDelete: 'CASCADE',
-        references: {
-          model: 'Users',
-          key: 'id',
-          as: 'userId'
-        }
-      },
-      articleId: {
-        type: Sequelize.INTEGER,
-        required: true,
-        onUpdate: 'CASCADE',
-        onDelete: 'CASCADE',
-        references: {
-          model: 'Articles',
-          key: 'id',
-          as: 'articleId'
-        }
-      },
-      createdAt: {
-        allowNull: false,
-        type: Sequelize.DATE
-      },
-      updatedAt: {
-        allowNull: false,
-        type: Sequelize.DATE
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Bookmarks', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    userId: {
+      type: Sequelize.INTEGER,
+      required: true,
+      onUpdate: 'CASCADE',
+      onDelete: 'CASCADE',
+      references: {
+        model: 'Users',
+        key: 'id',
+        as: 'userId'
       }
-    }),
-    down: queryInterface => queryInterface.dropTable('Bookmarks'),
-  };
+    },
+    articleId: {
+      type: Sequelize.INTEGER,
+      required: true,
+      onUpdate: 'CASCADE',
+      onDelete: 'CASCADE',
+      references: {
+        model: 'Articles',
+        key: 'id',
+        as: 'articleId'
+      }
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    }
+  }),
+  down: queryInterface => queryInterface.dropTable('Bookmarks'),
+};
diff --git a/src/db/models/bookmark.js b/src/db/models/bookmark.js
@@ -1,25 +1,25 @@
 module.exports = (sequelize, DataTypes) => {
-    const Bookmark = sequelize.define('Bookmark', {
-      userId: {
-        type: DataTypes.INTEGER,
-        required: true,
-      },
-      articleId: {
-        type: DataTypes.INTEGER,
-        required: true,
-      }
-    }, {});
-    Bookmark.associate = (models) => {
-      Bookmark.belongsTo(models.Article, {
-        foreignKey: 'articleId',
-        onDelete: 'CASCADE',
-        onUpdate: 'CASCADE'
-      });
-      Bookmark.belongsTo(models.User, {
-        foreignKey: 'userId',
-        onDelete: 'CASCADE',
-        onUpdate: 'CASCADE'
-      });
-    };
-    return Bookmark;
+  const Bookmark = sequelize.define('Bookmark', {
+    userId: {
+      type: DataTypes.INTEGER,
+      required: true,
+    },
+    articleId: {
+      type: DataTypes.INTEGER,
+      required: true,
+    }
+  }, {});
+  Bookmark.associate = (models) => {
+    Bookmark.belongsTo(models.Article, {
+      foreignKey: 'articleId',
+      onDelete: 'CASCADE',
+      onUpdate: 'CASCADE'
+    });
+    Bookmark.belongsTo(models.User, {
+      foreignKey: 'userId',
+      onDelete: 'CASCADE',
+      onUpdate: 'CASCADE'
+    });
   };
+  return Bookmark;
+};
diff --git a/src/db/models/index.js b/src/db/models/index.js
@@ -7,16 +7,12 @@ const config = require(__dirname + '/../config/config.js')[env];
 const db = {};
 
 let sequelize;
-if (config.use_env_variable) {
-  sequelize = new Sequelize(process.env[config.use_env_variable], config);
-} else {
-  sequelize = new Sequelize(
-    config.database,
-    config.username,
-    config.password,
-    config,
-  );
-}
+sequelize = new Sequelize(
+  config.database,
+  config.username,
+  config.password,
+  config,
+);
 
 fs.readdirSync(__dirname)
   .filter(file => {

diff --git a/src/db/models/report.js b/src/db/models/report.js
@@ -1,10 +1,10 @@
 module.exports = (sequelize, DataTypes) => {
-    const Report = sequelize.define('Report', {
-      body: DataTypes.TEXT,
-      reportType: DataTypes.ENUM(['article', 'comment']),
-      reportTypeId: DataTypes.INTEGER
-    }, {});
-    Report.associate = function(models) {
-    };
-    return Report;
+  const Report = sequelize.define('Report', {
+    body: DataTypes.TEXT,
+    reportType: DataTypes.ENUM(['article', 'comment']),
+    reportTypeId: DataTypes.INTEGER
+  }, {});
+  Report.associate = function(models) {
   };
+  return Report;
+};
diff --git a/src/middleware/tokenGenerator.js b/src/middleware/tokenGenerator.js
@@ -63,7 +63,7 @@ class TokenGenerator {
                 email
               }
             });
-            next();
+            return next();
           }
           return res.status(400).json({
             status: 400,