Updated build and version.

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.vscode
 node_modules
 .log
 .nyc_output

Changelog.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## v2.4.0
+### Changed
+ - Upgrade debug@4.3.2, coveralls@3.1.1, supertest@6.1.6, fast-json-patch@3.1.0, eslint@7.32.0, mongodb@4.1.1, mocha@9.1.0, mongoose@6.0.2
+
 ## v2.3.4
 ### Changed
  - Upgrade dependencies.
@@ -61,7 +65,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  - The resourcejs middleware paths to be able to be processed outside of Express.
 
 ### Changed
- - Upgrade mocha@7.1.0 
+ - Upgrade mocha@7.1.0
 
 ## v2.0.0
 ### Changed
@@ -71,7 +75,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## v1.39.0
 ### Changed
- - Upgrade mongoose@5.8.11, mongodb@3.5.3, mocha@7.0.1 
+ - Upgrade mongoose@5.8.11, mongodb@3.5.3, mocha@7.0.1
 
 ## v1.38.2
 ### Fixed
@@ -87,7 +91,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## v1.38.0
 ### Fixed
  - Issue where the ObjectId object is not defined in Swagger.js.
- 
+
 ### Changed
  - Upgraded mongodb@3.4.0, mongoose@5.8.0
 
@@ -131,7 +135,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## v1.25.1
 ### Changed
- - Upgraded  mongodb@3.1.3, mongoose@5.2.8, eslint@5.3.0 
+ - Upgraded  mongodb@3.1.3, mongoose@5.2.8, eslint@5.3.0
 
 ## v1.25.0
 ### Changed

Resource.js

@@ -230,6 +230,15 @@ class Resource {
     next();
   }
 
+  static ObjectId(id) {
+    try {
+      return (new mongodb.ObjectId(id));
+    }
+    catch (e) {
+      return id;
+    }
+  }
+
   /**
    * Sets the response that needs to be made and calls the next middleware for
    * execution.
@@ -386,13 +395,13 @@ class Resource {
       options.convertIds &&
       name.match(options.convertIds) &&
       (typeof value === 'string') &&
-      (mongodb.ObjectID.isValid(value))
+      (mongodb.ObjectId.isValid(value))
     ) {
       try {
-        value = new mongodb.ObjectID(value);
+        value = Resource.ObjectId(value);
       }
       catch (err) {
-        console.warn(`Invalid ObjectID: ${value}`);
+        console.warn(`Invalid ObjectId: ${value}`);
       }
     }
 
@@ -581,9 +590,14 @@ class Resource {
       }
 
       // Get the query object.
-      const countQuery = req.countQuery || req.modelQuery || req.model || this.model;
+      let countQuery = req.countQuery || req.modelQuery || req.model || this.model;
       const query = req.modelQuery || req.model || this.model;
 
+      // Make sure to clone the count query if it is available.
+      if (typeof countQuery.clone === 'function') {
+        countQuery = countQuery.clone();
+      }
+
       // Get the find query.
       const findQuery = this.getFindQuery(req, null, query._conditions);
 
@@ -839,7 +853,7 @@ class Resource {
       const { __v, ...update} = req.body;
       const query = req.modelQuery || req.model || this.model;
 
-      query.findOne({ _id: req.params[`${this.name}Id`] }, (err, item) => {
+      query.findOne({ _id: Resource.ObjectId(req.params[`${this.name}Id`]) }, (err, item) => {
         if (err) {
           debug.put(err);
           return Resource.setResponse(res, { status: 400, error: err }, next);