From 7dca7e20b0781bd74525849e1e1eb38c56c7189d Mon Sep 17 00:00:00 2001 From: Drew Gross Date: Mon, 23 May 2016 17:18:46 -0700 Subject: [PATCH] Remove schemaController parameter --- spec/MongoTransform.spec.js | 18 +++++++++--------- .../Storage/Mongo/MongoStorageAdapter.js | 2 +- src/Adapters/Storage/Mongo/MongoTransform.js | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spec/MongoTransform.spec.js b/spec/MongoTransform.spec.js index d8136483..f667a2ee 100644 --- a/spec/MongoTransform.spec.js +++ b/spec/MongoTransform.spec.js @@ -121,7 +121,7 @@ describe('transformWhere', () => { describe('mongoObjectToParseObject', () => { it('built-in timestamps', (done) => { var input = {createdAt: new Date(), updatedAt: new Date()}; - var output = transform.mongoObjectToParseObject(dummySchema, null, input, { fields: {} }); + var output = transform.mongoObjectToParseObject(null, input, { fields: {} }); expect(typeof output.createdAt).toEqual('string'); expect(typeof output.updatedAt).toEqual('string'); done(); @@ -129,7 +129,7 @@ describe('mongoObjectToParseObject', () => { it('pointer', (done) => { var input = {_p_userPointer: '_User$123'}; - var output = transform.mongoObjectToParseObject(dummySchema, null, input, { + var output = transform.mongoObjectToParseObject(null, input, { fields: { userPointer: { type: 'Pointer', targetClass: '_User' } }, }); expect(typeof output.userPointer).toEqual('object'); @@ -141,7 +141,7 @@ describe('mongoObjectToParseObject', () => { it('null pointer', (done) => { var input = {_p_userPointer: null}; - var output = transform.mongoObjectToParseObject(dummySchema, null, input, { + var output = transform.mongoObjectToParseObject(null, input, { fields: { userPointer: { type: 'Pointer', targetClass: '_User' } }, }); expect(output.userPointer).toBeUndefined(); @@ -150,7 +150,7 @@ describe('mongoObjectToParseObject', () => { it('file', (done) => { var input = {picture: 'pic.jpg'}; - var output = transform.mongoObjectToParseObject(dummySchema, null, input, { + var output = transform.mongoObjectToParseObject(null, input, { fields: { picture: { type: 'File' }}, }); expect(typeof output.picture).toEqual('object'); @@ -160,7 +160,7 @@ describe('mongoObjectToParseObject', () => { it('geopoint', (done) => { var input = {location: [180, -180]}; - var output = transform.mongoObjectToParseObject(dummySchema, null, input, { + var output = transform.mongoObjectToParseObject(null, input, { fields: { location: { type: 'GeoPoint' }}, }); expect(typeof output.location).toEqual('object'); @@ -172,7 +172,7 @@ describe('mongoObjectToParseObject', () => { it('nested array', (done) => { var input = {arr: [{_testKey: 'testValue' }]}; - var output = transform.mongoObjectToParseObject(dummySchema, null, input, { + var output = transform.mongoObjectToParseObject(null, input, { fields: { arr: { type: 'Array' } }, }); expect(Array.isArray(output.arr)).toEqual(true); @@ -192,7 +192,7 @@ describe('mongoObjectToParseObject', () => { }, regularKey: "some data", }]} - let output = transform.mongoObjectToParseObject(dummySchema, null, input, { + let output = transform.mongoObjectToParseObject(null, input, { fields: { array: { type: 'Array' }}, }); expect(dd(output, input)).toEqual(undefined); @@ -262,7 +262,7 @@ describe('transform schema key changes', () => { _rperm: ["*"], _wperm: ["Kevin"] }; - var output = transform.mongoObjectToParseObject(dummySchema, null, input, { fields: {} }); + var output = transform.mongoObjectToParseObject(null, input, { fields: {} }); expect(typeof output.ACL).toEqual('object'); expect(output._rperm).toBeUndefined(); expect(output._wperm).toBeUndefined(); @@ -276,7 +276,7 @@ describe('transform schema key changes', () => { long: mongodb.Long.fromNumber(Number.MAX_SAFE_INTEGER), double: new mongodb.Double(Number.MAX_VALUE) } - var output = transform.mongoObjectToParseObject(dummySchema, null, input, { + var output = transform.mongoObjectToParseObject(null, input, { fields: { long: { type: 'Number' }, double: { type: 'Number' }, diff --git a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js index 65eca277..0be09a2a 100644 --- a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js +++ b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js @@ -202,7 +202,7 @@ export class MongoStorageAdapter { find(className, query, { skip, limit, sort }, schemaController, schema) { return this.adaptiveCollection(className) .then(collection => collection.find(query, { skip, limit, sort })) - .then(objects => objects.map(object => transform.mongoObjectToParseObject(schemaController, className, object, schema))); + .then(objects => objects.map(object => transform.mongoObjectToParseObject(className, object, schema))); } get transform() { diff --git a/src/Adapters/Storage/Mongo/MongoTransform.js b/src/Adapters/Storage/Mongo/MongoTransform.js index e335f3a0..5b7cc1e3 100644 --- a/src/Adapters/Storage/Mongo/MongoTransform.js +++ b/src/Adapters/Storage/Mongo/MongoTransform.js @@ -755,7 +755,7 @@ const nestedMongoObjectToNestedParseObject = mongoObject => { // Converts from a mongo-format object to a REST-format object. // Does not strip out anything based on a lack of authentication. -const mongoObjectToParseObject = (schemaController, className, mongoObject, schema) => { +const mongoObjectToParseObject = (className, mongoObject, schema) => { switch(typeof mongoObject) { case 'string': case 'number':