From 33ef9bdf61ea9f42a3ef5053ab81a5fe5a95be61 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Thu, 11 May 2023 07:18:58 +0200
Subject: [PATCH] refs #4797 refactor

---
 back/methods/notification/getList.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/back/methods/notification/getList.js b/back/methods/notification/getList.js
index fe5aa23a5..35a0498c0 100644
--- a/back/methods/notification/getList.js
+++ b/back/methods/notification/getList.js
@@ -43,6 +43,11 @@ module.exports = Self => {
             }
         }, myOptions);
 
+        const activeNotifications = await models.NotificationSubscription.find({
+            include: {relation: 'notification'},
+            where: {userFk: id}
+        }, myOptions);
+
         for (acl of availableNotifications) {
             notifications.set(acl.notificationFk, {
                 id: null,
@@ -53,17 +58,14 @@ module.exports = Self => {
             });
         }
 
-        const activeNotifications = await models.NotificationSubscription.find({
-            include: {relation: 'notification'},
-            where: {userFk: id}
-        }, myOptions);
-
         for (subscription of activeNotifications) {
-            const notification = notifications.get(subscription.notificationFk);
-            if (notification) {
-                notification.active = true;
-                notification.id = subscription.id;
-            }
+            notifications.set(subscription.notificationFk, {
+                id: subscription.id,
+                notificationFk: subscription.notificationFk,
+                name: subscription.notification().name,
+                description: subscription.notification().description,
+                active: true,
+            });
         }
 
         return [...notifications.values()];