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

- fix notifiche

Browse Source
This commit is contained in:
Surya Paolo
2024-05-10 00:58:38 +02:00
parent 3b1b2b9c83
commit 1d5002ea0f
6 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/models/sendnotif.js
View File

@@ -161,7 +161,7 @@ sendNotifSchema.statics.getRecNotif = function (id) {
}; };
sendNotifSchema.statics.findAllNotifByUsernameIdAndIdApp = function (username, lastdataread, idapp, limitrecord, typedir) { sendNotifSchema.statics.findAllNotifByUsernameIdAndIdApp = function (username, lastdataread, idapp, limitrecord, qualinotif) {
const SendNotif = this; const SendNotif = this;
if (!lastdataread) if (!lastdataread)
@@ -173,8 +173,13 @@ sendNotifSchema.statics.findAllNotifByUsernameIdAndIdApp = function (username, l
{ datenotif: { $gt: new Date(lastdataread) } } { datenotif: { $gt: new Date(lastdataread) } }
]; ];
if (typedir) { if (qualinotif) {
arrfilter.push({typedir}); if (qualinotif === shared_consts.QualiNotifs.CIRCUITS) {
arrfilter.push({ typedir: shared_consts.TypeNotifs.TYPEDIR_CIRCUITS });
} else {
arrfilter.push({ typedir: { $ne: shared_consts.TypeNotifs.TYPEDIR_CIRCUITS } });
}
} }
return SendNotif.find({ return SendNotif.find({

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

@@ -3281,8 +3281,8 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
} }
outres.recnotif = await SendNotif.getRecNotif(extrarec.notifId); outres.recnotif = await SendNotif.getRecNotif(extrarec.notifId);
outres.arrrecnotif = await SendNotif.findAllNotifByUsernameIdAndIdApp(username_action, extrarec.lastdr, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.TypeNotifs.TYPEDIR_OTHERS); outres.arrrecnotif = await SendNotif.findAllNotifByUsernameIdAndIdApp(username_action, extrarec.lastdr, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.QualiNotifs.OTHERS);
outres.arrrecnotifcoins = await SendNotif.findAllNotifByUsernameIdAndIdApp(username_action, extrarec.lastdr, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.TypeNotifs.TYPEDIR_CIRCUITS); outres.arrrecnotifcoins = await SendNotif.findAllNotifByUsernameIdAndIdApp(username_action, extrarec.lastdr, idapp, shared_consts.LIMIT_NOTIFCOINS_FOR_USER, shared_consts.QualiNotifs.CIRCUITS);
} else { } else {
outres.cansend = false; outres.cansend = false;

4
src/server/router/circuits_router.js
View File

@@ -84,8 +84,8 @@ router.post('/load', authenticate, async (req, res) => {
data.account = await Account.getAccountByUsernameAndCircuitId(idapp, '', data._id, false, false, '', data.path); data.account = await Account.getAccountByUsernameAndCircuitId(idapp, '', data._id, false, false, '', data.path);
} }
const arrrecnotif = await SendNotif.findAllNotifByUsernameIdAndIdApp(req.user.username, lastdr, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.TypeNotifs.TYPEDIR_OTHERS); const arrrecnotif = await SendNotif.findAllNotifByUsernameIdAndIdApp(req.user.username, lastdr, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.QualiNotifs.OTHERS);
const arrrecnotifcoins = await SendNotif.findAllNotifByUsernameIdAndIdApp(req.user.username, lastdr, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.TypeNotifs.TYPEDIR_CIRCUITS); const arrrecnotifcoins = await SendNotif.findAllNotifByUsernameIdAndIdApp(req.user.username, lastdr, idapp, shared_consts.LIMIT_NOTIFCOINS_FOR_USER, shared_consts.QualiNotifs.CIRCUITS);
/// E' QUIIII !!!! /// E' QUIIII !!!!
const useraccounts = await Account.getUserAccounts(idapp, req.user.username); const useraccounts = await Account.getUserAccounts(idapp, req.user.username);

24
src/server/router/sendnotif_router.js
View File

@@ -34,7 +34,7 @@ router.get('/setall/:username/:qualinotif/:idapp', authenticate, async (req, res
const idapp = req.params.idapp; const idapp = req.params.idapp;
const username = req.params.username; const username = req.params.username;
const qualinotif = req.params.qualinotif; const qualinotif = parseInt(req.params.qualinotif);
const username_call = req.user.username; const username_call = req.user.username;
try { try {
@@ -115,7 +115,7 @@ router.get('/delall/:username/:qualinotif/:idapp', authenticate, async (req, res
const idapp = req.params.idapp; const idapp = req.params.idapp;
const username = req.params.username; const username = req.params.username;
const qualinotif = req.params.qualinotif; const qualinotif = parseInt(req.params.qualinotif);
const username_call = req.user.username; const username_call = req.user.username;
try { try {
@@ -143,18 +143,13 @@ router.get('/:username/:lastdataread/:idapp', authenticate, (req, res) => {
return getNotif(req, res); return getNotif(req, res);
}); });
router.get('/:username/:lastdataread/:idapp/:qualinotif', authenticate, (req, res) => { async function getNotif(req, res) {
return getNotif(req, res);
});
function getNotif(req, res) {
try { try {
// tools.mylog('GET NotifS : ', req.params); // tools.mylog('GET NotifS : ', req.params);
const username = req.params.username; const username = req.params.username;
const lastdataread = req.params.lastdataread; const lastdataread = req.params.lastdataread;
const idapp = req.params.idapp; const idapp = req.params.idapp;
const qualinotif = req.params.qualinotif;
// var category = req.params.category; // var category = req.params.category;
@@ -163,21 +158,18 @@ function getNotif(req, res) {
return res.status(404).send({ code: server_constants.RIS_CODE_NOT_MY_USERNAME }); return res.status(404).send({ code: server_constants.RIS_CODE_NOT_MY_USERNAME });
} }
return SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdataread, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, qualinotif).then(async (arrnotif) => { const arrnotif = await SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdataread, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.QualiNotifs.OTHERS);
// const wait = new Promise((resolve, reject) => { const arrnotifcoins = await SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdataread, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.QualiNotifs.CIRCUITS);
// setTimeout(() => {
//++Todo: Ottimizzare ! Non occorre inviare tutti questi dati !!! Solo per il Circuito ?! //++Todo: Ottimizzare ! Non occorre inviare tutti questi dati !!! Solo per il Circuito ?!
const userprofile = await User.getExtraInfoByUsername(idapp, req.user.username); const userprofile = await User.getExtraInfoByUsername(idapp, req.user.username);
return res.send({ arrnotif, userprofile }); return res.send({ arrnotif, arrnotifcoins, userprofile });
}).catch((e) => {
console.log(e.message);
res.status(400).send(e);
});
} catch (e) { } catch (e) {
console.log(e.message); console.log(e.message);
res.status(400).send(e);
} }
}; };

4
src/server/router/users_router.js
View File

@@ -902,8 +902,8 @@ router.post('/updatesaldo', authenticate, async (req, res) => {
userprofile userprofile
} }
ris.arrrecnotif = await SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdr, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.TypeNotifs.TYPEDIR_OTHERS); ris.arrrecnotif = await SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdr, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.QualiNotifs.OTHERS);
ris.arrrecnotifcoins = await SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdr, idapp, shared_consts.LIMIT_NOTIF_FOR_USER, shared_consts.TypeNotifs.TYPEDIR_CIRCUITS); ris.arrrecnotifcoins = await SendNotif.findAllNotifByUsernameIdAndIdApp(username, lastdr, idapp, shared_consts.LIMIT_NOTIFCOINS_FOR_USER, shared_consts.QualiNotifs.CIRCUITS);
return res.send({ ris }); return res.send({ ris });

3
src/server/tools/shared_nodejs.js
View File

@@ -3,7 +3,8 @@ module.exports = {
CHECK_READ_GUIDELINES: 1, CHECK_READ_GUIDELINES: 1,
CHECK_SEE_VIDEO_PRINCIPI: 2, CHECK_SEE_VIDEO_PRINCIPI: 2,
}, },
LIMIT_NOTIF_FOR_USER: 200, LIMIT_NOTIF_FOR_USER: 100,
LIMIT_NOTIFCOINS_FOR_USER: 200,
QUERYTYPE_MYGROUP: 1, QUERYTYPE_MYGROUP: 1,
QUERYTYPE_REFUSED_USER_GRP: 2, QUERYTYPE_REFUSED_USER_GRP: 2,