Remove mongoFind and mostly remove adaptiveCollection (#1924)

* Use adapter.count

* use adapter.upsertOneObject

* Use adapter.deleteObjectsByQuery

* Use adapter.find

* use adapter.find

* Update tests to avoid mongoFind

* Fix a test to not use mongoFind

* Fix a test to not use mongoFind

* remove some mongoFind

* Remove some mongoFind

* Remove some mongoFind

* Remove more mongoFind

* remove more mongoFind

* remove more mongoFind

* remove more mongoFind

* remove more mongoFind

* remove more mongoFind

* remove more mongoFind

* remove more mongoFind

* remove more mongoFind

* Restore update ios device token with duplicate device token to original

* remove a mongoFind

* remove a mongoFind

* formatting

* formatting

* remove a mongoFind

* remove a mongoFind

* remove a mongoFind

* kill mongoFind

* Fix tests

* Fix tests

* fix syntax

* Fix test

Author: drew-gross

spec/MongoStorageAdapter.spec.js

@@ -2,8 +2,17 @@
 
 const MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter');
 const MongoClient = require('mongodb').MongoClient;
+const databaseURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';
 
+// These tests are specific to the mongo storage adapter + mongo storage format
+// and will eventually be moved into their own repo
 describe('MongoStorageAdapter', () => {
+  beforeEach(done => {
+    new MongoStorageAdapter({ uri: databaseURI })
+    .deleteAllSchemas()
+    .then(done, fail);
+  });
+
   it('auto-escapes symbols in auth information', () => {
     spyOn(MongoClient, 'connect').and.returnValue(Promise.resolve(null));
     new MongoStorageAdapter({
@@ -37,4 +46,110 @@ describe('MongoStorageAdapter', () => {
       jasmine.any(Object)
     );
   });
+
+  it('stores objectId in _id', done => {
+    let adapter = new MongoStorageAdapter({ uri: databaseURI });
+    adapter.createObject('Foo', { objectId: 'abcde' }, { fields: { objectId: 'String' } })
+    .then(() => adapter._rawFind('Foo', {}))
+    .then(results => {
+      expect(results.length).toEqual(1);
+      var obj = results[0];
+      expect(typeof obj._id).toEqual('string');
+      expect(obj.objectId).toBeUndefined();
+      done();
+    });
+  });
+
+  it('stores pointers with a _p_ prefix', (done) => {
+    let obj = {
+      objectId: 'bar',
+      aPointer: {
+        __type: 'Pointer',
+        className: 'JustThePointer',
+        objectId: 'qwerty'
+      }
+    };
+    let adapter = new MongoStorageAdapter({ uri: databaseURI });
+    adapter.createObject('APointerDarkly', obj, { fields: {
+      objectId: { type: 'String' },
+      aPointer: { type: 'Pointer', targetClass: 'JustThePointer' },
+    }})
+    .then(() => adapter._rawFind('APointerDarkly', {}))
+    .then(results => {
+      expect(results.length).toEqual(1);
+      let output = results[0];
+      expect(typeof output._id).toEqual('string');
+      expect(typeof output._p_aPointer).toEqual('string');
+      expect(output._p_aPointer).toEqual('JustThePointer$qwerty');
+      expect(output.aPointer).toBeUndefined();
+      done();
+    });
+  });
+
+  it('handles object and subdocument', done => {
+    let adapter = new MongoStorageAdapter({ uri: databaseURI });
+    let schema = { fields : { subdoc: { type: 'Object' } } };
+    let obj = { subdoc: {foo: 'bar', wu: 'tan'} };
+    adapter.createObject('MyClass', obj, schema)
+    .then(() => adapter._rawFind('MyClass', {}))
+    .then(results => {
+      expect(results.length).toEqual(1);
+      let mob = results[0];
+      expect(typeof mob.subdoc).toBe('object');
+      expect(mob.subdoc.foo).toBe('bar');
+      expect(mob.subdoc.wu).toBe('tan');
+      let obj = { 'subdoc.wu': 'clan' };
+      return adapter.findOneAndUpdate('MyClass', {}, schema, obj);
+    })
+    .then(() => adapter._rawFind('MyClass', {}))
+    .then(results => {
+      expect(results.length).toEqual(1);
+      let mob = results[0];
+      expect(typeof mob.subdoc).toBe('object');
+      expect(mob.subdoc.foo).toBe('bar');
+      expect(mob.subdoc.wu).toBe('clan');
+      done();
+    });
+  });
+
+  it('handles array, object, date', (done) => {
+    let adapter = new MongoStorageAdapter({ uri: databaseURI });
+    let obj = {
+      array: [1, 2, 3],
+      object: {foo: 'bar'},
+      date: {
+        __type: 'Date',
+        iso: '2016-05-26T20:55:01.154Z',
+      },
+    };
+    let schema = { fields: {
+      array: { type: 'Array' },
+      object: { type: 'Object' },
+      date: { type: 'Date' },
+    } };
+    adapter.createObject('MyClass', obj, schema)
+    .then(() => adapter._rawFind('MyClass', {}))
+    .then(results => {
+      expect(results.length).toEqual(1);
+      let mob = results[0];
+      expect(mob.array instanceof Array).toBe(true);
+      expect(typeof mob.object).toBe('object');
+      expect(mob.date instanceof Date).toBe(true);
+      return adapter.find('MyClass', {}, schema, {});
+    })
+    .then(results => {
+      expect(results.length).toEqual(1);
+      let mob = results[0];
+      expect(mob.array instanceof Array).toBe(true);
+      expect(typeof mob.object).toBe('object');
+      expect(mob.date.__type).toBe('Date');
+      expect(mob.date.iso).toBe('2016-05-26T20:55:01.154Z');
+      done();
+    })
+    .catch(error => {
+      console.log(error);
+      fail();
+      done();
+    });
+  });
 });

spec/OAuth.spec.js

@@ -1,6 +1,7 @@
 var OAuth = require("../src/authDataManager/OAuth1Client");
 var request = require('request');
 var Config = require("../src/Config");
+var defaultColumns = require('../src/Controllers/SchemaController').defaultColumns;
 
 describe('OAuth', function() {
 
@@ -283,9 +284,10 @@ describe('OAuth', function() {
                "Expiration should be cleared");
             // make sure the auth data is properly deleted
             var config = new Config(Parse.applicationId);
-            config.database.mongoFind('_User', {
-              _id: model.id
-            }).then((res) => {
+            config.database.adapter.find('_User', { objectId: model.id }, {
+              fields: Object.assign({}, defaultColumns._Default, defaultColumns._Installation),
+            }, {})
+            .then(res => {
               expect(res.length).toBe(1);
               expect(res[0]._auth_data_myoauth).toBeUndefined();
               expect(res[0]._auth_data_myoauth).not.toBeNull();

spec/ParseAPI.spec.js

@@ -203,7 +203,7 @@ describe('miscellaneous', function() {
       return obj.save();
     }).then(() => {
       var db = DatabaseAdapter.getDatabaseConnection(appId, 'test_');
-      return db.mongoFind('TestObject', {}, {});
+      return db.adapter.find('TestObject', {}, { fields: {} }, {});
     }).then((results) => {
       expect(results.length).toEqual(1);
       expect(results[0]['foo']).toEqual('bar');