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

Circuits OK

Browse Source 
Accounts Ok
Movements OK
This commit is contained in:
Paolo Arena
2022-09-14 11:32:04 +02:00
parent 2f24a02a63
commit 845e244470
90 changed files with 362 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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', process.env.DEBUG);
const mongoose = require('mongoose').set('debug', false);
const {CfgServer} = require('../models/cfgserver');
const shared_consts = require('../tools/shared_nodejs');

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

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

2
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', process.env.DEBUG);
const mongoose = require('mongoose').set('debug', false);
const {User} = require('../models/user');
const {Circuit} = require('../models/circuit');

9
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', process.env.DEBUG);
const mongoose = require('mongoose').set('debug', false);
const {CfgServer} = require('../models/cfgserver');
// const uuidv4 = require('uuid/v4'); // I chose v4 ‒ you can select others
@@ -305,7 +305,8 @@ router.post('/settable', authenticate, async (req, res) => {
mytablerec.isNew = false;
}
if (shared_consts.TABLES_ID_NUMBER.includes(params.table)) {
if (shared_consts.TABLES_ID_NUMBER.includes(params.table) ||
shared_consts.TABLES_ID_STRING.includes(params.table)) {
} else if (params.table === 'hours') {
@@ -347,6 +348,8 @@ router.post('/settable', authenticate, async (req, res) => {
mytablerec.date_updated = new Date();
}
console.log('mydata',mydata);
return await mytablerec.save().
then(async (rec) => {
@@ -1237,7 +1240,7 @@ function load(req, res, version) {
let myuserextra = null;
if (req.user) {
// askedfriends = User.getAskedFriendsByUsername(idapp, req.user.username);
myuserextra = User.addExtraInfo(idapp, req.user, req);
myuserextra = User.addExtraInfo(idapp, req.user);
}
return Promise.all([

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', process.env.DEBUG)
const mongoose = require('mongoose').set('debug', false)
// 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', process.env.DEBUG);
var mongoose = require('mongoose').set('debug', false);
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', process.env.DEBUG);
var mongoose = require('mongoose').set('debug', false);
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', process.env.DEBUG);
const mongoose = require('mongoose').set('debug', false);
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', process.env.DEBUG);
var mongoose = require('mongoose').set('debug', false);
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', process.env.DEBUG)
var mongoose = require('mongoose').set('debug', false)
const Subscription = mongoose.model('subscribers');
const _ = require('lodash');

2
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', process.env.DEBUG)
// var mongoose = require('mongoose').set('debug', false)
const { Project } = require('../models/project');
const { Todo } = require('../models/todo');

2
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', process.env.DEBUG);
const mongoose = require('mongoose').set('debug', false);
const Subscription = mongoose.model('subscribers');
// const q = require('q');
const webpush = require('web-push');

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', process.env.DEBUG)
// var mongoose = require('mongoose').set('debug', false)
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', process.env.DEBUG)
const mongoose = require('mongoose').set('debug', false)
const { User } = require('../models/user');
// const { Nave } = require('../models/nave');

2
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', process.env.DEBUG);
const mongoose = require('mongoose').set('debug', false);
const Subscription = mongoose.model('subscribers');
const tools = require('../tools/general');

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', process.env.DEBUG)
var mongoose = require('mongoose').set('debug', false)
const Subscription = mongoose.model('subscribers');
var { Todo } = require('../models/todo');

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

@@ -39,7 +39,7 @@ const TypedError = require('../modules/ErrorHandler');
const {MyGroup} = require('../models/mygroup');
const {Circuit} = require('../models/circuit');
const mongoose = require('mongoose').set('debug', process.env.DEBUG);
const mongoose = require('mongoose').set('debug', false);
const Subscription = mongoose.model('subscribers');
@@ -644,7 +644,7 @@ router.post('/circuits', authenticate, (req, res) => {
idapp = req.body.idapp;
locale = req.body.locale;
return Circuit.getCircuitsByUsername(idapp, username, req).then((ris) => {
return Circuit.getCircuitsByUsername(idapp, username, req.user).then((ris) => {
res.send(ris);
}).catch((e) => {
tools.mylog('ERRORE IN circuits: ' + e.message);
@@ -731,11 +731,13 @@ router.post('/circuits/cmd', authenticate, async (req, res) => {
}*/
return await User.setCircuitCmd(idapp, usernameOrig, circuitname, cmd, value, usernameLogged, extrarec).
then((ris) => {
then(async (ris) => {
// Check if ìs a Notif to read
const idnotif = extrarec['idnotif'] ? extrarec['idnotif'] : '';
SendNotif.setNotifAsRead(idapp, usernameOrig, idnotif);
if (extrarec && extrarec.hasOwnProperty('idnotif')) {
const idnotif = extrarec['idnotif'] ? extrarec['idnotif'] : '';
await SendNotif.setNotifAsRead(idapp, usernameOrig, idnotif);
}
return res.send(ris);
}).