Merge a110ddc into e69a1f9

package.json

@@ -42,7 +42,9 @@
     "dotenv": "^6.0.0",
     "errorhandler": "^1.5.0",
     "express": "^4.16.3",
+    "faker": "^4.1.0",
     "jsonwebtoken": "^8.3.0",
+    "lodash": "^4.17.15",
     "morgan": "^1.9.1",
     "multer": "^1.4.2",
     "node-cron": "^2.0.3",

server/controllers/articleController.js

@@ -1,11 +1,14 @@
 import uuid from 'uuid';
 import sequelize from 'sequelize';
 import models from '../db/models';
+import helpers from '../helpers';
 import utils from '../helpers/Utilities';
+
 import Paginate from '../helpers/paginate';
 
 const { Op } = sequelize;
 const { paginateArticles } = Paginate;
+const { querySearch, filterSearch } = helpers;
 /**
  * @Module ArticleController
  * @description Controlls all activities related to Articles
@@ -47,11 +50,20 @@ class ArticleController {
    * @memberof ArticleController
    */
   static async getAllArticles(req, res) {
+    const { searchQuery } = req.query;
+    const queryFilters = req.body;
+    let articles;
     const { page, limit } = req.query;
     if (!page && !limit) {
-      const articles = await models.Article.findAll({
-        include: [{ model: models.User, as: 'author', attributes: ['firstname', 'lastname', 'username', 'image', 'email'] }]
-      });
+      if (!searchQuery) {
+        articles = await models.Article.findAll({
+          include: [{ model: models.User, as: 'author', attributes: ['firstname', 'lastname', 'username', 'image', 'email'] }]
+        });
+      } else if (searchQuery && Object.keys(queryFilters)[0] !== 'undefined') {
+        articles = await filterSearch(searchQuery, queryFilters);
+      } else {
+        articles = await querySearch(searchQuery);
+      }
       return utils.successStat(res, 200, 'articles', articles);
     }
     paginateArticles(req, res);

server/db/migrations/20190803192315-create-categories.js

@@ -0,0 +1,29 @@
+'use strict';
+
+module.exports = {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Categories', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    name: {
+      type: Sequelize.STRING,
+      unique: true,
+      allowNull: false
+    },
+    description: {
+      type: Sequelize.STRING
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    }
+  }),
+  down: queryInterface => queryInterface.dropTable('Categories')
+};

server/db/migrations/20190803192334-create-tags.js

@@ -0,0 +1,29 @@
+'use strict';
+
+module.exports = {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Tags', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    name: {
+      type: Sequelize.STRING,
+      unique: true,
+      allowNull: false
+    },
+    description: {
+      type: Sequelize.STRING
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    }
+  }),
+  down: queryInterface => queryInterface.dropTable('Tags')
+};

server/db/migrations/20190803192656-create-article-tags.js

@@ -0,0 +1,27 @@
+'use strict';
+
+module.exports = {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('ArticleTags', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    articleId: {
+      type: Sequelize.INTEGER
+    },
+    tagId: {
+      type: Sequelize.INTEGER
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    }
+  }),
+  down: queryInterface => queryInterface.dropTable('ArticleTags')
+};

server/db/migrations/20190803193836-create-article-categories.js

@@ -0,0 +1,27 @@
+'use strict';
+
+module.exports = {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('ArticleCategories', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    articleId: {
+      type: Sequelize.INTEGER
+    },
+    categoryId: {
+      type: Sequelize.INTEGER
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    }
+  }),
+  down: queryInterface => queryInterface.dropTable('ArticleCategories')
+};

server/db/models/article.js

@@ -32,6 +32,14 @@ module.exports = (sequelize, DataTypes) => {
     Article.hasMany(models.Comment, {
       foreignKey: 'articleId', onDelete: 'CASCADE', as: 'comment', hooks: true
     });
+    Article.belongsToMany(models.Categories, {
+      through: 'ArticleCategories',
+      foreignKey: 'articleId'
+    });
+    Article.belongsToMany(models.Tags, {
+      through: 'ArticleTags',
+      foreignKey: 'articleId'
+    });
   };
   return Article;
 };

server/db/models/articlecategories.js

@@ -0,0 +1,14 @@
+/* eslint-disable func-names */
+
+'use strict';
+
+module.exports = (sequelize, DataTypes) => {
+  const ArticleCategories = sequelize.define('ArticleCategories', {
+    articleId: DataTypes.INTEGER,
+    categoryId: DataTypes.INTEGER
+  }, {});
+  ArticleCategories.associate = function () {
+    // associations can be defined here
+  };
+  return ArticleCategories;
+};

server/db/models/articletags.js

@@ -0,0 +1,14 @@
+/* eslint-disable func-names */
+
+'use strict';
+
+module.exports = (sequelize, DataTypes) => {
+  const ArticleTags = sequelize.define('ArticleTags', {
+    articleId: DataTypes.INTEGER,
+    tagId: DataTypes.INTEGER
+  }, {});
+  ArticleTags.associate = function () {
+    // associations can be defined here
+  };
+  return ArticleTags;
+};

server/db/models/categories.js

