Fixes paths for functions with structured or collection-valued parameters (#203)

* Update In property value for structured and col-valued func. params

* Replace parameter alias for structured and col-valued func. params with braces

* Remove comment

* Add workflow_dispatch

* PR feedback

Author: irvinesunday

.github/workflows/codeql-analysis.yml

@@ -19,6 +19,7 @@ on:
     branches: [ master ]
   schedule:
     - cron: '32 2 * * 6'
+  workflow_dispatch:
 
 jobs:
   analyze:

src/Microsoft.OpenApi.OData.Reader/Edm/ODataOperationSegment.cs

@@ -139,22 +139,13 @@ private string FunctionName(IEdmFunction function, OpenApiConvertSettings settin
                 functionName.Append(function.FullName());
             }
             functionName.Append("(");
-
-            // Structured or collection-valued parameters are represented as a parameter alias in the path template
-            // and the parameters array contains a Parameter Object for the parameter alias as a query option of type string.
+            
             int skip = function.IsBound ? 1 : 0;
-            functionName.Append(String.Join(",", function.Parameters.Skip(skip).Select(p =>
+            functionName.Append(string.Join(",", function.Parameters.Skip(skip).Select(p =>
             {
                 string uniqueName = Utils.GetUniqueName(p.Name, parameters);
-                if (p.Type.IsStructured() || p.Type.IsCollection())
-                {
-                    return p.Name + "=@" + uniqueName;
-                }
-                else
-                {
-                    var quote = p.Type.Definition.ShouldPathParameterBeQuoted(settings) ? "'" : string.Empty;
-                    return p.Name + $"={quote}{{{uniqueName}}}{quote}";
-                }
+                var quote = p.Type.Definition.ShouldPathParameterBeQuoted(settings) ? "'" : string.Empty;
+                return p.Name + $"={quote}{{{uniqueName}}}{quote}";
             })));
 
             functionName.Append(")");

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs

@@ -81,17 +81,14 @@ public static IList<OpenApiParameter> CreateParameters(this ODataContext context
                     }
                 }                
 
-                OpenApiParameter parameter;
-                // Structured or collection-valued parameters are represented as a parameter alias
-                // in the path template and the parameters array contains a Parameter Object for
-                // the parameter alias as a query option of type string.
+                OpenApiParameter parameter;                
                 if (edmParameter.Type.IsStructured() ||
                     edmParameter.Type.IsCollection())
                 {
                     parameter = new OpenApiParameter
                     {
                         Name = parameterNameMapping == null ? edmParameter.Name : parameterNameMapping[edmParameter.Name],
-                        In = ParameterLocation.Query, // as query option
+                        In = ParameterLocation.Path,
                         Required = true,
 
                         // Create schema in the Content property to indicate that the parameters are serialized as JSON

test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataOperationSegmentTests.cs

@@ -75,9 +75,9 @@ public void GetPathItemNameReturnsCorrectActionLiteral(bool unqualifiedCall, boo
 
         [Theory]
         [InlineData(true, true, "MyFunction(param={param})")]
-        [InlineData(true, false, "MyFunction(entity=@entity,param={param})")]
+        [InlineData(true, false, "MyFunction(entity={entity},param={param})")]
         [InlineData(false, true, "NS.MyFunction(param={param})")]
-        [InlineData(false, false, "NS.MyFunction(entity=@entity,param={param})")]
+        [InlineData(false, false, "NS.MyFunction(entity={entity},param={param})")]
         public void GetPathItemNameReturnsCorrectFunctionLiteral(bool unqualifiedCall, bool isBound, string expected)
         {
             // Arrange & Act

test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiParameterGeneratorTests.cs

@@ -407,7 +407,7 @@ public void CreateParametersWorks()
             string json1 = parameter1.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
             string expectedPayload1 = $@"{{
   ""name"": ""ids"",
-  ""in"": ""query"",
+  ""in"": ""path"",
   ""description"": ""The URL-encoded JSON object"",
   ""required"": true,
   ""content"": {{