diff --git a/src/server/db/mongoose.js b/src/server/db/mongoose.js
index 3b2f8d4..650be13 100755
--- a/src/server/db/mongoose.js
+++ b/src/server/db/mongoose.js
@@ -1,4 +1,4 @@
-var mongoose = require('mongoose').set('debug', process.env.DEBUG)
+var mongoose = require('mongoose').set('debug', false)
mongoose.Promise = global.Promise;
@@ -9,7 +9,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true
});
-mongoose.set('debug', process.env.DEBUG);
+mongoose.set('debug', false);
const options = {
// user: process.env.UDB,
@@ -17,7 +17,8 @@ const options = {
// useMongoClient: true,
// useMongoClient: false,
useNewUrlParser: true,
- // useFindAndModify: false,
+ // useFindAndModify: true,
+ useFindAndModify: false,
// useCreateIndex: true,
useUnifiedTopology: true,
diff --git a/src/server/locales/en.json b/src/server/locales/en.json
index d1f977b..92de6b2 100755
--- a/src/server/locales/en.json
+++ b/src/server/locales/en.json
@@ -51,6 +51,9 @@
"CIRCUIT_REMOVED_TO_ME": "❌ Sei stato rimosso dal Circuito %s (da parte di %s)",
"CIRCUIT_SENDCOINSREQ": "%s ti sta inviando %s %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_QTAMAX": "L'importo supera la quantità massima che il destinatario può accumulare",
"CIRCUIT_COINS_ALREADY_PROCESSED": "La richiesta è stata già processata. Stato %s",
diff --git a/src/server/locales/it.json b/src/server/locales/it.json
index 12c97a9..4846465 100644
--- a/src/server/locales/it.json
+++ b/src/server/locales/it.json
@@ -1,61 +1,65 @@
{
- "Hello": "Ciao",
- "Hello %s": "Ciao %s",
- "Good: %s": "Bene: %s",
- "Service: %s": "Servizio: %s",
- "%s new Good: %s": "%s nuovo Bene: %s",
- "%s new Service: %s": "%s nuovo Servizio: %s",
- "OPEN PAGE": "APRI PAGINA",
- "%s asked you for Friendship": "%s ti ha chiesto l'Amicizia",
- "%s accepted your Friendship": "%s ha accettato l'Amicizia",
- "%s refused your Friendship": "%s ha rifiutato l'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 !",
- "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_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_TO_ME": "❌ Sei uscito dal Gruppo %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)",
- "GROUP_REQUEST_TO_ENTER": "%s ha chiesto di entrare nel gruppo %s",
- "GROUP_CREATED": "✅ %s ha creato un nuovo Gruppo chiamato %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_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_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",
- "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": "E' stato segnalato %s da %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": "E' stato riattivato %s da %s.",
- "FRIEND_UNBLOCKED_YOU": "Hai riattivato %s.",
- "CIRCUIT_ACCEPT_NEWENTRY": "❇️👥 🧍♂️ Accetta Ingresso 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_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_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_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",
- "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)",
- "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_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_EXIT_USER": "❌ l'utente %s è 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_SENDCOINSREQ": "%s ti sta inviando %s %s.",
- "ID_CIRCUIT_COINS_ACCEPTED": "%s %s accettati da %s.",
- "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"
+ "Hello": "Ciao",
+ "Hello %s": "Ciao %s",
+ "Good: %s": "Bene: %s",
+ "Service: %s": "Servizio: %s",
+ "%s new Good: %s": "%s nuovo Bene: %s",
+ "%s new Service: %s": "%s nuovo Servizio: %s",
+ "OPEN PAGE": "APRI PAGINA",
+ "%s asked you for Friendship": "%s ti ha chiesto l'Amicizia",
+ "%s accepted your Friendship": "%s ha accettato l'Amicizia",
+ "%s refused your Friendship": "%s ha rifiutato l'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 !",
+ "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_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_TO_ME": "❌ Sei uscito dal Gruppo %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)",
+ "GROUP_REQUEST_TO_ENTER": "%s ha chiesto di entrare nel gruppo %s",
+ "GROUP_CREATED": "✅ %s ha creato un nuovo Gruppo chiamato %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_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_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",
+ "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": "E' stato segnalato %s da %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": "E' stato riattivato %s da %s.",
+ "FRIEND_UNBLOCKED_YOU": "Hai riattivato %s.",
+ "CIRCUIT_ACCEPT_NEWENTRY": "❇️👥 🧍♂️ Accetta Ingresso 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_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_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_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",
+ "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)",
+ "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_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_EXIT_USER": "❌ l'utente %s è 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_SENDCOINSREQ": "%s ti sta inviando %s %s.",
+ "CIRCUIT_SENDCOINSREQ_TO_ME": "Stai inviando %s %s a %s.",
+ "ID_CIRCUIT_COINS_ACCEPTED": "%s %s accettati da %s.",
+ "ID_CIRCUIT_COINS_ACCEPTED_TO_ME": "%s %s sono stati 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_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"
}
diff --git a/src/server/models/account.js b/src/server/models/account.js
index 2ce0b7d..fc43dfd 100755
--- a/src/server/models/account.js
+++ b/src/server/models/account.js
@@ -1,7 +1,7 @@
/*
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;
mongoose.Promise = global.Promise;
@@ -18,7 +18,10 @@ mongoose.plugin(schema => {
const AccountSchema = new Schema({
_id: {
- type: Number,
+ type: String,
+ default: function () {
+ return new ObjectID().toString()
+ }
},
idapp: {
type: String,
@@ -27,7 +30,7 @@ const AccountSchema = new Schema({
type: String,
},
circuitId: { // ----- REF TO Circuit
- type: Number,
+ type: String,
},
name: {
type: String,
@@ -72,16 +75,7 @@ AccountSchema.statics.findAllIdApp = async function(idapp) {
AccountSchema.pre('save', async function(next) {
if (this.isNew) {
- const myrec = await Account.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._id = new ObjectID().toString()
}
next();
@@ -130,6 +124,14 @@ AccountSchema.statics.addtoSaldo = async function(id, amount) {
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) {
const Account = this;
@@ -152,26 +154,35 @@ AccountSchema.statics.getAccountByUsernameAndCircuitId = async function(idapp, u
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) {
- myaccount = new Account({
- idapp,
- username,
- circuitId: mycircuit._id,
- deperibile: false,
- fidoConcesso: mycircuit.fido_scoperto_default,
- qta_maxConcessa: mycircuit.qta_max_default,
- importo_iniziale: 0,
- saldo: 0,
- });
+ if (mycircuit) {
+ let myaccount = await Account.findOne(myquery).lean();
- 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 myaccount;
+ return null;
} catch (e) {
console.error('error', e);
diff --git a/src/server/models/adtype.js b/src/server/models/adtype.js
index bc0464a..7b3a19a 100755
--- a/src/server/models/adtype.js
+++ b/src/server/models/adtype.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG);
+const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/adtypegood.js b/src/server/models/adtypegood.js
index a1ab854..09e95e8 100755
--- a/src/server/models/adtypegood.js
+++ b/src/server/models/adtypegood.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG);
+const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/booking.js b/src/server/models/booking.js
index f2d4ae9..274224b 100755
--- a/src/server/models/booking.js
+++ b/src/server/models/booking.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/bot.js b/src/server/models/bot.js
index 2f941a4..50f622e 100755
--- a/src/server/models/bot.js
+++ b/src/server/models/bot.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/calzoom.js b/src/server/models/calzoom.js
index f6b69fe..72b427b 100755
--- a/src/server/models/calzoom.js
+++ b/src/server/models/calzoom.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/cart.js b/src/server/models/cart.js
index 6641b54..8aff97a 100755
--- a/src/server/models/cart.js
+++ b/src/server/models/cart.js
@@ -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 shared_consts = require('../tools/shared_nodejs');
diff --git a/src/server/models/cash.js b/src/server/models/cash.js
index e0e3e06..a265b6d 100755
--- a/src/server/models/cash.js
+++ b/src/server/models/cash.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/cashCategory.js b/src/server/models/cashCategory.js
index 18d4a29..943066c 100755
--- a/src/server/models/cashCategory.js
+++ b/src/server/models/cashCategory.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/cashSubCategory.js b/src/server/models/cashSubCategory.js
index ccd2227..077ec6c 100755
--- a/src/server/models/cashSubCategory.js
+++ b/src/server/models/cashSubCategory.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/category.js b/src/server/models/category.js
index 9e23880..c04fe2c 100755
--- a/src/server/models/category.js
+++ b/src/server/models/category.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/catgrp.js b/src/server/models/catgrp.js
index 9d8f594..1078415 100755
--- a/src/server/models/catgrp.js
+++ b/src/server/models/catgrp.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/cfgserver.js b/src/server/models/cfgserver.js
index 93a2012..d1ebfae 100755
--- a/src/server/models/cfgserver.js
+++ b/src/server/models/cfgserver.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/circuit.js b/src/server/models/circuit.js
index c1d0ed1..43ef450 100755
--- a/src/server/models/circuit.js
+++ b/src/server/models/circuit.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG);
+const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
@@ -17,7 +17,10 @@ mongoose.plugin(schema => {
const CircuitSchema = new Schema({
_id: {
- type: Number,
+ type: String,
+ default: function () {
+ return new ObjectID().toString()
+ }
},
idapp: {
type: String,
@@ -165,16 +168,7 @@ const CircuitSchema = new Schema({
CircuitSchema.pre('save', async function(next) {
if (this.isNew) {
- const myrec = await Circuit.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._id = new ObjectID().toString();
this.date_created = new Date();
}
@@ -210,7 +204,7 @@ CircuitSchema.statics.executeQueryTable = function(idapp, params) {
CircuitSchema.statics.getWhatToShow = function(idapp, username) {
// FOR ME, PERMIT ALL
return {
- circuitId: 1,
+ _id: 1,
groupnameId: 1,
path: 1,
name: 1,
@@ -245,7 +239,6 @@ CircuitSchema.statics.removeAdminOfMyCircuit = async function(idapp, username, n
CircuitSchema.statics.getWhatToShow_Unknown = function(idapp, username) {
return {
- circuitId: 1,
groupnameId: 1,
path: 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 {
const {User} = require('../models/user');
@@ -327,7 +320,7 @@ CircuitSchema.statics.getCircuitsByUsername = async function(idapp, username, re
asked_circuits,
refused_circuits,
manage_mycircuits,
- mycircuits: req.user.profile.mycircuits,
+ mycircuits: user.profile.mycircuits,
};
} catch (e) {
@@ -381,7 +374,7 @@ CircuitSchema.statics.getCircuitByName = async function(idapp, name) {
CircuitSchema.statics.getCircuitById = async function(circuitId) {
const myfind = {
- circuitId,
+ _id: circuitId,
};
try {
diff --git a/src/server/models/city.js b/src/server/models/city.js
index 0717120..a3eae1c 100755
--- a/src/server/models/city.js
+++ b/src/server/models/city.js
@@ -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 escapeStringRegexp = require('escape-string-regexp');
diff --git a/src/server/models/contribtype.js b/src/server/models/contribtype.js
index 91e3e6c..bdfd4cd 100755
--- a/src/server/models/contribtype.js
+++ b/src/server/models/contribtype.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/department.js b/src/server/models/department.js
index 2b0d47d..daf4979 100755
--- a/src/server/models/department.js
+++ b/src/server/models/department.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/discipline.js b/src/server/models/discipline.js
index f72eb01..3c446a2 100755
--- a/src/server/models/discipline.js
+++ b/src/server/models/discipline.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/extralist.js b/src/server/models/extralist.js
index 16cefdc..715a61a 100755
--- a/src/server/models/extralist.js
+++ b/src/server/models/extralist.js
@@ -1,5 +1,5 @@
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 jwt = require('jsonwebtoken');
const _ = require('lodash');
@@ -16,7 +16,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true
});
-mongoose.set('debug', process.env.DEBUG);
+mongoose.set('debug', false);
var ExtraListSchema = new mongoose.Schema({
idapp: {
diff --git a/src/server/models/gallery.js b/src/server/models/gallery.js
index 0fda2ee..cd7e555 100755
--- a/src/server/models/gallery.js
+++ b/src/server/models/gallery.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/good.js b/src/server/models/good.js
index 8bf4168..f91a9d9 100755
--- a/src/server/models/good.js
+++ b/src/server/models/good.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/graduatoria.js b/src/server/models/graduatoria.js
index 927c049..420ee03 100755
--- a/src/server/models/graduatoria.js
+++ b/src/server/models/graduatoria.js
@@ -1,5 +1,5 @@
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 jwt = require('jsonwebtoken');
const _ = require('lodash');
@@ -20,7 +20,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true
});
-mongoose.set('debug', process.env.DEBUG);
+mongoose.set('debug', false);
const GraduatoriaSchema = new mongoose.Schema({
idapp: {
diff --git a/src/server/models/group.js b/src/server/models/group.js
index 20de55c..a642809 100755
--- a/src/server/models/group.js
+++ b/src/server/models/group.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/hours.js b/src/server/models/hours.js
index 8c9c54c..3f6ca56 100755
--- a/src/server/models/hours.js
+++ b/src/server/models/hours.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/iscrittiConacreis.js b/src/server/models/iscrittiConacreis.js
index ead8aee..cf8514f 100755
--- a/src/server/models/iscrittiConacreis.js
+++ b/src/server/models/iscrittiConacreis.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/level.js b/src/server/models/level.js
index 8300990..85c1e1f 100755
--- a/src/server/models/level.js
+++ b/src/server/models/level.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG);
+const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/mailinglist.js b/src/server/models/mailinglist.js
index 744b6db..707c431 100755
--- a/src/server/models/mailinglist.js
+++ b/src/server/models/mailinglist.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/movement.js b/src/server/models/movement.js
index 7d2d816..9a29fb6 100755
--- a/src/server/models/movement.js
+++ b/src/server/models/movement.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG);
+const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
@@ -16,7 +16,10 @@ mongoose.plugin(schema => {
const MovementSchema = new Schema({
_id: {
- type: Number,
+ type: String,
+ default: function () {
+ return new ObjectID().toString()
+ }
},
idapp: {
type: String,
@@ -25,10 +28,10 @@ const MovementSchema = new Schema({
type: Date,
},
accountFromId: {
- type: Number,
+ type: String,
},
accountToId: {
- type: Number,
+ type: String,
},
causal_table: {
type: String,
@@ -62,16 +65,8 @@ MovementSchema.statics.findAllIdApp = async function(idapp) {
MovementSchema.pre('save', async function(next) {
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._id = 1;
- }
+ this.transactionDate = new Date();
}
next();
@@ -94,6 +89,7 @@ MovementSchema.statics.addMov = async function(idapp, accountFromId, accountToId
try {
let mymov = Movement(
{
+ _id: new ObjectID().toString(),
idapp,
transactionDate: new Date(),
accountFromId: accountFromId._id,
@@ -105,12 +101,15 @@ MovementSchema.statics.addMov = async function(idapp, accountFromId, accountToId
},
);
- // Update saldo dell'Account
- Account.addtoSaldo(accountToId, amount);
+ const rismov = await mymov.save();
+ 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) {
console.error('Error in addMov', e.message);
}
diff --git a/src/server/models/msg_template.js b/src/server/models/msg_template.js
index 50f29fb..9b493a3 100755
--- a/src/server/models/msg_template.js
+++ b/src/server/models/msg_template.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/mybacheca.js b/src/server/models/mybacheca.js
index be6d4d1..9210748 100755
--- a/src/server/models/mybacheca.js
+++ b/src/server/models/mybacheca.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG);
+const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/myevent.js b/src/server/models/myevent.js
index 5b9b744..53bf5e9 100755
--- a/src/server/models/myevent.js
+++ b/src/server/models/myevent.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/mygood.js b/src/server/models/mygood.js
index c72ee63..b55a5cd 100755
--- a/src/server/models/mygood.js
+++ b/src/server/models/mygood.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG);
+const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/mygroup.js b/src/server/models/mygroup.js
index 52e546a..d95fc9b 100755
--- a/src/server/models/mygroup.js
+++ b/src/server/models/mygroup.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/myhosp.js b/src/server/models/myhosp.js
index 6ee35c0..3ef7d29 100755
--- a/src/server/models/myhosp.js
+++ b/src/server/models/myhosp.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG);
+const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/mypage.js b/src/server/models/mypage.js
index a809e9f..dfebce0 100755
--- a/src/server/models/mypage.js
+++ b/src/server/models/mypage.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/myskill.js b/src/server/models/myskill.js
index 37b4b00..37be683 100755
--- a/src/server/models/myskill.js
+++ b/src/server/models/myskill.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG);
+const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/newstosent.js b/src/server/models/newstosent.js
index 0a6e993..d460eb0 100755
--- a/src/server/models/newstosent.js
+++ b/src/server/models/newstosent.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/operator.js b/src/server/models/operator.js
index 7b2aed6..67b7022 100755
--- a/src/server/models/operator.js
+++ b/src/server/models/operator.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/opzemail.js b/src/server/models/opzemail.js
index 7071152..9c27e34 100755
--- a/src/server/models/opzemail.js
+++ b/src/server/models/opzemail.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/order.js b/src/server/models/order.js
index 2b2761f..25db436 100755
--- a/src/server/models/order.js
+++ b/src/server/models/order.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/orderscart.js b/src/server/models/orderscart.js
index 0734783..76ec3f9 100755
--- a/src/server/models/orderscart.js
+++ b/src/server/models/orderscart.js
@@ -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 shared_consts = require('../tools/shared_nodejs');
diff --git a/src/server/models/paymenttype.js b/src/server/models/paymenttype.js
index c69d8d9..4a45408 100755
--- a/src/server/models/paymenttype.js
+++ b/src/server/models/paymenttype.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/permission.js b/src/server/models/permission.js
index 4a0f959..202b01e 100755
--- a/src/server/models/permission.js
+++ b/src/server/models/permission.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/producer.js b/src/server/models/producer.js
index c440300..c6469e1 100755
--- a/src/server/models/producer.js
+++ b/src/server/models/producer.js
@@ -1,4 +1,4 @@
- mongoose = require('mongoose').set('debug', process.env.DEBUG)
+ mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
const tools = require('../tools/general');
diff --git a/src/server/models/product.js b/src/server/models/product.js
index 4510a99..ec5e47f 100755
--- a/src/server/models/product.js
+++ b/src/server/models/product.js
@@ -1,4 +1,4 @@
-mongoose = require('mongoose').set('debug', process.env.DEBUG)
+mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
const tools = require('../tools/general');
diff --git a/src/server/models/project.js b/src/server/models/project.js
index 1ef9a22..6632c08 100755
--- a/src/server/models/project.js
+++ b/src/server/models/project.js
@@ -1,4 +1,4 @@
-var mongoose = require('mongoose').set('debug', process.env.DEBUG)
+var mongoose = require('mongoose').set('debug', false)
const _ = require('lodash');
@@ -16,7 +16,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true
});
-mongoose.set('debug', process.env.DEBUG);
+mongoose.set('debug', false);
var ProjectSchema = new mongoose.Schema({
idapp: {
diff --git a/src/server/models/province.js b/src/server/models/province.js
index bef3a23..3c9e6ff 100755
--- a/src/server/models/province.js
+++ b/src/server/models/province.js
@@ -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 escapeStringRegexp = require('escape-string-regexp');
diff --git a/src/server/models/sector.js b/src/server/models/sector.js
index a33f50f..b532fbb 100755
--- a/src/server/models/sector.js
+++ b/src/server/models/sector.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/sectorgood.js b/src/server/models/sectorgood.js
index bf804d9..38a12ba 100755
--- a/src/server/models/sectorgood.js
+++ b/src/server/models/sectorgood.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/sendmsg.js b/src/server/models/sendmsg.js
index 6234099..a0c2d3f 100755
--- a/src/server/models/sendmsg.js
+++ b/src/server/models/sendmsg.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/sendnotif.js b/src/server/models/sendnotif.js
index 56e8d1e..198e509 100755
--- a/src/server/models/sendnotif.js
+++ b/src/server/models/sendnotif.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG);
+const mongoose = require('mongoose').set('debug', false);
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
@@ -84,7 +84,6 @@ const sendNotifSchema = new Schema({
options: {
type: Array,
},
-
});
sendNotifSchema.statics.setNotifAsRead = function(idapp, username, idnotif) {
@@ -326,10 +325,27 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = function(recnotif) {
recnotif.paramsObj.extrarec.symbol);
tag = 'sendcoin';
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) {
newdescr = i18n.__('ID_CIRCUIT_COINS_ACCEPTED', 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_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;
}
} 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;
dest = myrecnotif.dest;
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) {
typeidsearch = shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ;
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);
- await SendNotif.sendToSingleUserDest(myrecnotif, req, res, onlysave);
+ return await SendNotif.sendToSingleUserDest(myrecnotif, req, res, onlysave);
- return true;
} catch (e) {
console.error('createNewNotification', e);
- return false;
+ return null;
}
};
@@ -773,7 +798,7 @@ sendNotifSchema.statics.sendToTheDestinations = async function(myrecnotifpass, r
if (send) {
let myrecnotif = new SendNotif(myrecnotifpass);
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;
if (onlysave) {
- await SendNotif.saveNotif(myrecnotif);
+ return await SendNotif.saveNotif(myrecnotif);
} else {
- await SendNotif.saveAndSendNotif(myrecnotif, req, res, null);
+ return await SendNotif.saveAndSendNotif(myrecnotif, req, res, null);
}
} catch (e) {
diff --git a/src/server/models/settings.js b/src/server/models/settings.js
index ff5eb03..437785d 100755
--- a/src/server/models/settings.js
+++ b/src/server/models/settings.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/sharewithus.js b/src/server/models/sharewithus.js
index cd35c23..c05699f 100755
--- a/src/server/models/sharewithus.js
+++ b/src/server/models/sharewithus.js
@@ -1,4 +1,4 @@
- mongoose = require('mongoose').set('debug', process.env.DEBUG)
+ mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
const tools = require('../tools/general');
diff --git a/src/server/models/site.js b/src/server/models/site.js
index 00ee5da..3ff3087 100755
--- a/src/server/models/site.js
+++ b/src/server/models/site.js
@@ -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 tools = require('../tools/general');
@@ -6,7 +6,7 @@ const tools = require('../tools/general');
mongoose.Promise = global.Promise;
mongoose.level = "F";
-mongoose.set('debug', process.env.DEBUG);
+mongoose.set('debug', false);
// Resolving error Unknown modifier: $pushAll
mongoose.plugin(schema => {
diff --git a/src/server/models/skill.js b/src/server/models/skill.js
index 249d1e7..5bd6bbe 100755
--- a/src/server/models/skill.js
+++ b/src/server/models/skill.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/statusSkill.js b/src/server/models/statusSkill.js
index eb0eb4b..fc16981 100755
--- a/src/server/models/statusSkill.js
+++ b/src/server/models/statusSkill.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/storehouse.js b/src/server/models/storehouse.js
index 3829932..8ed78a8 100755
--- a/src/server/models/storehouse.js
+++ b/src/server/models/storehouse.js
@@ -1,4 +1,4 @@
- mongoose = require('mongoose').set('debug', process.env.DEBUG)
+ mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
const tools = require('../tools/general');
diff --git a/src/server/models/subscribers.js b/src/server/models/subscribers.js
index 7db4143..975d15a 100755
--- a/src/server/models/subscribers.js
+++ b/src/server/models/subscribers.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/subskill.js b/src/server/models/subskill.js
index 9e65434..2ed6ab1 100755
--- a/src/server/models/subskill.js
+++ b/src/server/models/subskill.js
@@ -1,4 +1,4 @@
-const mongoose = require('mongoose').set('debug', process.env.DEBUG)
+const mongoose = require('mongoose').set('debug', false)
const Schema = mongoose.Schema;
mongoose.Promise = global.Promise;
diff --git a/src/server/models/templemail.js b/src/server/models/templemail.js
index ddd9ce1..c5f740d 100755
--- a/src/server/models/templemail.js
+++ b/src/server/models/templemail.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/models/todo.js b/src/server/models/todo.js
index 39ee612..d92db32 100755
--- a/src/server/models/todo.js
+++ b/src/server/models/todo.js
@@ -1,4 +1,4 @@
-var mongoose = require('mongoose').set('debug', process.env.DEBUG)
+var mongoose = require('mongoose').set('debug', false)
const _ = require('lodash');
@@ -18,7 +18,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true
});
-mongoose.set('debug', process.env.DEBUG);
+mongoose.set('debug', false);
var TodoSchema = new mongoose.Schema({
userId: {
diff --git a/src/server/models/user.js b/src/server/models/user.js
index c99ae1e..8f299e2 100755
--- a/src/server/models/user.js
+++ b/src/server/models/user.js
@@ -1,5 +1,5 @@
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 jwt = require('jsonwebtoken');
const _ = require('lodash');
@@ -32,7 +32,7 @@ mongoose.plugin(schema => {
schema.options.usePushEach = true;
});
-mongoose.set('debug', process.env.DEBUG);
+mongoose.set('debug', false);
const UserSchema = new mongoose.Schema({
userId: {
@@ -2107,6 +2107,9 @@ UserSchema.statics.setCircuitCmd = async function(idapp, usernameOrig, circuitna
// Elimina eventualmente se era bloccato:
update = {$pull: {refused_users: {username: {$in: [usernameOrig]}}}};
await Circuit.updateOne({idapp, name: circuitname}, update);
+
+ await Account.createAccount(idapp, usernameOrig, circuitname);
+
} else {
ris = false;
}
@@ -2137,7 +2140,6 @@ UserSchema.statics.setCircuitCmd = async function(idapp, usernameOrig, circuitna
};
ris = await Circuit.updateOne({idapp, name: circuitname}, update);
- await Account.createAccount(idapp, usernameOrig, circuitname);
}
if (ris) {
// Invia una notifica alla persona
@@ -2215,7 +2217,7 @@ UserSchema.statics.setCircuitCmd = async function(idapp, usernameOrig, circuitna
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 !
let ris2 = {
@@ -2231,7 +2233,11 @@ UserSchema.statics.setCircuitCmd = async function(idapp, usernameOrig, circuitna
risStatus = i18n.__('STATUS_REFUSED');
}
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) {
// 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.user = await User.getExtraInfoByUsername(idapp, username_action);
} else {
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 {
const listSentMyRequestFriends = await User.find({
@@ -3795,7 +3814,7 @@ UserSchema.statics.addExtraInfo = async function(idapp, recUser, req) {
// 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);
diff --git a/src/server/models/variant.js b/src/server/models/variant.js
index 5a1ca6b..01191ee 100755
--- a/src/server/models/variant.js
+++ b/src/server/models/variant.js
@@ -1,5 +1,5 @@
-var mongoose = require('mongoose').set('debug', process.env.DEBUG)
+var mongoose = require('mongoose').set('debug', false)
var variantSchema = mongoose.Schema({
productID: {
diff --git a/src/server/models/where.js b/src/server/models/where.js
index e397dd6..5f13a7d 100755
--- a/src/server/models/where.js
+++ b/src/server/models/where.js
@@ -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 tools = require('../tools/general');
diff --git a/src/server/populate/populate.js b/src/server/populate/populate.js
index 5356412..b10e6c8 100644
--- a/src/server/populate/populate.js
+++ b/src/server/populate/populate.js
@@ -2,7 +2,7 @@
const tools = require('../tools/general');
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');
diff --git a/src/server/router/admin_router.js b/src/server/router/admin_router.js
index 6b94568..be77475 100755
--- a/src/server/router/admin_router.js
+++ b/src/server/router/admin_router.js
@@ -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');
diff --git a/src/server/router/api/actions.js b/src/server/router/api/actions.js
index 858c608..0909f39 100755
--- a/src/server/router/api/actions.js
+++ b/src/server/router/api/actions.js
@@ -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');
diff --git a/src/server/router/circuits_router.js b/src/server/router/circuits_router.js
index b86c7e0..d50cfc6 100755
--- a/src/server/router/circuits_router.js
+++ b/src/server/router/circuits_router.js
@@ -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');
diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js
index a7e1ea2..87834e5 100755
--- a/src/server/router/index_router.js
+++ b/src/server/router/index_router.js
@@ -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([
diff --git a/src/server/router/iscrittiConacreis_router.js b/src/server/router/iscrittiConacreis_router.js
index 5dfd03b..7fd5218 100755
--- a/src/server/router/iscrittiConacreis_router.js
+++ b/src/server/router/iscrittiConacreis_router.js
@@ -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
diff --git a/src/server/router/mygen_router.js b/src/server/router/mygen_router.js
index e3e42f4..9b17824 100755
--- a/src/server/router/mygen_router.js
+++ b/src/server/router/mygen_router.js
@@ -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');
diff --git a/src/server/router/mygoods_router.js b/src/server/router/mygoods_router.js
index b4365c4..631113e 100755
--- a/src/server/router/mygoods_router.js
+++ b/src/server/router/mygoods_router.js
@@ -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');
diff --git a/src/server/router/mygroups_router.js b/src/server/router/mygroups_router.js
index 24da02c..bbe18d8 100755
--- a/src/server/router/mygroups_router.js
+++ b/src/server/router/mygroups_router.js
@@ -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');
diff --git a/src/server/router/myskills_router.js b/src/server/router/myskills_router.js
index ddcea5a..b92cb62 100755
--- a/src/server/router/myskills_router.js
+++ b/src/server/router/myskills_router.js
@@ -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');
diff --git a/src/server/router/orders_router.js b/src/server/router/orders_router.js
index 675f44f..9515933 100755
--- a/src/server/router/orders_router.js
+++ b/src/server/router/orders_router.js
@@ -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');
diff --git a/src/server/router/projects_router.js b/src/server/router/projects_router.js
index 245b8ca..bb67f59 100755
--- a/src/server/router/projects_router.js
+++ b/src/server/router/projects_router.js
@@ -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');
diff --git a/src/server/router/push_router.js b/src/server/router/push_router.js
index 55991c6..d7d8d83 100755
--- a/src/server/router/push_router.js
+++ b/src/server/router/push_router.js
@@ -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');
diff --git a/src/server/router/report_router.js b/src/server/router/report_router.js
index 740da06..f9f260d 100755
--- a/src/server/router/report_router.js
+++ b/src/server/router/report_router.js
@@ -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');
diff --git a/src/server/router/site_router.js b/src/server/router/site_router.js
index 5b24194..600cdf5 100755
--- a/src/server/router/site_router.js
+++ b/src/server/router/site_router.js
@@ -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');
diff --git a/src/server/router/subscribe_router.js b/src/server/router/subscribe_router.js
index c47b8e1..b09d021 100755
--- a/src/server/router/subscribe_router.js
+++ b/src/server/router/subscribe_router.js
@@ -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');
diff --git a/src/server/router/test_router.js b/src/server/router/test_router.js
index 186154a..6dfab18 100755
--- a/src/server/router/test_router.js
+++ b/src/server/router/test_router.js
@@ -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');
diff --git a/src/server/router/users_router.js b/src/server/router/users_router.js
index ec446ce..b1d63ee 100755
--- a/src/server/router/users_router.js
+++ b/src/server/router/users_router.js
@@ -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);
}).
diff --git a/src/server/server.js b/src/server/server.js
index b88cac6..eee04c0 100755
--- a/src/server/server.js
+++ b/src/server/server.js
@@ -63,9 +63,9 @@ const tools = require('./tools/general');
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 {ObjectID} = require('mongodb');
diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js
index 290c210..f795f13 100755
--- a/src/server/telegram/telegrambot.js
+++ b/src/server/telegram/telegrambot.js
@@ -822,6 +822,8 @@ const MyTelegramBot = {
try {
const cl = getclTelegByidapp(idapp);
+ if (!cl)
+ return false;
const langdest = myuser.lang;
const telegid = myuser.profile.teleg_id;
@@ -908,6 +910,8 @@ const MyTelegramBot = {
try {
const cl = getclTelegByidapp(idapp);
+ if (!cl)
+ return false;
const {SendNotif} = require('../models/sendnotif');
@@ -949,7 +953,7 @@ const MyTelegramBot = {
}
if (sendnotif) {
- const req = this.getReqByPar(idapp, username);
+ const req = tools.getReqByPar(idapp, username);
// CREATE NOTIFICATION IN TABLE SENDNOTIF
await SendNotif.createNewNotifToSingleUser(req, null, paramsObj, true, typedir, typeid);
}
@@ -3820,7 +3824,7 @@ if (true) {
username: dataarr[1] ? dataarr[1] : '',
userDest: dataarr[2] ? dataarr[2] : '',
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) {
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) {
// Aggiungilo nel Circuito
diff --git a/src/server/tests/seed/seed.js b/src/server/tests/seed/seed.js
index 705bea7..7b2be7c 100755
--- a/src/server/tests/seed/seed.js
+++ b/src/server/tests/seed/seed.js
@@ -84,7 +84,7 @@ const userjson = JSON.stringify(users[0]);
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;
diff --git a/src/server/tools/general.js b/src/server/tools/general.js
index 1f53609..87a928b 100755
--- a/src/server/tools/general.js
+++ b/src/server/tools/general.js
@@ -20,7 +20,7 @@ const {ObjectID} = require('mongodb');
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 server_constants = require('./server_constants');
@@ -855,7 +855,7 @@ module.exports = {
return true;
}
});
- }catch (e) {
+ } catch (e) {
console.error('sendNotificationToUser', e.message);
}
@@ -1070,10 +1070,16 @@ module.exports = {
typeid = shared_consts.TypeNotifs.ID_CIRCUIT_REMOVED_ADMIN;
} else if (cmd === shared_consts.CIRCUITCMD.SENDCOINS_REQ) {
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) {
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) {
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 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 ) {
- ris = await this.sendNotifCircuitByUsername(cmd, idapp, usernameOrig, extrarec.dest, username_action, circuitname, circuit.path, null,
+ let recnotif = 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);
+ extrarec.notifIdToUpdate = '';
+
+
if (ris)
inviato = true;
// ++Todo: Inviare anche agli Admin ?!
@@ -1170,7 +1196,8 @@ module.exports = {
if (!giainviato && cmd !== shared_consts.CIRCUITCMD.REQ) {
// 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);
if (ris)
inviato = true;
@@ -1581,7 +1608,7 @@ module.exports = {
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 = {
$match: {
$expr: {
@@ -1911,19 +1938,19 @@ module.exports = {
query.push(...myquery);
- /*} else if (params.table === 'circuits') {
- const qacirc = this.getLookup(
- {
- lk_tab: 'accounts',
- lk_LF: 'circuitId',
- lk_FF: '_id',
- lk_as: 'account',
- }, 0, {
- 'acc': 1,
- });
- if (qacirc) query = [...query, ...qacirc];
+ /*} else if (params.table === 'circuits') {
+ const qacirc = this.getLookup(
+ {
+ lk_tab: 'accounts',
+ lk_LF: 'circuitId',
+ lk_FF: '_id',
+ lk_as: 'account',
+ }, 0, {
+ 'acc': 1,
+ });
+ if (qacirc) query = [...query, ...qacirc];
- */
+ */
}
if (newvers) {
diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js
index 7bdc924..323231a 100755
--- a/src/server/tools/shared_nodejs.js
+++ b/src/server/tools/shared_nodejs.js
@@ -73,13 +73,16 @@ module.exports = {
SET: 2001,
REMOVE_FROM_MYLIST: 2144,
REFUSE_REQ: 2145,
- CANCEL_REQ: 1146,
+ CANCEL_REQ: 2146,
DELETE: 2170,
ADDADMIN: 2180,
REMOVEADMIN: 2185,
SENDCOINS_REQ: 2200,
+ SENDCOINS_REQ_SENT: 2205,
SENDCOINS_ACCEPT: 2210,
+ SENDCOINS_ACCEPT_SENT: 2212,
SENDCOINS_REFUSE: 2220,
+ SENDCOINS_REFUSE_SENT: 2222,
},
REPORT_FILT_RESP: 1,
@@ -129,7 +132,7 @@ module.exports = {
TABLES_PERM_NEWREC: ['skills', 'goods', 'subskills', 'mygroups', 'myhosps'],
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_EVENTS_NOTIFICATION: ['mybachecas'],
@@ -138,6 +141,12 @@ module.exports = {
TABLES_NUM_AS_ID_NUMBER: [ ],
+ TABLES_ID_STRING: [
+ 'circuits',
+ 'accounts',
+ 'movements',
+ ],
+
TABLES_ID_NUMBER: [
'permissions',
'levels',
@@ -155,9 +164,8 @@ module.exports = {
'mybachecas',
'myhosps',
'mygoods',
- 'mygroups',
- 'circuits',
- 'movements'],
+ 'mygroups'
+ ],
TABLES_USER_ID: ['mygroups', 'myskills', 'mybachecas', 'myhosps', 'mygoods'],
TABLES_CREATEDBY: ['mygroups', 'circuits'],
TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'bots', 'mygroups', 'circuits'],
@@ -348,6 +356,8 @@ module.exports = {
STATUS_REMOVED: 57,
STATUS_COINS_ACCEPTED: 60,
STATUS_COINS_REFUSED: 61,
+ STATUS_COINS_ACCEPTED_SENT: 62,
+ STATUS_COINS_REFUSED_SENT: 63,
},
TypeNotifs: {
@@ -391,6 +401,9 @@ module.exports = {
ID_CIRCUIT_SENDCOINSREQ: 512,
ID_CIRCUIT_COINS_ACCEPTED: 1024,
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,