From 8363d654561a35eb8cfbae83000368e21847f0e3 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Mon, 3 Mar 2025 01:07:00 +0100 Subject: [PATCH] - passato mongoose da versione 7 a versione 8 --- logtrans.txt | 7 +- package.json | 2 +- src/server/models/attivita.js | 1 - src/server/models/myskill.js | 5 -- src/server/models/sendnotif.js | 9 +-- src/server/models/user.js | 4 -- yarn.lock | 118 ++++++++------------------------- 7 files changed, 36 insertions(+), 110 deletions(-) diff --git a/logtrans.txt b/logtrans.txt index d811b57..4b5b56f 100644 --- a/logtrans.txt +++ b/logtrans.txt @@ -433,4 +433,9 @@ Lun 03/03 ORE 00:40: [Circuito RIS Italia]: Inviate Monete da surya1977 a Saldi: surya1977: 62.55 RIS] -Giovannifruttadisicilia: 362.40 RIS] \ No newline at end of file +Giovannifruttadisicilia: 362.40 RIS] +Lun 03/03 ORE 01:06: [Circuito RIS Arezzo]: Inviate Monete da surya1977 a Andro 1 RIS [causale: test] + +Saldi: +surya1977: -1.10 RIS] +Andro: 1.00 RIS] \ No newline at end of file diff --git a/package.json b/package.json index f99cc16..46bb566 100755 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "jsonwebtoken": "^9.0.2", "lodash": "^4.17.21", "mongodb": "^6.14.0", - "mongoose": "^7.0.0", + "mongoose": "^8.11.0", "multer": "^1.4.5-lts.1", "mysql": "^2.18.1", "node-cron": "^3.0.3", diff --git a/src/server/models/attivita.js b/src/server/models/attivita.js index 1595660..fed2693 100755 --- a/src/server/models/attivita.js +++ b/src/server/models/attivita.js @@ -134,7 +134,6 @@ const AttivitaSchema = new Schema( ...tools.getFieldsForAnnunci() }, { strict: false }); -AttivitaSchema.index({ 'idapp': 1 }); AttivitaSchema.pre('save', async function (next) { diff --git a/src/server/models/myskill.js b/src/server/models/myskill.js index 29ab7aa..dd14bde 100755 --- a/src/server/models/myskill.js +++ b/src/server/models/myskill.js @@ -373,9 +373,4 @@ MySkillSchema.statics.getCompleteRecord = function (idapp, id) { const MySkill = mongoose.model('MySkill', MySkillSchema); -MySkill.createIndexes() - .then(() => { }) - .catch((err) => { throw err; }); - - module.exports = { MySkill }; diff --git a/src/server/models/sendnotif.js b/src/server/models/sendnotif.js index eca3fd2..4e99e5b 100755 --- a/src/server/models/sendnotif.js +++ b/src/server/models/sendnotif.js @@ -116,10 +116,10 @@ const sendNotifSchema = new Schema({ }, }); -sendNotifSchema.index({ idapp: 1 }); +/*sendNotifSchema.index({ idapp: 1 }); sendNotifSchema.index({ typedir: 1 }); sendNotifSchema.index({ typeid: 1 }); -sendNotifSchema.index({ sender: 1 }); +sendNotifSchema.index({ sender: 1 });*/ sendNotifSchema.index({ idapp: 1, typedir: 1, typeid: 1, status: 1, sender: 1 }); @@ -1383,9 +1383,4 @@ sendNotifSchema.statics.checkIfAlreadyExist = async function (idapp, tag, idpost const SendNotif = mongoose.model('SendNotif', sendNotifSchema); -SendNotif.createIndexes() - .then(() => { }) - .catch((err) => { throw err; }); - - module.exports = { SendNotif: SendNotif }; diff --git a/src/server/models/user.js b/src/server/models/user.js index 8da5668..32bcfcb 100755 --- a/src/server/models/user.js +++ b/src/server/models/user.js @@ -6304,10 +6304,6 @@ UserSchema.statics.createNewSubRecord = async function (idapp, req) { const User = mongoose.model('User', UserSchema); -User.createIndexes() - .then(() => { }) - .catch((err) => { throw err; }); - class Hero { constructor(name, level) { diff --git a/yarn.lock b/yarn.lock index 6a7767d..725a05e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -987,7 +987,7 @@ dependencies: make-plural "^7.0.0" -"@mongodb-js/saslprep@^1.1.0", "@mongodb-js/saslprep@^1.1.9": +"@mongodb-js/saslprep@^1.1.9": version "1.2.0" resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.2.0.tgz#4373d7a87660ea44a0a7a461ff6d8bc832733a4b" integrity sha512-+ywrb0AqkfaYuhHs6LxKWgqbh3I72EpEgESCw37o+9qPx9WTCkgDm2B+eMrwehGtHBWHFU4GXvnSCNiFhhausg== @@ -1181,14 +1181,6 @@ dependencies: "@types/webidl-conversions" "*" -"@types/whatwg-url@^8.2.1": - version "8.2.2" - resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63" - integrity sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA== - dependencies: - "@types/node" "*" - "@types/webidl-conversions" "*" - "@types/yargs-parser@*": version "21.0.3" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15" @@ -1907,12 +1899,7 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -bson@^5.5.0: - version "5.5.1" - resolved "https://registry.yarnpkg.com/bson/-/bson-5.5.1.tgz#f5849d405711a7f23acdda9a442375df858e6833" - integrity sha512-ix0EwukN2EpC0SRWIj/7B5+A6uQMQy6KMREI9qQqvgpkV2frH63T0UDVd1SYedL6dNCmDBYB3QtXi4ISk9YT+g== - -bson@^6.10.3: +bson@^6.10.1, bson@^6.10.3: version "6.10.3" resolved "https://registry.yarnpkg.com/bson/-/bson-6.10.3.tgz#5f9a463af6b83e264bedd08b236d1356a30eda47" integrity sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ== @@ -4417,14 +4404,6 @@ interpret@^3.1.1: resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== -ip-address@^9.0.5: - version "9.0.5" - resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" - integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g== - dependencies: - jsbn "1.1.0" - sprintf-js "^1.1.3" - ip-regex@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd" @@ -5344,11 +5323,6 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -jsbn@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" - integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== - jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -5515,10 +5489,10 @@ jws@^4.0.0: jwa "^2.0.0" safe-buffer "^5.0.1" -kareem@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.5.1.tgz#7b8203e11819a8e77a34b3517d3ead206764d15d" - integrity sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA== +kareem@2.6.3: + version "2.6.3" + resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.6.3.tgz#23168ec8ffb6c1abfd31b7169a6fb1dd285992ac" + integrity sha512-C3iHfuGUXK2u8/ipq9LfjFfXFxAZMQJJq7vLS45r3D9Y2xQ/m4S8zaR4zMLFWh9AsNPXmcFfUDhTEO8UIC/V6Q== kind-of@^3.0.2: version "3.2.2" @@ -6041,14 +6015,6 @@ mocha@^11.1.0: yargs-parser "^21.1.1" yargs-unparser "^2.0.0" -mongodb-connection-string-url@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf" - integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ== - dependencies: - "@types/whatwg-url" "^8.2.1" - whatwg-url "^11.0.0" - mongodb-connection-string-url@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz#e223089dfa0a5fa9bf505f8aedcbc67b077b33e7" @@ -6057,17 +6023,6 @@ mongodb-connection-string-url@^3.0.0: "@types/whatwg-url" "^11.0.2" whatwg-url "^14.1.0 || ^13.0.0" -mongodb@5.9.2: - version "5.9.2" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-5.9.2.tgz#39a73b9fbc87ac9d9c1aaf8aab5c5bb69e2b913e" - integrity sha512-H60HecKO4Bc+7dhOv4sJlgvenK4fQNqqUIlXxZYQNbfEWSALGAwGoyJd/0Qwk4TttFXUOHJ2ZJQe/52ScaUwtQ== - dependencies: - bson "^5.5.0" - mongodb-connection-string-url "^2.6.0" - socks "^2.7.1" - optionalDependencies: - "@mongodb-js/saslprep" "^1.1.0" - mongodb@^6.14.0: version "6.14.0" resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-6.14.0.tgz#b260bcf6070c091b43c748f4c35f06c5d852786f" @@ -6077,18 +6032,27 @@ mongodb@^6.14.0: bson "^6.10.3" mongodb-connection-string-url "^3.0.0" -mongoose@^7.0.0: - version "7.8.6" - resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-7.8.6.tgz#86e9c287bf9f15a1d4f236426b5d698b1685a8c3" - integrity sha512-1oVPRHvcmPVwk/zeSTEzayzQEVeYQM1D5zrkLsttfNNB7pPRUmkKeFu6gpbvyEswOuZLrWJjqB8kSTY+k2AZOA== +mongodb@~6.13.0: + version "6.13.1" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-6.13.1.tgz#924319f957a22efda45a96d38c08a594fd7929fa" + integrity sha512-gdq40tX8StmhP6akMp1pPoEVv+9jTYFSrga/g23JxajPAQhH39ysZrHGzQCSd9PEOnuEQEdjIWqxO7ZSwC0w7Q== dependencies: - bson "^5.5.0" - kareem "2.5.1" - mongodb "5.9.2" + "@mongodb-js/saslprep" "^1.1.9" + bson "^6.10.3" + mongodb-connection-string-url "^3.0.0" + +mongoose@^8.11.0: + version "8.11.0" + resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-8.11.0.tgz#11e7f604f1febc4c11f56ec240dc740352aace7e" + integrity sha512-xaQSuaLk2JKmXI5zDVVWXVCQTnWhAe8MFOijMnwOuP/wucKVphd3f+ouDKivCDMGjYBDrR7dtoyV0U093xbKqA== + dependencies: + bson "^6.10.1" + kareem "2.6.3" + mongodb "~6.13.0" mpath "0.9.0" mquery "5.0.0" ms "2.1.3" - sift "16.0.1" + sift "17.1.3" moo@^0.5.1: version "0.5.2" @@ -7791,10 +7755,10 @@ side-channel@^1.0.6, side-channel@^1.1.0: side-channel-map "^1.0.1" side-channel-weakmap "^1.0.2" -sift@16.0.1: - version "16.0.1" - resolved "https://registry.yarnpkg.com/sift/-/sift-16.0.1.tgz#e9c2ccc72191585008cf3e36fc447b2d2633a053" - integrity sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ== +sift@17.1.3: + version "17.1.3" + resolved "https://registry.yarnpkg.com/sift/-/sift-17.1.3.tgz#9d2000d4d41586880b0079b5183d839c7a142bf7" + integrity sha512-Rtlj66/b0ICeFzYTuNvX/EF1igRbbnGSvEyT79McoZa/DeGhMyC5pWKOEsZKnpkqtSeovd5FL/bjHWC3CIIvCQ== signal-exit@^3.0.0, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" @@ -7842,11 +7806,6 @@ slick@^1.12.2: resolved "https://registry.yarnpkg.com/slick/-/slick-1.12.2.tgz#bd048ddb74de7d1ca6915faa4a57570b3550c2d7" integrity sha512-4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A== -smart-buffer@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" - integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== - socket.io-adapter@~2.5.2: version "2.5.5" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz#c7a1f9c703d7756844751b6ff9abfc1780664082" @@ -7886,14 +7845,6 @@ socket.io@^4.4.1: socket.io-adapter "~2.5.2" socket.io-parser "~4.2.4" -socks@^2.7.1: - version "2.8.4" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.4.tgz#07109755cdd4da03269bda4725baa061ab56d5cc" - integrity sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ== - dependencies: - ip-address "^9.0.5" - smart-buffer "^4.2.0" - source-map-js@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" @@ -8470,13 +8421,6 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -tr46@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" - integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== - dependencies: - punycode "^2.1.1" - tr46@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.0.0.tgz#3b46d583613ec7283020d79019f1335723801cec" @@ -8964,14 +8908,6 @@ whatwg-mimetype@^4.0.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a" integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg== -whatwg-url@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" - integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== - dependencies: - tr46 "^3.0.0" - webidl-conversions "^7.0.0" - whatwg-url@^14.0.0, whatwg-url@^14.1.0, "whatwg-url@^14.1.0 || ^13.0.0": version "14.1.1" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.1.1.tgz#ce71e240c61541315833b5cdafd139a479e47058"