refactor(objectid): remove bson-objectid from project

RisingStack · Sep 22, 2015 · c4e7ad1 · c4e7ad1
1 parent 5a2813d
commit c4e7ad1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,6 @@
     "ORM"
   ],
   "dependencies": {
-    "bson-objectid": "^1.1.1",
     "graphql": "0.2.2",
     "lodash": "^3.10.0"
   },
@@ -39,7 +38,7 @@
     "co-mocha": "^1.1.2",
     "eslint": "1.0.0",
     "mocha": "^2.2.5",
-    "mongoose": "^4.0.6",
+    "mongoose": "^4.1.8",
     "pre-commit": "^1.1.1",
     "sinon": "^1.15.4",
     "sinon-chai": "^2.8.0"

diff --git a/src/field.js b/src/field.js
@@ -1,5 +1,4 @@
 import {isDate} from 'lodash';
-import ObjectID from 'bson-objectid';
 
 import {
   GraphQLString,
@@ -52,10 +51,10 @@ function getField(field, types, models, model) {
 
       graphQLfield.type = types[field.ref];
       graphQLfield.resolve = (modelInstance, params, source, fieldASTs) => {
-        var projections = getProjection(fieldASTs);        
+        var projections = getProjection(fieldASTs);
 
         return models[field.ref].model.findOne({
-          _id: new ObjectID(modelInstance[field.name])
+          _id: modelInstance[field.name]
         }, projections);
       };
     }

diff --git a/src/field.spec.js b/src/field.spec.js
@@ -1,5 +1,4 @@
 import {expect} from 'chai';
-import ObjectID from 'bson-objectid';
 import {
   GraphQLString,
   GraphQLFloat,
@@ -44,7 +43,7 @@ describe('field', () => {
     });
 
     expect(findOneStub).to.calledWith({
-      _id: new ObjectID(user._id.toString()),
+      _id: user._id.toString(),
     }, {
       name: 1
     });

diff --git a/src/query.js b/src/query.js
@@ -1,5 +1,4 @@
 import {reduce} from 'lodash';
-import ObjectID from 'bson-objectid';
 
 import {
   GraphQLString,
@@ -74,7 +73,7 @@ function getRootFields (types, models) {
 
         var filter = reduce(args, (args, arg, argName) => {
           if (arg && argName === '_id') {
-            args[argName] = new ObjectID(arg);
+            args[argName] = arg;
           } else if (arg) {
             args[argName] = arg;
           }

diff --git a/src/schema.spec.js b/src/schema.spec.js
@@ -1,6 +1,5 @@
 import {expect} from 'chai';
 import {graphql} from 'graphql';
-import ObjectID from 'bson-objectid';
 
 import {getModels} from './model';
 import {getSchema} from './schema';
@@ -35,7 +34,7 @@ describe('schema', () => {
         }`);
 
         expect(findByIdStub).to.calledWith({
-          _id: new ObjectID(user._id.toString())
+          _id: user._id.toString()
         }, {
           _id: 1
         });
@@ -218,7 +217,7 @@ describe('schema', () => {
         }`);
 
         expect(findOneStub).to.calledWith({
-          _id: new ObjectID(user2._id.toString())
+          _id: user2._id.toString()
         }, {
           name: 1,
           friends: 1