Merge e35479f into 30629b6

andela · Jul 9, 2019 · 40e7330 · 40e7330
2 parents 30629b6 + e35479f
commit 40e7330
Show file tree

Hide file tree

Showing 24 changed files with 741 additions and 87 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -10,7 +10,9 @@
     "one-var": 0,
     "one-var-declaration-per-line": 0,
     "new-cap": 0,
-		"consistent-return": 0,
+    "consistent-return": 0,
+   "no-unused-expressions": 0,
+   "array-callback-return": 0,
 		"no-console": "off",
     "no-param-reassign": 0,
     "class-methods-use-this":"off",

diff --git a/controllers/profiles/index.js b/controllers/profiles/index.js
@@ -16,6 +16,7 @@ export default {
         profile: data
       });
     } catch (e) {
+      /* istanbul ignore next */
       return res.status(500).json({
         message: 'Something went wrong'
       });

diff --git a/controllers/users/index.js b/controllers/users/index.js
@@ -24,7 +24,9 @@ export default {
         user: user.response()
       });
     } catch (e) {
+      /* istanbul ignore next */
       console.log(e);
+      /* istanbul ignore next */
       return res.status(500).json({
         message: 'Something went wrong'
       });
@@ -80,7 +82,9 @@ export default {
         user: user.response()
       });
     } catch (e) {
+      /* istanbul ignore next */
       console.log(e);
+      /* istanbul ignore next */
       return res.status(500).json({
         message: 'Something went wrong'
       });
@@ -187,5 +191,64 @@ export default {
 
   home: async (req, res) => res.status(200).send({
     user: req.user
-  })
+  }),
+
+  changeEmailNotification: async (req, res) => {
+    const { user } = req;
+    const notifyMe = user.emailNotify;
+    user.update({
+      emailNotify: !notifyMe,
+    });
+
+    return res.status(200).send({
+      message: 'updated'
+    });
+  },
+
+  changeInAppNotification: async (req, res) => {
+    const { user } = req;
+    const notifyMe = user.inAppNotify;
+    user.update({
+      inAppNotify: !notifyMe,
+    });
+
+    return res.status(200).send({
+      message: 'updated'
+    });
+  },
+
+  getNotifications: async (req, res) => {
+    const { user } = req;
+    const { id } = user;
+
+    const notifications = await db.Notification.findAll({
+      where: {
+        receiverId: id,
+      },
+      include: ['notifyMessage'],
+    });
+
+    return res.status(200).send({
+      notifications
+    });
+  },
+
+  readNotification: async (req, res) => {
+    const { user } = req;
+    const { id } = user;
+    const notifyId = req.params.id;
+    const notification = await db.Notification.findOne({
+      where: {
+        receiverId: id,
+        id: notifyId,
+      }
+    });
+    const result = await notification.update({
+      seen: !notification.seen,
+    });
+
+    return res.status(200).send({
+      result,
+    });
+  }
 };
diff --git a/db/migrations/20190703160309-add_social_to_users_table.js b/db/migrations/20190703160309-add_social_to_users_table.js
@@ -6,5 +6,4 @@ module.exports = {
   }),
   down: queryInterface => queryInterface
     .removeColumn('Users', 'social')
-    .then(() => queryInterface.removeColumn('Users', 'social'))
 };
