update package.json

package.json

@@ -16,7 +16,6 @@
     "db-migrate:undo": "./node_modules/.bin/babel-node ./node_modules/.bin/sequelize db:migrate:undo:all",
     "db-migrate:undo:test": "NODE_ENV=test ./node_modules/.bin/babel-node ./node_modules/.bin/sequelize db:migrate:undo:all",
     "db-refresh": "npm run db-migrate:undo && npm run db-migrate && npm run db-seed",
-    "db-refresht": "npm run db-migrate:undo && npm run db-migrate && npm run db-seed && npm run test",
     "db-refresh:test": "NODE_ENV=test npm run db-migrate:undo:test && npm run db-migrate:test && npm run db-seed:test",
     "db-seed": "./node_modules/.bin/babel-node ./node_modules/.bin/sequelize db:seed:all",
     "db-seed:test": "NODE_ENV=test ./node_modules/.bin/babel-node ./node_modules/.bin/sequelize db:seed:all",

src/controllers/follower.js

@@ -13,30 +13,28 @@ export const followUser = async (req, res) => {
   try {
     const { user } = req;
     const { followerId } = req.params;
-    const findUser = await User.findOne({ where: { id: followerId } });
-    if (!findUser) {
-      return res.status(404).json(
-        errorResponseFormat({
-          status: 'fail',
-          message: 'User not found!'
-        })
-      );
+    const followee = await User.findOne({ where: { id: followerId } });
+    if (!followee) {
+      return res.status(404).json(responseFormat({
+        status: 'fail',
+        data: 'This user does not exist'
+      }));
     }
-    if (findUser.id === user.id) {
+    if (followerId === user.id) {
       return res.status(403).json(
-        errorResponseFormat({
+        responseFormat({
           status: 'fail',
-          message: 'Sorry, you can not follow yourself'
+          data: 'Sorry, you can not follow yourself'
         })
       );
     }
-    const isFollowed = await Follower.findOrCreate({ where: { userId: user.id, followerId }
-    });
-    if (isFollowed[1] === false) {
-      return res.status(400).json(
-        errorResponseFormat({
-          status: 'fail',
-          message: 'You are already following this user'
+    const [, created] = await Follower.findOrCreate({ where: { userId: user.id, followerId } });
+    if (!created) {
+      await Follower.destroy({ where: { userId: user.id, followerId } });
+      return res.status(200).json(
+        responseFormat({
+          status: 'success',
+          data: 'You have successfully unfollowed this user'
         })
       );
     }
@@ -49,60 +47,6 @@ export const followUser = async (req, res) => {
   } catch (error) {
     return res.status(400).json(
       errorResponseFormat({
-        status: 'fail',
-        message: 'Something went wrong, please try again later!'
-      })
-    );
-  }
-};
-
-/**
- * @name unFollowUser
- * @description This is the method for indicationg a user to follow in the request body
- * @param {object} req The request object
- * @param {object} res The response object
- * @returns {int} Returns the followed user
- */
-export const unfollowUser = async (req, res) => {
-  try {
-    const { user } = req;
-    const { followerId } = req.params;
-    const findUser = await User.findOne({ where: { id: followerId } });
-    if (!findUser) {
-      return res.status(404).json(
-        errorResponseFormat({
-          status: 'fail',
-          message: 'User not found!'
-        })
-      );
-    }
-    if (findUser.id === user.id) {
-      return res.status(403).json(
-        errorResponseFormat({
-          status: 'fail',
-          message: 'Sorry, you can not unfollow yourself'
-        })
-      );
-    }
-    const unfollowResult = await Follower.findOne({ where: { userId: user.id, followerId } });
-    if (!unfollowResult) {
-      return res.status(404).json(
-        errorResponseFormat({
-          status: 'fail',
-          message: 'Sorry, You are already unfollowing this user'
-        })
-      );
-    }
-    await unfollowResult.destroy({ where: { userId: user.id, followerId } });
-    return res.status(200).json(
-      responseFormat({
-        status: 'success',
-        data: 'You have successfully unfollowed user'
-      }));
-  } catch (error) {
-    return res.status(400).json(
-      errorResponseFormat({
-        status: 'error',
         message: 'Something went wrong, please try again later!'
       })
     );

src/routers/index.js

@@ -10,7 +10,7 @@ import checkBody from '../middlewares/signUpValidator';
 import likeArticle from '../controllers/like';
 import articleValidation, { verifyArticle, isAuthor } from '../middlewares/articles';
 import { checkParam } from '../middlewares/checkParam';
-import { followUser, unfollowUser } from '../controllers/follower';
+import { followUser } from '../controllers/follower';
 
 
 const router = Router();
@@ -73,8 +73,7 @@ router.get('/auth/linkedin', linkedinUser);
 router
   .post('/signup', checkBody, createUser);
 router.post('/login', checkFields, login);
-router.post('/followers/:followerId/follow', Auth.verifyToken, followUser);
-router.delete('/followers/:followerId/unfollow', Auth.verifyToken, unfollowUser);
+router.post('/followers/:followerId/follow', Auth.authenticateUser, followUser);
 
 
 // route for twitter authentication

tests/integration/follower.test.js

@@ -0,0 +1,82 @@
+import chai from 'chai';
+import chaiHttp from 'chai-http';
+import { startServer } from '../../src/server';
+import { testUser } from '../mock/followers';
+import Auth from '../../src/middlewares/authenticator';
+
+
+const { expect } = chai;
+
+chai.use(chaiHttp);
+describe('User Following API test', () => {
+  let app = null;
+  let agent = null;
+
+  beforeEach(async () => {
+    app = await startServer(5000);
+    agent = chai.request(app);
+  });
+
+  afterEach(async () => {
+    await app.close();
+    agent = null;
+  });
+
+  const token = Auth.generateToken(testUser);
+
+  it('Should follow a user successfully', (done) => {
+    agent
+      .post('/api/v1/followers/979eaa2e-5b8f-4103-8192-4639afae2ba7/follow')
+      .set('Authorization', token)
+      .end((err, res) => {
+        expect(res).to.have.status(200);
+        expect(res.body).to.have.property('status').eql('success');
+        expect(res.body).to.have.property('data').to.be.a('string');
+        done();
+      });
+  });
+  it('Should unfollow a user successfully', (done) => {
+    agent
+      .post('/api/v1/followers/979eaa2e-5b8f-4103-8192-4639afae2ba7/follow')
+      .set('Authorization', token)
+      .end((err, res) => {
+        expect(res).to.have.status(200);
+        expect(res.body).to.have.property('status').eql('success');
+        expect(res.body).to.have.property('data').to.equal('You have successfully unfollowed this user');
+        done();
+      });
+  });
+  it('Should return status 403 if user tries following self', (done) => {
+    agent
+      .post('/api/v1/followers/979eaa2e-5b8f-4103-8192-4639afae2ba9/follow')
+      .set('Authorization', token)
+      .end((err, res) => {
+        expect(res).to.have.status(403);
+        expect(res.body).to.have.property('status').eql('fail');
+        expect(res.body).to.have.property('data').to.equal('Sorry, you can not follow yourself');
+        done();
+      });
+  });
+  it('Should return an error if user not found in user table', (done) => {
+    agent
+      .post('/api/v1/followers/979eaa2e-5b8f-4103-8192-4639afae2ba0/follow')
+      .set('Authorization', token)
+      .end((err, res) => {
+        expect(res).to.have.status(404);
+        expect(res.body).to.have.property('status').eql('fail');
+        expect(res.body).to.have.property('data').to.equal('This user does not exist');
+        done();
+      });
+  });
+  it('Should return 500 for server error', (done) => {
+    agent
+      .post('/api/v1/followers/979eaa2e-5b8f-4103-8192-4639afae2ba/follow')
+      .set('Authorization', token)
+      .end((err, res) => {
+        expect(res).to.have.status(400);
+        expect(res.body).to.have.property('status').eql('error');
+        expect(res.body).to.have.property('message').to.equal('Something went wrong, please try again later!');
+        done();
+      });
+  });
+});

tests/mock/followers.js

@@ -2,3 +2,9 @@ export const userData = {
   email: 'martins@gmail.com',
   password: '%RYYT&^UTB*UYT*IUYIU',
 };
+
+export const testUser = {
+  id: '979eaa2e-5b8f-4103-8192-4639afae2ba9',
+  fullName: 'Chike Ozulumba',
+  email: 'testuser@email.com',
+};