Fix polymorphic models generation

Author: mathieuales

src/scripts/services/swagger-model.js

@@ -57,8 +57,8 @@ angular
 				schema = angular.copy(schema);
 				angular.forEach(schema.allOf, function(def) {
 					var ref = resolveReference(openApiSpec, def);
-					if (!ref.discriminator) {
-						// do not handle inhertited properties here
+					if (!def.$ref || !ref.discriminator) {
+						// do not handle inherited properties here
 						angular.merge(schema, ref);
 					}
 				});
@@ -207,36 +207,40 @@ angular
 		 * generates new inline model name
 		 */
 		function getInlineModelName() {
-			var name = INLINE_MODEL_NAME + (countInLineModels++);
-			return name;
+			return INLINE_MODEL_NAME + (countInLineModels++);
 		}
 
 		/**
 		 * identify models using inheritance
 		 */
 		this.resolveInheritance = function(openApiSpec) {
 			angular.forEach(openApiSpec.definitions, function(schema, modelName) {
-				if (schema.discriminator) {
-					schema.subModelsRef = [];
-					angular.forEach(openApiSpec.definitions, function(subSchema, subModelName) {
-						if (schema !== subSchema && subSchema.allOf) {
-							angular.forEach(subSchema.allOf, function(parent) {
-								if (parent.$ref && modelName === getClassName(parent)) {
-									subSchema.parentModelsRef = subSchema.parentModelsRef || [];
-									subSchema.parentModelsRef.push({
-										'$ref': '#/definitions/' + modelName
-									});
-									schema.subModelsRef.push({
-										'$ref': '#/definitions/' + subModelName
-									});
-								}
-							});
-						}
-					});
-				}
+				resolveItemInheritance(openApiSpec, schema, schema, modelName);
 			});
 		};
 
+		function resolveItemInheritance(openApiSpec, schema, def, modelName) {
+			if (def.discriminator && !schema.subModelsRef) {
+				schema.subModelsRef = [];
+				angular.forEach(openApiSpec.definitions, function(subSchema, subModelName) {
+					if (modelName !== subModelName && subSchema.allOf) {
+						angular.forEach(subSchema.allOf, function(parent) {
+							if (parent.$ref && modelName === getClassName(parent)) {
+								subSchema.parentModelsRef = subSchema.parentModelsRef || [];
+								subSchema.parentModelsRef.push({
+									'$ref': '#/definitions/' + modelName
+								});
+								schema.subModelsRef.push({
+									'$ref': '#/definitions/' + subModelName
+								});
+							}
+							resolveItemInheritance(openApiSpec, subSchema, parent, subModelName);
+						});
+					}
+				});
+			}
+		}
+
 		/**
 		 * generate a model and its submodels from schema
 		 */
@@ -252,7 +256,7 @@ angular
 				if (schema.properties) {
 					// if inline model
 					subModels[getInlineModelName()] = schema;
-					subModels = angular.merge(subModels, findAllModels(openApiSpec, schema, subModelIds));
+					angular.merge(subModels, findAllModels(openApiSpec, schema, subModelIds));
 				} else {
 					subModels = findAllModels(openApiSpec, schema, subModelIds);
 				}