Merge c61b25a into 77ca063

andela · Aug 27, 2019 · 19e5554 · 19e5554
2 parents 77ca063 + c61b25a
commit 19e5554
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 25 deletions.
diff --git a/controllers/articles/index.js b/controllers/articles/index.js
@@ -237,7 +237,6 @@ export default {
           id: categoryId
         }
       });
-
       if (!categoryExist) {
         return res.status(400).send({
           message: 'category does not Exist'
@@ -297,6 +296,7 @@ export default {
         type: 'publish'
       });
 
+
       return res.status(201).json({
         message: 'Article Created Successfully',
         article

diff --git a/controllers/users/index.js b/controllers/users/index.js
@@ -226,15 +226,26 @@ export default {
     }
   },
 
+  getNotificationStatus: async (req, res) => {
+    const { user: { emailNotify, inAppNotify } } = req;
+    return res.status(200).send({
+      notificationStatus: {
+        emailNotify, inAppNotify
+      }
+    });
+  },
+
   changeEmailNotification: async (req, res) => {
     const { user } = req;
     const notifyMe = user.emailNotify;
     const result = await user.update({
       emailNotify: !notifyMe,
     });
-
+    const { emailNotify, inAppNotify } = result;
     return res.status(200).send({
-      user: result
+      notificationStatus: {
+        emailNotify, inAppNotify
+      }
     });
   },
 
@@ -245,8 +256,11 @@ export default {
       inAppNotify: !notifyMe,
     });
 
+    const { emailNotify, inAppNotify } = result;
     return res.status(200).send({
-      user: result
+      notificationStatus: {
+        emailNotify, inAppNotify
+      }
     });
   },
 
@@ -256,7 +270,10 @@ export default {
     const notifications = await db.Notification.findAll({
       where: {
         receiverId: id,
-      }
+      },
+      order: [
+        ['createdAt', 'DESC']
+      ]
     });
 
     return res.status(200).send({

diff --git a/routes/v1/notifications.js b/routes/v1/notifications.js
@@ -7,6 +7,7 @@ const router = express.Router();
 router.patch('/email-notify', Middleware.authenticate, Middleware.isblackListedToken, User.changeEmailNotification);
 router.patch('/app-notify', Middleware.authenticate, Middleware.isblackListedToken, User.changeInAppNotification);
 router.get('/', Middleware.authenticate, Middleware.isblackListedToken, User.getNotifications);
+router.get('/status', Middleware.authenticate, Middleware.isblackListedToken, User.getNotificationStatus);
 router.patch('/:id', Middleware.authenticate, Middleware.isblackListedToken, User.readNotification);
 
 export default router;
diff --git a/tests/functions/notification.spec.js b/tests/functions/notification.spec.js
@@ -71,7 +71,14 @@ describe('Notification functions', () => {
       });
 
       const { message } = notificationContent.dataValues;
-      expect(message).to.equal(`${hamza.firstName} ${hamza.lastName} is following you`);
+      console.log(message);
+      const expectedMsg = {
+        name: `${hamza.firstName} ${hamza.lastName}`,
+        msg: 'is following you',
+        article: null,
+      };
+
+      expect((message)).to.equal(JSON.stringify(expectedMsg));
     });
 
     it('should create a new like notification message', async () => {
@@ -87,9 +94,13 @@ describe('Notification functions', () => {
           receiverId: hamza.id
         },
       });
-
+      const expectedMsg = {
+        name: `${vincent.firstName} ${vincent.lastName}`,
+        msg: 'likes your article',
+        article: hamzaArticle.title,
+      };
       const { message } = notificationContent.dataValues;
-      expect(message).to.equal(`${vincent.firstName} ${vincent.lastName} likes your article "${hamzaArticle.dataValues.title}"`);
+      expect((message)).to.equal(JSON.stringify(expectedMsg));
     });
 
     it('should create a new comment notification message', async () => {
@@ -106,8 +117,13 @@ describe('Notification functions', () => {
         }
       });
 
+      const expectedMsg = {
+        name: `${vincent.firstName} ${vincent.lastName}`,
+        msg: 'commented on your article',
+        article: hamzaArticle.title,
+      };
       const { message } = notificationContent.dataValues;
-      expect(message).to.equal(`${vincent.firstName} ${vincent.lastName} commented on your article "${hamzaArticle.dataValues.title}"`);
+      expect((message)).to.equal(JSON.stringify(expectedMsg));
     });
 
     it('should create a new dislike notification message', async () => {
@@ -125,8 +141,13 @@ describe('Notification functions', () => {
         }
       });
 
+      const expectedMsg = {
+        name: `${vincent.firstName} ${vincent.lastName}`,
+        msg: 'dislikes your article',
+        article: hamzaArticle.title,
+      };
       const { message } = notificationContent.dataValues;
-      expect(message).to.equal(`${vincent.firstName} ${vincent.lastName} dislikes your article "${hamzaArticle.dataValues.title}"`);
+      expect((message)).to.equal(JSON.stringify(expectedMsg));
     });
 
     it('should get a new publish notification message', async () => {
@@ -149,8 +170,13 @@ describe('Notification functions', () => {
         }
       });
 
+      const expectedMsg = {
+        name: `${hamza.firstName} ${hamza.lastName}`,
+        msg: 'published a new article titled',
+        article: hamzaArticle.title,
+      };
       const { message } = notificationContent.dataValues;
-      expect(message).to.equal(`${hamza.firstName} ${hamza.lastName} published a new article titled "${hamzaArticle.dataValues.title}"`);
+      expect((message)).to.equal(JSON.stringify(expectedMsg));
     });
   });
 });
