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

Step 2: 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-27 00:37:10 +02:00
parent e6c4053ccf
commit 5307c04151
9 changed files with 106 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/router/sendmsg_router.js
View File

@@ -6,26 +6,32 @@ const server_constants = require('../tools/server_constants');
const { authenticate } = require('../middleware/authenticate');
const { Operator } = require('../models/operator');
const { User } = require('../models/user');
const { SendMsg } = require('../models/sendmsg');
const { ObjectID } = require('mongodb');
const sendemail = require('../sendemail');
const shared_consts = require('../tools/shared_nodejs');
const _ = require('lodash');
async function sendNotif(res, idapp, user, recmsg) {
//++Todo: tools.sendNotificationToUser
if (tools.isBitActive(recmsg.options, shared_consts.MessageOptions.Notify_ByPushNotification)) {
//++Todo: tools.sendNotificationToUser
console.log('SEND PUSH NOTIFICATION ')
}
// Extract the Email Destination
const emaildest = await Operator.getEmailByUsername(recmsg.dest.idapp, recmsg.dest.username);
const emaildest = await User.getEmailByUsername(recmsg.dest.idapp, recmsg.dest.username);
console.log('emaildest', emaildest);
// Send Msg by EMAIL
if (emaildest)
return await sendemail.sendEmail_Msg(res, user.lang, emaildest, user, idapp, recmsg);
if (emaildest && tools.isBitActive(recmsg.options, shared_consts.MessageOptions.Notify_ByEmail))
await sendemail.sendEmail_Msg(res, user.lang, emaildest, user, idapp, recmsg);
return true
}
router.post('/', authenticate, (req, res) => {
@@ -36,7 +42,7 @@ router.post('/', authenticate, (req, res) => {
tools.mylog('crea SendMsg');
const myrecmsg = new SendMsg(body);
const check = tools.checkUserOk(myrecmsg.origin.userId, req.user._id);
const check = tools.checkUserOk(myrecmsg.origin.username, req.user.username);
if (check.exit) return check.ret;
// console.log('fieldtochange', fieldtochange);
@@ -54,36 +60,38 @@ router.post('/', authenticate, (req, res) => {
recmsg.origin.infoevent = body.origin.infoevent;
return sendNotif(res, body.idapp, req.user, recmsg).then((ris) => {
if (ris)
return res.send({ code: server_constants.RIS_CODE_OK, msg: '', id: recmsg._id });
else
return res.send({ code: server_constants.RIS_CODE_ERR, msg: '' });
return res.send({ code: server_constants.RIS_CODE_OK, msg: '', id: recmsg._id });
})
});
}).catch((e) => {
console.log(e);
res.status(400).send(e);
// res.status(400).send(e);
return res.send({ code: server_constants.RIS_CODE_ERR, msg: '' });
})
});
router.get('/:username/:lastdataread/:idapp', authenticate, (req, res) => {
tools.mylog('GET SendMsgS : ', req.params);
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 (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.findAllMsgByUsernameIdAndIdApp(username, lastdataread, idapp).then((arrmsg) => {
// const wait = new Promise((resolve, reject) => {
// setTimeout(() => {
res.send({ arrmsg });
// }, 2000);
// });
}).catch((e) => {
console.log(e);
res.status(400).send(e);