From d3f407290ce006ef9a8587479f8a826bcf646069 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Fri, 19 Feb 2021 11:31:49 +0100
Subject: [PATCH] Fix schema.

---
 .../Api/Config/OpenApi/OpenApiServices.cs     |  4 +-
 .../Api/Config/OpenApi/QueryExtensions.cs     | 64 +++++++++----------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs b/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs
index bb495952f..406d9cc56 100644
--- a/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs
+++ b/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs
@@ -107,9 +107,9 @@ namespace Squidex.Areas.Api.Config.OpenApi
             {
                 CreateStringMap<DomainId>(),
                 CreateStringMap<Instant>(JsonFormatStrings.DateTime),
-                CreateStringMap<Language>(),
                 CreateStringMap<LocalDate>(JsonFormatStrings.Date),
                 CreateStringMap<LocalDateTime>(JsonFormatStrings.DateTime),
+                CreateStringMap<Language>(),
                 CreateStringMap<NamedId<DomainId>>(),
                 CreateStringMap<NamedId<Guid>>(),
                 CreateStringMap<NamedId<string>>(),
@@ -120,7 +120,7 @@ namespace Squidex.Areas.Api.Config.OpenApi
                 CreateObjectMap<AssetMetadata>()
             };
 
-            settings.FlattenInheritanceHierarchy = true;
+            settings.FlattenInheritanceHierarchy = flatten;
         }
 
         private static ITypeMapper CreateObjectMap<T>()
diff --git a/backend/src/Squidex/Areas/Api/Config/OpenApi/QueryExtensions.cs b/backend/src/Squidex/Areas/Api/Config/OpenApi/QueryExtensions.cs
index 18db0e842..ebe834cd3 100644
--- a/backend/src/Squidex/Areas/Api/Config/OpenApi/QueryExtensions.cs
+++ b/backend/src/Squidex/Areas/Api/Config/OpenApi/QueryExtensions.cs
@@ -14,74 +14,74 @@ namespace Squidex.Areas.Api.Config.OpenApi
     {
         public static void AddQuery(this OpenApiOperation operation, bool supportSearch)
         {
-            var @string = new JsonSchema
+            var stringSchema = new JsonSchema
             {
                 Type = JsonObjectType.String
             };
 
-            var number = new JsonSchema
+            var numberSchema = new JsonSchema
             {
-                Type = JsonObjectType.String
+                Type = JsonObjectType.Number
             };
 
+            void AddQuery(OpenApiParameter parameter)
+            {
+                parameter.Kind = OpenApiParameterKind.Query;
+
+                operation.Parameters.Add(parameter);
+            }
+
             if (supportSearch)
             {
-                operation.Parameters.Add(new OpenApiParameter
+                AddQuery(new OpenApiParameter
                 {
-                    Schema = @string,
+                    Schema = stringSchema,
                     Name = "$search",
-                    Description = "Optional OData full text search.",
-                    Kind = OpenApiParameterKind.Query
+                    Description = "Optional OData full text search."
                 });
             }
 
-            operation.Parameters.Add(new OpenApiParameter
+            AddQuery(new OpenApiParameter
             {
-                Schema = number,
+                Schema = numberSchema,
                 Name = "$top",
-                Description = "Optional OData parameter to define the number of items to retrieve.",
-                Kind = OpenApiParameterKind.Query
+                Description = "Optional OData parameter to define the number of items to retrieve."
             });
 
-            operation.Parameters.Add(new OpenApiParameter
+            AddQuery(new OpenApiParameter
             {
-                Schema = number,
+                Schema = numberSchema,
                 Name = "$skip",
-                Description = "Optional OData parameter to skip items.",
-                Kind = OpenApiParameterKind.Query
+                Description = "Optional OData parameter to skip items."
             });
 
-            operation.Parameters.Add(new OpenApiParameter
+            AddQuery(new OpenApiParameter
             {
-                Schema = @string,
+                Schema = stringSchema,
                 Name = "$orderby",
-                Description = "Optional OData order definition to sort the result set.",
-                Kind = OpenApiParameterKind.Query
+                Description = "Optional OData order definition to sort the result set."
             });
 
-            operation.Parameters.Add(new OpenApiParameter
+            AddQuery(new OpenApiParameter
             {
-                Schema = @string,
+                Schema = stringSchema,
                 Name = "$filter",
-                Description = "Optional OData order definition to filter the result set.",
-                Kind = OpenApiParameterKind.Query
+                Description = "Optional OData order definition to filter the result set."
             });
 
-            operation.Parameters.Add(new OpenApiParameter
+            AddQuery(new OpenApiParameter
             {
-                Schema = @string,
+                Schema = stringSchema,
                 Name = "q",
-                Description = "JSON query as well formatted json string. Overrides all other query parameters, except 'ids'.",
-                Kind = OpenApiParameterKind.Query
+                Description = "JSON query as well formatted json string. Overrides all other query parameters, except 'ids'."
             });
 
-            operation.Parameters.Add(new OpenApiParameter
+            AddQuery(new OpenApiParameter
             {
-                Schema = @string,
+                Schema = stringSchema,
                 Name = "ids",
-                Description = "Comma separated list of content items. Overrides all other query parameters.",
-                Kind = OpenApiParameterKind.Query
+                Description = "Comma separated list of content items. Overrides all other query parameters."
             });
         }
     }
-}
+}
\ No newline at end of file