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

Step 1: Creating page Messages: userlist last messages + a page for all the messages received and sent.

Browse Source
This commit is contained in:
Paolo Arena
2019-10-26 02:21:22 +02:00
parent 18d18df9ae
commit 408a7f4c6f
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/router/index_router.js
View File

@@ -318,7 +318,7 @@ router.get('/loadsite/:userId/:idapp/:sall', authenticate_noerror, (req, res) =>
const wheres = Where.findAllIdApp(idapp);
const contribtype = Contribtype.findAllIdApp(idapp);
return Promise.all([bookedevent, eventlist, operators, wheres, contribtype, msgs])
return Promise.all([bookedevent, eventlist, operators, wheres, contribtype])
.then((arrdata) => {
// console.table(arrdata);
res.send({
@@ -355,7 +355,7 @@ router.get(process.env.LINK_CHECK_UPDATES, authenticate, (req, res) => {
// const sall = '0';
// msgs = SendMsg.findAllByUserIdAndIdApp(userId, req.user.username, req.user.idapp);
msgs = SendMsg.findLastGroupByUserIdAndIdApp(userId, req.user.username, req.user.idapp);
last_msgs = SendMsg.findLastGroupByUserIdAndIdApp(userId, req.user.username, req.user.idapp);
let usersList = null;
@@ -368,13 +368,13 @@ router.get(process.env.LINK_CHECK_UPDATES, authenticate, (req, res) => {
}
}
return Promise.all([usersList, msgs])
return Promise.all([usersList, last_msgs])
.then((arrdata) => {
// console.table(arrdata);
return res.send({
cfgServer: arrcfgrec,
usersList: arrdata[0],
msgs: arrdata[1],
last_msgs: arrdata[1],
});
});

20
server/router/sendmsg_router.js
View File

@@ -67,25 +67,23 @@ router.post('/', authenticate, (req, res) => {
});
router.get('/:userId/:idapp', authenticate, (req, res) => {
const userId = req.params.userId;
router.get('/:username/:lastdataread/:idapp', authenticate, (req, res) => {
const username = req.params.username;
const lastdataread = req.params.lastdataread;
const idapp = req.params.idapp;
// var category = req.params.category;
tools.mylog('GET SendMsgS : ', req.params);
if (!ObjectID.isValid(userId)) {
return res.status(404).send();
}
if (userId !== String(req.user._id)) {
// I'm trying to write something not mine!
return res.status(404).send({ code: server_constants.RIS_CODE_TODO_CREATING_NOTMYUSER });
if (req.user.idapp !== idapp) {
// I'm trying to get something not mine!
return res.status(404).send({ code: server_constants.RIS_CODE_NOT_MY_USERNAME });
}
// Extract all the todos of the userId only
return SendMsg.findAllByUserIdAndIdApp(userId, idapp).then((msgall) => {
res.send({ msgall });
return SendMsg.findAllMsgByUsernameIdAndIdApp(username, lastdataread, idapp).then((arrmsg) => {
res.send({ arrmsg });
}).catch((e) => {
console.log(e);
res.status(400).send(e);