Merge pull request #38 from 2do2go/refactor/use-return-document

Refactor: Use findOneAndUpdate with returnDocument
2do2go · Sep 11, 2021 · f197aa3 · f197aa3
2 parents 4363afb + 5ee457a
commit f197aa3
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 42 deletions.
diff --git a/lib/mongoStore.js b/lib/mongoStore.js
@@ -147,7 +147,7 @@ MongoStore.prototype.incr = function(key, callback) {
 				modifier,
 				{
 					upsert: true,
-					returnOriginal: false
+					returnDocument: 'after'
 				},
 				this.slot()
 			);
@@ -201,7 +201,7 @@ MongoStore.prototype.decrement = function(key) {
 				modifier,
 				{
 					upsert: true,
-					returnOriginal: false
+					returnDocument: 'after'
 				},
 				this.slot()
 			);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "mongodb"
   ],
   "dependencies": {
-    "mongodb": ">= 3.3.4 < 4.0.0",
+    "mongodb": "^3.6.7",
     "twostep": "0.4.2",
     "underscore": "1.12.1"
   },

diff --git a/test/mongoStore/decrement/withFindOneAndUpdateError.js b/test/mongoStore/decrement/withFindOneAndUpdateError.js
@@ -97,7 +97,7 @@ describe(describeTitle, function() {
 				},
 				{
 					upsert: true,
-					returnOriginal: false
+					returnDocument: 'after'
 				}
 			]);
 

diff --git a/test/mongoStore/decrement/withResetExpireDateOnCange.js b/test/mongoStore/decrement/withResetExpireDateOnCange.js
@@ -93,7 +93,7 @@ describe(describeTitle, function() {
 				},
 				{
 					upsert: true,
-					returnOriginal: false
+					returnDocument: 'after'
 				}
 			]);
 

diff --git a/test/mongoStore/decrement/withoutResetExpireDateOnChange.js b/test/mongoStore/decrement/withoutResetExpireDateOnChange.js
@@ -93,7 +93,7 @@ describe(describeTitle, function() {
 				},
 				{
 					upsert: true,
-					returnOriginal: false
+					returnDocument: 'after'
 				}
 			]);
 

diff --git a/test/mongoStore/incr/withFindOndAndUpdateDuplicateKeyError.js b/test/mongoStore/incr/withFindOndAndUpdateDuplicateKeyError.js
@@ -94,7 +94,7 @@ describe(describeTitle, function() {
 				},
 				{
 					upsert: true,
-					returnOriginal: false
+					returnDocument: 'after'
 				}
 			]);
 

diff --git a/test/mongoStore/incr/withFindOneAndUpdateError.js b/test/mongoStore/incr/withFindOneAndUpdateError.js
@@ -99,7 +99,7 @@ describe(describeTitle, function() {
 				},
 				{
 					upsert: true,
-					returnOriginal: false
+					returnDocument: 'after'
 				}
 			]);
 

diff --git a/test/mongoStore/incr/withResetExpireDateOnCange.js b/test/mongoStore/incr/withResetExpireDateOnCange.js
@@ -97,7 +97,7 @@ describe(describeTitle, function() {
 				},
 				{
 					upsert: true,
-					returnOriginal: false
+					returnDocument: 'after'
 				}
 			]);
 

diff --git a/test/mongoStore/incr/withoutResetExpireDateOnChange.js b/test/mongoStore/incr/withoutResetExpireDateOnChange.js
@@ -97,7 +97,7 @@ describe(describeTitle, function() {
 				},
 				{
 					upsert: true,
-					returnOriginal: false
+					returnDocument: 'after'
 				}
 			]);
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,7 +97,7 @@ describe(describeTitle, function() { @@
     				},
     				{
     					upsert: true,
-    					returnOriginal: false
+    					returnDocument: 'after'
     				}
     			]);
@@ Expand Down @@