Merge 7c06793 into 7983c75

src/controllers/bookmarkController.js

@@ -0,0 +1,50 @@
+import { Bookmark } from '../db/models';
+
+/**
+ * @description - Article Bookmarks
+ * @class BookmarkController
+ */
+class BookmarkController{
+ /**
+  * @description - Bookmark an article
+   * @return {object } res
+  * @static
+  * @param { object } req
+  * @param { object } res
+  * @memberof BookmarkController
+  */
+ static async bookmarkArticles(req, res){
+  const userId = req.user; 
+  const {article} = res.locals;
+  const articleId = article.id
+
+  try{
+    const bookmarkedArticle = await Bookmark.findOne({
+      where: { userId, articleId }
+    });
+    if (bookmarkedArticle) {
+      await bookmarkedArticle.destroy();
+      return res.status(200).json({
+        status: 200,
+        message: 'You just unbookmarked this article',
+      });
+    }
+    await Bookmark.create({
+      userId, articleId
+    });
+    return res.status(200).json({
+      status: 200,
+      message: 'You just bookmarked this article'
+    })
+
+  }catch(err){
+    return res.status(500).json({
+      status: 500,
+      message: 'Internal server error'
+    })
+  }
+
+ }
+
+}
+export default BookmarkController;

src/db/migrations/20190716060554-create-report.js

@@ -35,4 +35,4 @@ module.exports = {
     down: (queryInterface, Sequelize) => {
       return queryInterface.dropTable('Reports');
     }
-  };
+  };

src/db/migrations/20190716062433-create-user-report.js

@@ -40,4 +40,4 @@ module.exports = {
     down: (queryInterface, Sequelize) => {
       return queryInterface.dropTable('UserReports');
     }
-  };
+  };

src/db/migrations/20190717002802-create-highlight-comment.js

@@ -44,4 +44,4 @@ module.exports = {
     down: (queryInterface, Sequelize) => {
       return queryInterface.dropTable('highlightComments');
     }
-  };
+  };

src/db/migrations/30181008085230-create-bookmark.js

@@ -39,4 +39,3 @@ module.exports = {
     }),
     down: queryInterface => queryInterface.dropTable('Bookmarks'),
   };
-

src/db/models/bookmark.js

@@ -23,4 +23,3 @@ module.exports = (sequelize, DataTypes) => {
     };
     return Bookmark;
   };
-

src/db/models/commentLike.js

@@ -23,4 +23,3 @@ module.exports = (sequelize, DataTypes) => {
     };
     return CommentLike;
   };
-

src/db/models/highlightcomment.js

@@ -42,4 +42,4 @@ module.exports = (sequelize, DataTypes) => {
       });
     };
     return highlightComment;
-  };
+  };

src/db/models/report.js

@@ -7,4 +7,4 @@ module.exports = (sequelize, DataTypes) => {
     Report.associate = function(models) {
     };
     return Report;
-  };
+  };

src/db/models/user.js

@@ -70,6 +70,10 @@ module.exports = (sequelize, DataTypes) => {
       foreignKey: 'userId',
       as: 'highlightComment'
     });
+    User.hasMany(models.Rating, {
+      foreignKey: 'userId',
+      as: 'userRatings'
+    });
     User.hasMany(models.CommentLike, {
       foreignKey: 'userId',
       as: 'userCommentsLike'

src/db/models/userreport.js

@@ -14,4 +14,4 @@ module.exports = (sequelize, DataTypes) => {
       });
     };
     return UserReport;
-  };
+  };

src/routes/bookmarkRoute.js

@@ -0,0 +1,11 @@
+import express from 'express';
+import BookmarkController from '../controllers/bookmarkController';
+import verify from '../helpers/verifyToken';
+import findItem from '../helpers/findItem';
+
+
+const router = express.Router();
+
+router.post('/articles/bookmark/:slug', verify, findItem.findArticle, BookmarkController.bookmarkArticles);
+
+export default router;

src/routes/index.js

@@ -6,6 +6,7 @@ import likeRoute from './likeRoute';
 import articleRoute from './articleRoute';
 import commentRoute from './commentRoute';
 import ratingRoute from './ratingRoute';
+import bookmarkRoute from './bookmarkRoute'
 
 const router = express.Router();
 
@@ -17,5 +18,6 @@ router.use('/api/v1/', articleRoute);
 router.use('/api/v1', userRoute);
 router.use('/api/v1/articles', commentRoute);
 router.use('/api/v1', ratingRoute);
+router.use('/api/v1', bookmarkRoute);
 
 export default router;

test/bookmark.test.js

@@ -0,0 +1,61 @@
+import chai from 'chai';
+import chaiHttp from 'chai-http';
+import app from '../src/server';
+
+chai.should();
+chai.use(chaiHttp);
+const { expect } = chai;
+
+let testToken;
+
+const user = {
+  email: 'john.doe@andela.com',
+  password: 'password',
+};
+
+describe('BookmarkController', () => {
+  it('should enable a user to bookmark an article', (done) => {
+    chai.request(app).post('/api/v1/auth/login')
+      .send(user)
+      .end((err, res) => {
+        testToken = res.body.token;
+        chai.request(app).post('/api/v1/articles/bookmark/article')
+          .set('token', testToken)
+          .end((err, res) => {
+            res.should.have.status(200);
+            expect(res.body.message).to.equal('You just bookmarked this article');
+            done();
+          });
+      });
+  });
+
+  it('should enable a user to unbookmark an article', (done) => {
+    chai.request(app).post('/api/v1/auth/login')
+      .send(user)
+      .end((err, res) => {
+        testToken = res.body.token;
+        chai.request(app).post('/api/v1/articles/bookmark/article')
+          .set('token', testToken)
+          .end((err, res) => {
+            res.should.have.status(200);
+            expect(res.body.message).to.equal('You just unbookmarked this article');
+            done();
+          });
+      });
+  });
+
+  it('should indicate that an article does not exist', (done) => {
+    chai.request(app).post('/api/v1/auth/login')
+      .send(user)
+      .end((err, res) => {
+        testToken = res.body.token;
+        chai.request(app).post('/api/v1/articles/bookmark/art')
+          .set('token', testToken)
+          .end((err, res) => {
+            res.should.have.status(404);
+            expect(res.body.message).equal('Article not found');
+            done();
+          });
+      });
+  });
+});