Resolves operationId and tag names for OData cast paths

src/Microsoft.OpenApi.OData.Reader/Common/EdmModelHelper.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Vocabulary.Capabilities;
 
 namespace Microsoft.OpenApi.OData.Common
@@ -22,7 +23,7 @@ internal static OpenApiSchema GetDerivedTypesReferenceSchema(IEdmStructuredType
         {
             Utils.CheckArgumentNull(structuredType, nameof(structuredType));
             Utils.CheckArgumentNull(edmModel, nameof(edmModel));
-            if(structuredType is not IEdmSchemaElement schemaElement) throw new ArgumentException("The type is not a schema element.", nameof(structuredType));
+            if (structuredType is not IEdmSchemaElement schemaElement) throw new ArgumentException("The type is not a schema element.", nameof(structuredType));
 
             IEnumerable<IEdmSchemaElement> derivedTypes = edmModel.FindAllDerivedTypes(structuredType).OfType<IEdmSchemaElement>();
 
@@ -32,12 +33,12 @@ internal static OpenApiSchema GetDerivedTypesReferenceSchema(IEdmStructuredType
             }
 
             OpenApiSchema schema = new()
-			{
+            {
                 OneOf = new List<OpenApiSchema>()
             };
 
             OpenApiSchema baseTypeSchema = new()
-			{
+            {
                 UnresolvedReference = true,
                 Reference = new OpenApiReference
                 {
@@ -50,7 +51,7 @@ internal static OpenApiSchema GetDerivedTypesReferenceSchema(IEdmStructuredType
             foreach (IEdmSchemaElement derivedType in derivedTypes)
             {
                 OpenApiSchema derivedTypeSchema = new()
-				{
+                {
                     UnresolvedReference = true,
                     Reference = new OpenApiReference
                     {
@@ -62,7 +63,7 @@ internal static OpenApiSchema GetDerivedTypesReferenceSchema(IEdmStructuredType
             };
 
             return schema;
-        }            
+        }
 
         /// <summary>
         /// Verifies whether the provided navigation restrictions allow for navigability of a navigation property. 
@@ -83,7 +84,91 @@ internal static bool NavigationRestrictionsAllowsNavigability(
             // if the individual has no navigability setting, use the global navigability setting
             // Default navigability for all navigation properties of the annotation target.
             // Individual navigation properties can override this value via `RestrictedProperties/Navigability`.
-            return restrictionProperty?.Navigability != null || restrictionType == null || restrictionType.IsNavigable;            
+            return restrictionProperty?.Navigability != null || restrictionType == null || restrictionType.IsNavigable;
+        }
+
+        /// <summary>
+        /// Generates the operation id for a navigation property path.
+        /// </summary>
+        /// <param name="path">The target <see cref="ODataPath"/>.</param>
+        /// <param name="navigationSource">The <see cref="IEdmNavigationSource"/> of the target path.</param>
+        /// <param name="prefix">Identifier indicating whether it is a collection-valued non-indexed navigation property.</param>
+        /// <returns>The operation id name.</returns>
+        internal static string GenerateNavigationPropertyPathOperationId(ODataPath path, IEdmNavigationSource navigationSource, string prefix = null)
+        {
+            if (path == null || navigationSource == null)
+                return null;
+
+            IList<string> items = new List<string>
+            {
+                navigationSource.Name
+            };
+
+            var lastpath = path.Segments.Last(c => c is ODataNavigationPropertySegment);
+            foreach (var segment in path.Segments.Skip(1).OfType<ODataNavigationPropertySegment>())
+            {
+                if (segment == lastpath)
+                {
+                    if (prefix != null)
+                    {
+                        items.Add(prefix + Utils.UpperFirstChar(segment.NavigationProperty.Name));
+                    }
+                    else
+                    {
+                        items.Add(Utils.UpperFirstChar(segment.NavigationProperty.Name));
+                    }
+
+                    break;
+                }
+                else
+                {
+                    items.Add(segment.NavigationProperty.Name);
+                }
+            }
+
+            return string.Join(".", items);
+        }
+
+        /// <summary>
+        /// Generates the tag for a navigation property path.
+        /// </summary>
+        /// <param name="path">The target <see cref="ODataPath"/>.</param>
+        /// <param name="navigationSource">The <see cref="IEdmNavigationSource"/> of the target path.</param>
+        /// <param name="navigationProperty">The target <see cref="IEdmNavigationProperty"/>.</param>
+        /// <param name="context">The <see cref="ODataContext"/>.</param>
+        /// <returns>The tag name.</returns>
+        internal static string GenerateNavigationPropertyPathTag(ODataPath path, IEdmNavigationSource navigationSource, IEdmNavigationProperty navigationProperty, ODataContext context)
+        {
+            if (path == null || navigationSource == null || navigationProperty == null)
+                return null;
+
+            IList<string> items = new List<string>
+            {
+                navigationSource.Name
+            };
+
+            foreach (var segment in path.Segments.Skip(1).OfType<ODataNavigationPropertySegment>())
+            {
+                if (segment.NavigationProperty == navigationProperty)
+                {
+                    items.Add(navigationProperty.ToEntityType().Name);
+                    break;
+                }
+                else
+                {
+                    if (items.Count >= context.Settings.TagDepth - 1)
+                    {
+                        items.Add(segment.NavigationProperty.ToEntityType().Name);
+                        break;
+                    }
+                    else
+                    {
+                        items.Add(segment.NavigationProperty.Name);
+                    }
+                }
+            }
+
+            return string.Join(".", items);
         }
     }
 }

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

@@ -15,24 +15,13 @@
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageId>Microsoft.OpenApi.OData</PackageId>
     <SignAssembly>true</SignAssembly>
-    <Version>1.2.0</Version>
+    <Version>1.3.0</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
-- Set assembly version used for conversion in OpenApiInfo object #208
-- Adds create and update operations to non-containment navigation properties when restrictions annotations are explicitly set to true #265
-- Generate odata.nextLink and odata.deltaLink properties on delta functions response schemas #285
-- Omits paths with PathItems without any operation #148
-- Expands navigation properties of derived types only if declaring navigation property is a containment #269
-- Adds custom parameters to $count and ODataTypeCast paths' Get operations #207
-- Adds support for configuring the default value of derived types' @odata.type property #304
-- Adds OData query parameters to $count endpoints #313
-- Finds all the derived types for a schema element #84
-- Add support for paths with alternate keys #120, #329
+- Resolves operationId and tag names for OData cast paths #324
     </PackageReleaseNotes>
     <AssemblyName>Microsoft.OpenApi.OData.Reader</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\tool\Microsoft.OpenApi.OData.snk</AssemblyOriginatorKeyFile>

src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs

@@ -78,33 +78,7 @@ protected override void Initialize(ODataContext context, ODataPath path)
         /// <inheritdoc/>
         protected override void SetTags(OpenApiOperation operation)
         {
-            IList<string> items = new List<string>
-            {
-                NavigationSource.Name
-            };
-
-            foreach (var segment in Path.Segments.Skip(1).OfType<ODataNavigationPropertySegment>())
-            {
-                if (segment.NavigationProperty == NavigationProperty)
-                {
-                    items.Add(NavigationProperty.ToEntityType().Name);
-                    break;
-                }
-                else
-                {
-                    if (items.Count >= Context.Settings.TagDepth - 1)
-                    {
-                        items.Add(segment.NavigationProperty.ToEntityType().Name);
-                        break;
-                    }
-                    else
-                    {
-                        items.Add(segment.NavigationProperty.Name);
-                    }
-                }
-            }
-
-            string name = string.Join(".", items);
+            string name = EdmModelHelper.GenerateNavigationPropertyPathTag(Path, NavigationSource, NavigationProperty, Context);
             OpenApiTag tag = new()
             {
                 Name = name
@@ -125,37 +99,10 @@ protected override void SetExtensions(OpenApiOperation operation)
             base.SetExtensions(operation);
         }
 
-        protected string GetOperationId(string prefix = null)
-        {
-            IList<string> items = new List<string>
-            {
-                NavigationSource.Name
-            };
-
-            var lastpath = Path.Segments.Last(c => c is ODataNavigationPropertySegment);
-            foreach (var segment in Path.Segments.Skip(1).OfType<ODataNavigationPropertySegment>())
-            {
-                if (segment == lastpath)
-                {
-                    if (prefix != null)
-                    {
-                        items.Add(prefix + Utils.UpperFirstChar(segment.NavigationProperty.Name));
-                    }
-                    else
-                    {
-                        items.Add(Utils.UpperFirstChar(segment.NavigationProperty.Name));
-                    }
-
-                    break;
-                }
-                else
-                {
-                    items.Add(segment.NavigationProperty.Name);
-                }
-            }
-
-            return string.Join(".", items);
-        }
+        internal string GetOperationId(string prefix = null)
+        {            
+            return EdmModelHelper.GenerateNavigationPropertyPathOperationId(Path, NavigationSource, prefix);
+        }               
 
         /// <inheritdoc/>
         protected override void SetExternalDocs(OpenApiOperation operation)