diff --git a/tests/routes/notifications.spec.js b/tests/routes/notifications.spec.js
@@ -35,7 +35,7 @@ describe('USER NOTIFICATIONS', () => {
       .patch('/api/v1/notifications/email-notify')
       .set('x-access-token', token);
     expect(res.statusCode).to.equal(200);
-    expect(res.body.user.emailNotify).to.equal(false);
+    expect(res.body.notificationStatus.emailNotify).to.equal(false);
   });
 
   it('should return 200 and true if user opt in to email notification', async () => {
@@ -54,7 +54,7 @@ describe('USER NOTIFICATIONS', () => {
       .patch('/api/v1/notifications/email-notify')
       .set('x-access-token', token);
     expect(res.statusCode).to.equal(200);
-    expect(res.body.user.emailNotify).to.equal(true);
+    expect(res.body.notificationStatus.emailNotify).to.equal(true);
   });
 
   it('should return all the users notifications if any', async () => {
@@ -152,7 +152,7 @@ describe('USER NOTIFICATIONS', () => {
       .patch('/api/v1/notifications/app-notify')
       .set('x-access-token', token);
     expect(res.statusCode).to.equal(200);
-    expect(res.body.user.inAppNotify).to.equal(false);
+    expect(res.body.notificationStatus.inAppNotify).to.equal(false);
   });
 
   it('should return 200 and true if user opt in to an app notification', async () => {
@@ -171,6 +171,6 @@ describe('USER NOTIFICATIONS', () => {
       .patch('/api/v1/notifications/app-notify')
       .set('x-access-token', token);
     expect(res.statusCode).to.equal(200);
-    expect(res.body.user.inAppNotify).to.equal(true);
+    expect(res.body.notificationStatus.inAppNotify).to.equal(true);
   });
 });
diff --git a/utils/notifications/index.js b/utils/notifications/index.js
@@ -13,9 +13,9 @@ const pusher = new Pusher({
   useTLS: true
 });
 
-const pushNotification = (users) => {
-  users.forEach((user) => {
-    pusher.trigger('notifications', `event-${user.id}`, 'You have a notification');
+const pushNotification = (userIds) => {
+  userIds.forEach((id) => {
+    pusher.trigger('notifications', `event-${id}`, 'You have a new notification');
   });
 };
 
@@ -53,7 +53,11 @@ const followNotification = async ({ userId, followedUserId }) => {
   });
 
   const { emailNotify, inAppNotify, email } = followedUser;
-  const message = `${user.firstName} ${user.lastName} is following you`;
+  const message = JSON.stringify({
+    name: `${user.firstName} ${user.lastName}`,
+    msg: 'is following you',
+    article: null
+  });
   const emailMsg = `<strong>${user.firstName} ${user.lastName}</strong> is following you`;
   const link = `/profile/${user.username}`;
 
@@ -135,31 +139,42 @@ const articleNotification = async ({ userId, articleId, type }) => {
   const link = `/articles/${slug}`;
 
   if (type === 'publish') {
-    const publishMsg = `${author.firstName} ${author.lastName} published a new article titled "${title}"`;
-    const publishEmailMsg = `${author.firstName} ${author.lastName} published a new article titled <strong>${title}</strong>`;
+    const publishMsg = JSON.stringify({
+      name: `${author.firstName} ${author.lastName}`,
+      msg: 'published a new article titled',
+      article: title
+    });
+    const publishEmailMsg = `<strong>${author.firstName} ${author.lastName}</strong> published a new article titled <strong>${title}</strong>`;
     await bulkNotify({
       senderId: userId,
       message: publishMsg,
       emailMsg: publishEmailMsg,
       link
     });
   } else {
+    if (user.id === author.id) {
+      return;
+    }
     let msgType;
     if (type === 'like') msgType = 'likes';
     else if (type === 'dislike') msgType = 'dislikes';
     else msgType = 'commented on';
 
-    const message = `${user.firstName} ${user.lastName} ${msgType} your article "${title}"`;
+    const message = JSON.stringify({
+      name: `${user.firstName} ${user.lastName}`,
+      msg: `${msgType} your article`,
+      article: title
+    });
     const emailMsg = `${user.firstName} ${user.lastName} ${msgType} your article <strong>${title}</strong>`;
 
-    if (emailNotify) await sendEmailNotification(email, emailMsg, link);
+    if (emailNotify) sendEmailNotification(email, emailMsg, link);
 
 
     if (inAppNotify) {
       await createNotificationMsg({
         senderId: userId, receiverId: authorId, message, link
       });
-      await pushNotification([userId]);
+      pushNotification([authorId]);
     }
   }
 };

diff --git a/validators/articles/index.js b/validators/articles/index.js
@@ -14,7 +14,6 @@ export default {
     };
 
     const data = { ...req.body, ...req.files };
-
     try {
       await validatorInstance.validateAll(data, rules, messages);
       next();