Ensure no single quotes are added to URL path parameters of temporal type (#287)

* Do not add single quotes to URL Path parameters of temporal type

* Update release notes

* Add tests to ensure no single quotes are added to URL path parameters of temporal type

Co-authored-by: Vincent Biret <[email protected]>

Author: millicentachieng

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

@@ -28,7 +28,7 @@ public static bool ShouldPathParameterBeQuoted(this IEdmType edmType, OpenApiCon
             return edmType.TypeKind switch
             {
                 EdmTypeKind.Enum => true,
-                EdmTypeKind.Primitive when edmType.IsString() || edmType.IsTemporal() => true,
+                EdmTypeKind.Primitive when edmType.IsString() => true,
                 _ => false,
             };
         }

src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj

@@ -15,13 +15,14 @@
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageId>Microsoft.OpenApi.OData</PackageId>
     <SignAssembly>true</SignAssembly>
-    <Version>1.2.0-preview1</Version>
+    <Version>1.2.0-preview2</Version>
     <Description>This package contains the codes you need to convert OData CSDL to Open API Document of Model.</Description>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>Microsoft OpenApi OData EDM</PackageTags>
     <RepositoryUrl>https://github.com/Microsoft/OpenAPI.NET.OData</RepositoryUrl>
     <PackageReleaseNotes>
 - Use convert setting to toggle between referencing @odata.count and @odata.nextLink #282
+- Fixes URL Path parameters of type datetime generated as strings with quotes #262
     </PackageReleaseNotes>
     <AssemblyName>Microsoft.OpenApi.OData.Reader</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\tool\Microsoft.OpenApi.OData.snk</AssemblyOriginatorKeyFile>

test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmFunctionOperationHandlerTests.cs

@@ -8,6 +8,7 @@
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Csdl;
 using Microsoft.OpenApi.Extensions;
+using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Tests;
 using Xunit;
@@ -228,7 +229,7 @@ public void CreateOperationForEdmFunctionWithTypeCastReturnsCorrectOperationId(b
                 new ODataKeySegment(customer),
                 new ODataTypeCastSegment(vipCustomer),
                 new ODataOperationSegment(function));
-
+          
             // Act
             var operation = _operationHandler.CreateOperation(context, path);
 
@@ -445,5 +446,38 @@ public void CreateOperationForEdmFunctionWithCollectionReturnTypeContainsXMsPage
                 Assert.False(operation.Extensions.ContainsKey(Common.Constants.xMsPageable));
             }
         }
+
+        [Fact]
+        public void CreateOperationForFunctionWithDateTimeParametersReturnsCorrectPathItemName()
+        {
+            // Arrange
+            IEdmModel model = EdmModelHelper.GraphBetaModel;
+            OpenApiConvertSettings settings = new()
+            {
+                AddSingleQuotesForStringParameters = true,
+            };
+            ODataContext context = new(model, settings);
+
+            IEdmFunction function = model.SchemaElements.OfType<IEdmFunction>()
+                .FirstOrDefault(x => x.Name == "getPrinterUsageSummary");
+            Assert.NotNull(function); // guard
+
+            IEdmEntityContainer container = model.SchemaElements.OfType<IEdmEntityContainer>().First();
+            IEdmSingleton reports = container.FindSingleton("reports");
+
+            ODataPath path = new(new ODataNavigationSourceSegment(reports),
+                new ODataOperationSegment(function));
+
+            // Act
+            OpenApiOperation operation = _operationHandler.CreateOperation(context, path);
+            string pathItemName = path.GetPathItemName();
+            
+            // Assert
+            Assert.NotNull(operation);
+            Assert.Equal("/reports/microsoft.graph.getPrinterUsageSummary(printerId={printerId},periodStart={periodStart},periodEnd={periodEnd})", pathItemName);
+            Assert.Equal("Usage: periodStart={periodStart}", operation.Parameters.First(x => x.Name == "periodStart").Description);
+            Assert.Equal("Usage: periodEnd={periodEnd}", operation.Parameters.First(x => x.Name == "periodEnd").Description);
+
+        }
     }
 }