fix: toMongoDottedObject() now keep bson ObjectId untouched

Author: nodkz

src/__mocks__/mongooseCommon.js

@@ -12,7 +12,7 @@ const originalConnect = mongoose.connect;
 mongoose.connect = async () => {
   const mongoServer = new MongodbMemoryServer();
 
-  const mongoUri = await mongoServer.getConnectionString();
+  const mongoUri = await mongoServer.getConnectionString(true);
 
   originalConnect.bind(mongoose)(mongoUri, { useMongoClient: true });
 

src/utils/__tests__/toMongoDottedObject-test.js

@@ -1,5 +1,6 @@
 /* @flow */
 
+import { Types } from 'mongoose';
 import toMongoDottedObject from '../toMongoDottedObject';
 
 describe('toMongoDottedObject()', () => {
@@ -40,4 +41,11 @@ describe('toMongoDottedObject()', () => {
       'a.dateField': new Date(100),
     });
   });
+
+  it('should keep BSON ObjectId untouched', () => {
+    const id = new Types.ObjectId();
+    expect(toMongoDottedObject({ a: { someField: id } })).toEqual({
+      'a.someField': id,
+    });
+  });
 });

src/utils/toMongoDottedObject.js

@@ -1,5 +1,9 @@
 /* @flow */
 
+import { Types } from 'mongoose';
+
+const ObjectId = Types.ObjectId;
+
 /**
  * Convert object to dotted-key/value pair
  * { a: { b: { c: 1 }}} ->  { 'a.b.c': 1 }
@@ -24,11 +28,11 @@ export default function toMongoDottedObject(
   /* eslint-disable */
   objKeys.forEach(key => {
      if (key.startsWith('$')) {
-       target[path.join('.')] = { 
+       target[path.join('.')] = {
          ...target[path.join('.')],
          [key]: obj[key],
        };
-     } else if (Object(obj[key]) === obj[key]) {
+     } else if (Object(obj[key]) === obj[key] && !(obj[key] instanceof ObjectId)) {
        toMongoDottedObject(obj[key], target, path.concat(key));
      } else {
        target[path.concat(key).join('.')] = obj[key];
@@ -38,7 +42,7 @@ export default function toMongoDottedObject(
    if (objKeys.length === 0) {
      target[path.join('.')] = obj;
    }
-   
+
    return target;
    /* eslint-enable */
 }