error handling

Author: dplewis

spec/schemas.spec.js

@@ -1784,7 +1784,10 @@ describe('schemas', () => {
           name2: { field2: 1},
         },
       });
-      done();
+      config.database.adapter.getIndexes('NewClass').then((indexes) => {
+        expect(indexes.length).toBe(3);
+        done();
+      });
     });
   });
 
@@ -1860,7 +1863,7 @@ describe('schemas', () => {
           indexes: {
             name1: { field1: 1 },
             name2: { field2: 1 },
-            name3: { field3: 1 },
+            name3: { field3: 1, field4: 1 },
           }
         }
       }, (error, response, body) => {
@@ -1876,7 +1879,7 @@ describe('schemas', () => {
           indexes: {
             name1: { field1: 1 },
             name2: { field2: 1 },
-            name3: { field3: 1 },
+            name3: { field3: 1, field4: 1 },
           }
         })).toEqual(undefined);
         request.get({
@@ -1896,7 +1899,7 @@ describe('schemas', () => {
             indexes: {
               name1: { field1: 1 },
               name2: { field2: 1 },
-              name3: { field3: 1 },
+              name3: { field3: 1, field4: 1 },
             },
           });
           config.database.adapter.getIndexes('NewClass').then((indexes) => {
@@ -2102,4 +2105,63 @@ describe('schemas', () => {
       });
     })
   });
+
+  it_exclude_dbs(['postgres'])('cannot delete index that does not exist', done => {
+    request.post({
+      url: 'http://localhost:8378/1/schemas/NewClass',
+      headers: masterKeyHeaders,
+      json: true,
+      body: {},
+    }, () => {
+      request.put({
+        url: 'http://localhost:8378/1/schemas/NewClass',
+        headers: masterKeyHeaders,
+        json: true,
+        body: {
+          indexes: {
+            unknownIndex: { __op: 'Delete' }
+          }
+        }
+      }, (error, response, body) => {
+        expect(body.code).toBe(Parse.Error.INVALID_QUERY);
+        expect(body.error).toBe('Index unknownIndex does not exist, cannot delete.');
+        done();
+      });
+    })
+  });
+
+  it_exclude_dbs(['postgres'])('cannot update index that exist', done => {
+    request.post({
+      url: 'http://localhost:8378/1/schemas/NewClass',
+      headers: masterKeyHeaders,
+      json: true,
+      body: {},
+    }, () => {
+      request.put({
+        url: 'http://localhost:8378/1/schemas/NewClass',
+        headers: masterKeyHeaders,
+        json: true,
+        body: {
+          indexes: {
+            name1: { field1: 1 }
+          }
+        }
+      }, () => {
+        request.put({
+          url: 'http://localhost:8378/1/schemas/NewClass',
+          headers: masterKeyHeaders,
+          json: true,
+          body: {
+            indexes: {
+              name1: { field2: 1 }
+            }
+          }
+        }, (error, response, body) => {
+          expect(body.code).toBe(Parse.Error.INVALID_QUERY);
+          expect(body.error).toBe('Index name1 exists, cannot update.');
+          done();
+        });
+      });
+    })
+  });
 });

src/Adapters/Storage/Mongo/MongoStorageAdapter.js

@@ -179,16 +179,23 @@ export class MongoStorageAdapter {
     }
     const deletePromises = [];
     const insertedIndexes = [];
-    Object.keys(submittedIndexes).forEach(indexName => {
-      if (submittedIndexes[indexName].__op === 'Delete') {
-        const promise = this.dropIndex(className, indexName);
+    Object.keys(submittedIndexes).forEach(name => {
+      const field = submittedIndexes[name];
+      if (existingIndexes[name] && field.__op !== 'Delete') {
+        throw new Parse.Error(Parse.Error.INVALID_QUERY, `Index ${name} exists, cannot update.`);
+      }
+      if (!existingIndexes[name] && field.__op === 'Delete') {
+        throw new Parse.Error(Parse.Error.INVALID_QUERY, `Index ${name} does not exist, cannot delete.`);
+      }
+      if (field.__op === 'Delete') {
+        const promise = this.dropIndex(className, name);
         deletePromises.push(promise);
-        delete existingIndexes[indexName];
+        delete existingIndexes[name];
       } else {
-        existingIndexes[indexName] = submittedIndexes[indexName];
+        existingIndexes[name] = field;
         insertedIndexes.push({
-          key: submittedIndexes[indexName],
-          name: indexName,
+          key: field,
+          name,
         });
       }
     });
@@ -208,7 +215,8 @@ export class MongoStorageAdapter {
     schema = convertParseSchemaToMongoSchema(schema);
     const mongoObject = mongoSchemaFromFieldsAndClassNameAndCLP(schema.fields, className, schema.classLevelPermissions, schema.indexes);
     mongoObject._id = className;
-    return this._schemaCollection()
+    return this.setIndexes(className, schema.indexes, {}, schema)
+      .then(() => this._schemaCollection())
       .then(schemaCollection => schemaCollection._collection.insertOne(mongoObject))
       .then(result => MongoSchemaCollection._TESTmongoSchemaToParseSchema(result.ops[0]))
       .catch(error => {