Merge pull request #211 from atc-net/hotfix/client-generation

Hotfix/client generation

Author: perkops

src/Atc.Rest.ApiGenerator.Framework/Factories/Parameters/Client/ContentGeneratorClientParameterParametersFactory.cs

@@ -37,6 +37,8 @@ private static void AppendParameters(
         {
             var useListForDataType = openApiParameter.Schema.IsTypeArray();
 
+            var parameterName = openApiParameter.Name.EnsureValidFormattedPropertyName();
+
             var dataType = useListForDataType
                 ? openApiParameter.Schema.Items.GetDataType()
                 : openApiParameter.Schema.GetDataType();
@@ -47,17 +49,27 @@ private static void AppendParameters(
 
             if (parameters.FirstOrDefault(x => x.Name == openApiParameter.Name) is null)
             {
+                var defaultValueInitializer = openApiParameter.Schema.GetDefaultValueAsString();
+
+                if (!string.IsNullOrEmpty(defaultValueInitializer) &&
+                    openApiParameter.ContainsEnumInSchemaOrProperties())
+                {
+                    defaultValueInitializer = dataType.Equals(parameterName, StringComparison.Ordinal)
+                        ? $"{ContentGeneratorConstants.Contracts}.{dataType}.{defaultValueInitializer.PascalCase(ApiOperationExtractor.ModelNameSeparators, removeSeparators: true)}"
+                        : $"{dataType}.{defaultValueInitializer.PascalCase(ApiOperationExtractor.ModelNameSeparators, removeSeparators: true)}";
+                }
+
                 parameters.Add(new ContentGeneratorClientParameterParametersProperty(
                     openApiParameter.Name,
-                    openApiParameter.Name.EnsureValidFormattedPropertyName(),
+                    parameterName,
                     openApiParameter.ExtractDocumentationTags(),
                     dataType,
                     isSimpleType,
                     useListForDataType,
                     GetIsNullable(openApiParameter, useListForDataType),
                     openApiParameter.Required,
                     GetAdditionalValidationAttributes(openApiParameter),
-                    openApiParameter.Schema.GetDefaultValueAsString()));
+                    defaultValueInitializer));
             }
         }
     }
@@ -94,7 +106,7 @@ private static void AppendParametersFromBody(
         var requestBodyType = "string?";
         if (requestSchema.Reference is not null)
         {
-            requestBodyType = requestSchema.Reference.Id.EnsureFirstCharacterToUpper();
+            requestBodyType = requestSchema.Reference.Id.PascalCase(ApiOperationExtractor.ModelNameSeparators, removeSeparators: true);
         }
         else if (isFormatTypeOfBinary)
         {
@@ -106,7 +118,7 @@ private static void AppendParametersFromBody(
         }
         else if (requestSchema.Items is not null)
         {
-            requestBodyType = requestSchema.Items.Reference.Id.EnsureFirstCharacterToUpper();
+            requestBodyType = requestSchema.Items.Reference.Id.PascalCase(ApiOperationExtractor.ModelNameSeparators, removeSeparators: true);
         }
 
         parameters.Add(new ContentGeneratorClientParameterParametersProperty(

src/Atc.Rest.ApiGenerator.OpenApi/Extensions/OpenApiDocumentExtensions.cs

@@ -262,15 +262,15 @@ public static bool IsUsingRequiredForSystemTextJsonSerializationAndSystemRuntime
 
                 foreach (var apiParameter in apiPathPair.Value.Parameters)
                 {
-                    if (apiParameter.IsSchemaEnumAndUseJsonString())
+                    if (apiParameter.IsSchemaEnumAndUsesJsonString())
                     {
                         return true;
                     }
                 }
 
                 foreach (var apiParameter in apiOperationPair.Value.Parameters)
                 {
-                    if (apiParameter.IsSchemaEnumAndUseJsonString())
+                    if (apiParameter.IsSchemaEnumAndUsesJsonString())
                     {
                         return true;
                     }

src/Atc.Rest.ApiGenerator.OpenApi/Extensions/OpenApiParameterExtensions.cs

@@ -2,7 +2,8 @@ namespace Atc.Rest.ApiGenerator.OpenApi.Extensions;
 
 public static class OpenApiParameterExtensions
 {
-    public static bool IsSchemaEnumAndUseJsonString(this OpenApiParameter apiParameter)
+    public static bool IsSchemaEnumAndUsesJsonString(
+        this OpenApiParameter apiParameter)
     {
         if (apiParameter.Schema.IsSchemaEnum())
         {
@@ -24,6 +25,13 @@ public static bool IsSchemaEnumAndUseJsonString(this OpenApiParameter apiParamet
         return false;
     }
 
+    public static bool ContainsEnumInSchemaOrProperties(
+        this OpenApiParameter apiParameter)
+        => apiParameter.Schema.IsSchemaEnumOrPropertyEnum() ||
+           apiParameter.Schema.AllOf.Any(allOfSchema => allOfSchema.IsSchemaEnumOrPropertyEnum()) ||
+           apiParameter.Schema.OneOf.Any(oneOfSchema => oneOfSchema.IsSchemaEnumOrPropertyEnum()) ||
+           apiParameter.Schema.AnyOf.Any(anyOfSchema => anyOfSchema.IsSchemaEnumOrPropertyEnum());
+
     public static CodeDocumentationTags ExtractDocumentationTags(
         this OpenApiParameter apiParameter)
     {

src/Atc.Rest.ApiGenerator.OpenApi/Extractors/ApiOperationExtractor.cs

@@ -5,7 +5,7 @@ namespace Atc.Rest.ApiGenerator.OpenApi.Extractors;
 
 public sealed class ApiOperationExtractor : IApiOperationExtractor
 {
-    public static readonly char[] ModelNameSeparators = { ' ', '-', '_', '.' };
+    public static readonly char[] ModelNameSeparators = [' ', '-', '_', '.'];
 
     public IList<ApiOperation> Extract(
         OpenApiDocument apiDocument)