surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aggio2

Browse Source
This commit is contained in:
Surya Paolo
2023-12-11 20:48:52 +01:00
parent 296b7b4fb8
commit caadbaae5f
4 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/models/circuit.js
View File

@@ -1161,6 +1161,7 @@ CircuitSchema.statics.SetDefMinMaxCollettivi = async function (idapp, valmin, va
CircuitSchema.statics.setFido = async function (idapp, username, circuitName, groupname) { CircuitSchema.statics.setFido = async function (idapp, username, circuitName, groupname) {
try {
mycircuit = await Circuit.findOne({ idapp, name: circuitName }).lean(); mycircuit = await Circuit.findOne({ idapp, name: circuitName }).lean();
if (mycircuit) { if (mycircuit) {
const circuitId = mycircuit._id; const circuitId = mycircuit._id;
@@ -1194,7 +1195,7 @@ CircuitSchema.statics.setFido = async function (idapp, username, circuitName, gr
} }
} else { } else {
// Se non ho Circuiti locali, non applico il Fido ! // Se non ho Circuiti locali, non applico il Fido !
return false; return null;
} }
} else { } else {
@@ -1216,7 +1217,10 @@ CircuitSchema.statics.setFido = async function (idapp, username, circuitName, gr
} }
} }
} }
return false; } catch (e) {
console.error('Err:', e);
}
return null;
}; };
const Circuit = mongoose.model('Circuit', CircuitSchema); const Circuit = mongoose.model('Circuit', CircuitSchema);

4
src/server/models/user.js
View File

@@ -2763,10 +2763,12 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
} else if (cmd === shared_consts.CIRCUITCMD.SETFIDO) { } else if (cmd === shared_consts.CIRCUITCMD.SETFIDO) {
ris = await Circuit.setFido(idapp, usernameOrig, circuitname, groupname); ris = await Circuit.setFido(idapp, usernameOrig, circuitname, groupname);
if (ris) { if (ris && ris.fidoConcesso) {
if (extrarec) {
extrarec.fidoConcesso = ris.fidoConcesso; extrarec.fidoConcesso = ris.fidoConcesso;
extrarec.qta_maxConcessa = ris.qta_maxConcessa; extrarec.qta_maxConcessa = ris.qta_maxConcessa;
}
// Elimina la richiesta: // Elimina la richiesta:
update = { $pull: { req_users: { username: { $in: [usernameOrig] } } } }; update = { $pull: { req_users: { username: { $in: [usernameOrig] } } } };

4
src/server/telegram/telegrambot.js
View File

@@ -3,8 +3,8 @@ const tools = require('../tools/general');
const appTelegram = [tools.FREEPLANET, tools.RISO]; const appTelegram = [tools.FREEPLANET, tools.RISO];
const appTelegram_TEST = [tools.FREEPLANET, tools.RISO]; const appTelegram_TEST = [tools.FREEPLANET, tools.RISO];
//const appTelegram_DEVELOP = [tools.RISO]; const appTelegram_DEVELOP = [tools.RISO];
const appTelegram_DEVELOP = [tools.FIOREDELLAVITA]; //const appTelegram_DEVELOP = [tools.FIOREDELLAVITA];
const appTelegramFinti = ['2', tools.CNM]; const appTelegramFinti = ['2', tools.CNM];
const appTelegramDest = [tools.FREEPLANET, tools.FREEPLANET]; const appTelegramDest = [tools.FREEPLANET, tools.FREEPLANET];

8
src/server/tools/general.js
View File

@@ -1083,7 +1083,7 @@ module.exports = {
let onlysave = false; let onlysave = false;
let numuserincircuit = await User.countUsersInCircuit(idapp, circuitname); let numuserincircuit = await User.countUsersInCircuit(idapp, circuitname);
const mycircuit = await Circuit.findOne({ name: circuitname }).lean(); const mycircuit = await Circuit.findOne({ name: circuitname }).lean();
if (mycircuit) { if (mycircuit && extrarec) {
extrarec.fido_scoperto_default = mycircuit.fido_scoperto_default; extrarec.fido_scoperto_default = mycircuit.fido_scoperto_default;
extrarec.fido_scoperto_default_grp = mycircuit.fido_scoperto_default_grp; extrarec.fido_scoperto_default_grp = mycircuit.fido_scoperto_default_grp;
} }
@@ -1363,9 +1363,9 @@ module.exports = {
if (!giainviato && cmd !== shared_consts.CIRCUITCMD.REQ) { if (!giainviato && cmd !== shared_consts.CIRCUITCMD.REQ) {
// SEND TO THE USER DEST THE NOTIFICATION // SEND TO THE USER DEST THE NOTIFICATION
ris = await this.sendNotifCircuitByUsername(cmd, idapp, usernameOrig, groupOrig, usernameOrig, '', username_action, circuitname, circuit.path, ris = await this.sendNotifCircuitByUsername(cmd, idapp, usernameOrig, groupOrig, usernameOrig, '', username_action, circuitname, circuit.path,
null, null, false, '', extrarec);
false, '', extrarec);
if (ris.recnotif) if (ris && ris.recnotif)
inviato = true; inviato = true;
} }
} }