SWIK-1684 enable mark as unread

slidewiki · Sep 19, 2017 · 81bd945 · 81bd945
1 parent 8c6b5e3
commit 81bd945
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/application/controllers/handler.js b/application/controllers/handler.js
@@ -34,7 +34,9 @@ let self = module.exports = {
 
   //Create notification with new id and payload or return INTERNAL_SERVER_ERROR
   newNotification: function(request, reply) {
-    request.payload.new = true;
+    if (!request.payload.new) {
+      request.payload.new = true;
+    }
     return notificationsDB.insert(request.payload).then((inserted) => {
       //console.log('inserted: ', inserted);
       if (co.isEmpty(inserted.ops) || co.isEmpty(inserted.ops[0]))
@@ -68,18 +70,19 @@ let self = module.exports = {
   },
 
   //Mark notification as read (set new to false)
-  markAsReadNotification: function(request, reply) {
+  markNotification: function(request, reply) {
+    const markAsRead = request.query.read;
     const query = {
       _id: request.params.id//oid(request.params.id)
       //encodeURIComponent(request.params.id)
     };
 
     return notificationsDB.partlyUpdate(query, {
       $set: {
-        new: false
+        new: markAsRead
       }
     }).then(() => {
-      reply({'msg': 'notification is successfully marked as read...'});
+      reply({'msg': 'notification is successfully marked...'});
     }).catch((error) => {
       tryRequestLog(request, 'error', error);
       reply(boom.badImplementation());

diff --git a/application/database/notificationsDatabase.js b/application/database/notificationsDatabase.js
@@ -46,7 +46,9 @@ module.exports = {
       .then((db) => db.collection(collectionName))
       .then((col) => {
         let valid = false;
-        notification.timestamp = new Date();
+        if (!notification.timestamp) {//if timestamp has not already been defined
+          notification.timestamp = new Date();
+        }
         try {
           valid = notificationModel(notification);
           if (!valid) {

diff --git a/application/routes.js b/application/routes.js
@@ -30,12 +30,15 @@ module.exports = function(server) {
   //Mark notification as read (set new to false)
   server.route({
     method: 'GET',
-    path: '/notification/markasread/{id}',
-    handler: handlers.markAsReadNotification,
+    path: '/notification/mark/{id}',
+    handler: handlers.markNotification,
     config: {
       validate: {
         params: {
           id: Joi.string().description('The id of the notification')
+        },
+        query: {
+          read: Joi.boolean().description('Set to true to mark the notification as read')
         }
       },
       tags: ['api'],