Merge pull request #42 from dadi/feature/id-plain-string

Convert ObjectIds to plain Strings before returning to API

Author: eduardoboucas

README.md

@@ -11,7 +11,7 @@
 ## Requirements
 
 * [DADI API](https://www.npmjs.com/package/@dadi/api) Version 3.0.0 or greater
-* a running MongoDB server
+* A running MongoDB server
 
 ## Usage
 

lib/index.js

@@ -164,7 +164,13 @@ DataStore.prototype.find = function ({ query, collection, options = {}, schema,
             if (err) return reject(err)
 
             const returnData = {
-              results: result,
+              results: result.map(document => {
+                if (document._id) {
+                  document._id = document._id.toString()
+                }
+
+                return document
+              }),
               metadata: this.getMetadata(options, count)
             }
 
@@ -209,7 +215,15 @@ DataStore.prototype.insert = function ({data, collection, options = {}, schema,
         return reject(err)
       }
 
-      return resolve(result.ops)
+      return resolve(
+        result.ops.map(document => {
+          if (document._id) {
+            document._id = document._id.toString()
+          }
+
+          return document
+        })
+      )
     })
   })
 }

test/unit/connect.js

@@ -204,7 +204,7 @@ describe('MongoDB Connection', function () {
       mongodb.connect().then(() => {
       }).catch((err) => {
         should.exist(err)
-        err.toString().should.eql('MongoError: no primary found in replicaset')
+        err.should.be.Error
         mongodb.connectionString.should.eql('mongodb://127.0.0.1:27017/testdb?replicaSet=test&readPreference=secondaryPreferred')
         done()
       })

test/unit/operations.js

@@ -101,9 +101,10 @@ describe('MongoDB Operations', function () {
           result.should.be.Array
           result.length.should.eql(1)
           should.exist(result[0].fieldName)
-          should.exist(result[0]._id);
-
-          (typeof result[0]._id).should.eql('object')
+          should.exist(result[0]._id)
+          result[0]._id.should.be.String
+          result[0]._id.length.should.eql(24)
+          should.equal(Object.keys(result[0]._id).length, 24)
           done()
         }).catch((err) => {
           done(err)
@@ -130,10 +131,16 @@ describe('MongoDB Operations', function () {
           should.exist(result[0].fieldName)
           should.exist(result[0]._id);
 
-          (typeof result[0]._id).should.eql('object')
-
           result[0].fieldName.should.eql('foo')
+          result[0]._id.length.should.eql(24)
+          result[0]._id.should.be.String
+          should.equal(Object.keys(result[0]._id).length, 24)
+
           result[1].fieldName.should.eql('foo_1')
+          result[1]._id.length.should.eql(24)
+          result[1]._id.should.be.String
+          should.equal(Object.keys(result[1]._id).length, 24)
+
           done()
         }).catch((err) => {
           done(err)
@@ -175,6 +182,8 @@ describe('MongoDB Operations', function () {
             result.results.should.be.Array
             result.results.length.should.eql(1)
             result.results[0]._id.should.eql(inserted._id)
+            result.results[0]._id.length.should.eql(24)
+            Object.keys(result.results[0]._id).length.should.eql(24)
             done()
           })
         }).catch((err) => {
@@ -195,6 +204,8 @@ describe('MongoDB Operations', function () {
             result.results.should.be.Array
             result.results.length.should.eql(1)
             result.results[0]._id.should.eql(inserted._id)
+            result.results[0]._id.length.should.eql(24)
+            Object.keys(result.results[0]._id).length.should.eql(24)
             done()
           })
         }).catch((err) => {