Eliminate duplicated request bodies for actions

microsoft · Aug 24, 2022 · 90b6a94 · 90b6a94
1 parent 7439ab5
commit 90b6a94
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 6 deletions.
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs
@@ -200,7 +200,7 @@ public static bool IsOperationOverload(this IEdmModel model, IEdmOperation opera
         }
 
         /// <summary>
-        /// Check whether the operaiton import is overload in the model.
+        /// Check whether the operation import is overload in the model.
         /// </summary>
         /// <param name="model">The Edm model.</param>
         /// <param name="operationImport">The test operations.</param>

diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiRequestBodyGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiRequestBodyGenerator.cs
@@ -95,17 +95,22 @@ public static IDictionary<string, OpenApiRequestBody> CreateRequestBodies(this O
         {
             Utils.CheckArgumentNull(context, nameof(context));
 
-            return new Dictionary<string, OpenApiRequestBody>
+            Dictionary<string, OpenApiRequestBody> requestBodies = new()
             {
                 {
                     Constants.ReferencePostRequestBodyName,
-                    CreateRefPostRequestBody() 
+                    CreateRefPostRequestBody()
                 },
                 {
                     Constants.ReferencePutRequestBodyName,
                     CreateRefPutRequestBody()
                 }
             };
+
+            // get request bodies for overloaded actions
+            Dictionary<string, OpenApiRequestBody> requestBodiesForOverloadedActions = CreateRequestBodiesForOverloadedActions(context);
+
+            return requestBodies.Union(requestBodiesForOverloadedActions).ToDictionary(k => k.Key, v => v.Value);
         }
 
         /// <summary>
@@ -170,5 +175,23 @@ private static OpenApiRequestBody CreateRefPutRequestBody()
                 }
             };
         }
+
+        private static Dictionary<string, OpenApiRequestBody> CreateRequestBodiesForOverloadedActions(ODataContext context)
+        {
+            Dictionary<string, OpenApiRequestBody> requestBodies = new();
+
+            foreach (IEdmAction action in context.Model.SchemaElements.Where(x => x.SchemaElementKind == EdmSchemaElementKind.Action).ToList())
+            {
+                if (context.Model.IsOperationOverload(action))
+                {
+                    requestBodies.Add(
+                            $"{action.Name}RequestBody",
+                            new OpenApiRequestBody()
+                        );
+                }
+            }
+
+            return requestBodies;
+        }
     }
 }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionOperationHandler.cs
@@ -37,10 +37,24 @@ protected override void SetBasicInfo(OpenApiOperation operation)
         /// <inheritdoc/>
         protected override void SetRequestBody(OpenApiOperation operation)
         {
-            IEdmAction action = EdmOperation as IEdmAction;
-            if (action != null)
+            if (EdmOperation is IEdmAction action)
             {
-                operation.RequestBody = Context.CreateRequestBody(action);
+                if (Context.Model.IsOperationOverload(action))
+                {
+                    operation.RequestBody = new OpenApiRequestBody
+                    {
+                        UnresolvedReference = true,
+                        Reference = new OpenApiReference
+                        {
+                            Type = ReferenceType.RequestBody,
+                            Id = $"{action.Name}RequestBody"
+                        }
+                    };
+                }
+                else
+                {
+                    operation.RequestBody = Context.CreateRequestBody(action);
+                }
             }
 
             base.SetRequestBody(operation);