Move the swagger model filters at the end after default behavior has been applied.

mythz · mythz · commit 3659f75f0299 · 2013-10-23T02:53:45.000-04:00
diff --git a/src/ServiceStack.Api.Swagger/SwaggerApiService.cs b/src/ServiceStack.Api.Swagger/SwaggerApiService.cs
@@ -250,11 +250,6 @@ private void ParseModel(IDictionary<string, SwaggerModel> models, Type modelType
             };
             models[model.Id] = model;
 
-            if (ModelFilter != null)
-            {
-                ModelFilter(model);
-            }
-
             foreach (var prop in modelType.GetProperties())
             {
                 var allApiDocAttributes = prop
@@ -268,11 +263,6 @@ private void ParseModel(IDictionary<string, SwaggerModel> models, Type modelType
                 var propertyType = prop.PropertyType;
                 var modelProp = new ModelProperty { Type = GetSwaggerTypeName(propertyType), Required = !IsNullable(propertyType) };
 
-                if (ModelPropertyFilter != null)
-                {
-                    ModelPropertyFilter(modelProp);
-                }
-
                 if (IsListType(propertyType))
                 {
                     modelProp.Type = SwaggerType.Array;
@@ -321,10 +311,18 @@ private void ParseModel(IDictionary<string, SwaggerModel> models, Type modelType
                 if (allowableValues != null)
                     modelProp.AllowableValues = GetAllowableValue(allowableValues);
 
+                if (ModelPropertyFilter != null)
+                {
+                    ModelPropertyFilter(modelProp);
+                }
+
                 model.Properties[GetModelPropertyName(prop)] = modelProp;
             }
 
-
+            if (ModelFilter != null)
+            {
+                ModelFilter(model);
+            }
         }
 
         private static string GetModelPropertyName(PropertyInfo prop)