diff --git a/db/migrations/20190708143436-alter_user_table_for_notification.js b/db/migrations/20190708143436-alter_user_table_for_notification.js
@@ -0,0 +1,14 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => queryInterface
+    .addColumn('Users', 'emailNotify', {
+      type: Sequelize.BOOLEAN,
+      allowNull: false,
+      defaultValue: true
+    })
+    .then(() => queryInterface.addColumn('Users', 'inAppNotify', {
+      type: Sequelize.BOOLEAN,
+      allowNull: false,
+      defaultValue: true
+    })),
+  down: queryInterface => queryInterface.removeColumn('Users', 'emailNotify').then(() => queryInterface.removeColumn('Users', 'inAppNotify')),
+};
diff --git a/db/migrations/20190708150656-create_notification_message_table.js b/db/migrations/20190708150656-create_notification_message_table.js
@@ -0,0 +1,25 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('NotifyMessages', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    message: {
+      type: Sequelize.TEXT
+    },
+    link: {
+      type: Sequelize.STRING
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    }
+  }),
+  down: queryInterface => queryInterface.dropTable('NotifyMessages')
+};
diff --git a/db/migrations/20190708161211-create-notifications.js b/db/migrations/20190708161211-create-notifications.js
@@ -0,0 +1,47 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Notifications', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    receiverId: {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'Users',
+        key: 'id',
+        as: 'receiver',
+      },
+    },
+    senderId: {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'Users',
+        key: 'id',
+        as: 'sender',
+      },
+    },
+    seen: {
+      type: Sequelize.BOOLEAN,
+      defaultValue: false
+    },
+    notifyMessageId: {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'NotifyMessages',
+        key: 'id',
+        as: 'notifyMessage',
+      },
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE
+    }
+  }),
+  down: queryInterface => queryInterface.dropTable('Notifications')
+};
diff --git a/db/models/Article.js b/db/models/Article.js
@@ -21,8 +21,8 @@ module.exports = (sequelize, DataTypes) => {
   });
   Article.associate = (models) => {
     Article.belongsTo(models.User, {
-      foreginKey: 'userId',
-      as: 'user',
+      foreignKey: 'userId',
+      as: 'author',
     });
   };
   return Article;

diff --git a/db/models/Notification.js b/db/models/Notification.js
@@ -0,0 +1,25 @@
+module.exports = (sequelize, DataTypes) => {
+  const Notification = sequelize.define(
+    'Notification',
+    {
+      receiverId: DataTypes.INTEGER,
+      senderId: DataTypes.INTEGER,
+      seen: DataTypes.BOOLEAN,
+      notifyMessageId: DataTypes.INTEGER,
+    },
+    {}
+  );
+
+  Notification.associate = (models) => {
+    Notification.belongsTo(models.NotifyMessage, {
+      foreignKey: 'notifyMessageId',
+      as: 'notifyMessage',
+    });
+
+    Notification.belongsTo(models.User, {
+      foreignKey: 'receiverId',
+      as: 'receiver',
+    });
+  };
+  return Notification;
+};
diff --git a/db/models/NotifyMessage.js b/db/models/NotifyMessage.js
@@ -0,0 +1,18 @@
+module.exports = (sequelize, DataTypes) => {
+  const NotifyMessage = sequelize.define(
+    'NotifyMessage',
+    {
+      message: DataTypes.TEXT,
+      link: DataTypes.STRING,
+    },
+    {}
+  );
+
+  NotifyMessage.associate = (models) => {
+    NotifyMessage.hasMany(models.Notification, {
+      foreignKey: 'notifyMessageId',
+      as: 'notifications',
+    });
+  };
+  return NotifyMessage;
+};
diff --git a/db/models/User.js b/db/models/User.js
@@ -18,6 +18,14 @@ module.exports = (sequelize, DataTypes) => {
       passwordResetToken: DataTypes.STRING,
       passwordResetExpire: DataTypes.DATE,
       emailVerificationToken: DataTypes.STRING,
+      emailNotify: {
+        type: DataTypes.BOOLEAN,
+        default: true,
+      },
+      inAppNotify: {
+        type: DataTypes.BOOLEAN,
+        default: true,
+      },
       activated: {
         type: DataTypes.BOOLEAN,
         default: false,
@@ -46,11 +54,20 @@ module.exports = (sequelize, DataTypes) => {
       },
     }
   );
-  User.associate = models => User.hasMany(models.Article, {
-    foreignKey: 'userId',
-    as: 'article',
-    cascade: true,
-  });
+  User.associate = (models) => {
+    User.hasMany(models.Article, {
+      foreignKey: 'userId',
+      as: 'article',
+      cascade: true,
+    });
+
+    User.hasMany(models.Notification, {
+      foreignKey: 'receiverId',
+      as: 'notifications',
+      cascade: true,
+    });
+  };
+
   User.prototype.passwordsMatch = function match(password) {
     return bcrypt.compare(password, this.password);
   };

diff --git a/env-sample b/env-sample
@@ -16,3 +16,7 @@ BASE_URL=
 GOOGLE_CALLBACK=
 MAIL_USERNAME=
 MAIL_PASSWORD=
+PUSHER_APP_ID=
+PUSHER_KEY=
+PUSHER_SECRET=
+PUSHER_CLUSTER=