Merge 0301472 into 8a126fc

Author: mstniy

spec/ParseAPI.spec.js

@@ -35,6 +35,45 @@ describe('miscellaneous', () => {
   });
 });
 
+describe_only_db('mongo')('spatial index', () => {
+  beforeAll(async () => {
+    await TestUtils.destroyAllDataPermanently(false);
+    // Create a schema with a spatial index
+    const testSchema = new Parse.Schema('geojson_test');
+    testSchema.addObject('geometry');
+    testSchema.addIndex('geospatial_index', {
+      geometry: '2dsphere',
+    });
+    await testSchema.save();
+  });
+
+  it('invalid geometry fails (#7331)', async () => {
+    let obj = new Parse.Object('geojson_test');
+    obj.set('geometry', { foo: 'bar' });
+    try {
+      await obj.save();
+      fail('Invalid geometry did not fail');
+    } catch (e) {
+      expect(e.code).toEqual(Parse.Error.INVALID_VALUE);
+    }
+    obj = new Parse.Object('geojson_test');
+    await obj.save();
+    try {
+      obj.set('geometry', { foo: 'bar' });
+      await obj.save();
+      fail('Invalid geometry did not fail');
+    } catch (e) {
+      expect(e.code).toEqual(Parse.Error.INVALID_VALUE);
+    }
+  });
+
+  it('valid geometry succeeds', async () => {
+    const obj = new Parse.Object('geojson_test');
+    obj.set('geometry', { type: 'Point', coordinates: [-73.97, 40.77] });
+    await obj.save();
+  });
+});
+
 describe('miscellaneous', function () {
   it('create a GameScore object', function (done) {
     const obj = new Parse.Object('GameScore');

src/Adapters/Storage/Mongo/MongoStorageAdapter.js

@@ -125,6 +125,30 @@ function validateExplainValue(explain) {
   }
 }
 
+function mongoErrorToParse(error) {
+  if (error.code === 11000) {
+    // Duplicate value
+    const err = new Parse.Error(
+      Parse.Error.DUPLICATE_VALUE,
+      'A duplicate value for a field with unique values was provided'
+    );
+    err.underlyingError = error;
+    if (error.message) {
+      const matches = error.message.match(/index:[\sa-zA-Z0-9_\-\.]+\$?([a-zA-Z_-]+)_1/);
+      if (matches && Array.isArray(matches)) {
+        err.userInfo = { duplicated_field: matches[1] };
+      }
+    }
+    return err;
+  } else if (error.code === 16755 || error.code === 16756) {
+    // Can't extract geo keys
+    const err = new Parse.Error(Parse.Error.INVALID_VALUE, error.message);
+    err.underlyingError = error;
+    return err;
+  }
+  return error;
+}
+
 export class MongoStorageAdapter implements StorageAdapter {
   // Private
   _uri: string;
@@ -481,22 +505,7 @@ export class MongoStorageAdapter implements StorageAdapter {
       .then(collection => collection.insertOne(mongoObject, transactionalSession))
       .then(() => ({ ops: [mongoObject] }))
       .catch(error => {
-        if (error.code === 11000) {
-          // Duplicate value
-          const err = new Parse.Error(
-            Parse.Error.DUPLICATE_VALUE,
-            'A duplicate value for a field with unique values was provided'
-          );
-          err.underlyingError = error;
-          if (error.message) {
-            const matches = error.message.match(/index:[\sa-zA-Z0-9_\-\.]+\$?([a-zA-Z_-]+)_1/);
-            if (matches && Array.isArray(matches)) {
-              err.userInfo = { duplicated_field: matches[1] };
-            }
-          }
-          throw err;
-        }
-        throw error;
+        throw mongoErrorToParse(error);
       })
       .catch(err => this.handleError(err));
   }
@@ -567,13 +576,7 @@ export class MongoStorageAdapter implements StorageAdapter {
       )
       .then(result => mongoObjectToParseObject(className, result.value, schema))
       .catch(error => {
-        if (error.code === 11000) {
-          throw new Parse.Error(
-            Parse.Error.DUPLICATE_VALUE,
-            'A duplicate value for a field with unique values was provided'
-          );
-        }
-        throw error;
+        throw mongoErrorToParse(error);
       })
       .catch(err => this.handleError(err));
   }