From 3fb744458041c557e0b74fcac9358d1524b3e3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 28 May 2021 11:12:21 -0400 Subject: [PATCH] fix: returnOriginal deprecation https://github.com/mongodb/node-mongodb-native/pull/2808 --- src/database/mongo/hash.js | 10 +++++++++- src/database/mongo/main.js | 7 ++++++- src/database/mongo/sorted.js | 10 +++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js index ec8a0b9c03..0829bbf8af 100644 --- a/src/database/mongo/hash.js +++ b/src/database/mongo/hash.js @@ -222,7 +222,15 @@ module.exports = function (module) { return result.map(data => data && data[field]); } - const result = await module.client.collection('objects').findOneAndUpdate({ _key: key }, { $inc: increment }, { returnOriginal: false, upsert: true }); + const result = await module.client.collection('objects').findOneAndUpdate({ + _key: key, + }, { + $inc: increment, + }, { + returnDocument: 'after', + upsert: true, + }); + cache.del(key); return result && result.value ? result.value[field] : null; }; diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js index 1e4f7e51df..e7b961a30c 100644 --- a/src/database/mongo/main.js +++ b/src/database/mongo/main.js @@ -90,7 +90,12 @@ module.exports = function (module) { } const result = await module.client.collection('objects').findOneAndUpdate({ _key: key, - }, { $inc: { data: 1 } }, { returnOriginal: false, upsert: true }); + }, { + $inc: { data: 1 }, + }, { + returnDocument: 'after', + upsert: true, + }); return result && result.value ? result.value.data : null; }; diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js index 87664c71ed..7b59828e49 100644 --- a/src/database/mongo/sorted.js +++ b/src/database/mongo/sorted.js @@ -400,7 +400,15 @@ module.exports = function (module) { data.score = parseFloat(increment); try { - const result = await module.client.collection('objects').findOneAndUpdate({ _key: key, value: value }, { $inc: data }, { returnOriginal: false, upsert: true }); + const result = await module.client.collection('objects').findOneAndUpdate({ + _key: key, + value: value, + }, { + $inc: data, + }, { + returnDocument: 'after', + upsert: true, + }); return result && result.value ? result.value.score : null; } catch (err) { // if there is duplicate key error retry the upsert