Remove private Schema API usage from SchemasRouter.

src/Routers/SchemasRouter.js

@@ -83,24 +83,27 @@ function modifySchema(req) {
       }
 
       // Finally we have checked to make sure the request is valid and we can start deleting fields.
-      // Do all deletions first, then a single save to _SCHEMA collection to handle all additions.
+      // Do all deletions first, then add fields to avoid duplicate geopoint error.
-      let deletionPromises = [];
+      let deletePromises = [];
-      Object.keys(submittedFields).forEach(submittedFieldName => {
+      let insertedFields = [];
-        if (submittedFields[submittedFieldName].__op === 'Delete') {
+      Object.keys(submittedFields).forEach(fieldName => {
-          let promise = schema.deleteField(submittedFieldName, className, req.config.database);
+        if (submittedFields[fieldName].__op === 'Delete') {
-          deletionPromises.push(promise);
+          const promise = schema.deleteField(fieldName, className, req.config.database);
+          deletePromises.push(promise);
+        } else {
+          insertedFields.push(fieldName);
         }
       });
-
+      return Promise.all(deletePromises) // Delete Everything
-      return Promise.all(deletionPromises)
+        .then(() => schema.reloadData()) // Reload our Schema, so we have all the new values
-        .then(() => new Promise((resolve, reject) => {
+        .then(() => {
-          schema.collection.update({_id: className}, mongoObject.result, {w: 1}, (err, docs) => {
+          let promises = insertedFields.map(fieldName => {
-            if (err) {
+            const mongoType = mongoObject.result[fieldName];
-              reject(err);
+            return schema.validateField(className, fieldName, mongoType);
-            }
+          });
-            resolve({ response: Schema.mongoSchemaToSchemaAPIResponse(mongoObject.result)});
+          return Promise.all(promises);
         })
-        }));
+        .then(() => ({ response: Schema.mongoSchemaToSchemaAPIResponse(mongoObject.result) }));
     });
 }