From 1268c961cf9ebf17018fd5f0930526d6a7c20d08 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Sat, 17 Feb 2024 15:07:21 +0100
Subject: [PATCH] - corretto saldi pendenti sulla lista circuiti e anche il
 calcolo

---
 logtrans.txt                   | 14 +++++++++++++-
 src/server/models/sendnotif.js | 16 +++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/logtrans.txt b/logtrans.txt
index 4a186f1..3048212 100644
--- a/logtrans.txt
+++ b/logtrans.txt
@@ -152,4 +152,16 @@ paoloar77: 35 RIS]
 Sab 17/02 ORE 14:11: [<b>Circuito RIS Bologna</b>]: Inviate Monete da paoloar77 a SuryaArena 6 RIS [causale: Per Surya]
 Saldi:
 paoloar77: 29 RIS] 
-SuryaArena: 7 RIS]
\ No newline at end of file
+SuryaArena: 7 RIS]
+Sab 17/02 ORE 14:50: [<b>Circuito RIS Bologna</b>]: Inviate Monete da paoloar77 a SuryaArena 3 RIS [causale: BBBBAAA]
+Saldi:
+paoloar77: 26 RIS] 
+SuryaArena: 10 RIS]
+Sab 17/02 ORE 14:53: [<b>Circuito RIS Bologna</b>]: Inviate Monete da paoloar77 a SuryaArena 4 RIS [causale: GGGG]
+Saldi:
+paoloar77: 22 RIS] 
+SuryaArena: 14 RIS]
+Sab 17/02 ORE 15:03: [<b>Circuito RIS Bologna</b>]: Inviate Monete da paoloar77 a SuryaArena 2 RIS [causale: ]
+Saldi:
+paoloar77: 20 RIS] 
+SuryaArena: 16 RIS]
\ No newline at end of file
diff --git a/src/server/models/sendnotif.js b/src/server/models/sendnotif.js
index de14c61..244b609 100755
--- a/src/server/models/sendnotif.js
+++ b/src/server/models/sendnotif.js
@@ -1149,16 +1149,19 @@ sendNotifSchema.statics.getSumPendingTransactionsMittente = async function (idap
   const SendNotif = this;
 
   try {
-    const query = {
+    let query = {
       idapp,
       sender: username,
-      sendergroup: groupname,
       typedir: shared_consts.TypeNotifs.TYPEDIR_CIRCUITS,
       typeid: shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ,
       status: 0,
       'extrarec.circuitname': circuitname,
     };
 
+    if (groupname) {
+      query.sendergroup = groupname;
+    }
+
     return await SendNotif.find(query).lean();
 
   } catch (e) {
@@ -1171,18 +1174,21 @@ sendNotifSchema.statics.getSumPendingTransactionsDest = async function (idapp, u
   const SendNotif = this;
 
   try {
-    const query = {
+    let query = {
       idapp,
       sender: username,
-      sendergroup: groupname,
       typedir: shared_consts.TypeNotifs.TYPEDIR_CIRCUITS,
       typeid: shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ,
       status: 0,
       'extrarec.circuitname': circuitname,
       'extrarec.dest': username,
-      'extrarec.groupdest': groupname,
     };
 
+    if (groupname) {
+      query.sendergroup = groupname;
+      query.extrarec.groupdest = groupname;
+    }
+
     return await SendNotif.find(query).lean();
 
   } catch (e) {