From 1214bcfbfc439884f584f6f22e697e27293216f5 Mon Sep 17 00:00:00 2001 From: paoloar77 Date: Tue, 22 Feb 2022 15:24:32 +0100 Subject: [PATCH] Ver 0.2.8 Added msg Server error in every pages Nuovo Gruppo non funziona. Corretto altre funzioni del Gruppo Errore del server" Network Error", fare pagina test con altri host per vedere se da lo stesso msg, con IP --- src/server/middleware/authenticate.js | 2 +- src/server/models/mygroup.js | 27 +++++++++++++++++++++++++++ src/server/populate/adtypes.js | 1 - src/server/router/index_router.js | 27 ++++++++++++++++++--------- src/server/tools/shared_nodejs.js | 2 +- 5 files changed, 47 insertions(+), 12 deletions(-) diff --git a/src/server/middleware/authenticate.js b/src/server/middleware/authenticate.js index 54e1234..655e570 100755 --- a/src/server/middleware/authenticate.js +++ b/src/server/middleware/authenticate.js @@ -50,7 +50,7 @@ const authenticate = (req, res, next) => { // tools.mylog('userid', user._id); }).catch((e) => { - tools.mylog("ERR =", e); + tools.mylog("ERR authenticate invalid Token =", e); res.status(server_constants.RIS_CODE_HTTP_INVALID_TOKEN).send(); }); }; diff --git a/src/server/models/mygroup.js b/src/server/models/mygroup.js index ef840f9..dc5cf6d 100755 --- a/src/server/models/mygroup.js +++ b/src/server/models/mygroup.js @@ -5,6 +5,7 @@ const tools = require('../tools/general'); const shared_consts = require('../tools/shared_nodejs'); + mongoose.Promise = global.Promise; mongoose.level = 'F'; @@ -14,6 +15,9 @@ mongoose.plugin(schema => { }); const MyGroupSchema = new Schema({ + _id: { + type: Number, + }, idapp: { type: String, }, @@ -105,6 +109,8 @@ MyGroupSchema.statics.getFieldsForSearch = function() { MyGroupSchema.statics.executeQueryTable = function(idapp, params) { params.fieldsearch = this.getFieldsForSearch(); + const { User } = require('./user'); + if (params.options) { if (tools.isBitActive(params.options, shared_consts.OPTIONS_SEARCH_USER_ONLY_FULL_WORDS)) { params.fieldsearch = User.getFieldsForSearchUserFriend(); @@ -116,6 +122,27 @@ MyGroupSchema.statics.executeQueryTable = function(idapp, params) { return tools.executeQueryTable(this, idapp, params); }; +MyGroupSchema.pre('save', async function(next) { + if (this.isNew) { + const myrec = await MyGroup.findOne().limit(1).sort({_id: -1}); + if (!!myrec) { + if (myrec._doc._id === 0) + this._id = 1; + else + this._id = myrec._doc._id + 1; + + } else { + this._id = 1; + } + + this.date_created = new Date(); + } + + next(); +}); + + + MyGroupSchema.statics.findAllIdApp = async function(idapp) { const myfind = {idapp}; diff --git a/src/server/populate/adtypes.js b/src/server/populate/adtypes.js index c4c5a81..28531ab 100644 --- a/src/server/populate/adtypes.js +++ b/src/server/populate/adtypes.js @@ -2,6 +2,5 @@ module.exports = { list: [ {_id: 1, descr: 'Offro'}, {_id: 2, descr: 'Cerco'}, - {_id: 3, descr: 'Evento'}, ], }; diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js index bb81f48..44ef05b 100755 --- a/src/server/router/index_router.js +++ b/src/server/router/index_router.js @@ -144,7 +144,7 @@ router.post(process.env.LINKVERIF_REG, (req, res) => { } } }).catch((e) => { - console.log(e.message); + console.log(process.env.LINKVERIF_REG, e.message); res.status(400).send(); }); @@ -177,7 +177,7 @@ router.post(process.env.LINK_REQUEST_NEWPASSWORD, (req, res) => { }); } }).catch((e) => { - console.log(e.message); + console.log(process.env.LINK_REQUEST_NEWPASSWORD, e.message); res.status(400).send(); res.send({code: server_constants.RIS_CODE_ERR, msg: e}); }); @@ -218,7 +218,7 @@ router.post(process.env.LINK_UPDATE_PWD, (req, res) => { }); } }).catch((e) => { - console.log(e.message); + console.log(process.env.LINK_UPDATE_PWD, e.message); res.status(400).send(); }); @@ -232,6 +232,7 @@ router.post('/testServer', (req, res) => { return res.send(ris); } catch (e) { + console.error('testServer', e.message); return res.status(400).send(e); } @@ -339,6 +340,7 @@ router.post('/settable', authenticate, (req, res) => { // tools.mylog('rec', rec); }).catch((e) => { + console.error('settable', e.message); if (e.code === 11000) { const id = mytablerec._id; delete mytablerec._doc['_id']; @@ -360,6 +362,7 @@ router.post('/settable', authenticate, (req, res) => { }); } catch (e) { + console.error('settable', e.message); return res.status(400).send(e); } @@ -423,13 +426,19 @@ router.post('/gettable', authenticate, (req, res) => { return res.status(400).send({}); } - return mytable.executeQueryTable(req.user.idapp, params).then(ris => { - return res.send(ris); + try { - }).catch((e) => { - console.log('gettable: ' + e.message); - res.status(400).send(e); - }); + return mytable.executeQueryTable(req.user.idapp, params).then(ris => { + return res.send(ris); + + }).catch((e) => { + console.error('gettable: ' + e.message); + res.status(400).send(e); + }); + }catch (e) { + console.error(`ERROR gettable ${params.table}: `, e.message, 'params', params); + res.status(500).send(e); + } }); diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js index cfd9a2b..7c162e8 100755 --- a/src/server/tools/shared_nodejs.js +++ b/src/server/tools/shared_nodejs.js @@ -113,7 +113,7 @@ module.exports = { 'mybachecas', 'mygoods', 'mygroups'], - TABLES_USER_ID: ['myskills', 'mybachecas', 'mygoods'], + TABLES_USER_ID: ['mygroups', 'myskills', 'mybachecas', 'mygoods'], TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybachecas', 'mygoods', 'mybots'], TABLES_FINDER: ['myskills', 'mybachecas', 'mygoods', 'mygroups'], TABLES_VISU_CMYSRECCARD: ['myskills', 'mybachecas', 'mygoods'],