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

Circuits...

Browse Source 
Circuits Fido e Max Qta
Fixed error eslint: 7.0.0 is OK
This commit is contained in:
Paolo Arena
2022-09-11 11:45:33 +02:00
parent d262f94315
commit d62888083b
100 changed files with 3699 additions and 2774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
const express = require('express');
const router = express.Router();
const mongoose = require('mongoose').set('debug', false);
const mongoose = require('mongoose').set('debug', process.env.DEBUG);
const {CfgServer} = require('../models/cfgserver');
const shared_consts = require('../tools/shared_nodejs');
@@ -40,7 +40,7 @@ router.post('/import', authenticate, async (req, res) => {
const liste = require('../data/liste');
if (cmd === shared_consts.Cmd.CITIES_SERVER) {
return City.insertMany(liste.Comuni).then((ris) => {
return await City.insertMany(liste.Comuni).then((ris) => {
return res.status(200).send(true);
});

2
src/server/router/api/actions.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', false)
const mongoose = require('mongoose').set('debug', process.env.DEBUG)
const Subscription = mongoose.model('subscribers');
//const { ListaIngresso } = require('../../models/listaingresso');

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

@@ -19,9 +19,9 @@ const sendNotifBooking = async (res, idapp, user, recbooking) => {
// Send Email
if (recbooking.booked)
return sendemail.sendEmail_Booking(res, user.lang, user.email, user, idapp, recbooking);
return await sendemail.sendEmail_Booking(res, user.lang, user.email, user, idapp, recbooking);
else
return sendemail.sendEmail_CancelBooking(res, user.lang, user.email, user, idapp, recbooking);
return await sendemail.sendEmail_CancelBooking(res, user.lang, user.email, user, idapp, recbooking);
};
router.post('/', authenticate, (req, res) => {

7
src/server/router/cart_router.js
View File

@@ -12,13 +12,8 @@ var { Project } = require('../models/project');
var { authenticate, auth_default } = require('../middleware/authenticate');
var mongoose = require('mongoose').set('debug', false)
const Subscription = mongoose.model('subscribers');
const _ = require('lodash');
const { ObjectID } = require('mongodb');
const Product = require('../models/product');
const Order = require('../models/order');
const Variant = require('../models/variant');
@@ -199,7 +194,7 @@ router.post('/:userId/cartstatus', authenticate, async function (req, res, next)
created_at: new Date(),
modify_at: new Date(),
})
return OrdersCart.updateOrdersCartById(-1, newOrderCart, function (err, ris) {
return await OrdersCart.updateOrdersCartById(-1, newOrderCart, function (err, ris) {
//if (err) return next(err)
if (err)
return res.send({ code: server_constants.RIS_CODE_ERR, status: 0 });

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

@@ -7,7 +7,7 @@ const server_constants = require('../tools/server_constants');
const {authenticate} = require('../middleware/authenticate');
const mongoose = require('mongoose').set('debug', false);
const mongoose = require('mongoose').set('debug', process.env.DEBUG);
const {User} = require('../models/user');
const {Circuit} = require('../models/circuit');
@@ -37,6 +37,7 @@ router.post('/load', authenticate, async (req, res) => {
try {
const {SendNotif} = require('../models/sendnotif');
const {Movement} = require('../models/movement');
// Check if ìs a Notif to read
const idnotif = req.body['idnotif'] ? req.body['idnotif'] : '';
@@ -63,6 +64,8 @@ router.post('/load', authenticate, async (req, res) => {
data = await getCircuitRecAdminsInfo(idapp, data);
data.movements = await Movement.getMovsByCircuitId(idapp, usernameOrig, data._id);
res.send({circuit: data, users_in_circuit});
} catch (e) {

3
src/server/router/dashboard_router.js
View File

@@ -11,9 +11,6 @@ const { User } = require('../models/user');
const { MsgTemplate } = require('../models/msg_template');
const mongoose = require('mongoose').set('debug', false)
const Subscription = mongoose.model('subscribers');
const telegrambot = require('../telegram/telegrambot');
const _ = require('lodash');

40
src/server/router/index_router.js
View File

@@ -14,7 +14,7 @@ const {ObjectID} = require('mongodb');
// const {ListaIngresso} = require('../models/listaingresso');
const {Graduatoria} = require('../models/graduatoria');
const mongoose = require('mongoose').set('debug', false);
const mongoose = require('mongoose').set('debug', process.env.DEBUG);
const {CfgServer} = require('../models/cfgserver');
// const uuidv4 = require('uuid/v4'); // I chose v4 ‒ you can select others
@@ -198,14 +198,14 @@ router.post(process.env.LINK_UPDATE_PWD, (req, res) => {
});
router.post('/testServer', authenticate_noerror, (req, res) => {
router.post('/testServer', authenticate_noerror, async (req, res) => {
try {
const test = req.body.test;
let ris = {test};
if (req.user) {
tools.sendNotificationToUser(req.user._id, 'Test Server',
await tools.sendNotificationToUser(req.user._id, 'Test Server',
'Test Server OK',
'/', '', 'server', []);
}
@@ -223,7 +223,7 @@ router.post('/settable', authenticate, async (req, res) => {
const mytable = globalTables.getTableByTableName(params.table);
let mydata = req.body.data;
let extrarec = {};
if (myapp.hasOwnProperty('extrarec')) {
if (mydata && mydata.hasOwnProperty('extrarec')) {
extrarec = mydata['extrarec'];
delete mydata['extrarec'];
}
@@ -343,7 +343,7 @@ router.post('/settable', authenticate, async (req, res) => {
mytablerec.date_updated = new Date();
}
return mytablerec.save().
return await mytablerec.save().
then(async (rec) => {
if (shared_consts.TABLES_GETCOMPLETEREC.includes(params.table)) {
@@ -399,7 +399,7 @@ router.post('/settable', authenticate, async (req, res) => {
if (params.table === shared_consts.TAB_MYGROUPS && isnewrec) {
// nuovo Record:
// aggiungi il creatore al gruppo stesso
return User.setGroupsCmd(mydata.idapp, req.user.username,
return await User.setGroupsCmd(mydata.idapp, req.user.username,
myrec.groupname,
shared_consts.GROUPSCMD.SETGROUP, true, req.user.username).then((ris) => {
return res.send(myrec);
@@ -407,14 +407,14 @@ router.post('/settable', authenticate, async (req, res) => {
} else if (params.table === shared_consts.TAB_MYCIRCUITS && isnewrec) {
// nuovo Record:
// aggiungi il creatore al Circuito stesso
return User.setCircuitCmd(mydata.idapp, req.user.username, myrec.name,
return await User.setCircuitCmd(mydata.idapp, req.user.username, myrec.name,
shared_consts.CIRCUITCMD.SET, true, req.user.username, extrarec).then((ris) => {
return res.send(myrec);
});
}
return res.send(myrec);
}).catch((e) => {
}).catch(async (e) => {
console.error('settable', e.message);
if (e.code === 11000) {
const id = mytablerec._id;
@@ -423,7 +423,7 @@ router.post('/settable', authenticate, async (req, res) => {
if (!myfields.userId) {
myfields.userId = req.user._id.toString();
}
return mytablestrutt.findByIdAndUpdate(id, {$set: myfields}).
return await mytablestrutt.findByIdAndUpdate(id, {$set: myfields}).
then(async (rec) => {
return res.send(rec);
}).
@@ -465,10 +465,12 @@ router.post('/setsubrec', authenticate, (req, res) => {
return res.send(rec);
return mytablerec.save().then(rec => {
// tools.mylog('rec', rec);
return res.send(rec);
}).catch((e) => {
if (e.code === 11000) {
const id = mytablerec._id;
@@ -598,7 +600,7 @@ router.post('/getpage', async (req, res) => {
const idapp = req.body.idapp;
const mypath = params.path;
return MyPage.findOne({idapp, path: mypath}).then((ris) => {
return await MyPage.findOne({idapp, path: mypath}).then((ris) => {
return res.send({mypage: ris});
}).catch((e) => {
console.log(e.message);
@@ -1061,7 +1063,7 @@ router.delete('/delrec/:table/:id', authenticate, async (req, res) => {
});
router.post('/duprec/:table/:id', authenticate, (req, res) => {
router.post('/duprec/:table/:id', authenticate, async (req, res) => {
const id = req.params.id;
const tablename = req.params.table;
// const idapp = req.body.idapp;
@@ -1081,12 +1083,12 @@ router.post('/duprec/:table/:id', authenticate, (req, res) => {
send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
}
return mytable.findById(id).then((mydata) => {
return await mytable.findById(id).then(async (mydata) => {
const datadup = tools.CloneRecordToNew(mydata);
const mynewrec = new mytable(datadup);
return mynewrec.save().then((rec) => {
return await mynewrec.save().then(async (rec) => {
if (!rec) {
return res.status(404).send();
}
@@ -1094,7 +1096,7 @@ router.post('/duprec/:table/:id', authenticate, (req, res) => {
tools.mylog('DUPLICATED ', rec);
// Do extra things after deleted
return actions.doOtherThingsAfterDuplicated(tablename, rec).
return await actions.doOtherThingsAfterDuplicated(tablename, rec).
then(({myrec}) => {
// ...
mytable.findById(myrec._id).then((record) => {
@@ -1503,19 +1505,19 @@ function uploadFile(req, res, version) {
try {
form.on('fileBegin', async function(name, file) {
file.path = folder + '/' + file.name;
file.path = folder + '/' + file.newFilename;
});
form.on('file', async function(name, file) {
try {
console.log('1) Uploading ' + file.name);
console.log('1) Uploading ' + file.originalFilename);
const mydir = tools.getdirByIdApp(idapp) + dirmain +
server_constants.DIR_UPLOAD + '/' + dir;
// Create Dir if doesn't exist:
const rismk = tools.mkdirpath(mydir);
let filename = file.name;
let filename = file.originalFilename;
let ext = path.extname(filename);
//++Todo: Modifica del nomefile... da passare al frontend
@@ -1524,10 +1526,10 @@ function uploadFile(req, res, version) {
//}
file.name = filename;
let newname = mydir + '/' + file.name;
let newname = mydir + '/' + file.originalFilename;
let resized_img = mydir + '/' + server_constants.PREFIX_IMG + filename;
oldpath = file.path;
oldpath = file.newFilename;
file.path = newname;
if (!tools.sulServer()) {

2
src/server/router/iscrittiConacreis_router.js
View File

@@ -19,7 +19,7 @@ const _ = require('lodash');
const { authenticate } = require('../middleware/authenticate');
const mongoose = require('mongoose').set('debug', false)
const mongoose = require('mongoose').set('debug', process.env.DEBUG)
// POST /iscritti_conacreis

2
src/server/router/mygen_router.js
View File

@@ -9,7 +9,7 @@ var server_constants = require('../tools/server_constants');
var {authenticate, auth_default} = require('../middleware/authenticate');
var mongoose = require('mongoose').set('debug', false);
var mongoose = require('mongoose').set('debug', process.env.DEBUG);
const Subscription = mongoose.model('subscribers');
const _ = require('lodash');

2
src/server/router/mygoods_router.js
View File

@@ -9,7 +9,7 @@ var server_constants = require('../tools/server_constants');
var {authenticate, auth_default} = require('../middleware/authenticate');
var mongoose = require('mongoose').set('debug', false);
var mongoose = require('mongoose').set('debug', process.env.DEBUG);
const Subscription = mongoose.model('subscribers');
const _ = require('lodash');

2
src/server/router/mygroups_router.js
View File

@@ -7,7 +7,7 @@ const server_constants = require('../tools/server_constants');
const {authenticate} = require('../middleware/authenticate');
const mongoose = require('mongoose').set('debug', false);
const mongoose = require('mongoose').set('debug', process.env.DEBUG);
const {User} = require('../models/user');
const {MyGroup} = require('../models/mygroup');

2
src/server/router/myskills_router.js
View File

@@ -9,7 +9,7 @@ var server_constants = require('../tools/server_constants');
var {authenticate, auth_default} = require('../middleware/authenticate');
var mongoose = require('mongoose').set('debug', false);
var mongoose = require('mongoose').set('debug', process.env.DEBUG);
const Subscription = mongoose.model('subscribers');
const _ = require('lodash');

2
src/server/router/orders_router.js
View File

@@ -11,7 +11,7 @@ var { Project } = require('../models/project');
var { authenticate, auth_default } = require('../middleware/authenticate');
var mongoose = require('mongoose').set('debug', false)
var mongoose = require('mongoose').set('debug', process.env.DEBUG)
const Subscription = mongoose.model('subscribers');
const _ = require('lodash');

5
src/server/router/products_router.js
View File

@@ -9,13 +9,8 @@ var { Project } = require('../models/project');
var { authenticate, auth_default } = require('../middleware/authenticate');
var mongoose = require('mongoose').set('debug', false)
const Subscription = mongoose.model('subscribers');
const _ = require('lodash');
const { ObjectID } = require('mongodb');
const Product = require('../models/product');
const Variant = require('../models/variant');

6
src/server/router/projects_router.js
View File

@@ -7,7 +7,7 @@ const server_constants = require('../tools/server_constants');
const { authenticate } = require('../middleware/authenticate');
// var mongoose = require('mongoose').set('debug', false)
// var mongoose = require('mongoose').set('debug', process.env.DEBUG)
const { Project } = require('../models/project');
const { Todo } = require('../models/todo');
@@ -45,9 +45,9 @@ router.post('/', authenticate, (req, res) => {
project.save().then((writeresult) => {
let idobj = writeresult._id;
Project.findById(idobj)
.then(record => {
.then(async (record) => {
tools.sendNotificationToUser(record.userId, '[Progetto]: ' + record.descr, record.descr, '/todo/' + record._id, '', 'todo', [])
await tools.sendNotificationToUser(record.userId, '[Progetto]: ' + record.descr, record.descr, '/todo/' + record._id, '', 'todo', [])
res.send({ record: record._doc });

6
src/server/router/push_router.js
View File

@@ -1,6 +1,6 @@
const express = require('express');
const router = express.Router();
const mongoose = require('mongoose').set('debug', false);
const mongoose = require('mongoose').set('debug', process.env.DEBUG);
const Subscription = mongoose.model('subscribers');
// const q = require('q');
const webpush = require('web-push');
@@ -89,10 +89,10 @@ router.post('/', (req, res) => {
async function SendMsgTo(idapp, username, params) {
return User.find({idapp, username}).then((arrusers) => {
return await User.find({idapp, username}).then(async (arrusers) => {
if (arrusers !== null) {
for (const user of arrusers) {
tools.sendNotificationToUser(user._id, params.title, params.content,
await tools.sendNotificationToUser(user._id, params.title, params.content,
params.openUrl, params.openUrl2, params.tag, params.actions, params.id).
then(ris => {
if (ris) {

2
src/server/router/report_router.js
View File

@@ -7,7 +7,7 @@ const server_constants = require('../tools/server_constants');
const { authenticate } = require('../middleware/authenticate');
// var mongoose = require('mongoose').set('debug', false)
// var mongoose = require('mongoose').set('debug', process.env.DEBUG)
const { Project } = require('../models/project');
const { Todo } = require('../models/todo');

2
src/server/router/site_router.js
View File

@@ -7,7 +7,7 @@ const server_constants = require('../tools/server_constants');
const { authenticate } = require('../middleware/authenticate');
const mongoose = require('mongoose').set('debug', false)
const mongoose = require('mongoose').set('debug', process.env.DEBUG)
const { User } = require('../models/user');
// const { Nave } = require('../models/nave');

6
src/server/router/subscribe_router.js
View File

@@ -1,6 +1,6 @@
const express = require('express');
const router = express.Router();
const mongoose = require('mongoose').set('debug', false);
const mongoose = require('mongoose').set('debug', process.env.DEBUG);
const Subscription = mongoose.model('subscribers');
const tools = require('../tools/general');
@@ -48,7 +48,7 @@ router.post('/', authenticate, async (req, res) => {
}).catch(err => {
// Not found
return null;
}).then(myitem => {
}).then(async (myitem) => {
if (myitem === null) {
myitem = subscriptionModel;
@@ -59,7 +59,7 @@ router.post('/', authenticate, async (req, res) => {
myitem.createDate = new Date();
}
return myitem.save((err, subscription) => {
return await myitem.save((err, subscription) => {
if (err) {
console.error(`Error occurred while saving subscription. Err: ${err}`);
return res.status(500).json({

2
src/server/router/test_router.js
View File

@@ -9,7 +9,7 @@ var { Project } = require('../models/project');
var { authenticate } = require('../middleware/authenticate');
var mongoose = require('mongoose').set('debug', false)
var mongoose = require('mongoose').set('debug', process.env.DEBUG)
const Subscription = mongoose.model('subscribers');
var { Todo } = require('../models/todo');

6
src/server/router/todos_router.js
View File

@@ -9,8 +9,6 @@ var { Project } = require('../models/project');
var { authenticate } = require('../middleware/authenticate');
var mongoose = require('mongoose').set('debug', false)
const Subscription = mongoose.model('subscribers');
var { Todo } = require('../models/todo');
@@ -56,7 +54,7 @@ router.post('/', authenticate, async (req, res) => {
.then((writeresult) => {
let idobj = writeresult._id;
return Todo.findById(idobj)
.then(record => {
.then(async (record) => {
// tools.mylog('REC SAVED :', record.descr);
let aggiorna = false;
@@ -72,7 +70,7 @@ router.post('/', authenticate, async (req, res) => {
}
if (aggiorna) {
tools.sendNotificationToUser(todo.userId, titolo + ' ' + record.descr, record.descr, '/todo/' + todo.category, '', 'todo', [])
await tools.sendNotificationToUser(todo.userId, titolo + ' ' + record.descr, record.descr, '/todo/' + todo.category, '', 'todo', [])
.then(ris => {
if (ris) {
return res.send({ record });

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

@@ -39,7 +39,8 @@ const TypedError = require('../modules/ErrorHandler');
const {MyGroup} = require('../models/mygroup');
const {Circuit} = require('../models/circuit');
const mongoose = require('mongoose').set('debug', false);
const mongoose = require('mongoose').set('debug', process.env.DEBUG);
const Subscription = mongoose.model('subscribers');
function existSubScribe(userId, access, browser) {