Merge pull request #5639 from acburdine/notifications-pipeline

Apply pipeline to notifications API endpoints

core/server/api/notifications.js

@@ -5,6 +5,7 @@ var Promise            = require('bluebird'),
     canThis            = require('../permissions').canThis,
     errors             = require('../errors'),
     utils              = require('./utils'),
+    pipeline           = require('../utils/pipeline'),
 
     // Holds the persistent notifications
     notificationsStore = [],
@@ -47,6 +48,29 @@ notifications = {
      * ```
      */
     add: function add(object, options) {
+        var tasks;
+
+        /**
+         * ### Handle Permissions
+         * We need to be an authorised user to perform this action
+         * @param {Object} options
+         * @returns {Object} options
+         */
+        function handlePermissions(options) {
+            return canThis(options.context).add.notification().then(function () {
+                return options;
+            }, function () {
+                return Promise.reject(new errors.NoPermissionError('You do not have permission to add notifications.'));
+            });
+        }
+
+        /**
+         * ### Save Notifications
+         * Save the notifications
+         * @param {Object} options
+         * @returns {Object} options
+         */
+        function saveNotifications(options) {
             var defaults = {
                     dismissible: true,
                     location: 'bottom',
@@ -54,9 +78,7 @@ notifications = {
                 },
                 addedNotifications = [];
 
-        return canThis(options.context).add.notification().then(function () {
+            _.each(options.data.notifications, function (notification) {
-            return utils.checkObject(object, 'notifications').then(function (checkedNotificationData) {
-                _.each(checkedNotificationData.notifications, function (notification) {
                 notificationCounter = notificationCounter + 1;
 
                 notification = _.assign(defaults, notification, {
@@ -68,10 +90,17 @@ notifications = {
                 addedNotifications.push(notification);
             });
 
-                return {notifications: addedNotifications};
+            return addedNotifications;
-            });
+        }
-        }, function () {
+
-            return Promise.reject(new errors.NoPermissionError('You do not have permission to add notifications.'));
+        tasks = [
+            utils.validate('notifications'),
+            handlePermissions,
+            saveNotifications
+        ];
+
+        return pipeline(tasks, object, options).then(function formatResponse(result) {
+            return {notifications: result};
         });
     },
 
@@ -83,7 +112,23 @@ notifications = {
      * @returns {Promise(Notifications)}
      */
     destroy: function destroy(options) {
+        var tasks;
+
+        /**
+         * ### Handle Permissions
+         * We need to be an authorised user to perform this action
+         * @param {Object} options
+         * @returns {Object} options
+         */
+        function handlePermissions(options) {
             return canThis(options.context).destroy.notification().then(function () {
+                return options;
+            }, function () {
+                return Promise.reject(new errors.NoPermissionError('You do not have permission to destroy notifications.'));
+            });
+        }
+
+        function destroyNotification(options) {
             var notification = _.find(notificationsStore, function (element) {
                 return element.id === parseInt(options.id, 10);
             });
@@ -101,9 +146,19 @@ notifications = {
             notificationsStore = _.reject(notificationsStore, function (element) {
                 return element.id === parseInt(options.id, 10);
             });
-            return {notifications: [notification]};
+            notificationCounter = notificationCounter - 1;
-        }, function () {
+
-            return Promise.reject(new errors.NoPermissionError('You do not have permission to destroy notifications.'));
+            return notification;
+        }
+
+        tasks = [
+            utils.validate('notifications', {opts: utils.idDefaultOptions}),
+            handlePermissions,
+            destroyNotification
+        ];
+
+        return pipeline(tasks, options).then(function formatResponse(result) {
+            return {notifications: [result]};
         });
     },