Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/client generation #211

Merged
merged 5 commits into from
Dec 13, 2024
Merged

Hotfix/client generation #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92a37a7
style: use collection-expression in ApiOperationExtractor
Dec 12, 2024
b5ae8a6
chore: rename IsSchemaEnumAndUseJsonString to IsSchemaEnumAndUsesJson…
Dec 12, 2024
73360b2
feat: add ContainsEnumInSchemaOrProperties in OpenApiParameterExtensions
Dec 12, 2024
1e59aaf
fix: ensure proper generation of csharp client for default values on …
Dec 12, 2024
242b90d
test: update monta client test
Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 16 additions & 4 deletions ...Framework/Factories/Parameters/Client/ContentGeneratorClientParameterParametersFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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));
}
}
}
Expand Down Expand Up @@ -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)
{
Expand All @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions src/Atc.Rest.ApiGenerator.OpenApi/Extensions/OpenApiDocumentExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
10 changes: 9 additions & 1 deletion src/Atc.Rest.ApiGenerator.OpenApi/Extensions/OpenApiParameterExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
{
Expand All @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Atc.Rest.ApiGenerator.OpenApi/Extractors/ApiOperationExtractor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading
Loading