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

- fixed quantità

Browse Source 
- creazione mappa numero utenti per provincia !
This commit is contained in:
Surya Paolo
2024-03-19 00:21:54 +01:00
parent 44b25fdf33
commit 3e0d0bf018
6 changed files with 209 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ mongoose.level = 'F';
const tools = require('../tools/general');
const {ObjectID} = require('mongodb');
const { ObjectID } = require('mongodb');
const shared_consts = require('../tools/shared_nodejs');
@@ -51,9 +51,9 @@ const CitySchema = new Schema({
},
});
CitySchema.pre('save', async function(next) {
CitySchema.pre('save', async function (next) {
if (this.isNew) {
const myrec = await City.findOne().limit(1).sort({_id: -1});
const myrec = await City.findOne().limit(1).sort({ _id: -1 });
if (!!myrec) {
if (myrec._doc._id === 0)
this._id = 1;
@@ -68,8 +68,8 @@ CitySchema.pre('save', async function(next) {
next();
});
CitySchema.statics.getProvinceByIdCity = async function(idcity) {
const myrec = await City.findOne({_id: idcity}).lean();
CitySchema.statics.getProvinceByIdCity = async function (idcity) {
const myrec = await City.findOne({ _id: idcity }).lean();
if (myrec) {
return myrec.prov;
}
@@ -77,10 +77,10 @@ CitySchema.statics.getProvinceByIdCity = async function(idcity) {
return '';
}
CitySchema.statics.getCircuitNameBystrProv = async function(strProv) {
CitySchema.statics.getCircuitNameBystrProv = async function (strProv) {
const { Circuit } = require('../models/circuit');
const myrec = await Circuit.findOne({strProv}).lean();
const myrec = await Circuit.findOne({ strProv }).lean();
if (myrec) {
return myrec.name;
}
@@ -88,8 +88,8 @@ CitySchema.statics.getCircuitNameBystrProv = async function(strProv) {
return '';
}
CitySchema.statics.getRegionByIdCity = async function(idcity) {
const myrec = await City.findOne({_id: idcity}).lean();
CitySchema.statics.getRegionByIdCity = async function (idcity) {
const myrec = await City.findOne({ _id: idcity }).lean();
if (myrec) {
return myrec.reg;
}
@@ -97,13 +97,13 @@ CitySchema.statics.getRegionByIdCity = async function(idcity) {
return '';
}
CitySchema.statics.findByCity = function(mycity) {
CitySchema.statics.findByCity = function (mycity) {
let myregexp = new RegExp(mycity.trim().replace(' ', '|'), 'ig');
const query = [
{$match: {comune: {$regex: myregexp}}},
{$sort: {descr: 1}},
{ $match: { comune: { $regex: myregexp } } },
{ $sort: { descr: 1 } },
];
return City.aggregate(query).then((arrrec) => {
@@ -112,17 +112,17 @@ CitySchema.statics.findByCity = function(mycity) {
};
CitySchema.statics.getFieldsForSearch = function() {
CitySchema.statics.getFieldsForSearch = function () {
return [
{field: 'comune', type: tools.FieldType.string},
{field: 'prov', type: tools.FieldType.string},
{field: 'reg', type: tools.FieldType.string},
{field: 'pref', type: tools.FieldType.number},
{field: 'cap', type: tools.FieldType.number},
{ field: 'comune', type: tools.FieldType.string },
{ field: 'prov', type: tools.FieldType.string },
{ field: 'reg', type: tools.FieldType.string },
{ field: 'pref', type: tools.FieldType.number },
{ field: 'cap', type: tools.FieldType.number },
];
};
CitySchema.statics.executeQueryTable = function(idapp, params) {
CitySchema.statics.executeQueryTable = function (idapp, params) {
params.fieldsearch = this.getFieldsForSearch();
const strfind = params.search;
@@ -134,7 +134,7 @@ CitySchema.statics.executeQueryTable = function(idapp, params) {
return tools.executeQueryTable(this, 0, params);
};
CitySchema.statics.executeQueryPickup = async function(idapp, params) {
CitySchema.statics.executeQueryPickup = async function (idapp, params) {
const strfind = params.search;
@@ -144,19 +144,19 @@ CitySchema.statics.executeQueryPickup = async function(idapp, params) {
let filterfindexact = {};
if (strfind) {
filterfindexact = {comune: strfind};
filterfindexact = { comune: strfind };
}
let limit = 10;
let risexact = [];
let filterfind = {comune: {$regex: '^' + strfind, $options: 'i'}};
let filterfind = { comune: { $regex: '^' + strfind, $options: 'i' } };
let aggr1 = [
{
$match: {comune: strfind},
$match: { comune: strfind },
},
{ $limit : 1 },
{ $limit: 1 },
{
$project: {
comune: { $concat: ["$comune", " (", "$prov", ")"] },
@@ -165,7 +165,7 @@ CitySchema.statics.executeQueryPickup = async function(idapp, params) {
];
if (params.filter) {
filterfind = {...params.filter, ...filterfind};
filterfind = { ...params.filter, ...filterfind };
limit = 200;
} else {
// risexact = await City.find(filterfindexact, {comune: 1, prov: 1, reg: 1}).lean();
@@ -176,7 +176,7 @@ CitySchema.statics.executeQueryPickup = async function(idapp, params) {
{
$match: filterfind,
},
{ $limit : limit },
{ $limit: limit },
{
$project: {
comune: { $concat: ["$comune", " (", "$prov", ")"] },
@@ -192,17 +192,18 @@ CitySchema.statics.executeQueryPickup = async function(idapp, params) {
};
CitySchema.statics.findAllIdApp = async function(idapp) {
CitySchema.statics.findAllIdApp = async function (idapp) {
const myfind = {};
return await City.find(myfind);
};
const City = mongoose.model('City', CitySchema);
City.createIndexes((err) => {
if (err) throw err;
});
module.exports = {City};
module.exports = { City };

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

@@ -605,7 +605,8 @@ module.exports.getTotalOrderById = async function (id) {
];
return await Order.aggregate(query);
const ris = await Order.aggregate(query);
return ris;
}
module.exports.RemoveDeletedOrdersInOrderscart = async function () {

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

@@ -8,7 +8,7 @@ mongoose.level = 'F';
const tools = require('../tools/general');
const {ObjectID} = require('mongodb');
const { ObjectID } = require('mongodb');
const shared_consts = require('../tools/shared_nodejs');
@@ -35,18 +35,25 @@ const ProvinceSchema = new Schema({
link_grp: {
type: String,
},
card : {
card: {
type: String,
},
link_telegram: {
type: String,
},
}, { _id : false });
lat: {
type: Number,
},
long: {
type: Number,
},
}, { _id: false });
ProvinceSchema.pre('save', async function (next) {
if (this.isNew) {
const myrec = await Province.findOne().limit(1).sort({_id:-1});
const myrec = await Province.findOne().limit(1).sort({ _id: -1 });
if (!!myrec) {
if (myrec._doc._id === 0)
this._id = 1;
@@ -61,8 +68,8 @@ ProvinceSchema.pre('save', async function (next) {
next();
});
ProvinceSchema.statics.getRegionByStrProvince = async function(strprovince) {
const myrec = await Province.findOne({prov: strprovince}).lean();
ProvinceSchema.statics.getRegionByStrProvince = async function (strprovince) {
const myrec = await Province.findOne({ prov: strprovince }).lean();
if (myrec) {
return myrec.reg;
}
@@ -70,8 +77,8 @@ ProvinceSchema.statics.getRegionByStrProvince = async function(strprovince) {
return '';
}
ProvinceSchema.statics.getStrProvinceByProv = async function(prov) {
const myrec = await Province.findOne({prov}).lean();
ProvinceSchema.statics.getStrProvinceByProv = async function (prov) {
const myrec = await Province.findOne({ prov }).lean();
if (myrec) {
return myrec.descr;
}
@@ -79,14 +86,14 @@ ProvinceSchema.statics.getStrProvinceByProv = async function(prov) {
return '';
}
ProvinceSchema.statics.getFieldsForSearch = function() {
ProvinceSchema.statics.getFieldsForSearch = function () {
return [
{field: 'prov', type: tools.FieldType.string},
{field: 'descr', type: tools.FieldType.string},
{ field: 'prov', type: tools.FieldType.string },
{ field: 'descr', type: tools.FieldType.string },
];
};
ProvinceSchema.statics.executeQueryTable = function(idapp, params) {
ProvinceSchema.statics.executeQueryTable = function (idapp, params) {
params.fieldsearch = this.getFieldsForSearch();
const strfind = params.search;
@@ -98,7 +105,7 @@ ProvinceSchema.statics.executeQueryTable = function(idapp, params) {
return tools.executeQueryTable(this, 0, params);
};
ProvinceSchema.statics.executeQueryPickup = async function(idapp, params) {
ProvinceSchema.statics.executeQueryPickup = async function (idapp, params) {
const strfind = params.search;
@@ -106,12 +113,12 @@ ProvinceSchema.statics.executeQueryPickup = async function(idapp, params) {
return [];
}
let filterfindexact = {descr: strfind};
let filterfindexact = { descr: strfind };
const risexact = await Province.find(filterfindexact).lean();
let filterfind = {};
filterfind = {descr: {$regex: '^' + strfind, $options: 'i'}};
filterfind = { descr: { $regex: '^' + strfind, $options: 'i' } };
const ris = await Province.find(filterfind).lean().limit(10);
@@ -119,16 +126,34 @@ ProvinceSchema.statics.executeQueryPickup = async function(idapp, params) {
};
ProvinceSchema.statics.findAllIdApp = async function(idapp) {
ProvinceSchema.statics.findAllIdApp = async function (idapp) {
const myfind = {};
return Province.find(myfind).sort({descr: 1});
return Province.find(myfind).sort({ descr: 1 });
};
ProvinceSchema.statics.setCoordinatesOnDB = async function () {
const arrprov = await Province.find({}).lean();
// Funzione per ottenere le coordinate di tutte le città
for (const prov of arrprov) {
if (!prov.lat) {
let coord = await tools.getCityCoordinates(prov);
if (coord) {
let ris = await Province.findOneAndUpdate({ _id: prov._id }, { $set: { lat: coord.lat, long: coord.long } }, { new: true });
console.log(' *** Update ', prov.descr, 'lat', ris.lat, 'long', ris.long);
}
}
}
};
const Province = mongoose.model('Province', ProvinceSchema);
Province.createIndexes((err) => {
if (err) throw err;
});
module.exports = {Province};
module.exports = { Province };