diff --git a/.env.development b/.env.development index b06ac29..568ecce 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -DATABASE=test_PiuCheBuono +DATABASE=test_FreePlanet UDB=paofreeplanet PDB=mypassword@1A SEND_EMAIL=0 diff --git a/src/server/models/account.js b/src/server/models/account.js index 21209b4..35f5d01 100755 --- a/src/server/models/account.js +++ b/src/server/models/account.js @@ -636,7 +636,7 @@ AccountSchema.statics.updateQtaMax = async function (idapp, username, groupname, else risult = await Account.updateOne({ idapp, username, circuitId }, { $set: paramstoupdate }); - return risult; + return risult && risult.nModified > 0; }; AccountSchema.statics.getAccountsCircuitiNazionali = async function (idapp) { diff --git a/src/server/models/circuit.js b/src/server/models/circuit.js index bf370df..e3f52d9 100755 --- a/src/server/models/circuit.js +++ b/src/server/models/circuit.js @@ -1168,6 +1168,8 @@ CircuitSchema.statics.setFido = async function (idapp, username, circuitName, gr let account = null; let fido = 0; let qtamax = 0; + let variato = false; + let variato2 = false; if (mycircuit.showAlways) { @@ -1208,12 +1210,12 @@ CircuitSchema.statics.setFido = async function (idapp, username, circuitName, gr if (account) { if (qtamax > 0) { - await Account.updateQtaMax(idapp, username, groupname, circuitId, qtamax); + variato = await Account.updateQtaMax(idapp, username, groupname, circuitId, qtamax); } const ris = await Account.updateFido(idapp, username, groupname, circuitId, fido); if (ris) { - return { qta_maxConcessa: qtamax, fidoConcesso: fido }; + return { qta_maxConcessa: qtamax, fidoConcesso: fido, changed: variato || (ris && ris.nModified > 0) }; } } } diff --git a/src/server/models/sendnotif.js b/src/server/models/sendnotif.js index 21472bc..29540df 100755 --- a/src/server/models/sendnotif.js +++ b/src/server/models/sendnotif.js @@ -357,6 +357,7 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif, us let circuitname = ''; let numuserincircuit = 0; try { + circuitname = recnotif.paramsObj.circuitnameDest; username_action = recnotif.paramsObj.username_action username_mittente = recnotif.paramsObj.sender ? recnotif.paramsObj.sender : username_action myorig = recnotif.paramsObj.extrarec.grouporig; @@ -364,7 +365,6 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif, us destinatario = recnotif.paramsObj.extrarec.dest ? recnotif.paramsObj.extrarec.dest : (recnotif.paramsObj.extrarec.groupdest ? recnotif.paramsObj.extrarec.groupdest : recnotif.paramsObj.extrarec.contoComDest); qty = recnotif.paramsObj.extrarec && recnotif.paramsObj.extrarec.qty ? recnotif.paramsObj.extrarec.qty.toString() : ''; symbol = recnotif.paramsObj.extrarec ? recnotif.paramsObj.extrarec.symbol : ''; - circuitname = recnotif.paramsObj.circuitnameDest; numuserincircuit = await User.countUsersInCircuit(recnotif.idapp, circuitname); } catch (e) { diff --git a/src/server/models/user.js b/src/server/models/user.js index 7802517..87fb04a 100755 --- a/src/server/models/user.js +++ b/src/server/models/user.js @@ -2763,7 +2763,7 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn } else if (cmd === shared_consts.CIRCUITCMD.SETFIDO) { ris = await Circuit.setFido(idapp, usernameOrig, circuitname, groupname); - if (ris && ris.fidoConcesso) { + if (ris && ris.fidoConcesso && ris.changed) { if (extrarec) { extrarec.fidoConcesso = ris.fidoConcesso;