Circuits...
Circuits Fido e Max Qta Fixed error eslint: 7.0.0 is OK
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
const mongoose = require('mongoose').set('debug', false);
|
||||
const mongoose = require('mongoose').set('debug', process.env.DEBUG);
|
||||
const Schema = mongoose.Schema;
|
||||
|
||||
mongoose.Promise = global.Promise;
|
||||
@@ -15,11 +15,7 @@ mongoose.plugin(schema => {
|
||||
|
||||
const CircuitSchema = new Schema({
|
||||
_id: {
|
||||
type: String,
|
||||
},
|
||||
Num: {
|
||||
type: Number,
|
||||
unique: true,
|
||||
},
|
||||
idapp: {
|
||||
type: String,
|
||||
@@ -84,6 +80,9 @@ const CircuitSchema = new Schema({
|
||||
fido_scoperto_default: {
|
||||
type: Number,
|
||||
},
|
||||
qta_max_default: {
|
||||
type: Number,
|
||||
},
|
||||
data_costituz: {
|
||||
type: Date,
|
||||
},
|
||||
@@ -128,9 +127,18 @@ const CircuitSchema = new Schema({
|
||||
date: {type: Date},
|
||||
},
|
||||
],
|
||||
img_logo: {
|
||||
type: String,
|
||||
},
|
||||
photos: [
|
||||
{
|
||||
imagefile: {
|
||||
type: String,
|
||||
},
|
||||
alt: {
|
||||
type: String,
|
||||
},
|
||||
description: {
|
||||
type: String,
|
||||
},
|
||||
}],
|
||||
req_users: [
|
||||
{
|
||||
_id: false,
|
||||
@@ -147,19 +155,19 @@ const CircuitSchema = new Schema({
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
}, );
|
||||
});
|
||||
|
||||
CircuitSchema.pre('save', async function(next) {
|
||||
if (this.isNew) {
|
||||
const myrec = await Circuit.findOne().limit(1).sort({_id: -1});
|
||||
if (!!myrec) {
|
||||
if (myrec._doc.Num === 0)
|
||||
this.Num = 1;
|
||||
if (myrec._doc._id === 0)
|
||||
this._id = 1;
|
||||
else
|
||||
this.Num = myrec._doc.Num + 1;
|
||||
this._id = myrec._doc._id + 1;
|
||||
|
||||
} else {
|
||||
this.Num = 1;
|
||||
this._id = 1;
|
||||
}
|
||||
|
||||
this.date_created = new Date();
|
||||
@@ -168,7 +176,6 @@ CircuitSchema.pre('save', async function(next) {
|
||||
next();
|
||||
});
|
||||
|
||||
|
||||
CircuitSchema.statics.findAllIdApp = async function(idapp) {
|
||||
const Circuit = this;
|
||||
|
||||
@@ -181,23 +188,6 @@ CircuitSchema.statics.findAllIdApp = async function(idapp) {
|
||||
});
|
||||
};
|
||||
|
||||
CircuitSchema.pre('save', async function(next) {
|
||||
if (this.isNew) {
|
||||
const myrec = await Circuit.findOne().limit(1).sort({Num: -1});
|
||||
if (!!myrec) {
|
||||
if (myrec._doc.Num === 0)
|
||||
this.Num = 1;
|
||||
else
|
||||
this.Num = myrec._doc.Num + 1;
|
||||
|
||||
} else {
|
||||
this.Num = 1;
|
||||
}
|
||||
}
|
||||
|
||||
next();
|
||||
});
|
||||
|
||||
CircuitSchema.statics.getFieldsForSearch = function() {
|
||||
return [
|
||||
{field: 'nome_circuito', type: tools.FieldType.string},
|
||||
@@ -230,7 +220,7 @@ CircuitSchema.statics.getWhatToShow = function(idapp, username) {
|
||||
symbol: 1,
|
||||
abbrev: 1,
|
||||
data_costituz: 1,
|
||||
img_logo: 1,
|
||||
photos: 1,
|
||||
admins: 1,
|
||||
req_users: 1,
|
||||
refused_users: 1,
|
||||
@@ -241,11 +231,10 @@ CircuitSchema.statics.getWhatToShow = function(idapp, username) {
|
||||
// Rimuovi dagli Admin del Circuito
|
||||
CircuitSchema.statics.removeAdminOfMyCircuit = async function(idapp, username, name) {
|
||||
|
||||
return Circuit.updateOne({idapp, name},
|
||||
return await Circuit.updateOne({idapp, name},
|
||||
{$pull: {admins: {username: {$in: [username]}}}});
|
||||
};
|
||||
|
||||
|
||||
CircuitSchema.statics.getWhatToShow_Unknown = function(idapp, username) {
|
||||
return {
|
||||
Num: 1,
|
||||
@@ -262,7 +251,7 @@ CircuitSchema.statics.getWhatToShow_Unknown = function(idapp, username) {
|
||||
symbol: 1,
|
||||
abbrev: 1,
|
||||
data_costituz: 1,
|
||||
img_logo: 1,
|
||||
photos: 1,
|
||||
admins: 1,
|
||||
createdBy: 1,
|
||||
date_created: 1,
|
||||
@@ -379,9 +368,24 @@ CircuitSchema.statics.getCircuitByName = async function(idapp, name) {
|
||||
|
||||
};
|
||||
|
||||
CircuitSchema.statics.getCircuitById = async function(circuitId) {
|
||||
|
||||
const myfind = {
|
||||
circuitId
|
||||
};
|
||||
|
||||
try {
|
||||
return await Circuit.findOne(myfind).lean();
|
||||
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
CircuitSchema.statics.deleteCircuit = async function(idapp, usernameOrig, name) {
|
||||
console.log('Circuito ' + name + ' rimosso da ' + usernameOrig);
|
||||
return Circuit.findOneAndRemove({idapp, name});
|
||||
return await Circuit.findOneAndRemove({idapp, name});
|
||||
};
|
||||
|
||||
CircuitSchema.statics.sendCoins = async function(idapp, usernameOrig, extrarec) {
|
||||
@@ -391,18 +395,21 @@ CircuitSchema.statics.sendCoins = async function(idapp, usernameOrig, extrarec)
|
||||
const {Account} = require('../models/account');
|
||||
|
||||
try {
|
||||
const reccircuit = Circuit.getCircuitByName(extrarec.circuitname);
|
||||
const reccircuit = await Circuit.getCircuitByName(idapp, extrarec.circuitname);
|
||||
|
||||
const myqty = extrarec.qty;
|
||||
if (reccircuit) {
|
||||
const myqty = extrarec.qty;
|
||||
|
||||
const accountdest = await Account.getAccountByUsernameAndCircuitId(idapp, extrarec.dest, reccircuit._id, true);
|
||||
const accountorig = await Account.getAccountByUsernameAndCircuitId(idapp, usernameOrig, reccircuit._id, true);
|
||||
const accountdest = await Account.getAccountByUsernameAndCircuitId(idapp, extrarec.dest, reccircuit._id, true);
|
||||
const accountorig = await Account.getAccountByUsernameAndCircuitId(idapp, usernameOrig, reccircuit._id, true);
|
||||
|
||||
// Add a Transaction !
|
||||
Movement.addMov(accountorig, accountdest, myqty, extrarec.causal);
|
||||
// Add a Transaction !
|
||||
return await Movement.addMov(idapp, accountorig, accountdest, myqty, extrarec.causal);
|
||||
|
||||
}catch (e) {
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Err sendCoins', e);
|
||||
return false;
|
||||
}
|
||||
|
||||
};
|
||||
@@ -410,14 +417,14 @@ CircuitSchema.statics.sendCoins = async function(idapp, usernameOrig, extrarec)
|
||||
// Rimuovo la Richiesta del Circuito
|
||||
CircuitSchema.statics.removeReqCircuit = async function(idapp, username, name) {
|
||||
|
||||
return Circuit.updateOne({idapp, name},
|
||||
return await Circuit.updateOne({idapp, name},
|
||||
{$pull: {req_users: {username: {$in: [username]}}}});
|
||||
};
|
||||
|
||||
// Aggiungi agli utenti Rifiutati del Circuito
|
||||
CircuitSchema.statics.refuseReqCircuit = async function(idapp, username, name) {
|
||||
|
||||
return Circuit.updateOne({idapp, name},
|
||||
return await Circuit.updateOne({idapp, name},
|
||||
{
|
||||
$push:
|
||||
{
|
||||
@@ -430,7 +437,6 @@ CircuitSchema.statics.refuseReqCircuit = async function(idapp, username, name) {
|
||||
|
||||
};
|
||||
|
||||
|
||||
const Circuit = mongoose.model('Circuit', CircuitSchema);
|
||||
|
||||
module.exports = {Circuit};
|
||||
|
||||
Reference in New Issue
Block a user