Merge 12b981c into 131cac1

server/controllers/TagController.js

@@ -0,0 +1,138 @@
+import db from '../models';
+import response from '../helpers/response';
+
+
+const { FollowedTags, Tag } = db;
+
+/**
+ * @class TagController
+ */
+class TagController {
+  /**
+   * @static
+   * @description a function that handles following of a tag by user
+   * @param {object} req HTTP request object
+   * @param {object} res HTTP response object
+   * @returns {object} api route response
+   */
+  static async follow(req, res) {
+    try {
+      const { userId } = req.user;
+      const { tagName } = req.params;
+      const tag = await Tag.findOne({ where: { name: tagName } });
+
+      if (!tag) {
+        return response(res, 404, 'failure', `${tagName} tag does not exist`);
+      }
+
+      FollowedTags.findOrCreate({
+        where: { tagName, followerId: userId, tagId: tag.id },
+        attributes: ['id', 'tagId', 'tagName', 'followerId']
+      }).spread((follow, created) => {
+        if (created) {
+          return response(
+            res,
+            201,
+            'success',
+            `You are now following the ${tagName} tag`
+          );
+        }
+        return response(
+          res,
+          409,
+          'failure',
+          `You are already following the ${tagName} tag`
+        );
+      });
+    } catch (error) {
+      return response(
+        res,
+        500,
+        'failure',
+        'Something went wrong on the server'
+      );
+    }
+  }
+
+  /**
+   * @static
+   * @description a function that handles getting all tags a user is following
+   * @param {object} req HTTP request object
+   * @param {object} res HTTP response object
+   * @returns {object} api route response
+   */
+  static async getFollowedTags(req, res) {
+    try {
+      const { userId } = req.user;
+      const followedTags = await FollowedTags.findAll({
+        where: { followerId: userId }
+      });
+
+      if (followedTags.length === 0) {
+        return response(res, 200, 'success', 'You are currenly not following any tag');
+      }
+
+      response(
+        res,
+        200,
+        'success',
+        'Tags you are following',
+        null,
+        followedTags
+      );
+    } catch (error) {
+      return response(
+        res,
+        500,
+        'failure',
+        'Something went wrong on the server'
+      );
+    }
+  }
+
+  /**
+   * @static
+   * @description a function that handles unfollowing a tag
+   * @param {object} req HTTP request object
+   * @param {object} res HTTP response object
+   * @returns {object} api route response
+   */
+  static async unFollow(req, res) {
+    try {
+      const { tagName } = req.params;
+      const { userId } = req.user;
+      const tag = await Tag.findOne({
+        where: { name: tagName }
+      });
+
+      if (!tag) {
+        return response(res, 404, 'failure', `${tagName} tag does not exist`);
+      }
+
+      const followingTag = await FollowedTags.findOne({
+        where: { followerId: userId, tagName }
+      });
+
+      if (!followingTag) {
+        return response(
+          res,
+          400,
+          'failure',
+          `You are not following the ${tagName} tag`
+        );
+      }
+
+      followingTag.destroy();
+      response(res, 200, 'success', `You have now unfollowed the ${tagName} tag`);
+    } catch (error) {
+      return response(
+        res,
+        500,
+        'failure',
+        'Something went wrong on the server'
+      );
+    }
+  }
+}
+
+export default TagController;

server/controllers/UserController.js

