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

7
src/server/db/mongoose.js
View File

@@ -1,4 +1,4 @@
var mongoose = require('mongoose').set('debug', process.env.DEBUG) var mongoose = require('mongoose').set('debug', false)
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;
@@ -9,7 +9,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true schema.options.usePushEach = true
}); });
mongoose.set('debug', process.env.DEBUG); mongoose.set('debug', false);
const options = { const options = {
// user: process.env.UDB, // user: process.env.UDB,
@@ -17,7 +17,8 @@ const options = {
// useMongoClient: true, // useMongoClient: true,
// useMongoClient: false, // useMongoClient: false,
useNewUrlParser: true, useNewUrlParser: true,
// useFindAndModify: false, // useFindAndModify: true,
useFindAndModify: false,
// useCreateIndex: true, // useCreateIndex: true,
useUnifiedTopology: true, useUnifiedTopology: true,

3
src/server/locales/en.json
View File

@@ -51,6 +51,9 @@
"CIRCUIT_REMOVED_TO_ME": "❌ Sei stato rimosso dal Circuito %s (da parte di %s)", "CIRCUIT_REMOVED_TO_ME": "❌ Sei stato rimosso dal Circuito %s (da parte di %s)",
"CIRCUIT_SENDCOINSREQ": "%s ti sta inviando %s %s.", "CIRCUIT_SENDCOINSREQ": "%s ti sta inviando %s %s.",
"ID_CIRCUIT_COINS_ACCEPTED": "%s %s accettati da %s.", "ID_CIRCUIT_COINS_ACCEPTED": "%s %s accettati da %s.",
"ID_CIRCUIT_COINS_ACCEPTED_TO_ME": "%s %s accettati da %s.",
"ID_CIRCUIT_COINS_REFUSED": "%s %s rifiutati da %s.",
"ID_CIRCUIT_COINS_REFUSED_TO_ME": "%s %s rifiutati da %s.",
"CIRCUIT_AMOUNT_EXCEED_FIDO": "L'importo supera la quantità massima concessa", "CIRCUIT_AMOUNT_EXCEED_FIDO": "L'importo supera la quantità massima concessa",
"CIRCUIT_AMOUNT_EXCEED_QTAMAX": "L'importo supera la quantità massima che il destinatario può accumulare", "CIRCUIT_AMOUNT_EXCEED_QTAMAX": "L'importo supera la quantità massima che il destinatario può accumulare",
"CIRCUIT_COINS_ALREADY_PROCESSED": "La richiesta è stata già processata. Stato %s", "CIRCUIT_COINS_ALREADY_PROCESSED": "La richiesta è stata già processata. Stato %s",

122
src/server/locales/it.json
View File

@@ -1,61 +1,65 @@
{ {
"Hello": "Ciao", "Hello": "Ciao",
"Hello %s": "Ciao %s", "Hello %s": "Ciao %s",
"Good: %s": "Bene: %s", "Good: %s": "Bene: %s",
"Service: %s": "Servizio: %s", "Service: %s": "Servizio: %s",
"<strong>%s</strong> new Good: %s": "<strong>%s</strong> nuovo Bene: %s", "<strong>%s</strong> new Good: %s": "<strong>%s</strong> nuovo Bene: %s",
"<strong>%s</strong> new Service: %s": "<strong>%s</strong> nuovo Servizio: %s", "<strong>%s</strong> new Service: %s": "<strong>%s</strong> nuovo Servizio: %s",
"OPEN PAGE": "APRI PAGINA", "OPEN PAGE": "APRI PAGINA",
"<strong>%s</strong> asked you for Friendship": "<strong>%s</strong> ti ha chiesto l'Amicizia", "<strong>%s</strong> asked you for Friendship": "<strong>%s</strong> ti ha chiesto l'Amicizia",
"<strong>%s</strong> accepted your Friendship": "<strong>%s</strong> ha accettato l'Amicizia", "<strong>%s</strong> accepted your Friendship": "<strong>%s</strong> ha accettato l'Amicizia",
"<strong>%s</strong> refused your Friendship": "<strong>%s</strong> ha rifiutato l'Amicizia", "<strong>%s</strong> refused your Friendship": "<strong>%s</strong> ha rifiutato l'Amicizia",
"✅ %s accepted your Friendship request !": "✅ %s ha accettato la tua richiesta di Amicizia !", "✅ %s accepted your Friendship request !": "✅ %s ha accettato la tua richiesta di Amicizia !",
"✅ You have accepted %s' Friendship request!": "✅ Hai accettato la richiesta di Amicizia di %s !", "✅ You have accepted %s' Friendship request!": "✅ Hai accettato la richiesta di Amicizia di %s !",
"GROUPS_ACCEPTED": "✅ Sei stato accettato da %s a far parte del Gruppo %s (da parte di %s)", "GROUPS_ACCEPTED": "✅ Sei stato accettato da %s a far parte del Gruppo %s (da parte di %s)",
"GROUPS_REFUSED": "❌ Ti è stato rifiutato l'accesso da %s a far parte del Gruppo %s. Se pensi sia un'errore, contatta l'amministratore del Gruppo.", "GROUPS_REFUSED": "❌ Ti è stato rifiutato l'accesso da %s a far parte del Gruppo %s. Se pensi sia un'errore, contatta l'amministratore del Gruppo.",
"GROUPS_REMOVED": "❌ l'utente %s è stato rimosso del Gruppo %s (da parte di %s)", "GROUPS_REMOVED": "❌ l'utente %s è stato rimosso del Gruppo %s (da parte di %s)",
"GROUPS_EXIT_USER": "❌ l'utente %s è uscito dal Gruppo %s", "GROUPS_EXIT_USER": "❌ l'utente %s è uscito dal Gruppo %s",
"GROUPS_EXIT_USER_TO_ME": "❌ Sei uscito dal Gruppo %s", "GROUPS_EXIT_USER_TO_ME": "❌ Sei uscito dal Gruppo %s",
"GROUPS_REMOVED_TO_ME": "❌ Sei stato rimosso dal Gruppo %s (da parte di %s)", "GROUPS_REMOVED_TO_ME": "❌ Sei stato rimosso dal Gruppo %s (da parte di %s)",
"ACCETTATO_NOTIFICA_ADMINS": "✅ l'utente %s è stato accettato a far parte del Gruppo %s (da parte di %s)", "ACCETTATO_NOTIFICA_ADMINS": "✅ l'utente %s è stato accettato a far parte del Gruppo %s (da parte di %s)",
"GROUP_REQUEST_TO_ENTER": "%s ha chiesto di entrare nel gruppo %s", "GROUP_REQUEST_TO_ENTER": "%s ha chiesto di entrare nel gruppo %s",
"GROUP_CREATED": "✅ %s ha creato un nuovo Gruppo chiamato %s", "GROUP_CREATED": "✅ %s ha creato un nuovo Gruppo chiamato %s",
"GROUP_REQUEST": "Richiesta di entrare nel Gruppo %s da parte di %s", "GROUP_REQUEST": "Richiesta di entrare nel Gruppo %s da parte di %s",
"GROUPS_ADDED_ADMIN_GROUP": "E' stato aggiunto %s come Amministratore del gruppo %s da parte di %s", "GROUPS_ADDED_ADMIN_GROUP": "E' stato aggiunto %s come Amministratore del gruppo %s da parte di %s",
"GROUPS_ADDED_ADMIN_GROUP_YOU": "Sei stato aggiunto come Amministratore del gruppo %s da parte di %s", "GROUPS_ADDED_ADMIN_GROUP_YOU": "Sei stato aggiunto come Amministratore del gruppo %s da parte di %s",
"GROUPS_REMOVED_ADMIN_GROUP": "E' stato rimosso l'incarico di Amministratore a %s del gruppo %s da parte di %s", "GROUPS_REMOVED_ADMIN_GROUP": "E' stato rimosso l'incarico di Amministratore a %s del gruppo %s da parte di %s",
"GROUPS_REMOVED_ADMIN_GROUP_YOU": "Ti è stato rimosso l'incarico di Amministratore del gruppo %s da parte di %s", "GROUPS_REMOVED_ADMIN_GROUP_YOU": "Ti è stato rimosso l'incarico di Amministratore del gruppo %s da parte di %s",
"RICHIESTA_BLOCCO_GRUPPO": "Richiesta di bloccare il Gruppo %s da parte di %s", "RICHIESTA_BLOCCO_GRUPPO": "Richiesta di bloccare il Gruppo %s da parte di %s",
"GRUPPO_ELIMINATO": "Il gruppo %s è stato eliminato da parte di %s", "GRUPPO_ELIMINATO": "Il gruppo %s è stato eliminato da parte di %s",
"FRIEND_REPORTED_TO_ME": "Sei stato segnalato da %s per comportamenti non idonei. Contatta %s per chiarimenti", "FRIEND_REPORTED_TO_ME": "Sei stato segnalato da %s per comportamenti non idonei. Contatta %s per chiarimenti",
"FRIEND_REPORTED": "E' stato segnalato %s da %s per comportamenti non idonei.", "FRIEND_REPORTED": "E' stato segnalato %s da %s per comportamenti non idonei.",
"FRIEND_REPORTED_YOU": "Hai segnalato %s per comportamenti non idonei.", "FRIEND_REPORTED_YOU": "Hai segnalato %s per comportamenti non idonei.",
"FRIEND_UNBLOCKED_TO_ME": "Sei stato riattivato da %s", "FRIEND_UNBLOCKED_TO_ME": "Sei stato riattivato da %s",
"FRIEND_UNBLOCKED": "E' stato riattivato %s da %s.", "FRIEND_UNBLOCKED": "E' stato riattivato %s da %s.",
"FRIEND_UNBLOCKED_YOU": "Hai riattivato %s.", "FRIEND_UNBLOCKED_YOU": "Hai riattivato %s.",
"CIRCUIT_ACCEPT_NEWENTRY": "❇️👥 🧍‍♂️ Accetta Ingresso nel Circuito %s:", "CIRCUIT_ACCEPT_NEWENTRY": "❇️👥 🧍‍♂️ Accetta Ingresso nel Circuito %s:",
"CIRCUIT_REQUEST_TO_ENTER": "%s ha chiesto di entrare nel circuito %s", "CIRCUIT_REQUEST_TO_ENTER": "%s ha chiesto di entrare nel circuito %s",
"CIRCUIT_CREATED": "✅ %s ha creato un nuovo Circuito chiamato %s", "CIRCUIT_CREATED": "✅ %s ha creato un nuovo Circuito chiamato %s",
"CIRCUIT_REQUEST": "Richiesta di entrare nel Circuito %s da parte di %s", "CIRCUIT_REQUEST": "Richiesta di entrare nel Circuito %s da parte di %s",
"CIRCUIT_ADDED_ADMIN": "E' stato aggiunto %s come Amministratore del circuito %s da parte di %s", "CIRCUIT_ADDED_ADMIN": "E' stato aggiunto %s come Amministratore del circuito %s da parte di %s",
"CIRCUIT_ADDED_ADMIN_YOU": "Sei stato aggiunto come Amministratore del circuito %s da parte di %s", "CIRCUIT_ADDED_ADMIN_YOU": "Sei stato aggiunto come Amministratore del circuito %s da parte di %s",
"CIRCUIT_REMOVED_ADMIN": "E' stato rimosso l'incarico di Amministratore a %s del circuito %s da parte di %s", "CIRCUIT_REMOVED_ADMIN": "E' stato rimosso l'incarico di Amministratore a %s del circuito %s da parte di %s",
"CIRCUIT_REMOVED_ADMIN_YOU": "Ti è stato rimosso l'incarico di Amministratore del circuito %s da parte di %s", "CIRCUIT_REMOVED_ADMIN_YOU": "Ti è stato rimosso l'incarico di Amministratore del circuito %s da parte di %s",
"RICHIESTA_BLOCCO_CIRCUIT": "Richiesta di bloccare il Circuito %s da parte di %s", "RICHIESTA_BLOCCO_CIRCUIT": "Richiesta di bloccare il Circuito %s da parte di %s",
"CIRCUIT_ELIMINATO": "Il circuito %s è stato eliminato da parte di %s", "CIRCUIT_ELIMINATO": "Il circuito %s è stato eliminato da parte di %s",
"ACCETTATO_NOTIFICA_ADMINS_CIRCUIT": "✅ l'utente %s è stato accettato a far parte del Circuito %s (da parte di %s)", "ACCETTATO_NOTIFICA_ADMINS_CIRCUIT": "✅ l'utente %s è stato accettato a far parte del Circuito %s (da parte di %s)",
"CIRCUIT_ACCEPTED": "✅ Sei stato accettato da %s a far parte del Circuito %s (da parte di %s)", "CIRCUIT_ACCEPTED": "✅ Sei stato accettato da %s a far parte del Circuito %s (da parte di %s)",
"CIRCUIT_REFUSED": "❌ Ti è stato rifiutato l'accesso da %s a far parte del Circuito %s. Se pensi sia un'errore, contatta l'amministratore del Circuito.", "CIRCUIT_REFUSED": "❌ Ti è stato rifiutato l'accesso da %s a far parte del Circuito %s. Se pensi sia un'errore, contatta l'amministratore del Circuito.",
"CIRCUIT_REMOVED": "❌ l'utente %s è stato rimosso del Circuito %s (da parte di %s)", "CIRCUIT_REMOVED": "❌ l'utente %s è stato rimosso del Circuito %s (da parte di %s)",
"CIRCUIT_REFUSED_TO_ME": "All'utente %s gli è stato rifiutato l'accesso a far parte del Circuito %s (da parte di %s).", "CIRCUIT_REFUSED_TO_ME": "All'utente %s gli è stato rifiutato l'accesso a far parte del Circuito %s (da parte di %s).",
"CIRCUIT_EXIT_USER": "❌ l'utente %s è uscito dal Circuito %s", "CIRCUIT_EXIT_USER": "❌ l'utente %s è uscito dal Circuito %s",
"CIRCUIT_EXIT_USER_TO_ME": "❌ Sei uscito dal Circuito %s", "CIRCUIT_EXIT_USER_TO_ME": "❌ Sei uscito dal Circuito %s",
"CIRCUIT_REMOVED_TO_ME": "❌ Sei stato rimosso dal Circuito %s (da parte di %s)", "CIRCUIT_REMOVED_TO_ME": "❌ Sei stato rimosso dal Circuito %s (da parte di %s)",
"CIRCUIT_SENDCOINSREQ": "%s ti sta inviando %s %s.", "CIRCUIT_SENDCOINSREQ": "%s ti sta inviando %s %s.",
"ID_CIRCUIT_COINS_ACCEPTED": "%s %s accettati da %s.", "CIRCUIT_SENDCOINSREQ_TO_ME": "Stai inviando %s %s a %s.",
"CIRCUIT_AMOUNT_EXCEED_FIDO": "L'importo supera la quantità massima concessa", "ID_CIRCUIT_COINS_ACCEPTED": "%s %s accettati da %s.",
"CIRCUIT_AMOUNT_EXCEED_QTAMAX": "L'importo supera la quantità massima che il destinatario può accumulare", "ID_CIRCUIT_COINS_ACCEPTED_TO_ME": "%s %s sono stati accettati da %s.",
"CIRCUIT_COINS_ALREADY_PROCESSED": "La richiesta è stata già processata. Stato %s", "ID_CIRCUIT_COINS_REFUSED": "%s %s rifiutati da %s.",
"STATUS_SENT": "Inviato", "ID_CIRCUIT_COINS_REFUSED_TO_ME": "%s %s rifiutati da %s.",
"STATUS_REFUSED": "Rifiutato" "CIRCUIT_AMOUNT_EXCEED_FIDO": "L'importo supera la quantità massima concessa",
"CIRCUIT_AMOUNT_EXCEED_QTAMAX": "L'importo supera la quantità massima che il destinatario può accumulare",
"CIRCUIT_COINS_ALREADY_PROCESSED": "La richiesta è stata già processata. Stato %s",
"STATUS_SENT": "Inviato",
"STATUS_REFUSED": "Rifiutato"
} }

69
src/server/models/account.js
View File

@@ -1,7 +1,7 @@
/* /*
Account is a User's single Circuit Account is a User's single Circuit
*/ */
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;
@@ -18,7 +18,10 @@ mongoose.plugin(schema => {
const AccountSchema = new Schema({ const AccountSchema = new Schema({
_id: { _id: {
type: Number, type: String,
default: function () {
return new ObjectID().toString()
}
}, },
idapp: { idapp: {
type: String, type: String,
@@ -27,7 +30,7 @@ const AccountSchema = new Schema({
type: String, type: String,
}, },
circuitId: { // ----- REF TO Circuit circuitId: { // ----- REF TO Circuit
type: Number, type: String,
}, },
name: { name: {
type: String, type: String,
@@ -72,16 +75,7 @@ AccountSchema.statics.findAllIdApp = async function(idapp) {
AccountSchema.pre('save', async function(next) { AccountSchema.pre('save', async function(next) {
if (this.isNew) { if (this.isNew) {
const myrec = await Account.findOne().limit(1).sort({_id: -1}); this._id = new ObjectID().toString()
if (!!myrec) {
if (myrec._doc._id === 0)
this._id = 1;
else
this._id = myrec._doc._id + 1;
} else {
this._id = 1;
}
} }
next(); next();
@@ -130,6 +124,14 @@ AccountSchema.statics.addtoSaldo = async function(id, amount) {
return null; return null;
}; };
AccountSchema.pre('save', async function(next) {
if (this.isNew) {
this.date_created = new Date();
}
next();
});
AccountSchema.statics.getAccountByUsernameAndCircuitId = async function(idapp, username, {circuitId, circuitName}, createifnotexist) { AccountSchema.statics.getAccountByUsernameAndCircuitId = async function(idapp, username, {circuitId, circuitName}, createifnotexist) {
const Account = this; const Account = this;
@@ -152,26 +154,35 @@ AccountSchema.statics.getAccountByUsernameAndCircuitId = async function(idapp, u
myquery.circuitName = circuitName; myquery.circuitName = circuitName;
} }
const mycircuit = await Circuit.getCircuitById(circuitId); let mycircuit;
if (circuitId)
mycircuit = await Circuit.getCircuitById(circuitId);
else
mycircuit = await Circuit.findOne({name: circuitName}).lean();
let myaccount = await Account.findOne(myquery).lean();
if (!myaccount && createifnotexist) { if (mycircuit) {
myaccount = new Account({ let myaccount = await Account.findOne(myquery).lean();
idapp,
username,
circuitId: mycircuit._id,
deperibile: false,
fidoConcesso: mycircuit.fido_scoperto_default,
qta_maxConcessa: mycircuit.qta_max_default,
importo_iniziale: 0,
saldo: 0,
});
return await myaccount.save(); if (!myaccount && createifnotexist) {
myaccount = new Account({
_id: new ObjectID().toString(),
idapp,
username,
circuitId: mycircuit._id,
deperibile: false,
fidoConcesso: mycircuit.fido_scoperto_default,
qta_maxConcessa: mycircuit.qta_max_default,
importo_iniziale: 0,
saldo: 0,
});
return await myaccount.save();
}
return myaccount;
} }
return null;
return myaccount;
} catch (e) { } catch (e) {
console.error('error', e); console.error('error', e);

2
src/server/models/adtype.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/adtypegood.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/booking.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/bot.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/calzoom.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/cart.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const shared_consts = require('../tools/shared_nodejs'); const shared_consts = require('../tools/shared_nodejs');

2
src/server/models/cash.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/cashCategory.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/cashSubCategory.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/category.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/catgrp.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/cfgserver.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

27
src/server/models/circuit.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;
@@ -17,7 +17,10 @@ mongoose.plugin(schema => {
const CircuitSchema = new Schema({ const CircuitSchema = new Schema({
_id: { _id: {
type: Number, type: String,
default: function () {
return new ObjectID().toString()
}
}, },
idapp: { idapp: {
type: String, type: String,
@@ -165,16 +168,7 @@ const CircuitSchema = new Schema({
CircuitSchema.pre('save', async function(next) { CircuitSchema.pre('save', async function(next) {
if (this.isNew) { if (this.isNew) {
const myrec = await Circuit.findOne().limit(1).sort({_id: -1}); this._id = new ObjectID().toString();
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(); this.date_created = new Date();
} }
@@ -210,7 +204,7 @@ CircuitSchema.statics.executeQueryTable = function(idapp, params) {
CircuitSchema.statics.getWhatToShow = function(idapp, username) { CircuitSchema.statics.getWhatToShow = function(idapp, username) {
// FOR ME, PERMIT ALL // FOR ME, PERMIT ALL
return { return {
circuitId: 1, _id: 1,
groupnameId: 1, groupnameId: 1,
path: 1, path: 1,
name: 1, name: 1,
@@ -245,7 +239,6 @@ CircuitSchema.statics.removeAdminOfMyCircuit = async function(idapp, username, n
CircuitSchema.statics.getWhatToShow_Unknown = function(idapp, username) { CircuitSchema.statics.getWhatToShow_Unknown = function(idapp, username) {
return { return {
circuitId: 1,
groupnameId: 1, groupnameId: 1,
path: 1, path: 1,
name: 1, name: 1,
@@ -271,7 +264,7 @@ CircuitSchema.statics.getWhatToShow_Unknown = function(idapp, username) {
}; };
}; };
CircuitSchema.statics.getCircuitsByUsername = async function(idapp, username, req) { CircuitSchema.statics.getCircuitsByUsername = async function(idapp, username, user) {
try { try {
const {User} = require('../models/user'); const {User} = require('../models/user');
@@ -327,7 +320,7 @@ CircuitSchema.statics.getCircuitsByUsername = async function(idapp, username, re
asked_circuits, asked_circuits,
refused_circuits, refused_circuits,
manage_mycircuits, manage_mycircuits,
mycircuits: req.user.profile.mycircuits, mycircuits: user.profile.mycircuits,
}; };
} catch (e) { } catch (e) {
@@ -381,7 +374,7 @@ CircuitSchema.statics.getCircuitByName = async function(idapp, name) {
CircuitSchema.statics.getCircuitById = async function(circuitId) { CircuitSchema.statics.getCircuitById = async function(circuitId) {
const myfind = { const myfind = {
circuitId, _id: circuitId,
}; };
try { try {

2
src/server/models/city.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const escapeStringRegexp = require('escape-string-regexp'); const escapeStringRegexp = require('escape-string-regexp');

2
src/server/models/contribtype.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/department.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/discipline.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

4
src/server/models/extralist.js
View File

@@ -1,5 +1,5 @@
var bcrypt = require('bcryptjs'); var bcrypt = require('bcryptjs');
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const validator = require('validator'); const validator = require('validator');
const jwt = require('jsonwebtoken'); const jwt = require('jsonwebtoken');
const _ = require('lodash'); const _ = require('lodash');
@@ -16,7 +16,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true schema.options.usePushEach = true
}); });
mongoose.set('debug', process.env.DEBUG); mongoose.set('debug', false);
var ExtraListSchema = new mongoose.Schema({ var ExtraListSchema = new mongoose.Schema({
idapp: { idapp: {

2
src/server/models/gallery.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/good.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

4
src/server/models/graduatoria.js
View File

@@ -1,5 +1,5 @@
const bcrypt = require('bcryptjs'); const bcrypt = require('bcryptjs');
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const validator = require('validator'); const validator = require('validator');
const jwt = require('jsonwebtoken'); const jwt = require('jsonwebtoken');
const _ = require('lodash'); const _ = require('lodash');
@@ -20,7 +20,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true schema.options.usePushEach = true
}); });
mongoose.set('debug', process.env.DEBUG); mongoose.set('debug', false);
const GraduatoriaSchema = new mongoose.Schema({ const GraduatoriaSchema = new mongoose.Schema({
idapp: { idapp: {

2
src/server/models/group.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/hours.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/iscrittiConacreis.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/level.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/mailinglist.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

33
src/server/models/movement.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;
@@ -16,7 +16,10 @@ mongoose.plugin(schema => {
const MovementSchema = new Schema({ const MovementSchema = new Schema({
_id: { _id: {
type: Number, type: String,
default: function () {
return new ObjectID().toString()
}
}, },
idapp: { idapp: {
type: String, type: String,
@@ -25,10 +28,10 @@ const MovementSchema = new Schema({
type: Date, type: Date,
}, },
accountFromId: { accountFromId: {
type: Number, type: String,
}, },
accountToId: { accountToId: {
type: Number, type: String,
}, },
causal_table: { causal_table: {
type: String, type: String,
@@ -62,16 +65,8 @@ MovementSchema.statics.findAllIdApp = async function(idapp) {
MovementSchema.pre('save', async function(next) { MovementSchema.pre('save', async function(next) {
if (this.isNew) { if (this.isNew) {
const myrec = await Movement.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.transactionDate = new Date();
this._id = 1;
}
} }
next(); next();
@@ -94,6 +89,7 @@ MovementSchema.statics.addMov = async function(idapp, accountFromId, accountToId
try { try {
let mymov = Movement( let mymov = Movement(
{ {
_id: new ObjectID().toString(),
idapp, idapp,
transactionDate: new Date(), transactionDate: new Date(),
accountFromId: accountFromId._id, accountFromId: accountFromId._id,
@@ -105,12 +101,15 @@ MovementSchema.statics.addMov = async function(idapp, accountFromId, accountToId
}, },
); );
// Update saldo dell'Account const rismov = await mymov.save();
Account.addtoSaldo(accountToId, amount); if (rismov) {
// Update saldo dell'Account
Account.addtoSaldo(accountToId, amount);
Account.addtoSaldo(accountFromId, -amount); Account.addtoSaldo(accountFromId, -amount);
return await mymov.save(); return rismov;
}
} catch (e) { } catch (e) {
console.error('Error in addMov', e.message); console.error('Error in addMov', e.message);
} }

2
src/server/models/msg_template.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/mybacheca.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/myevent.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/mygood.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/mygroup.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/myhosp.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/mypage.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/myskill.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/newstosent.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/operator.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/opzemail.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/order.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/orderscart.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const shared_consts = require('../tools/shared_nodejs'); const shared_consts = require('../tools/shared_nodejs');

2
src/server/models/paymenttype.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/permission.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/producer.js
View File

@@ -1,4 +1,4 @@
mongoose = require('mongoose').set('debug', process.env.DEBUG) mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/product.js
View File

@@ -1,4 +1,4 @@
mongoose = require('mongoose').set('debug', process.env.DEBUG) mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

4
src/server/models/project.js
View File

@@ -1,4 +1,4 @@
var mongoose = require('mongoose').set('debug', process.env.DEBUG) var mongoose = require('mongoose').set('debug', false)
const _ = require('lodash'); const _ = require('lodash');
@@ -16,7 +16,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true schema.options.usePushEach = true
}); });
mongoose.set('debug', process.env.DEBUG); mongoose.set('debug', false);
var ProjectSchema = new mongoose.Schema({ var ProjectSchema = new mongoose.Schema({
idapp: { idapp: {

2
src/server/models/province.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const escapeStringRegexp = require('escape-string-regexp'); const escapeStringRegexp = require('escape-string-regexp');

2
src/server/models/sector.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/sectorgood.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/sendmsg.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

43
src/server/models/sendnotif.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;
@@ -84,7 +84,6 @@ const sendNotifSchema = new Schema({
options: { options: {
type: Array, type: Array,
}, },
}); });
sendNotifSchema.statics.setNotifAsRead = function(idapp, username, idnotif) { sendNotifSchema.statics.setNotifAsRead = function(idapp, username, idnotif) {
@@ -326,10 +325,27 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = function(recnotif) {
recnotif.paramsObj.extrarec.symbol); recnotif.paramsObj.extrarec.symbol);
tag = 'sendcoin'; tag = 'sendcoin';
recnotif.openUrl = '/circuit/' + recnotif.paramsObj.path; //++Todo: dove lo mando ? recnotif.openUrl = '/circuit/' + recnotif.paramsObj.path; //++Todo: dove lo mando ?
} else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ_SENT) {
newdescr = i18n.__('CIRCUIT_SENDCOINSREQ_TO_ME', recnotif.paramsObj.extrarec.qty.toString(),
recnotif.paramsObj.extrarec.symbol, recnotif.paramsObj.extrarec.dest);
tag = 'sendcoin';
recnotif.openUrl = '/circuit/' + recnotif.paramsObj.path; //++Todo: dove lo mando ?
} else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_ACCEPTED) { } else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_ACCEPTED) {
newdescr = i18n.__('ID_CIRCUIT_COINS_ACCEPTED', recnotif.paramsObj.extrarec.qty.toString(), recnotif.paramsObj.extrarec.symbol, newdescr = i18n.__('ID_CIRCUIT_COINS_ACCEPTED', recnotif.paramsObj.extrarec.qty.toString(), recnotif.paramsObj.extrarec.symbol,
recnotif.paramsObj.username_action); recnotif.paramsObj.username_action);
tag = 'sendcoin'; tag = 'sendcoin';
} else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_ACCEPTED_SENT) {
newdescr = i18n.__('ID_CIRCUIT_COINS_ACCEPTED_TO_ME', recnotif.paramsObj.extrarec.qty.toString(), recnotif.paramsObj.extrarec.symbol,
recnotif.paramsObj.extrarec.dest);
tag = 'sendcoin';
} else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED) {
newdescr = i18n.__('ID_CIRCUIT_COINS_REFUSED', recnotif.paramsObj.extrarec.qty.toString(), recnotif.paramsObj.extrarec.symbol,
recnotif.paramsObj.username_action);
tag = 'sendcoin';
} else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED_SENT) {
newdescr = i18n.__('ID_CIRCUIT_COINS_REFUSED_TO_ME', recnotif.paramsObj.extrarec.qty.toString(), recnotif.paramsObj.extrarec.symbol,
recnotif.paramsObj.extrarec.dest);
tag = 'sendcoin';
} }
} }
@@ -469,7 +485,9 @@ sendNotifSchema.statics.updateStatusAndDescr = async function(myrecnotif, onlysa
newstatus = shared_consts.GroupsNotifs.STATUS_GROUPS_DELETED; newstatus = shared_consts.GroupsNotifs.STATUS_GROUPS_DELETED;
} }
} else if (myrecnotif.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS) { } else if (myrecnotif.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS) {
idnotiftosearch = myrecnotif.paramsObj.extrarec.notifId; if (myrecnotif.paramsObj.extrarec)
idnotiftosearch = myrecnotif.paramsObj.extrarec.notifId;
typeidsearch = shared_consts.TypeNotifs.ID_CIRCUIT_NEW_REC; typeidsearch = shared_consts.TypeNotifs.ID_CIRCUIT_NEW_REC;
dest = myrecnotif.dest; dest = myrecnotif.dest;
if (myrecnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_ACCEPTED) { if (myrecnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_ACCEPTED) {
@@ -490,6 +508,14 @@ sendNotifSchema.statics.updateStatusAndDescr = async function(myrecnotif, onlysa
} else if (myrecnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED) { } else if (myrecnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED) {
typeidsearch = shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ; typeidsearch = shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ;
newstatus = shared_consts.CircuitsNotif.STATUS_COINS_REFUSED; newstatus = shared_consts.CircuitsNotif.STATUS_COINS_REFUSED;
} else if (myrecnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_ACCEPTED_SENT) {
if (myrecnotif.paramsObj.extrarec.hasOwnProperty('notifIdToUpdate'))
idnotiftosearch = myrecnotif.paramsObj.extrarec.notifIdToUpdate;
newstatus = shared_consts.CircuitsNotif.STATUS_COINS_ACCEPTED_SENT;
} else if (myrecnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED_SENT) {
if (myrecnotif.paramsObj.extrarec.hasOwnProperty('notifIdToUpdate'))
idnotiftosearch = myrecnotif.paramsObj.extrarec.notifIdToUpdate;
newstatus = shared_consts.CircuitsNotif.STATUS_COINS_REFUSED_SENT;
} }
} }
@@ -663,12 +689,11 @@ sendNotifSchema.statics.createNewNotifToSingleUser = async function(req, res, pa
myrecnotif = this.getExtraParam(myrecnotif, paramsObj); myrecnotif = this.getExtraParam(myrecnotif, paramsObj);
await SendNotif.sendToSingleUserDest(myrecnotif, req, res, onlysave); return await SendNotif.sendToSingleUserDest(myrecnotif, req, res, onlysave);
return true;
} catch (e) { } catch (e) {
console.error('createNewNotification', e); console.error('createNewNotification', e);
return false; return null;
} }
}; };
@@ -773,7 +798,7 @@ sendNotifSchema.statics.sendToTheDestinations = async function(myrecnotifpass, r
if (send) { if (send) {
let myrecnotif = new SendNotif(myrecnotifpass); let myrecnotif = new SendNotif(myrecnotifpass);
myrecnotif.dest = user.username; myrecnotif.dest = user.username;
await SendNotif.saveAndSendNotif(myrecnotif, req, res, user); return await SendNotif.saveAndSendNotif(myrecnotif, req, res, user);
} }
} }
} }
@@ -795,9 +820,9 @@ sendNotifSchema.statics.sendToSingleUserDest = async function(myrecnotif, req, r
: myrecnotif.dest; : myrecnotif.dest;
if (onlysave) { if (onlysave) {
await SendNotif.saveNotif(myrecnotif); return await SendNotif.saveNotif(myrecnotif);
} else { } else {
await SendNotif.saveAndSendNotif(myrecnotif, req, res, null); return await SendNotif.saveAndSendNotif(myrecnotif, req, res, null);
} }
} catch (e) { } catch (e) {

2
src/server/models/settings.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/sharewithus.js
View File

@@ -1,4 +1,4 @@
mongoose = require('mongoose').set('debug', process.env.DEBUG) mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

4
src/server/models/site.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');
@@ -6,7 +6,7 @@ const tools = require('../tools/general');
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;
mongoose.level = "F"; mongoose.level = "F";
mongoose.set('debug', process.env.DEBUG); mongoose.set('debug', false);
// Resolving error Unknown modifier: $pushAll // Resolving error Unknown modifier: $pushAll
mongoose.plugin(schema => { mongoose.plugin(schema => {

2
src/server/models/skill.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/statusSkill.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/storehouse.js
View File

@@ -1,4 +1,4 @@
mongoose = require('mongoose').set('debug', process.env.DEBUG) mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/models/subscribers.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/subskill.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;

2
src/server/models/templemail.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

4
src/server/models/todo.js
View File

@@ -1,4 +1,4 @@
var mongoose = require('mongoose').set('debug', process.env.DEBUG) var mongoose = require('mongoose').set('debug', false)
const _ = require('lodash'); const _ = require('lodash');
@@ -18,7 +18,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true schema.options.usePushEach = true
}); });
mongoose.set('debug', process.env.DEBUG); mongoose.set('debug', false);
var TodoSchema = new mongoose.Schema({ var TodoSchema = new mongoose.Schema({
userId: { userId: {

33
src/server/models/user.js
View File

@@ -1,5 +1,5 @@
const bcrypt = require('bcryptjs'); const bcrypt = require('bcryptjs');
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const validator = require('validator'); const validator = require('validator');
const jwt = require('jsonwebtoken'); const jwt = require('jsonwebtoken');
const _ = require('lodash'); const _ = require('lodash');
@@ -32,7 +32,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true; schema.options.usePushEach = true;
}); });
mongoose.set('debug', process.env.DEBUG); mongoose.set('debug', false);
const UserSchema = new mongoose.Schema({ const UserSchema = new mongoose.Schema({
userId: { userId: {
@@ -2107,6 +2107,9 @@ UserSchema.statics.setCircuitCmd = async function(idapp, usernameOrig, circuitna
// Elimina eventualmente se era bloccato: // Elimina eventualmente se era bloccato:
update = {$pull: {refused_users: {username: {$in: [usernameOrig]}}}}; update = {$pull: {refused_users: {username: {$in: [usernameOrig]}}}};
await Circuit.updateOne({idapp, name: circuitname}, update); await Circuit.updateOne({idapp, name: circuitname}, update);
await Account.createAccount(idapp, usernameOrig, circuitname);
} else { } else {
ris = false; ris = false;
} }
@@ -2137,7 +2140,6 @@ UserSchema.statics.setCircuitCmd = async function(idapp, usernameOrig, circuitna
}; };
ris = await Circuit.updateOne({idapp, name: circuitname}, update); ris = await Circuit.updateOne({idapp, name: circuitname}, update);
await Account.createAccount(idapp, usernameOrig, circuitname);
} }
if (ris) { if (ris) {
// Invia una notifica alla persona // Invia una notifica alla persona
@@ -2215,7 +2217,7 @@ UserSchema.statics.setCircuitCmd = async function(idapp, usernameOrig, circuitna
ris = ris2; ris = ris2;
} else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_ACCEPT) { } else if ((cmd === shared_consts.CIRCUITCMD.SENDCOINS_ACCEPT) || (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REFUSE)) {
// Before to accept, I see if it's already set ! // Before to accept, I see if it's already set !
let ris2 = { let ris2 = {
@@ -2231,7 +2233,11 @@ UserSchema.statics.setCircuitCmd = async function(idapp, usernameOrig, circuitna
risStatus = i18n.__('STATUS_REFUSED'); risStatus = i18n.__('STATUS_REFUSED');
} }
if (!await SendNotif.checkIfCoinsAlreadySent(extrarec.notifId)) { if (!await SendNotif.checkIfCoinsAlreadySent(extrarec.notifId)) {
ris2 = await Circuit.sendCoins(false, idapp, usernameOrig, extrarec); if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_ACCEPT) {
ris2 = await Circuit.sendCoins(false, idapp, usernameOrig, extrarec);
} else {
ris2.cansend = true;
}
if (ris2.cansend) { if (ris2.cansend) {
// Invia una notifica di moneta alla persona // Invia una notifica di moneta alla persona
@@ -2239,6 +2245,8 @@ UserSchema.statics.setCircuitCmd = async function(idapp, usernameOrig, circuitna
} }
ris2.recnotif = await SendNotif.getRecNotif(extrarec.notifId); ris2.recnotif = await SendNotif.getRecNotif(extrarec.notifId);
ris2.user = await User.getExtraInfoByUsername(idapp, username_action);
} else { } else {
ris2.cansend = false; ris2.cansend = false;
@@ -3734,7 +3742,18 @@ UserSchema.statics.DbOp = async function(idapp, mydata) {
}; };
UserSchema.statics.addExtraInfo = async function(idapp, recUser, req) { UserSchema.statics.getExtraInfoByUsername = async function(idapp, username) {
const User = this;
let myuser = await User.findOne({idapp, username});
if (myuser) {
myuserextra = await User.addExtraInfo(idapp, myuser);
}
return myuser._doc;
};
UserSchema.statics.addExtraInfo = async function(idapp, recUser) {
try { try {
const listSentMyRequestFriends = await User.find({ const listSentMyRequestFriends = await User.find({
@@ -3795,7 +3814,7 @@ UserSchema.statics.addExtraInfo = async function(idapp, recUser, req) {
// Circuit> // Circuit>
const circuitobj = await Circuit.getCircuitsByUsername(idapp, recUser.username, req); const circuitobj = await Circuit.getCircuitsByUsername(idapp, recUser.username, recUser);
const useraccounts = await Account.getUserAccounts(idapp, recUser.username); const useraccounts = await Account.getUserAccounts(idapp, recUser.username);

2
src/server/models/variant.js
View File

@@ -1,5 +1,5 @@
var mongoose = require('mongoose').set('debug', process.env.DEBUG) var mongoose = require('mongoose').set('debug', false)
var variantSchema = mongoose.Schema({ var variantSchema = mongoose.Schema({
productID: { productID: {

2
src/server/models/where.js
View File

@@ -1,4 +1,4 @@
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema; const Schema = mongoose.Schema;
const tools = require('../tools/general'); const tools = require('../tools/general');

2
src/server/populate/populate.js
View File

@@ -2,7 +2,7 @@
const tools = require('../tools/general'); const tools = require('../tools/general');
const Path = require('path'); const Path = require('path');
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
const shared_consts = require('../tools/shared_nodejs'); const shared_consts = require('../tools/shared_nodejs');

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

@@ -1,6 +1,6 @@
const express = require('express'); const express = require('express');
const router = express.Router(); 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 {CfgServer} = require('../models/cfgserver');
const shared_consts = require('../tools/shared_nodejs'); 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 Subscription = mongoose.model('subscribers');
//const { ListaIngresso } = require('../../models/listaingresso'); //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 {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 {User} = require('../models/user');
const {Circuit} = require('../models/circuit'); 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 {ListaIngresso} = require('../models/listaingresso');
const {Graduatoria} = require('../models/graduatoria'); 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 {CfgServer} = require('../models/cfgserver');
// const uuidv4 = require('uuid/v4'); // I chose v4 ‒ you can select others // 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; 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') { } else if (params.table === 'hours') {
@@ -347,6 +348,8 @@ router.post('/settable', authenticate, async (req, res) => {
mytablerec.date_updated = new Date(); mytablerec.date_updated = new Date();
} }
console.log('mydata',mydata);
return await mytablerec.save(). return await mytablerec.save().
then(async (rec) => { then(async (rec) => {
@@ -1237,7 +1240,7 @@ function load(req, res, version) {
let myuserextra = null; let myuserextra = null;
if (req.user) { if (req.user) {
// askedfriends = User.getAskedFriendsByUsername(idapp, req.user.username); // askedfriends = User.getAskedFriendsByUsername(idapp, req.user.username);
myuserextra = User.addExtraInfo(idapp, req.user, req); myuserextra = User.addExtraInfo(idapp, req.user);
} }
return Promise.all([ 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 { authenticate } = require('../middleware/authenticate');
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
// POST /iscritti_conacreis // 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 {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 Subscription = mongoose.model('subscribers');
const _ = require('lodash'); 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 {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 Subscription = mongoose.model('subscribers');
const _ = require('lodash'); 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 {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 {User} = require('../models/user');
const {MyGroup} = require('../models/mygroup'); 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 {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 Subscription = mongoose.model('subscribers');
const _ = require('lodash'); 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 { 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 Subscription = mongoose.model('subscribers');
const _ = require('lodash'); 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'); 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 { Project } = require('../models/project');
const { Todo } = require('../models/todo'); const { Todo } = require('../models/todo');

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

@@ -1,6 +1,6 @@
const express = require('express'); const express = require('express');
const router = express.Router(); 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 Subscription = mongoose.model('subscribers');
// const q = require('q'); // const q = require('q');
const webpush = require('web-push'); 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'); 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 { Project } = require('../models/project');
const { Todo } = require('../models/todo'); 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 { 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 { User } = require('../models/user');
// const { Nave } = require('../models/nave'); // const { Nave } = require('../models/nave');

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

@@ -1,6 +1,6 @@
const express = require('express'); const express = require('express');
const router = express.Router(); 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 Subscription = mongoose.model('subscribers');
const tools = require('../tools/general'); 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 { 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'); const Subscription = mongoose.model('subscribers');
var { Todo } = require('../models/todo'); 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 {MyGroup} = require('../models/mygroup');
const {Circuit} = require('../models/circuit'); 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'); const Subscription = mongoose.model('subscribers');
@@ -644,7 +644,7 @@ router.post('/circuits', authenticate, (req, res) => {
idapp = req.body.idapp; idapp = req.body.idapp;
locale = req.body.locale; locale = req.body.locale;
return Circuit.getCircuitsByUsername(idapp, username, req).then((ris) => { return Circuit.getCircuitsByUsername(idapp, username, req.user).then((ris) => {
res.send(ris); res.send(ris);
}).catch((e) => { }).catch((e) => {
tools.mylog('ERRORE IN circuits: ' + e.message); 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). return await User.setCircuitCmd(idapp, usernameOrig, circuitname, cmd, value, usernameLogged, extrarec).
then((ris) => { then(async (ris) => {
// Check if ìs a Notif to read // Check if ìs a Notif to read
const idnotif = extrarec['idnotif'] ? extrarec['idnotif'] : ''; if (extrarec && extrarec.hasOwnProperty('idnotif')) {
SendNotif.setNotifAsRead(idapp, usernameOrig, idnotif); const idnotif = extrarec['idnotif'] ? extrarec['idnotif'] : '';
await SendNotif.setNotifAsRead(idapp, usernameOrig, idnotif);
}
return res.send(ris); return res.send(ris);
}). }).

4
src/server/server.js
View File

@@ -63,9 +63,9 @@ const tools = require('./tools/general');
const shared_consts = require('./tools/shared_nodejs'); const shared_consts = require('./tools/shared_nodejs');
var mongoose = require('mongoose').set('debug', process.env.DEBUG); var mongoose = require('mongoose').set('debug', false);
mongoose.set('debug', process.env.DEBUG); mongoose.set('debug', false);
const {CfgServer} = require('./models/cfgserver'); const {CfgServer} = require('./models/cfgserver');
const {ObjectID} = require('mongodb'); const {ObjectID} = require('mongodb');

10
src/server/telegram/telegrambot.js
View File

@@ -822,6 +822,8 @@ const MyTelegramBot = {
try { try {
const cl = getclTelegByidapp(idapp); const cl = getclTelegByidapp(idapp);
if (!cl)
return false;
const langdest = myuser.lang; const langdest = myuser.lang;
const telegid = myuser.profile.teleg_id; const telegid = myuser.profile.teleg_id;
@@ -908,6 +910,8 @@ const MyTelegramBot = {
try { try {
const cl = getclTelegByidapp(idapp); const cl = getclTelegByidapp(idapp);
if (!cl)
return false;
const {SendNotif} = require('../models/sendnotif'); const {SendNotif} = require('../models/sendnotif');
@@ -949,7 +953,7 @@ const MyTelegramBot = {
} }
if (sendnotif) { if (sendnotif) {
const req = this.getReqByPar(idapp, username); const req = tools.getReqByPar(idapp, username);
// CREATE NOTIFICATION IN TABLE SENDNOTIF // CREATE NOTIFICATION IN TABLE SENDNOTIF
await SendNotif.createNewNotifToSingleUser(req, null, paramsObj, true, typedir, typeid); await SendNotif.createNewNotifToSingleUser(req, null, paramsObj, true, typedir, typeid);
} }
@@ -3820,7 +3824,7 @@ if (true) {
username: dataarr[1] ? dataarr[1] : '', username: dataarr[1] ? dataarr[1] : '',
userDest: dataarr[2] ? dataarr[2] : '', userDest: dataarr[2] ? dataarr[2] : '',
groupId: dataarr[3] ? parseInt(dataarr[3]) : '', groupId: dataarr[3] ? parseInt(dataarr[3]) : '',
circuitId: dataarr[4] ? parseInt(dataarr[4]) : '', circuitId: dataarr[4] ? dataarr[4] : '',
}; };
} }
} }
@@ -3942,7 +3946,7 @@ if (true) {
if (circuit) { if (circuit) {
cmd = shared_consts.CIRCUITCMD.SET; cmd = shared_consts.CIRCUITCMD.SET;
const foundIfAlreadyCircuit = await User.ifAlreadyInCircuit(user.idapp, data.username, circuit.name); constF foundIfAlreadyCircuit = await User.ifAlreadyInCircuit(user.idapp, data.username, circuit.name);
if (!foundIfAlreadyCircuit) { if (!foundIfAlreadyCircuit) {
// Aggiungilo nel Circuito // Aggiungilo nel Circuito

2
src/server/tests/seed/seed.js
View File

@@ -84,7 +84,7 @@ const userjson = JSON.stringify(users[0]);
const mynewID = new ObjectID(); const mynewID = new ObjectID();
const mongoose = require('mongoose').set('debug', process.env.DEBUG) const mongoose = require('mongoose').set('debug', false)
var ObjectId = mongoose.Types.ObjectId; var ObjectId = mongoose.Types.ObjectId;

63
src/server/tools/general.js
View File

@@ -20,7 +20,7 @@ const {ObjectID} = require('mongodb');
const shared_consts = require('./shared_nodejs'); const shared_consts = require('./shared_nodejs');
const mongoose = require('mongoose').set('debug', process.env.DEBUG); const mongoose = require('mongoose').set('debug', false);
const Subscription = mongoose.model('subscribers'); const Subscription = mongoose.model('subscribers');
const server_constants = require('./server_constants'); const server_constants = require('./server_constants');
@@ -855,7 +855,7 @@ module.exports = {
return true; return true;
} }
}); });
}catch (e) { } catch (e) {
console.error('sendNotificationToUser', e.message); console.error('sendNotificationToUser', e.message);
} }
@@ -1070,10 +1070,16 @@ module.exports = {
typeid = shared_consts.TypeNotifs.ID_CIRCUIT_REMOVED_ADMIN; typeid = shared_consts.TypeNotifs.ID_CIRCUIT_REMOVED_ADMIN;
} else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REQ) { } else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REQ) {
typeid = shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ; typeid = shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ;
} else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REQ_SENT) {
typeid = shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ_SENT;
} else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_ACCEPT) { } else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_ACCEPT) {
typeid = shared_consts.TypeNotifs.ID_CIRCUIT_COINS_ACCEPTED; typeid = shared_consts.TypeNotifs.ID_CIRCUIT_COINS_ACCEPTED;
} else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_ACCEPT_SENT) {
typeid = shared_consts.TypeNotifs.ID_CIRCUIT_COINS_ACCEPTED_SENT;
} else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REFUSE) { } else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REFUSE) {
typeid = shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED; typeid = shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED;
} else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REFUSE_SENT) {
typeid = shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED_SENT;
} }
} }
@@ -1143,11 +1149,31 @@ module.exports = {
let ris = false; let ris = false;
let inviato = false; let inviato = false;
if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REQ || cmd === shared_consts.CIRCUITCMD.SENDCOINS_ACCEPT || cmd ===
shared_consts.CIRCUITCMD.SENDCOINS_REFUSE) {
if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REQ || cmd === shared_consts.CIRCUITCMD.SENDCOINS_ACCEPT || cmd === shared_consts.CIRCUITCMD.SENDCOINS_REFUSE ) { let recnotif = null;
ris = await this.sendNotifCircuitByUsername(cmd, idapp, usernameOrig, extrarec.dest, username_action, circuitname, circuit.path, null, if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REQ) {
recnotif = await this.sendNotifCircuitByUsername(shared_consts.CIRCUITCMD.SENDCOINS_REQ_SENT, idapp, extrarec.dest, usernameOrig, username_action, circuitname, circuit.path, null,
false, '', extrarec);
} else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_ACCEPT) {
await this.sendNotifCircuitByUsername(shared_consts.CIRCUITCMD.SENDCOINS_ACCEPT_SENT, idapp, extrarec.dest, usernameOrig, username_action, circuitname, circuit.path, null,
false, '', extrarec);
} else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REFUSE) {
await this.sendNotifCircuitByUsername(shared_consts.CIRCUITCMD.SENDCOINS_REFUSE_SENT, idapp, extrarec.dest, usernameOrig, username_action, circuitname, circuit.path, null,
false, '', extrarec);
}
if (recnotif)
extrarec.notifIdToUpdate = recnotif._id;
ris = await this.sendNotifCircuitByUsername(cmd, idapp, usernameOrig, extrarec.dest, username_action, circuitname, circuit.path,
null,
false, '', extrarec); false, '', extrarec);
extrarec.notifIdToUpdate = '';
if (ris) if (ris)
inviato = true; inviato = true;
// ++Todo: Inviare anche agli Admin ?! // ++Todo: Inviare anche agli Admin ?!
@@ -1170,7 +1196,8 @@ module.exports = {
if (!giainviato && cmd !== shared_consts.CIRCUITCMD.REQ) { if (!giainviato && cmd !== shared_consts.CIRCUITCMD.REQ) {
// SEND TO THE USER DEST THE NOTIFICATION // SEND TO THE USER DEST THE NOTIFICATION
ris = await this.sendNotifCircuitByUsername(cmd, idapp, usernameOrig, usernameOrig, username_action, circuitname, circuit.path, null, ris = await this.sendNotifCircuitByUsername(cmd, idapp, usernameOrig, usernameOrig, username_action, circuitname, circuit.path,
null,
false, '', extrarec); false, '', extrarec);
if (ris) if (ris)
inviato = true; inviato = true;
@@ -1581,7 +1608,7 @@ module.exports = {
myquery = {}; myquery = {};
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)) {
myquery = { myquery = {
$match: { $match: {
$expr: { $expr: {
@@ -1911,19 +1938,19 @@ module.exports = {
query.push(...myquery); query.push(...myquery);
/*} else if (params.table === 'circuits') { /*} else if (params.table === 'circuits') {
const qacirc = this.getLookup( const qacirc = this.getLookup(
{ {
lk_tab: 'accounts', lk_tab: 'accounts',
lk_LF: 'circuitId', lk_LF: 'circuitId',
lk_FF: '_id', lk_FF: '_id',
lk_as: 'account', lk_as: 'account',
}, 0, { }, 0, {
'acc': 1, 'acc': 1,
}); });
if (qacirc) query = [...query, ...qacirc]; if (qacirc) query = [...query, ...qacirc];
*/ */
} }
if (newvers) { if (newvers) {

23
src/server/tools/shared_nodejs.js
View File

@@ -73,13 +73,16 @@ module.exports = {
SET: 2001, SET: 2001,
REMOVE_FROM_MYLIST: 2144, REMOVE_FROM_MYLIST: 2144,
REFUSE_REQ: 2145, REFUSE_REQ: 2145,
CANCEL_REQ: 1146, CANCEL_REQ: 2146,
DELETE: 2170, DELETE: 2170,
ADDADMIN: 2180, ADDADMIN: 2180,
REMOVEADMIN: 2185, REMOVEADMIN: 2185,
SENDCOINS_REQ: 2200, SENDCOINS_REQ: 2200,
SENDCOINS_REQ_SENT: 2205,
SENDCOINS_ACCEPT: 2210, SENDCOINS_ACCEPT: 2210,
SENDCOINS_ACCEPT_SENT: 2212,
SENDCOINS_REFUSE: 2220, SENDCOINS_REFUSE: 2220,
SENDCOINS_REFUSE_SENT: 2222,
}, },
REPORT_FILT_RESP: 1, REPORT_FILT_RESP: 1,
@@ -129,7 +132,7 @@ module.exports = {
TABLES_PERM_NEWREC: ['skills', 'goods', 'subskills', 'mygroups', 'myhosps'], TABLES_PERM_NEWREC: ['skills', 'goods', 'subskills', 'mygroups', 'myhosps'],
TABLES_REC_ID: ['skills', 'goods', 'subskills'], TABLES_REC_ID: ['skills', 'goods', 'subskills'],
TABLES_VISU_STAT_IN_HOME: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups'], TABLES_VISU_STAT_IN_HOME: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups', 'circuits'],
TABLES_ADV_NOTIFICATION: ['myskills', 'myhosps', 'mygoods'], TABLES_ADV_NOTIFICATION: ['myskills', 'myhosps', 'mygoods'],
TABLES_EVENTS_NOTIFICATION: ['mybachecas'], TABLES_EVENTS_NOTIFICATION: ['mybachecas'],
@@ -138,6 +141,12 @@ module.exports = {
TABLES_NUM_AS_ID_NUMBER: [ ], TABLES_NUM_AS_ID_NUMBER: [ ],
TABLES_ID_STRING: [
'circuits',
'accounts',
'movements',
],
TABLES_ID_NUMBER: [ TABLES_ID_NUMBER: [
'permissions', 'permissions',
'levels', 'levels',
@@ -155,9 +164,8 @@ module.exports = {
'mybachecas', 'mybachecas',
'myhosps', 'myhosps',
'mygoods', 'mygoods',
'mygroups', 'mygroups'
'circuits', ],
'movements'],
TABLES_USER_ID: ['mygroups', 'myskills', 'mybachecas', 'myhosps', 'mygoods'], TABLES_USER_ID: ['mygroups', 'myskills', 'mybachecas', 'myhosps', 'mygoods'],
TABLES_CREATEDBY: ['mygroups', 'circuits'], TABLES_CREATEDBY: ['mygroups', 'circuits'],
TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'bots', 'mygroups', 'circuits'], TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'bots', 'mygroups', 'circuits'],
@@ -348,6 +356,8 @@ module.exports = {
STATUS_REMOVED: 57, STATUS_REMOVED: 57,
STATUS_COINS_ACCEPTED: 60, STATUS_COINS_ACCEPTED: 60,
STATUS_COINS_REFUSED: 61, STATUS_COINS_REFUSED: 61,
STATUS_COINS_ACCEPTED_SENT: 62,
STATUS_COINS_REFUSED_SENT: 63,
}, },
TypeNotifs: { TypeNotifs: {
@@ -391,6 +401,9 @@ module.exports = {
ID_CIRCUIT_SENDCOINSREQ: 512, ID_CIRCUIT_SENDCOINSREQ: 512,
ID_CIRCUIT_COINS_ACCEPTED: 1024, ID_CIRCUIT_COINS_ACCEPTED: 1024,
ID_CIRCUIT_COINS_REFUSED: 2048, ID_CIRCUIT_COINS_REFUSED: 2048,
ID_CIRCUIT_SENDCOINSREQ_SENT: 4096,
ID_CIRCUIT_COINS_ACCEPTED_SENT: 8192,
ID_CIRCUIT_COINS_REFUSED_SENT: 16384,
TYPEDIR_BOOKING: 6, TYPEDIR_BOOKING: 6,