Merge 1c949cf into 5abbf4b

andela · Apr 16, 2019 · 570d45d · 570d45d
2 parents 5abbf4b + 1c949cf
commit 570d45d
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
diff --git a/controllers/article.js b/controllers/article.js
@@ -1,4 +1,5 @@
 import models from '../models/index';
+import readingTime from '../helpers/readingTime';
 
 const Article = models.article;
 /**
@@ -36,8 +37,13 @@ class ArticleController {
    */
   static getArticle(req, res) {
     Article.findAll()
-      .then(articles => res.status(200).json({ status: 200, articles }))
-      .catch(error => res.status(500).json({ error }));
+      .then((articles) => {
+        const articlesWithReadingTime = articles.map((article) => {
+          article.dataValues.readingTime = readingTime(article.title + article.body);
+          return article;
+        });
+        res.status(200).json({ status: 200, articles: articlesWithReadingTime });
+      }).catch(error => res.status(500).json({ error }));
   }
 
   /**
@@ -82,6 +88,7 @@ class ArticleController {
         if (!article) {
           return res.status(404).json({ error: 'Sorry the requested resource could not be found.' });
         }
+        article.dataValues.readingTime = readingTime(article.title + article.body);
         // @return article
         return res.status(200).json({ status: 200, article });
       })

diff --git a/helpers/readingTime.js b/helpers/readingTime.js
@@ -0,0 +1,19 @@
+
+const readingTime = (body) => {
+  const numberOfWords = body.split(' ').length;
+  const x = (numberOfWords / 265);
+  const initialMinutes = Math.floor(x);
+  const seconds = Math.floor((x - Math.floor(x)) * 60);
+  let finalMinutes;
+  if (initialMinutes > 0 && seconds >= 30) {
+    finalMinutes = initialMinutes + 1;
+  }
+  if (initialMinutes > 0 && seconds < 30) {
+    finalMinutes = initialMinutes;
+  }
+  const time = initialMinutes > 0 ? `${finalMinutes} min` : `${seconds} sec`;
+
+  return time;
+};
+
+export default readingTime;
diff --git a/migrations/20190402140158-article.js b/migrations/20190402140158-article.js
@@ -23,6 +23,7 @@ const articleMigration = {
       author: {
         type: Sequelize.INTEGER,
         allowNull: false,
+        onDelete: 'CASCADE',
         references: {
           model: 'users',
           key: 'id'

diff --git a/migrations/20190408131611-create-comments.js b/migrations/20190408131611-create-comments.js
@@ -12,13 +12,15 @@ module.exports = {
     articleId: {
       type: Sequelize.INTEGER,
       allowNull: false,
+      onDelete: 'CASCADE',
       references: {
         model: 'articles', key: 'article_id'
       }
     },
     author: {
       type: Sequelize.INTEGER,
       allowNull: false,
+      onDelete: 'CASCADE',
       references: {
         model: 'users', key: 'id'
       }

diff --git a/migrations/20190409161017-create-rate.js b/migrations/20190409161017-create-rate.js
@@ -9,6 +9,7 @@ const rateMigration = {
     userId: {
       type: Sequelize.INTEGER,
       allowNull: false,
+      onDelete: 'CASCADE',
       references: {
         model: 'users',
         key: 'id',
@@ -18,6 +19,7 @@ const rateMigration = {
     articleId: {
       type: Sequelize.INTEGER,
       allowNull: false,
+      onDelete: 'CASCADE',
       references: {
         model: 'articles',
         key: 'article_id',

diff --git a/models/article.js b/models/article.js
@@ -20,8 +20,8 @@ const articleModel = (Sequelize, DataTypes) => {
       foreignKey: 'articleId',
       allowNull: false
     });
-    Article.belongsTo(models.user, { as: 'authorfkey', foreignKey: 'author' });
-    Article.hasMany(models.rate, { foreignKey: 'articleId' });
+    Article.belongsTo(models.user, { as: 'authorfkey', foreignKey: 'author', onDelete: 'CASCADE' });
+    Article.hasMany(models.rate, { foreignKey: 'articleId', onDelete: 'CASCADE' });
   };
   return Article;
 };

diff --git a/testingdata/user.json b/testingdata/user.json
@@ -40,7 +40,7 @@
     "email": "blaise@gmail.com"
   },
   "googleValidToken": {
-    "access_token": "ya29.GlvpBnXYdrCRtsIchnu6i01ejs_52UwfyI6wztxXe-Fyu15M4kPOBS3V-sXYGIX89tLRKluMgGIZG_3AhO8rfHbSzs0JcHDhcuukpVdJTbopyWn7dnJ0ao2ZS1Vr"
+    "access_token": "ya29.GlvtBh1zpj-_QCVaZhyOkXLtLDG-s5vawM1FWGnnhtkoV3lMMile89zb-lLNmadfvzWWNbVdPyaRTMlzQin8NliZF2cOo-k6oAVkPCxmEANhgkYTsW14acaFnw0r"
   },
   "googleInvalidToken": {
     "access_token": "ya29.GlvhBpzY2hl2ShgOMrpkni8obGgwyX0mr85Oendf2kmblu3BrRNTmYK2DVQiPciVOBFkLvR57YE90qDyffgJOqgzV68zutO3-Y9QDKooAPuxPvwsbsWM36wwVPHT"