@@ -205,7 +205,7 @@ class UserController {
         }
       });
     } catch (err) {
-      res.status(400).send({
+      return res.status(400).send({
         status: 'failure',
         data: {
           statusCode: 400,
@@ -250,7 +250,7 @@ class UserController {
         }
       });
     } catch (err) {
-      res.status(400).send({
+      return res.status(400).send({
         status: 'failure',
         data: {
           error: err
@@ -448,41 +448,37 @@ class UserController {
       });
 
       if (!findProfile) {
-        response(res, 404, 'failure', 'User not found');
-        return;
+        return response(res, 404, 'failure', 'User not found');
       }
 
       const checkUserName = await User.findAndCountAll({
         where: { userName: req.body.userName }
       });
 
       if (checkUserName.count > 0) {
-        response(res, 409, 'failure', 'Username already exists');
-        return;
+        return response(res, 409, 'failure', 'Username already exists');
       }
 
       if (req.user.authTypeId === '15745c60-7b1a-11e8-9c9c-2d42b21b1a3e') {
         await findProfile.update(req.body, {
           fields: [...editableFeilds, 'passsword']
         });
-        response(res, 200, 'success', 'Profile updated successfully');
-        return;
+        return response(res, 200, 'success', 'Profile updated successfully');
       }
 
       const updatedProfile = await findProfile.update(req.body, {
         fields: [...editableFeilds]
       });
-      response(
+      return response(
         res,
         200,
         'success',
         'Profile updated successfully',
         null,
         updatedProfile.dataValues
       );
-      return;
     } catch (error) {
-      response(res, 500, 'failure', 'An error occured on the server');
+      return response(res, 500, 'failure', 'An error occured on the server');
     }
   }
 

server/middlewares/AuthMiddleware.js

@@ -32,9 +32,8 @@ class AuthMiddleware {
     } catch (error) {
       const { name } = error;
       if (name === 'TokenExpiredError' || name === 'JsonWebTokenError') {
-        return response(res, 401, 'failure', 'You need to log in again');
+        return response(res, 401, 'failure', 'You need to log in again.');
       }
-
       return response(res, 500, 'failure', 'An error occured on the server', error.message);
     }
   }
@@ -60,6 +59,7 @@ class AuthMiddleware {
     } catch (error) {
       req.isLoggedIn = false;
       next();
+      return response(res, 500, 'failure', 'An error occured on the server');
     }
   }
 
@@ -93,7 +93,7 @@ class AuthMiddleware {
     } catch (error) {
       const { name } = error;
       if (name === 'TokenExpiredError' || name === 'JsonWebTokenError') {
-        return response(res, 401, 'failure', 'You need to log in again');
+        return response(res, 401, 'failure', 'You need to log in again.');
       }
 
       return response(res, 500, 'failure', 'An error occured on the server', error);
@@ -129,7 +129,7 @@ class AuthMiddleware {
     } catch (error) {
       const { name } = error;
       if (name === 'TokenExpiredError' || name === 'JsonWebTokenError') {
-        return response(res, 401, 'failure', 'You need to log in again');
+        return response(res, 401, 'failure', 'You need to log in again.');
       }
 
       return response(res, 500, 'failure', 'An error occured on the server', error);

server/migrations/20190130065911-create-user-followed-tags.js

@@ -0,0 +1,38 @@
+export default {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.sequelize.query('CREATE EXTENSION IF NOT EXISTS "uuid-ossp";')
+      .then(() => {
+        return queryInterface.createTable('FollowedTags', {
+          id: {
+            allowNull: false,
+            primaryKey: true,
+            type: Sequelize.UUID,
+            defaultValue: Sequelize.literal('uuid_generate_v4()')
+          },
+          tagId: {
+            type: Sequelize.UUID,
+            allowNull: false
+          },
+          tagName: {
+            type: Sequelize.STRING,
+            allowNull: false
+          },
+          followerId: {
+            type: Sequelize.UUID,
+            allowNull: false
+          },
+          createdAt: {
+            allowNull: false,
+            type: Sequelize.DATE,
+            defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+          },
+          updatedAt: {
+            allowNull: false,
+            type: Sequelize.DATE,
+            defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+          }
+        })
+      })
+  },
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('FollowedTags')
+};

server/models/followedTags.js

@@ -0,0 +1,32 @@
+module.exports = (sequelize, DataTypes) => {
+  const FollowedTags = sequelize.define(
+    'FollowedTags',
+    {
+      tagId: {
+        type: DataTypes.UUID,
+        allowNull: false
+      },
+      tagName: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
+      followerId: {
+        type: DataTypes.UUID,
+        allowNull: false
+      }
+    },
+    {}
+  );
+  FollowedTags.associate = (models) => {
+    const { Tag, User } = models;
+    FollowedTags.belongsTo(Tag, {
+      foreignKey: 'tagId',
+      onDelete: 'CASCADE'
+    });
+    FollowedTags.belongsTo(User, {
+      foreignKey: 'followerId',
+      onDelete: 'CASCADE'
+    });
+  };
+  return FollowedTags;
+};

server/models/tag.js

@@ -11,11 +11,16 @@ module.exports = (sequelize, DataTypes) => {
     {}
   );
   Tag.associate = (models) => {
-    Tag.belongsToMany(models.Article, {
+    const { Article, User } = models;
+    Tag.belongsToMany(Article, {
       through: 'ArticleTag',
       as: 'articles',
       foreignKey: 'tagId'
     });
+    Tag.belongsToMany(User, {
+      through: 'FollowedTags',
+      foreignKey: 'tagId'
+    });
   };
   return Tag;
 };

server/models/user.js

@@ -83,7 +83,8 @@ export default (sequelize, DataTypes) => {
       Role,
       Report,
       ArticleLikesDislike,
-      ReadingStats
+      ReadingStats,
+      Tag
     } = models;
     User.hasMany(Article, {
       as: 'articles',
@@ -155,6 +156,11 @@ export default (sequelize, DataTypes) => {
     User.hasMany(ReadingStats, {
       foreignKey: 'userId'
     });
+    User.belongsToMany(Tag, {
+      through: 'FollowedTags',
+      as: 'followedTags',
+      foreignKey: 'followerId'
+    });
   };
   return User;
 };

server/routes/api/article.js

@@ -5,6 +5,7 @@ import AuthMiddleware from '../../middlewares/AuthMiddleware';
 import FollowFeedContoller from '../../controllers/FollowFeedController';
 
 
+
 const articleRoutes = Router();
 articleRoutes.get('/search', ArticleController.search);
 articleRoutes.post(

server/routes/api/tag.js

@@ -0,0 +1,26 @@
+import { Router } from 'express';
+import TagController from '../../controllers/TagController';
+import AuthMiddleware from '../../middlewares/AuthMiddleware';
+
+
+const tagRoutes = Router();
+
+tagRoutes.post(
+  '/tags/:tagName/follow',
+  AuthMiddleware.checkIfUserIsAuthenticated,
+  TagController.follow
+);
+
+tagRoutes.delete(
+  '/tags/:tagName/unfollow',
+  AuthMiddleware.checkIfUserIsAuthenticated,
+  TagController.unFollow
+);
+
+tagRoutes.get(
+  '/tags/followedTags',
+  AuthMiddleware.checkIfUserIsAuthenticated,
+  TagController.getFollowedTags
+);
+
+export default tagRoutes;