From 87808caadf64abdf109e1c688a7b5df28a1a03c4 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Fri, 10 May 2024 01:08:49 +0200
Subject: [PATCH] - fix notifiche

---
 src/server/models/sendnotif.js        | 5 ++++-
 src/server/router/sendnotif_router.js | 7 ++++---
 src/server/tools/shared_nodejs.js     | 5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/server/models/sendnotif.js b/src/server/models/sendnotif.js
index 5cc0d85..2e4f5cd 100755
--- a/src/server/models/sendnotif.js
+++ b/src/server/models/sendnotif.js
@@ -161,7 +161,7 @@ sendNotifSchema.statics.getRecNotif = function (id) {
 
 };
 
-sendNotifSchema.statics.findAllNotifByUsernameIdAndIdApp = function (username, lastdataread, idapp, limitrecord, qualinotif) {
+sendNotifSchema.statics.findAllNotifByUsernameIdAndIdApp = function (username, lastdataread, idapp, limitrecord, qualinotif, arroptionfilter) {
   const SendNotif = this;
 
   if (!lastdataread)
@@ -179,7 +179,10 @@ sendNotifSchema.statics.findAllNotifByUsernameIdAndIdApp = function (username, l
     } else {
       arrfilter.push({ typedir: { $ne: shared_consts.TypeNotifs.TYPEDIR_CIRCUITS } });
     }
+  }
 
+  if (arroptionfilter) {
+    arrfilter = [...arrfilter, ...arroptionfilter];
   }
 
   return SendNotif.find({
diff --git a/src/server/router/sendnotif_router.js b/src/server/router/sendnotif_router.js
index 0a82544..e95a222 100755
--- a/src/server/router/sendnotif_router.js
+++ b/src/server/router/sendnotif_router.js
@@ -159,13 +159,14 @@ async function getNotif(req, res) {
     }
 
     const arrnotif = await SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdataread, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.QualiNotifs.OTHERS);
-    const arrnotifcoins = await SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdataread, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.QualiNotifs.CIRCUITS);
+    const arrnotifcoins_inattesa = await SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdataread, idapp, shared_consts.LIMIT_NOTIFCOINS_IN_ATTESA_FOR_USER, shared_consts.QualiNotifs.CIRCUITS, [{ status: 0 }]);
+    const arrnotifcoins = await SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdataread, idapp, shared_consts.LIMIT_NOTIFCOINS_FOR_USER, shared_consts.QualiNotifs.CIRCUITS, [{ status: {$ne: 0 }}]);
+
 
-    
     //++Todo: Ottimizzare ! Non occorre inviare tutti questi dati !!! Solo per il Circuito ?!
     const userprofile = await User.getExtraInfoByUsername(idapp, req.user.username);
 
-    return res.send({ arrnotif, arrnotifcoins, userprofile });
+    return res.send({ arrnotif, arrnotifcoins: [...arrnotifcoins, ...arrnotifcoins_inattesa], userprofile });
 
   } catch (e) {
     console.log(e.message);
diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js
index 4d1a3b6..44c9b34 100755
--- a/src/server/tools/shared_nodejs.js
+++ b/src/server/tools/shared_nodejs.js
@@ -3,8 +3,9 @@ module.exports = {
     CHECK_READ_GUIDELINES: 1,
     CHECK_SEE_VIDEO_PRINCIPI: 2,
   },
-  LIMIT_NOTIF_FOR_USER: 100,
-  LIMIT_NOTIFCOINS_FOR_USER: 200,
+  LIMIT_NOTIF_FOR_USER: 50,
+  LIMIT_NOTIFCOINS_FOR_USER: 50,
+  LIMIT_NOTIFCOINS_IN_ATTESA_FOR_USER: 200,
 
   QUERYTYPE_MYGROUP: 1,
   QUERYTYPE_REFUSED_USER_GRP: 2,