@@ -0,0 +1,17 @@
+/* eslint-disable func-names */
+
+'use strict';
+
+module.exports = (sequelize, DataTypes) => {
+  const Categories = sequelize.define('Categories', {
+    name: DataTypes.STRING,
+    description: DataTypes.STRING
+  }, {});
+  Categories.associate = function (models) {
+    Categories.belongsToMany(models.Article, {
+      through: 'ArticleCategories',
+      foreignKey: 'categoryId'
+    });
+  };
+  return Categories;
+};

server/db/models/tags.js

@@ -0,0 +1,17 @@
+/* eslint-disable func-names */
+
+'use strict';
+
+module.exports = (sequelize, DataTypes) => {
+  const Tags = sequelize.define('Tags', {
+    name: DataTypes.STRING,
+    description: DataTypes.STRING
+  }, {});
+  Tags.associate = function (models) {
+    Tags.belongsToMany(models.Article, {
+      through: 'ArticleTags',
+      foreignKey: 'tagId'
+    });
+  };
+  return Tags;
+};

server/db/models/user.js

@@ -29,7 +29,7 @@ module.exports = (sequelize, DataTypes) => {
       hooks: true,
       timestamps: false,
     });
-    User.hasMany(models.Article, { as: 'authorId', foreignKey: 'authorId', onDelete: 'CASCADE' });
+    User.hasMany(models.Article, { foreignKey: 'id', onDelete: 'CASCADE' });
     User.hasMany(models.Comment, { foreignKey: 'authorId', onDelete: 'CASCADE' });
   };
   return User;

server/db/seeders/20190801215421-articles-seed.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const _ = require('lodash');
+const faker = require('faker');
+
+module.exports = {
+  up: (queryInterface) => {
+    const randomArticles = _.times(30, () => ({
+      title: faker.name.title(),
+      description: faker.lorem.sentence(),
+      articleBody: faker.lorem.sentence(),
+      uuid: faker.random.number({ max: '300' }),
+      slug: faker.lorem.words(),
+      image: faker.lorem.sentence(),
+      authorId: faker.random.number({
+        min: 1,
+        max: 12
+      }),
+      favorited: true,
+      favoriteCounts: 25,
+      createdAt: new Date(),
+      updatedAt: new Date()
+    }));
+    return queryInterface.bulkInsert('Articles', randomArticles, {});
+  },
+
+  down: queryInterface => queryInterface.bulkDelete('Articles', null, {})
+};

server/db/seeders/20190803194225-demo-categories.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const faker = require('faker');
+
+const categories = ['technology', 'health', 'science', 'fashion', 'education', 'culture', 'lifestyle'];
+
+module.exports = {
+  up: (queryInterface) => {
+    const randomCategories = categories.map(item => ({
+      name: item,
+      description: faker.lorem.sentence(),
+      createdAt: new Date(),
+      updatedAt: new Date()
+    }));
+
+    return queryInterface.bulkInsert('Categories', randomCategories, {});
+  },
+
+  down: queryInterface => queryInterface.bulkDelete('Categories', null, {})
+};

server/db/seeders/20190803194616-demo-articleCategories.js

@@ -0,0 +1,25 @@
+'use strict';
+
+const _ = require('lodash');
+const faker = require('faker');
+
+module.exports = {
+  up: (queryInterface) => {
+    const articleCategories = _.times(30, () => ({
+      articleId: faker.random.number({
+        min: 1,
+        max: 30
+      }),
+      categoryId: faker.random.number({
+        min: 1,
+        max: 7
+      }),
+      createdAt: new Date(),
+      updatedAt: new Date()
+    }));
+
+    return queryInterface.bulkInsert('ArticleCategories', articleCategories, {});
+  },
+
+  down: queryInterface => queryInterface.bulkDelete('ArticleCategories', null, {})
+};

server/db/seeders/20190805085916-tags.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const faker = require('faker');
+
+const tags = ['javascript', 'AI', 'travel', 'peace', 'believe', 'race', 'react', 'tutorial', 'knowledge'];
+module.exports = {
+  up: (queryInterface) => {
+    const randomCategories = tags.map(item => ({
+      name: item,
+      description: faker.lorem.sentence(),
+      createdAt: new Date(),
+      updatedAt: new Date()
+    }));
+
+    return queryInterface.bulkInsert('Tags', randomCategories, {});
+  },
+
+  down: queryInterface => queryInterface.bulkDelete('Tags', null, {})
+};

server/db/seeders/20190805085934-articleTags.js

@@ -0,0 +1,25 @@
+'use strict';
+
+const _ = require('lodash');
+const faker = require('faker');
+
+module.exports = {
+  up: (queryInterface) => {
+    const articleCategories = _.times(30, () => ({
+      articleId: faker.random.number({
+        min: 1,
+        max: 30
+      }),
+      tagId: faker.random.number({
+        min: 1,
+        max: 9
+      }),
+      createdAt: new Date(),
+      updatedAt: new Date()
+    }));
+
+    return queryInterface.bulkInsert('ArticleTags', articleCategories, {});
+  },
+
+  down: queryInterface => queryInterface.bulkDelete('ArticleTags', null, {})
+};