Remove transformKey(...)

Author: drew-gross

spec/MongoTransform.spec.js

@@ -191,14 +191,10 @@ describe('untransformObject', () => {
   });
 });
 
-describe('transformKey', () => {
-  it('throws out _password', (done) => {
-    try {
-      transform.transformKey(dummySchema, '_User', '_password');
-      fail('should have thrown');
-    } catch (e) {
-      done();
-    }
+describe('transformKeyValue', () => {
+  it('throws out _password', done => {
+    expect(() => transform.transformKeyValue(dummySchema, '_User', '_password', null, {validate: true})).toThrow();
+    done();
   });
 });
 

src/Adapters/Storage/Mongo/MongoTransform.js

@@ -454,11 +454,6 @@ function untransformACL(mongoObject) {
   return output;
 }
 
-// Transforms a key used in the REST API format to its mongo format.
-function transformKey(schema, className, key) {
-  return transformKeyValue(schema, className, key, null, {validate: true}).key;
-}
-
 // A sentinel value that helper transformations return when they
 // cannot perform a transformation
 function CannotTransform() {}
@@ -1038,7 +1033,7 @@ var FileCoder = {
 };
 
 module.exports = {
-  transformKey,
+  transformKeyValue,
   parseObjectToMongoObjectForCreate,
   transformUpdate,
   transformWhere,

src/Controllers/DatabaseController.js

@@ -619,7 +619,7 @@ DatabaseController.prototype.find = function(className, query, {
     if (sort) {
       mongoOptions.sort = {};
       for (let key in sort) {
-        let mongoKey = this.transform.transformKey(schemaController, className, key);
+        let mongoKey = this.transform.transformKeyValue(schemaController, className, key, null, {validate: true}).key;
         mongoOptions.sort[mongoKey] = sort[key];
       }
     }

src/Controllers/SchemaController.js

@@ -253,7 +253,7 @@ class SchemaController {
         this.data[schema.className] = schema.fields;
         this.perms[schema.className] = schema.classLevelPermissions;
       });
-      
+
       // Inject the in-memory classes
       volatileClasses.forEach(className => {
         this.data[className] = injectDefaultSchema({
@@ -467,7 +467,7 @@ class SchemaController {
   validateField(className, fieldName, type, freeze) {
     return this.reloadData().then(() => {
       // Just to check that the fieldName is valid
-      this._collection.transform.transformKey(this, className, fieldName);
+      this._collection.transform.transformKeyValue(this, className, fieldName, null, {validate: true});
 
       if( fieldName.indexOf(".") > 0 ) {
         // subdocument key (x.y) => ok if x is of type 'object'