diff --git a/src/server/models/account.js b/src/server/models/account.js index 5e15e9f..21209b4 100755 --- a/src/server/models/account.js +++ b/src/server/models/account.js @@ -741,4 +741,8 @@ AccountSchema.statics.updateSaldoAndTransato_AllAccounts = async function (idapp const Account = mongoose.model('Account', AccountSchema); +Account.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Account }; diff --git a/src/server/models/adtype.js b/src/server/models/adtype.js index 7b3a19a..455331d 100755 --- a/src/server/models/adtype.js +++ b/src/server/models/adtype.js @@ -64,4 +64,8 @@ AdTypeSchema.statics.executeQueryTable = function(idapp, params) { const AdType = mongoose.model('AdType', AdTypeSchema); +AdType.createIndexes((err) => { + if (err) throw err; +}); + module.exports = {AdType}; diff --git a/src/server/models/adtypegood.js b/src/server/models/adtypegood.js index 09e95e8..7aebac6 100755 --- a/src/server/models/adtypegood.js +++ b/src/server/models/adtypegood.js @@ -64,4 +64,8 @@ AdTypeGoodSchema.statics.executeQueryTable = function(idapp, params) { const AdTypeGood = mongoose.model('AdTypeGood', AdTypeGoodSchema); +AdTypeGood.createIndexes((err) => { + if (err) throw err; +}); + module.exports = {AdTypeGood}; diff --git a/src/server/models/booking.js b/src/server/models/booking.js index a6bbca7..de375e3 100755 --- a/src/server/models/booking.js +++ b/src/server/models/booking.js @@ -122,4 +122,8 @@ bookingSchema.statics.findAllDistinctByBooking = function (idapp) { const Booking = mongoose.model('Booking', bookingSchema); +Booking.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Booking }; diff --git a/src/server/models/bot.js b/src/server/models/bot.js index 50f622e..bb0d430 100755 --- a/src/server/models/bot.js +++ b/src/server/models/bot.js @@ -76,4 +76,8 @@ BotSchema.statics.findAllIdApp = async function(idapp) { const MyBot = mongoose.model('Bot', BotSchema); +MyBot.createIndexes((err) => { + if (err) throw err; +}); + module.exports = {MyBot}; diff --git a/src/server/models/calzoom.js b/src/server/models/calzoom.js index 72b427b..6ae1214 100755 --- a/src/server/models/calzoom.js +++ b/src/server/models/calzoom.js @@ -76,4 +76,8 @@ CalZoomSchema.statics.getNextZoom = async function (idapp) { const CalZoom = mongoose.model('CalZoom', CalZoomSchema); +CalZoom.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { CalZoom }; diff --git a/src/server/models/cart.js b/src/server/models/cart.js index 6e20fd9..92af3d6 100755 --- a/src/server/models/cart.js +++ b/src/server/models/cart.js @@ -31,6 +31,10 @@ const CartSchema = new Schema({ var Cart = module.exports = mongoose.model('Cart', CartSchema); +Cart.createIndexes((err) => { + if (err) throw err; +}); + module.exports.findAllIdApp = async function (idapp, userId) { const myfind = { idapp, userId }; diff --git a/src/server/models/cash.js b/src/server/models/cash.js index a265b6d..ee99fa3 100755 --- a/src/server/models/cash.js +++ b/src/server/models/cash.js @@ -82,6 +82,10 @@ const CashSchema = new Schema({ var Cash = module.exports = mongoose.model('Cash', CashSchema); +Cash.createIndexes((err) => { + if (err) throw err; +}); + module.exports.getFieldsForSearch = function () { return [] }; diff --git a/src/server/models/cashCategory.js b/src/server/models/cashCategory.js index 943066c..bce7e3b 100755 --- a/src/server/models/cashCategory.js +++ b/src/server/models/cashCategory.js @@ -28,6 +28,10 @@ const CashCategorySchema = new Schema({ var CashCategory = module.exports = mongoose.model('CashCategory', CashCategorySchema); +CashCategory.createIndexes((err) => { + if (err) throw err; +}); + module.exports.getFieldsForSearch = function () { return [] }; @@ -66,3 +70,4 @@ module.exports.createCashCategory = async function (CashCategory) { return null; }); } + diff --git a/src/server/models/cashSubCategory.js b/src/server/models/cashSubCategory.js index 077ec6c..6d587ee 100755 --- a/src/server/models/cashSubCategory.js +++ b/src/server/models/cashSubCategory.js @@ -69,3 +69,7 @@ module.exports.createCashSubCategory = async function (CashSubCategory) { return null; }); } + +module.exports.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/category.js b/src/server/models/category.js index 384af4e..9cbac88 100755 --- a/src/server/models/category.js +++ b/src/server/models/category.js @@ -50,4 +50,9 @@ CategorySchema.statics.findAllIdApp = async function (idapp) { const Category = mongoose.model('Category', CategorySchema); +Category.createIndexes((err) => { + if (err) throw err; +}); + + module.exports = { Category }; diff --git a/src/server/models/catgrp.js b/src/server/models/catgrp.js index 1078415..0f6b5c4 100755 --- a/src/server/models/catgrp.js +++ b/src/server/models/catgrp.js @@ -80,4 +80,8 @@ CatGrpSchema.statics.executeQueryTable = function (idapp, params) { const CatGrp = mongoose.model('CatGrp', CatGrpSchema); +CatGrp.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { CatGrp }; diff --git a/src/server/models/cfgserver.js b/src/server/models/cfgserver.js index d1ebfae..98eeafb 100755 --- a/src/server/models/cfgserver.js +++ b/src/server/models/cfgserver.js @@ -43,5 +43,9 @@ CfgServerSchema.statics.findAllIdApp = async function(idapp) { const CfgServer = mongoose.model('CfgServer', CfgServerSchema); +CfgServer.createIndexes((err) => { + if (err) throw err; +}); + module.exports = {CfgServer}; diff --git a/src/server/models/circuit.js b/src/server/models/circuit.js index eb75d88..0096f2f 100755 --- a/src/server/models/circuit.js +++ b/src/server/models/circuit.js @@ -1221,4 +1221,8 @@ CircuitSchema.statics.setFido = async function (idapp, username, circuitName, gr const Circuit = mongoose.model('Circuit', CircuitSchema); +Circuit.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Circuit }; diff --git a/src/server/models/city.js b/src/server/models/city.js index d58edf6..fb7ee3b 100755 --- a/src/server/models/city.js +++ b/src/server/models/city.js @@ -201,4 +201,8 @@ CitySchema.statics.findAllIdApp = async function(idapp) { const City = mongoose.model('City', CitySchema); +City.createIndexes((err) => { + if (err) throw err; +}); + module.exports = {City}; diff --git a/src/server/models/contribtype.js b/src/server/models/contribtype.js index bdfd4cd..96b1fab 100755 --- a/src/server/models/contribtype.js +++ b/src/server/models/contribtype.js @@ -52,4 +52,8 @@ ContribtypeSchema.statics.findAllIdApp = async function (idapp) { const Contribtype = mongoose.model('Contribtype', ContribtypeSchema); +Contribtype.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Contribtype }; diff --git a/src/server/models/department.js b/src/server/models/department.js index daf4979..d669059 100755 --- a/src/server/models/department.js +++ b/src/server/models/department.js @@ -26,6 +26,10 @@ const departmentSchema = new Schema({ var Department = module.exports = mongoose.model('Department', departmentSchema); +module.exports.createIndexes((err) => { + if (err) throw err; +}); + module.exports.getFieldsForSearch = function () { return [{ field: 'name', type: tools.FieldType.string }, { field: 'username', type: tools.FieldType.string } diff --git a/src/server/models/discipline.js b/src/server/models/discipline.js index 3c446a2..cbc0320 100755 --- a/src/server/models/discipline.js +++ b/src/server/models/discipline.js @@ -106,4 +106,8 @@ DisciplineSchema.statics.DuplicateAllRecords = async function (idapporig, idappd const Discipline = mongoose.model('Discipline', DisciplineSchema); +Discipline.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Discipline }; diff --git a/src/server/models/extralist.js b/src/server/models/extralist.js index 6815c54..46de837 100755 --- a/src/server/models/extralist.js +++ b/src/server/models/extralist.js @@ -332,6 +332,9 @@ ExtraListSchema.statics.ImportData = async function (locale, idapp, strdata) { const ExtraList = mongoose.model('ExtraList', ExtraListSchema); +ExtraList.createIndexes((err) => { + if (err) throw err; +}); module.exports = { ExtraList }; diff --git a/src/server/models/gallery.js b/src/server/models/gallery.js index cd7e555..4d11a81 100755 --- a/src/server/models/gallery.js +++ b/src/server/models/gallery.js @@ -64,4 +64,8 @@ GallerySchema.statics.findAllIdApp = async function (idapp) { const Gallery = mongoose.model('Gallery', GallerySchema); +Gallery.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Gallery }; diff --git a/src/server/models/good.js b/src/server/models/good.js index f91a9d9..559fff9 100755 --- a/src/server/models/good.js +++ b/src/server/models/good.js @@ -80,4 +80,8 @@ GoodSchema.statics.executeQueryTable = function (idapp, params) { const Good = mongoose.model('Good', GoodSchema); +Good.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Good }; diff --git a/src/server/models/graduatoria.js b/src/server/models/graduatoria.js index 7ae5af7..6164f2e 100755 --- a/src/server/models/graduatoria.js +++ b/src/server/models/graduatoria.js @@ -415,4 +415,8 @@ GraduatoriaSchema.statics.getPosizioneInGraduatoria = async function (idapp, ind const Graduatoria = mongoose.model('Graduatoria', GraduatoriaSchema); +Graduatoria.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Graduatoria }; diff --git a/src/server/models/group.js b/src/server/models/group.js index a642809..fbac281 100755 --- a/src/server/models/group.js +++ b/src/server/models/group.js @@ -47,3 +47,6 @@ module.exports.findAllIdApp = async function (idapp) { return await Group.find(myfind); }; +module.exports.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/hours.js b/src/server/models/hours.js index 3f6ca56..b267245 100755 --- a/src/server/models/hours.js +++ b/src/server/models/hours.js @@ -228,3 +228,6 @@ module.exports.calculateHoursTodo = async function (idtodo) { }; +module.exports.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/iscrittiArcadei.js b/src/server/models/iscrittiArcadei.js index 5d37dc5..545e27a 100755 --- a/src/server/models/iscrittiArcadei.js +++ b/src/server/models/iscrittiArcadei.js @@ -196,3 +196,7 @@ module.exports.findAllIdApp = async function(idapp) { return arrrec; }); }; + +module.exports.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/iscrittiConacreis.js b/src/server/models/iscrittiConacreis.js index cf8514f..9740220 100755 --- a/src/server/models/iscrittiConacreis.js +++ b/src/server/models/iscrittiConacreis.js @@ -196,3 +196,7 @@ module.exports.findAllIdApp = async function (idapp) { return arrrec }); }; + +module.exports.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/level.js b/src/server/models/level.js index 85c1e1f..1377744 100755 --- a/src/server/models/level.js +++ b/src/server/models/level.js @@ -73,4 +73,8 @@ LevelSchema.statics.executeQueryTable = function(idapp, params) { const Level = mongoose.model('Level', LevelSchema); +Level.createIndexes((err) => { + if (err) throw err; +}); + module.exports = {Level}; diff --git a/src/server/models/mailinglist.js b/src/server/models/mailinglist.js index 2ca9a73..27085ae 100755 --- a/src/server/models/mailinglist.js +++ b/src/server/models/mailinglist.js @@ -121,4 +121,8 @@ MailingListSchema.statics.findByHash = function (idapp, hash) { const MailingList = mongoose.model('MailingList', MailingListSchema); +MailingList.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { MailingList }; diff --git a/src/server/models/movement.js b/src/server/models/movement.js index c1f0bb0..1f60b75 100755 --- a/src/server/models/movement.js +++ b/src/server/models/movement.js @@ -693,4 +693,8 @@ MovementSchema.statics.checkIfCoinsAlreadySent = async function (notifId) { const Movement = mongoose.model('Movement', MovementSchema); +Movement.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Movement }; diff --git a/src/server/models/msg_template.js b/src/server/models/msg_template.js index 05b6615..7f720e6 100755 --- a/src/server/models/msg_template.js +++ b/src/server/models/msg_template.js @@ -125,4 +125,8 @@ MsgTemplateSchema.statics.findAllIdApp = async function (idapp) { const MsgTemplate = mongoose.model('MsgTemplate', MsgTemplateSchema); +MsgTemplate.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { MsgTemplate }; diff --git a/src/server/models/mybacheca.js b/src/server/models/mybacheca.js index c7c22f4..fa00061 100755 --- a/src/server/models/mybacheca.js +++ b/src/server/models/mybacheca.js @@ -378,4 +378,8 @@ MyBachecaSchema.statics.getCompleteRecord = function (idapp, id) { const MyBacheca = mongoose.model('MyBacheca', MyBachecaSchema); +MyBacheca.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { MyBacheca }; diff --git a/src/server/models/myelem.js b/src/server/models/myelem.js index 6d64f0e..463b240 100755 --- a/src/server/models/myelem.js +++ b/src/server/models/myelem.js @@ -210,4 +210,8 @@ MyElemSchema.statics.findAllIdApp = async function (idapp) { const MyElem = mongoose.model('MyElem', MyElemSchema); +MyElem.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { MyElem }; diff --git a/src/server/models/myevent.js b/src/server/models/myevent.js index 53bf5e9..3dfa33c 100755 --- a/src/server/models/myevent.js +++ b/src/server/models/myevent.js @@ -276,4 +276,8 @@ if (tools.INITDB_FIRSTIME) { const MyEvent = mongoose.model('MyEvent', MyEventSchema); +MyEvent.createIndexes((err) => { + if (err) throw err; +}); + module.exports = {MyEvent}; diff --git a/src/server/models/mygood.js b/src/server/models/mygood.js index 5dafd8b..8eea39e 100755 --- a/src/server/models/mygood.js +++ b/src/server/models/mygood.js @@ -348,4 +348,8 @@ MyGoodSchema.statics.getProject = function () { const MyGood = mongoose.model('MyGood', MyGoodSchema); +MyGood.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { MyGood }; diff --git a/src/server/models/mygroup.js b/src/server/models/mygroup.js index 296d95b..56b3370 100755 --- a/src/server/models/mygroup.js +++ b/src/server/models/mygroup.js @@ -643,4 +643,8 @@ MyGroupSchema.statics.setReceiveRisGroup = async function (idapp, groupname) { const MyGroup = mongoose.model('MyGroup', MyGroupSchema); +MyGroup.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { MyGroup }; diff --git a/src/server/models/myhosp.js b/src/server/models/myhosp.js index 636c6e2..b87c528 100755 --- a/src/server/models/myhosp.js +++ b/src/server/models/myhosp.js @@ -348,4 +348,8 @@ MyHospSchema.statics.getProject = function () { const MyHosp = mongoose.model('MyHosp', MyHospSchema); +MyHosp.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { MyHosp }; diff --git a/src/server/models/mypage.js b/src/server/models/mypage.js index a11bee9..172b6f3 100755 --- a/src/server/models/mypage.js +++ b/src/server/models/mypage.js @@ -218,4 +218,8 @@ MyPageSchema.statics.findInternalPages = async function (idapp) { const MyPage = mongoose.model('MyPage', MyPageSchema); +MyPage.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { MyPage }; diff --git a/src/server/models/myskill.js b/src/server/models/myskill.js index 310656e..bb9bcb6 100755 --- a/src/server/models/myskill.js +++ b/src/server/models/myskill.js @@ -354,4 +354,8 @@ MySkillSchema.statics.getCompleteRecord = function (idapp, id) { const MySkill = mongoose.model('MySkill', MySkillSchema); +MySkill.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { MySkill }; diff --git a/src/server/models/newstosent.js b/src/server/models/newstosent.js index d460eb0..5196bc1 100755 --- a/src/server/models/newstosent.js +++ b/src/server/models/newstosent.js @@ -170,4 +170,8 @@ NewstosentSchema.statics.isActivated = async function (_id) { const Newstosent = mongoose.model('Newstosent', NewstosentSchema); +Newstosent.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Newstosent }; diff --git a/src/server/models/operator.js b/src/server/models/operator.js index 67b7022..e9bd45a 100755 --- a/src/server/models/operator.js +++ b/src/server/models/operator.js @@ -118,4 +118,8 @@ OperatorSchema.statics.findAllIdApp = function (idapp) { const Operator = mongoose.model('Operator', OperatorSchema); +Operator.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Operator }; diff --git a/src/server/models/opzemail.js b/src/server/models/opzemail.js index 9c27e34..0942ddb 100755 --- a/src/server/models/opzemail.js +++ b/src/server/models/opzemail.js @@ -43,4 +43,8 @@ OpzEmailSchema.statics.findAllIdApp = async function (idapp) { const OpzEmail = mongoose.model('OpzEmail', OpzEmailSchema); +OpzEmail.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { OpzEmail }; diff --git a/src/server/models/order.js b/src/server/models/order.js index e9391f1..585a204 100755 --- a/src/server/models/order.js +++ b/src/server/models/order.js @@ -1,7 +1,7 @@ + const mongoose = require('mongoose').set('debug', false) const Schema = mongoose.Schema; -const tools = require('../tools/general'); const { ObjectID } = require('mongodb'); @@ -79,11 +79,17 @@ const orderSchema = new Schema({ var Order = module.exports = mongoose.model('Order', orderSchema); +module.exports.createIndexes((err) => { + if (err) throw err; +}); + module.exports.getFieldsForSearch = function () { return [] }; module.exports.executeQueryTable = function (idapp, params) { + const tools = require('../tools/general'); + params.fieldsearch = this.getFieldsForSearch(); return tools.executeQueryTable(this, idapp, params); }; diff --git a/src/server/models/orderscart.js b/src/server/models/orderscart.js index 76ec3f9..ed614fd 100755 --- a/src/server/models/orderscart.js +++ b/src/server/models/orderscart.js @@ -276,3 +276,7 @@ OrdersCartSchema.pre('save', async function (next) { console.error(e.message); } }); + +module.exports.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/paymenttype.js b/src/server/models/paymenttype.js index 4a45408..37b22fd 100755 --- a/src/server/models/paymenttype.js +++ b/src/server/models/paymenttype.js @@ -45,4 +45,8 @@ PaymentTypeSchema.statics.findAllIdApp = async function (idapp) { const PaymentType = mongoose.model('Paymenttype', PaymentTypeSchema); +PaymentType.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { PaymentType }; diff --git a/src/server/models/permission.js b/src/server/models/permission.js index f975ea8..1d72e2d 100755 --- a/src/server/models/permission.js +++ b/src/server/models/permission.js @@ -57,4 +57,8 @@ PermissionSchema.statics.findAllIdApp = async function () { const Permission = mongoose.model('Permission', PermissionSchema); +Permission.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Permission }; diff --git a/src/server/models/producer.js b/src/server/models/producer.js index c6469e1..f21540f 100755 --- a/src/server/models/producer.js +++ b/src/server/models/producer.js @@ -100,3 +100,7 @@ module.exports.getProducerByID = function (id, callback) { // const Producer = mongoose.model('Producer', producerSchema); // module.exports = { Producer }; + +module.exports.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/product.js b/src/server/models/product.js index 323433b..a266557 100755 --- a/src/server/models/product.js +++ b/src/server/models/product.js @@ -122,6 +122,8 @@ const productSchema = new Schema({ var Product = module.exports = mongoose.model('Product', productSchema); +productSchema.index({ idapp: 1 }); + module.exports.getFieldsForSearch = function () { return [{ field: 'name', type: tools.FieldType.string }] }; @@ -211,6 +213,9 @@ module.exports.getProductByID = function (id, callback) { Product.findById(id, callback); } +module.exports.createIndexes((err) => { + if (err) throw err; +}); // const Product = mongoose.model('Product', ProductSchema); diff --git a/src/server/models/project.js b/src/server/models/project.js index 6632c08..ec5bf9a 100755 --- a/src/server/models/project.js +++ b/src/server/models/project.js @@ -428,5 +428,9 @@ ProjectSchema.pre('save', function (next) { var Project = mongoose.model('Projects', ProjectSchema); +Project.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Project }; diff --git a/src/server/models/province.js b/src/server/models/province.js index 4d45f6b..75296c6 100755 --- a/src/server/models/province.js +++ b/src/server/models/province.js @@ -127,4 +127,8 @@ ProvinceSchema.statics.findAllIdApp = async function(idapp) { const Province = mongoose.model('Province', ProvinceSchema); +Province.createIndexes((err) => { + if (err) throw err; +}); + module.exports = {Province}; diff --git a/src/server/models/reaction.js b/src/server/models/reaction.js index 43573ff..ed540f4 100755 --- a/src/server/models/reaction.js +++ b/src/server/models/reaction.js @@ -433,4 +433,8 @@ reactionSchema.statics.removeBookmark = async function ( const Reaction = mongoose.model('Reaction', reactionSchema); +Reaction.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Reaction }; diff --git a/src/server/models/search.js b/src/server/models/search.js index b39fb5d..6b6ed58 100755 --- a/src/server/models/search.js +++ b/src/server/models/search.js @@ -42,4 +42,8 @@ searchSchema.statics.findAllByUserIdAndIdApp = function (userId, idapp, sall) { const Search = mongoose.model('Search', searchSchema); +Search.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Search }; diff --git a/src/server/models/sectorgood.js b/src/server/models/sectorgood.js index 38a12ba..efc7c6f 100755 --- a/src/server/models/sectorgood.js +++ b/src/server/models/sectorgood.js @@ -80,4 +80,8 @@ SectorGoodSchema.statics.executeQueryTable = function (idapp, params) { const SectorGood = mongoose.model('SectorGood', SectorGoodSchema); +SectorGood.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { SectorGood }; diff --git a/src/server/models/sendmsg.js b/src/server/models/sendmsg.js index a20921d..73ebbed 100755 --- a/src/server/models/sendmsg.js +++ b/src/server/models/sendmsg.js @@ -109,4 +109,8 @@ sendmsgSchema.statics.findLastGroupByUserIdAndIdApp = function (userId, username const SendMsg = mongoose.model('SendMsg', sendmsgSchema); +SendMsg.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { SendMsg }; diff --git a/src/server/models/sendnotif.js b/src/server/models/sendnotif.js index d3240fa..21472bc 100755 --- a/src/server/models/sendnotif.js +++ b/src/server/models/sendnotif.js @@ -1220,4 +1220,8 @@ sendNotifSchema.statics.checkIfAlreadyExist = async function (idapp, tag, idpost const SendNotif = mongoose.model('SendNotif', sendNotifSchema); +SendNotif.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { SendNotif: SendNotif }; diff --git a/src/server/models/settings.js b/src/server/models/settings.js index 437785d..369f6f7 100755 --- a/src/server/models/settings.js +++ b/src/server/models/settings.js @@ -178,4 +178,8 @@ SettingsSchema.statics.getKeyNum = async function (idapp, key, mydefault) { const Settings = mongoose.model('Settings', SettingsSchema); +Settings.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Settings }; diff --git a/src/server/models/sharewithus.js b/src/server/models/sharewithus.js index c05699f..5d9a83b 100755 --- a/src/server/models/sharewithus.js +++ b/src/server/models/sharewithus.js @@ -47,3 +47,6 @@ module.exports.findAllIdApp = async function (idapp) { return await ShareWithUs.find(myfind); }; +module.exports.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/site.js b/src/server/models/site.js index c2172e1..4be0b69 100755 --- a/src/server/models/site.js +++ b/src/server/models/site.js @@ -1,8 +1,6 @@ const mongoose = require('mongoose').set('debug', false) const Schema = mongoose.Schema; -const tools = require('../tools/general'); - mongoose.Promise = global.Promise; mongoose.level = "F"; @@ -217,7 +215,6 @@ module.exports.executeQueryTable = async function (idapp, params, userreq) { } - }; module.exports.findAll = async function () { @@ -357,3 +354,7 @@ module.exports.createFirstUserAdmin = async function () { } }; + +module.exports.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/skill.js b/src/server/models/skill.js index 5bd6bbe..acecc53 100755 --- a/src/server/models/skill.js +++ b/src/server/models/skill.js @@ -78,4 +78,8 @@ SkillSchema.statics.executeQueryTable = function (idapp, params) { const Skill = mongoose.model('Skill', SkillSchema); +Skill.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Skill }; diff --git a/src/server/models/statusSkill.js b/src/server/models/statusSkill.js index fc16981..a776422 100755 --- a/src/server/models/statusSkill.js +++ b/src/server/models/statusSkill.js @@ -75,4 +75,8 @@ StatusSkillSchema.statics.executeQueryTable = function (idapp, params) { const StatusSkill = mongoose.model('StatusSkill', StatusSkillSchema); +StatusSkill.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { StatusSkill }; diff --git a/src/server/models/storehouse.js b/src/server/models/storehouse.js index 8ed78a8..f9e3d09 100755 --- a/src/server/models/storehouse.js +++ b/src/server/models/storehouse.js @@ -59,3 +59,6 @@ module.exports.findAllIdApp = async function (idapp) { return await Storehouse.find(myfind); }; +module.exports.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/subscribers.js b/src/server/models/subscribers.js index 975d15a..e2dc383 100755 --- a/src/server/models/subscribers.js +++ b/src/server/models/subscribers.js @@ -24,4 +24,8 @@ const SubscriberSchema = new Schema({ } }); -mongoose.model('subscribers', SubscriberSchema); +var Subscription = module.exports = mongoose.model('subscribers', SubscriberSchema); + +Subscription.createIndexes((err) => { + if (err) throw err; +}); diff --git a/src/server/models/subskill.js b/src/server/models/subskill.js index 2ed6ab1..689e686 100755 --- a/src/server/models/subskill.js +++ b/src/server/models/subskill.js @@ -78,4 +78,8 @@ SubSkillSchema.statics.executeQueryTable = function (idapp, params) { const SubSkill = mongoose.model('SubSkill', SubSkillSchema); +SubSkill.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { SubSkill }; diff --git a/src/server/models/templemail.js b/src/server/models/templemail.js index c5f740d..f9671cf 100755 --- a/src/server/models/templemail.js +++ b/src/server/models/templemail.js @@ -67,4 +67,8 @@ TemplEmailSchema.statics.findAllIdApp = async function (idapp) { const TemplEmail = mongoose.model('TemplEmail', TemplEmailSchema); +TemplEmail.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { TemplEmail }; diff --git a/src/server/models/todo.js b/src/server/models/todo.js index d92db32..b873c20 100755 --- a/src/server/models/todo.js +++ b/src/server/models/todo.js @@ -519,5 +519,9 @@ TodoSchema.pre('save', function (next) { var Todo = mongoose.model('Todos', TodoSchema); +Todo.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Todo }; diff --git a/src/server/models/user.js b/src/server/models/user.js index b50d93b..46f5b73 100755 --- a/src/server/models/user.js +++ b/src/server/models/user.js @@ -4721,7 +4721,7 @@ if (tools.INITDB_FIRSTIME) { console.log(' createIndex User Index...'); UserSchema.index({ userId: 1 }); - UserSchema.index({ 'idapp': 1 }); + UserSchema.index({ idapp: 1 }); // UserSchema.index({ username: 'text', name: 'text', surname: 'text', email: 'text' }); @@ -5434,6 +5434,10 @@ UserSchema.statics.createNewSubRecord = async function (idapp, req) { const User = mongoose.model('User', UserSchema); +User.createIndexes((err) => { + if (err) throw err; +}); + class Hero { constructor(name, level) { this.name = name; diff --git a/src/server/models/userrequest.js b/src/server/models/userrequest.js index e3ee5c0..52fc536 100755 --- a/src/server/models/userrequest.js +++ b/src/server/models/userrequest.js @@ -95,4 +95,8 @@ UserRequestSchema.statics.findAllIdApp = async function (idapp) { const UserRequest = mongoose.model('UserRequest', UserRequestSchema); +UserRequest.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { UserRequest }; diff --git a/src/server/models/variant.js b/src/server/models/variant.js index 01191ee..41c529b 100755 --- a/src/server/models/variant.js +++ b/src/server/models/variant.js @@ -38,3 +38,7 @@ module.exports.getVariantProductByID = function(id, callback){ module.exports.getAllVariants = function(callback){ Variant.find(callback) } +module.exports.createIndexes((err) => { + if (err) throw err; + }); + \ No newline at end of file diff --git a/src/server/models/where.js b/src/server/models/where.js index 5f13a7d..9675afc 100755 --- a/src/server/models/where.js +++ b/src/server/models/where.js @@ -51,4 +51,8 @@ WhereSchema.statics.findAllIdApp = async function (idapp) { const Where = mongoose.model('Where', WhereSchema); +Where.createIndexes((err) => { + if (err) throw err; +}); + module.exports = { Where }; diff --git a/src/server/modules/Cart.js b/src/server/modules/Cart.js index d4fae39..4a19c19 100755 --- a/src/server/modules/Cart.js +++ b/src/server/modules/Cart.js @@ -96,7 +96,7 @@ class Cart { this.totalQty += order.quantity; this.totalPrice += order.price * order.quantity; } - + this.totalPrice = parseFloat(this.totalPrice.toFixed(2)) } diff --git a/src/server/router/api/actions.js b/src/server/router/api/actions.js index 0909f39..d5f44b4 100755 --- a/src/server/router/api/actions.js +++ b/src/server/router/api/actions.js @@ -1,5 +1,5 @@ const mongoose = require('mongoose').set('debug', false) -const Subscription = mongoose.model('subscribers'); +const Subscription = require('../../models/subscribers'); //const { ListaIngresso } = require('../../models/listaingresso'); const { Graduatoria } = require('../../models/graduatoria'); diff --git a/src/server/router/cart_router.js b/src/server/router/cart_router.js index c2822e5..3d33902 100755 --- a/src/server/router/cart_router.js +++ b/src/server/router/cart_router.js @@ -99,6 +99,7 @@ router.post('/:userId', authenticate, async function (req, res, next) { } catch (e) { + console.error('Err:', e); return res.send({ code: server_constants.RIS_CODE_ERR, cart: 0 }); } diff --git a/src/server/router/mygen_router.js b/src/server/router/mygen_router.js index 596a0bd..faa8e06 100755 --- a/src/server/router/mygen_router.js +++ b/src/server/router/mygen_router.js @@ -11,7 +11,7 @@ var server_constants = require('../tools/server_constants'); var { authenticate, authenticate_noerror, auth_default } = require('../middleware/authenticate'); var mongoose = require('mongoose').set('debug', false); -const Subscription = mongoose.model('subscribers'); +const Subscription = require('../models/subscribers'); const _ = require('lodash'); const { MyBacheca } = require('../models/mybacheca'); diff --git a/src/server/router/mygoods_router.js b/src/server/router/mygoods_router.js index 631113e..d6cadcd 100755 --- a/src/server/router/mygoods_router.js +++ b/src/server/router/mygoods_router.js @@ -10,7 +10,7 @@ var server_constants = require('../tools/server_constants'); var {authenticate, auth_default} = require('../middleware/authenticate'); var mongoose = require('mongoose').set('debug', false); -const Subscription = mongoose.model('subscribers'); +const Subscription = require('../models/subscribers'); const _ = require('lodash'); const {MyGood} = require('../models/mygood'); diff --git a/src/server/router/myskills_router.js b/src/server/router/myskills_router.js index b92cb62..8593c77 100755 --- a/src/server/router/myskills_router.js +++ b/src/server/router/myskills_router.js @@ -10,7 +10,7 @@ var server_constants = require('../tools/server_constants'); var {authenticate, auth_default} = require('../middleware/authenticate'); var mongoose = require('mongoose').set('debug', false); -const Subscription = mongoose.model('subscribers'); +const Subscription = require('../models/subscribers'); const _ = require('lodash'); const {MySkill} = require('../models/myskill'); diff --git a/src/server/router/orders_router.js b/src/server/router/orders_router.js index 9515933..90c3007 100755 --- a/src/server/router/orders_router.js +++ b/src/server/router/orders_router.js @@ -12,7 +12,7 @@ var { Project } = require('../models/project'); var { authenticate, auth_default } = require('../middleware/authenticate'); var mongoose = require('mongoose').set('debug', false) -const Subscription = mongoose.model('subscribers'); +const Subscription = require('../models/subscribers'); const _ = require('lodash'); diff --git a/src/server/router/push_router.js b/src/server/router/push_router.js index d7d8d83..8961718 100755 --- a/src/server/router/push_router.js +++ b/src/server/router/push_router.js @@ -1,7 +1,7 @@ const express = require('express'); const router = express.Router(); const mongoose = require('mongoose').set('debug', false); -const Subscription = mongoose.model('subscribers'); +const Subscription = require('../models/subscribers'); // const q = require('q'); const webpush = require('web-push'); diff --git a/src/server/router/subscribe_router.js b/src/server/router/subscribe_router.js index b0852ff..9df5269 100755 --- a/src/server/router/subscribe_router.js +++ b/src/server/router/subscribe_router.js @@ -1,7 +1,7 @@ const express = require('express'); const router = express.Router(); const mongoose = require('mongoose').set('debug', false); -const Subscription = mongoose.model('subscribers'); +const Subscription = require('../models/subscribers'); const tools = require('../tools/general'); diff --git a/src/server/router/test_router.js b/src/server/router/test_router.js index 6dfab18..1cdb2eb 100755 --- a/src/server/router/test_router.js +++ b/src/server/router/test_router.js @@ -10,7 +10,7 @@ var { Project } = require('../models/project'); var { authenticate } = require('../middleware/authenticate'); var mongoose = require('mongoose').set('debug', false) -const Subscription = mongoose.model('subscribers'); +const Subscription = require('../models/subscribers'); var { Todo } = require('../models/todo'); const { Settings } = require('../models/settings'); diff --git a/src/server/router/users_router.js b/src/server/router/users_router.js index 9f6f174..b6d39ef 100755 --- a/src/server/router/users_router.js +++ b/src/server/router/users_router.js @@ -43,7 +43,7 @@ const { Account } = require('../models/account'); const mongoose = require('mongoose').set('debug', false); -const Subscription = mongoose.model('subscribers'); +const Subscription = require('../models/subscribers'); function existSubScribe(userId, access, browser) { return Subscription.findOne({ userId, access, browser }).then(itemsub => { diff --git a/src/server/server.js b/src/server/server.js index d3d6e00..ae87210 100755 --- a/src/server/server.js +++ b/src/server/server.js @@ -63,6 +63,7 @@ console.log('DB: ' + process.env.DATABASE); var app = express(); + let telegrambot = null; const tools = require('./tools/general'); diff --git a/src/server/tools/general.js b/src/server/tools/general.js index 6814204..089d81f 100755 --- a/src/server/tools/general.js +++ b/src/server/tools/general.js @@ -10,8 +10,6 @@ require('../models/subscribers'); const printf = require('util').format; -const Site = require('../models/site'); - const CryptoJS = require('crypto-js'); const Url = require('url-parse'); @@ -21,7 +19,7 @@ const { ObjectID, ObjectId } = require('mongodb'); const shared_consts = require('./shared_nodejs'); const mongoose = require('mongoose').set('debug', false); -const Subscription = mongoose.model('subscribers'); +const Subscription = require('../models/subscribers'); const server_constants = require('./server_constants'); @@ -2952,14 +2950,14 @@ module.exports = { startTimeLog(name) { if (this.testing()) { - console.log('inizio', name); + // console.log('inizio', name); console.time(name); } }, endTimeLog(name) { if (this.testing()) { - console.log(' ... fine', name); + // console.log(' ... fine', name); console.timeEnd(name); } }, @@ -3920,6 +3918,8 @@ module.exports = { }, async loadApps() { + const Site = require('../models/site'); + try { this.MYAPPS = await Site.findAll(0); // console.log('this.MYAPPS', this.MYAPPS); @@ -3927,6 +3927,7 @@ module.exports = { console.error('loadApps', e); } }, + async getApps() { if (this.MYAPPS.length <= 0) await this.loadApps();