refs #4797 minor fixes

back/methods/notification/getList.js

@@ -21,7 +21,7 @@ module.exports = Self => {
     });
 
     Self.getList = async(id, options) => {
-        const notifications = [];
+        const notifications = new Map();
         const models = Self.app.models;
 
         const myOptions = {};
@@ -29,11 +29,6 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const activeNotifications = await models.NotificationSubscription.find({
-            include: {relation: 'notification'},
-            where: {userFk: id}
-        }, myOptions);
-
         const roles = await models.RoleMapping.find({
             fields: ['roleId'],
             where: {principalId: id}
@@ -43,38 +38,29 @@ module.exports = Self => {
             include: {relation: 'notification'},
             where: {
                 roleFk: {
-                    inq: roles.map(role => {
+                    inq: roles.map(role => role.roleId),
-                        return role.roleId;
-                    }),
                 },
             }
         }, myOptions);
 
-        for (subscription of activeNotifications) {
+        for (acl of availableNotifications) {
-            notifications.push({
+            notifications.set(acl.notificationFk, {
-                id: subscription.id,
+                id: null,
-                notificationFk: subscription.notificationFk,
+                notificationFk: acl.notificationFk,
-                name: subscription.notification().name,
+                name: acl.notification().name,
-                description: subscription.notification().description,
+                description: acl.notification().description,
-                active: true
+                active: false,
             });
         }
 
-        for (acl of availableNotifications) {
+        const activeNotifications = await models.NotificationSubscription.find({
-            const activeNotif = notifications.find(
+            include: {relation: 'notification'},
-                notif => notif.notificationFk === acl.notificationFk
+            where: {userFk: id}
-            );
+        }, myOptions);
-            if (!activeNotif) {
-                notifications.push({
-                    id: null,
-                    notificationFk: acl.notificationFk,
-                    name: acl.notification().name,
-                    description: acl.notification().description,
-                    active: false,
-                });
-            }
-        }
 
-        return notifications;
+        for (subscription of activeNotifications)
+            notifications.get(subscription.notificationFk).active = true;
+
+        return [...notifications.values()];
     };
 };

back/models/notificationSubscription.js

@@ -30,9 +30,7 @@ module.exports = Self => {
 
         const worker = await models.Worker.findById(workerId, {fields: ['id', 'bossFk']});
         const notificationsAvailables = await models.NotificationSubscription.getList(workerId);
-        const hasAcl = notificationsAvailables.some(function(available) {
+        const hasAcl = notificationsAvailables.some(available => available.notificationFk === notificationFk);
-            return available.notificationFk === notificationFk;
-        });
 
         if (!hasAcl || (userId != worker.id && userId != worker.bossFk))
             throw new UserError('The notification subscription of this worker cant be modified');