fix: Fixed methods with same query and path names.

tryAGI · Jun 15, 2024 · 17375d8 · 17375d8
1 parent 792358f
commit 17375d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/libs/OpenApiGenerator.Core/Generation/Sources.Methods.cs b/src/libs/OpenApiGenerator.Core/Generation/Sources.Methods.cs
@@ -180,7 +180,7 @@ public static string GenerateExtensionMethod(
             var request = new {endPoint.RequestType.CSharpTypeWithoutNullability}
             {{
 {endPoint.Properties.Where(x => x.ParameterLocation == null && (x.IsRequired || !x.IsDeprecated)).Select(x => $@"
-                {x.Name} = {x.ParameterName},").Inject()}
+                {(x.Name.StartsWith("request", StringComparison.Ordinal) ? x.Name.Replace("request", string.Empty) : x.Name)} = {x.ParameterName},").Inject()}
             }};
 
             {response}{endPoint.MethodName}(

diff --git a/src/libs/OpenApiGenerator.Core/Models/EndPoint.cs b/src/libs/OpenApiGenerator.Core/Models/EndPoint.cs
@@ -167,17 +167,17 @@ public static EndPoint FromSchema(
         var properties = parameters.ToList();
         foreach (var requestProperty in requestModel?.Properties ?? [])
         {
-            //if (properties.All(x => x.Name != requestProperty.Name))
+            if (properties.All(x => x.Name != requestProperty.Name))
             {
                 properties.Add(requestProperty);
             }
-            // else
-            // {
-            //     properties.Add(requestProperty with
-            //     {
-            //         Name = $"request{requestProperty.Name.ToPropertyName()}",
-            //     });
-            // }
+            else
+            {
+                properties.Add(requestProperty with
+                {
+                    Name = $"request{requestProperty.Name.ToPropertyName()}",
+                });
+            }
         }
 
         var endPoint = new EndPoint(