Fix enum mapping in net8 (#24)

Author: Dreamescaper

GenerateAspNetCoreClient.Command/ClientModelBuilder.cs

@@ -282,7 +282,7 @@ private List<Parameter> GetParameters(ApiDescription apiDescription)
 
                 parameterName = new string(parameterName.Where(c => char.IsLetterOrDigit(c)).ToArray());
 
-                var type = parameterDescription.Type ?? typeof(string);
+                var type = parameterDescription.ModelMetadata?.ModelType ?? parameterDescription.Type ?? typeof(string);
 
                 var defaultValue = GetDefaultValueLiteral(parameterDescription, type);
 
@@ -414,7 +414,7 @@ private List<string> GetNamespaces(IEnumerable<ApiDescription> apiDescriptions,
                             AddForType(parameterDescription.ModelMetadata.ContainerType);
                             break;
                         default:
-                            AddForType(parameterDescription.Type);
+                            AddForType(parameterDescription.ModelMetadata?.ModelType ?? parameterDescription.Type);
                             break;
                     }
                 }
@@ -440,16 +440,15 @@ void AddForType(Type? type)
 
         private static string? GetDefaultValueLiteral(ApiParameterDescription parameter, Type parameterType)
         {
-            // Use reflection for AspNetCore 2.1 compatibility.
-            var defaultValue = parameter.TryGetPropertyValue<object>(nameof(parameter.DefaultValue));
+            var defaultValue = parameter.DefaultValue;
 
             if (defaultValue != null && defaultValue is not DBNull)
             {
                 // If defaultValue is not null - return it.
                 return defaultValue.ToLiteral();
             }
 
-            var isRequired = parameter.TryGetPropertyValue<bool?>(nameof(parameter.IsRequired)) == true;
+            var isRequired = parameter.IsRequired;
             isRequired |= parameter.ModelMetadata?.IsBindingRequired == true;
 
             if (!parameterType.IsValueType || parameterType.IsNullable())

GenerateAspNetCoreClient.Command/GenerateAspNetCoreClient.Command.csproj

@@ -10,8 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
-    <PackageReference Include="Namotion.Reflection" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
+    <PackageReference Include="Namotion.Reflection" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>

Tests/GenerateAspNetCoreClient.Tests/GenerateAspNetCoreClient.Tests.csproj

@@ -10,7 +10,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="4.0.0" />
+    <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -27,8 +27,4 @@
     <ProjectReference Include="..\TestWebApi.MinimalApi\TestWebApi.MinimalApi.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="__snapshots__\" />
-  </ItemGroup>
-
 </Project>

Tests/GenerateAspNetCoreClient.Tests/__snapshots__/TestWebApi.Controllers/IAnotherTestApi.cs.snap

@@ -3,18 +3,22 @@
 using System;
 using System.Threading.Tasks;
 using Refit;
+using TestWebApi.Models;
 
 namespace Test.Name.Space
 {
     public partial interface IAnotherTestApi
     {
         [Get("/AnotherTest/with-query-model")]
-        Task WithQueryModel(string param1 = null, Guid? param2 = null, int? param3 = null);
+        Task WithQueryModel(string param1 = null, Guid? param2 = null, int? param3 = null, SomeEnum? param4 = null);
 
         [Get("/AnotherTest/with-query-name")]
         Task WithQueryParameterName([AliasAs("currency")] string currencyName = null);
 
         [Get("/AnotherTest/with-query-name-array")]
         Task WithQueryArrayParameterName([AliasAs("currencies")] string[] currencyNames = null);
+
+        [Get("/AnotherTest/with-query-enum")]
+        Task WithQueryEnumParameter(SomeEnum? enumParam = null);
     }
 }

Tests/TestWebApi.Controllers/Controllers/AnotherTestController.cs

@@ -26,5 +26,11 @@ public ActionResult WithQueryArrayParameterName([FromQuery(Name = "currencies")]
         {
             return Ok();
         }
+
+        [HttpGet("with-query-enum")]
+        public ActionResult WithQueryEnumParameter([FromQuery] SomeEnum enumParam)
+        {
+            return Ok();
+        }
     }
 }

Tests/TestWebApi.Dtos/SomeEnum.cs

@@ -0,0 +1,9 @@
+namespace TestWebApi.Models
+{
+    public enum SomeEnum
+    {
+        Value1,
+        Value2,
+        Value3
+    }
+}

Tests/TestWebApi.Dtos/SomeQueryModel.cs

@@ -5,5 +5,6 @@ public class SomeQueryModel
         public string Param1 { get; set; }
         public Guid? Param2 { get; set; }
         public int Param3 { get; set; }
+        public SomeEnum Param4 { get; set; }
     }
 }

Tests/TestWebApi.MinimalApi/TestWebApi.MinimalApi.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="8.0.0">
+    <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="8.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Tests/TestWebApi.Versioning/TestWebApi.Versioning.csproj

@@ -8,8 +8,8 @@
 
   <ItemGroup>
 	<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageReference Include="Asp.Versioning.Mvc" Version="7.1.0" />
-    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="7.1.0" />
+    <PackageReference Include="Asp.Versioning.Mvc" Version="8.0.0" />
+    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.0.0" />
   </ItemGroup>
 
 </Project>