Fix codegen

Author: MelbourneDeveloper

RestClient.Net.OpenApiGenerator.Tests/OpenApiCodeGeneratorTests.cs

@@ -263,10 +263,10 @@ public void Generate_HandlesPathAndQueryParametersTogether()
         );
 
         Assert.IsTrue(
-            result.ExtensionMethodsCode.Contains("string api_key")
+            result.ExtensionMethodsCode.Contains("string apiKey")
                 && result.ExtensionMethodsCode.Contains("long petId")
         );
-        Assert.IsTrue(result.ExtensionMethodsCode.Contains("?api_key={param.api_key}"));
+        Assert.IsTrue(result.ExtensionMethodsCode.Contains("?api_key={param.apiKey}"));
     }
 
     [TestMethod]

RestClient.Net.OpenApiGenerator/ExtensionMethodGenerator.cs

@@ -67,8 +67,10 @@ public static (string ExtensionMethods, string TypeAliases) GenerateExtensionMet
         var namingPolicyCode = jsonNamingPolicy switch
         {
             var s when s.Equals("PascalCase", StringComparison.OrdinalIgnoreCase) => "null",
-            var s when s.Equals("snake_case", StringComparison.OrdinalIgnoreCase)
-                    || s.Equals("snakecase", StringComparison.OrdinalIgnoreCase) => "JsonNamingPolicy.SnakeCaseLower",
+            var s
+                when s.Equals("snake_case", StringComparison.OrdinalIgnoreCase)
+                    || s.Equals("snakecase", StringComparison.OrdinalIgnoreCase) =>
+                "JsonNamingPolicy.SnakeCaseLower",
             _ => "JsonNamingPolicy.CamelCase",
         };
 
@@ -217,7 +219,7 @@ private static (string PublicMethod, string PrivateDelegate) GenerateHttpMethod(
         HttpMethod operationType,
         string methodName,
         string path,
-        List<(string Name, string Type, bool IsPath)> parameters,
+        List<(string Name, string Type, bool IsPath, string OriginalName)> parameters,
         string? requestBodyType,
         string responseType,
         string summary
@@ -240,7 +242,7 @@ string summary
         var deserializer =
             responseType == "string" ? "DeserializeString" : $"DeserializeJson<{responseType}>";
         var queryString = hasQueryParams
-            ? "?" + string.Join("&", queryParams.Select(q => $"{q.Name}={{{q.Name}}}"))
+            ? "?" + string.Join("&", queryParams.Select(q => $"{q.OriginalName}={{{q.Name}}}"))
             : string.Empty;
 
         var verb =
@@ -320,8 +322,12 @@ string summary
             var paramInvocation = isSingleParam ? queryParamsNames : $"({queryParamsNames})";
             var deserializeMethod = isDelete ? "_deserializeUnit" : deserializer;
             var queryStringWithParam = isSingleParam
-                ? "?" + string.Join("&", queryParams.Select(q => $"{q.Name}={{param}}"))
-                : "?" + string.Join("&", queryParams.Select(q => $"{q.Name}={{param.{q.Name}}}"));
+                ? "?" + string.Join("&", queryParams.Select(q => $"{q.OriginalName}={{param}}"))
+                : "?"
+                    + string.Join(
+                        "&",
+                        queryParams.Select(q => $"{q.OriginalName}={{param.{q.Name}}}")
+                    );
 
             var privateDelegate = $$"""
                 private static {{delegateType}}<{{resultResponseType}}, string, {{queryParamsType}}> {{privateFunctionName}} { get; } =
@@ -369,9 +375,12 @@ string summary
             var deserializeMethod = isDelete ? "_deserializeUnit" : deserializer;
             var queryStringWithParam =
                 isSingleParam && queryParams.Count == 1
-                    ? "?" + string.Join("&", queryParams.Select(q => $"{q.Name}={{param}}"))
+                    ? "?" + string.Join("&", queryParams.Select(q => $"{q.OriginalName}={{param}}"))
                     : "?"
-                        + string.Join("&", queryParams.Select(q => $"{q.Name}={{param.{q.Name}}}"));
+                        + string.Join(
+                            "&",
+                            queryParams.Select(q => $"{q.OriginalName}={{param.{q.Name}}}")
+                        );
             var pathWithParam =
                 isSingleParam && hasPathParams
                     ? pathExpression.Replace(
@@ -484,11 +493,11 @@ string path
         return $"{methodName}{CodeGenerationHelpers.ToPascalCase(pathPart)}";
     }
 
-    private static List<(string Name, string Type, bool IsPath)> GetParameters(
+    private static List<(string Name, string Type, bool IsPath, string OriginalName)> GetParameters(
         OpenApiOperation operation
     )
     {
-        var parameters = new List<(string Name, string Type, bool IsPath)>();
+        var parameters = new List<(string Name, string Type, bool IsPath, string OriginalName)>();
 
         if (operation.Parameters == null)
         {
@@ -505,7 +514,7 @@ OpenApiOperation operation
             var isPath = param.In == ParameterLocation.Path;
             var type = ModelGenerator.MapOpenApiType(param.Schema);
             var sanitizedName = CodeGenerationHelpers.ToCamelCase(param.Name);
-            parameters.Add((sanitizedName, type, isPath));
+            parameters.Add((sanitizedName, type, isPath, param.Name));
         }
 
         return parameters;