Merge pull request rairprotocol#108 from rairprotocol/107-notificatio…

…ns-mark-all-as-read-delete-all Optional array of IDs to mark as read/delete all
mfrosi · Jul 10, 2024 · 0f9a037 · 0f9a037
2 parents 3460441 + f54b801
commit 0f9a037
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/rair-node/bin/api/notifications/notifications.Controller.js b/rair-node/bin/api/notifications/notifications.Controller.js
@@ -1,6 +1,11 @@
 const express = require('express');
 const { requireUserSession, validation } = require('../../middleware');
-const { markNotificationAsRead, getSingleNotification, listNotifications, deleteNotification } = require('./notifications.Service');
+const {
+    markNotificationAsRead,
+    getSingleNotification,
+    listNotifications,
+    deleteNotification,
+} = require('./notifications.Service');
 
 const router = express.Router();
 

diff --git a/rair-node/bin/api/notifications/notifications.Service.js b/rair-node/bin/api/notifications/notifications.Service.js
@@ -93,10 +93,18 @@ module.exports = {
     },
     markNotificationAsRead: async (req, res, next) => {
         try {
-            const { ids } = req.body;
-            const result = await Notification.updateMany({
-                _id: { $in: ids },
-            }, { $set: { read: true } });
+            const { publicAddress } = req.user;
+            const { ids = [] } = req.body;
+            const filter = {
+                user: publicAddress,
+            };
+            if (ids?.length) {
+                filter._id = { $in: ids };
+            }
+            const result = await Notification.updateMany(
+                filter,
+                { $set: { read: true } },
+            );
             return res.json({
                 success: true,
                 updated: result.modifiedCount,
@@ -108,8 +116,15 @@ module.exports = {
     },
     deleteNotification: async (req, res, next) => {
         try {
-            const { ids } = req.body;
-            const result = await Notification.deleteMany({ _id: { $in: ids } });
+            const { publicAddress } = req.user;
+            const { ids = [] } = req.body;
+            const filter = {
+                user: publicAddress,
+            };
+            if (ids?.length) {
+                filter._id = { $in: ids };
+            }
+            const result = await Notification.deleteMany(filter);
             return res.json({
                 success: true,
                 deleted: result.deletedCount,