Merge branch 'develop'

Author: Ryan Kotzen

src/metadata/ensure-schema-set.js

@@ -5,10 +5,9 @@ var validator = require('../validate/validator');
 module.exports = function ensureSchemaSet(metadata, operation, direction) {
     if (!metadata.schemas[operation]) {
         metadata.schemas[operation] = _.cloneDeep(metadata.schemas.core);
-    } else {
-        ensureNotCoreId(metadata.schemas[operation], metadata.schemas.core, operation);
-        ensureNotCoreName(metadata.schemas[operation], metadata.schemas.core, operation, direction);
     }
+    ensureNotCoreId(metadata.schemas[operation], metadata.schemas.core, operation);
+    ensureNotCoreName(metadata.schemas[operation], metadata.schemas.core, operation, direction);
     validator.addSchema(metadata.schemas[operation]);
 };
 

src/routes/users/items/index.js

@@ -2,13 +2,12 @@
 var _ = require('lodash');
 var schema = require('./item.json');
 var outputSchema = _.merge({}, schema, require('./item-output.json'));
-var inputSchema = buildInputSchema();
 var router = require('../../../crud/router')({
     schemas: {
         core: schema,
         output: outputSchema,
-        creation: inputSchema,
-        update: inputSchema
+        creation: buildInputSchema(),
+        update: buildInputSchema()
     }
 });
 router.crudMiddleware = require('../../../mongo/crud')(router.metadata);

src/swagger/add-model.js

@@ -6,23 +6,26 @@ schemaKeys.push('definitions');
 
 module.exports = function addModel(schema) {
     var modelSchema = _.cloneDeep(_.pick(schema, schemaKeys));
-    stripSpecificProperties(modelSchema);
+    filterProperties(modelSchema.properties);
+    if (modelSchema.definitions) {
+        Object.keys(modelSchema.definitions).forEach(function (definitionName) {
+            var definitionValue = modelSchema.definitions[definitionName];
+            filterProperties(definitionValue.properties);
+        });
+    }
     swagger.common.addModel(modelSchema, {validation: 'warn'});
 };
 
-const propertiesToStrip = ['faker', 'chance'];
-function stripSpecificProperties(schema) {
-    if (_.isArray(schema)) {
-        schema.forEach(function (item) {
-            stripSpecificProperties(item);
+function filterProperties(properties) {
+    Object.keys(properties).forEach(function (propertyName) {
+        var propertyValue = properties[propertyName];
+        Object.keys(propertyValue).forEach(function (key) {
+            if (schemaKeys.indexOf(key) < 0) {
+                delete propertyValue[key];
+            }
+            if (key.toLowerCase() === 'properties') {
+                filterProperties(propertyValue.properties);
+            }
         });
-        return;
-    }
-    if (!_.isObject(schema)) {
-        return;
-    }
-    propertiesToStrip.forEach(function (key) {
-        delete schema[key];
     });
-    _.valuesIn(schema).forEach(stripSpecificProperties);
 }