Add support to attach entity set and operation to an API description

Author: Chris Martinez

src/Microsoft.AspNet.OData.Versioning.ApiExplorer/System.Web.Http/Description/ApiDescriptionExtensions.cs

@@ -72,5 +72,22 @@ public static IEdmEntityType EntityType( this ApiDescription apiDescription )
             Arg.NotNull( apiDescription, nameof( apiDescription ) );
             return apiDescription.EntitySet()?.EntityType();
         }
+
+        /// <summary>
+        /// Gets the operation associated with the API description.
+        /// </summary>
+        /// <param name="apiDescription">The <see cref="ApiDescription">API description</see> to get the operation for.</param>
+        /// <returns>The associated <see cref="IEdmOperation">EDM operation</see> or <c>null</c> if there is no associated operation.</returns>
+        public static IEdmOperation Operation( this ApiDescription apiDescription )
+        {
+            Arg.NotNull( apiDescription, nameof( apiDescription ) );
+
+            if ( apiDescription is VersionedApiDescription description )
+            {
+                return description.GetProperty<IEdmOperation>();
+            }
+
+            return default;
+        }
     }
 }

src/Microsoft.AspNet.OData.Versioning.ApiExplorer/Web.Http.Description/ODataApiExplorer.cs

@@ -461,6 +461,16 @@ void PopulateActionDescriptions(
                     Properties = { [typeof( IEdmModel )] = routeBuilderContext.EdmModel },
                 };
 
+                if ( routeBuilderContext.EntitySet != null )
+                {
+                    apiDescription.Properties[typeof( IEdmEntitySet )] = routeBuilderContext.EntitySet;
+                }
+
+                if ( routeBuilderContext.Operation != null )
+                {
+                    apiDescription.Properties[typeof( IEdmOperation )] = routeBuilderContext.Operation;
+                }
+
                 apiDescription.ParameterDescriptions.AddRange( routeBuilderContext.ParameterDescriptions );
                 apiDescription.SupportedRequestBodyFormatters.AddRange( requestFormatters );
                 apiDescription.SupportedResponseFormatters.AddRange( responseFormatters );

src/Microsoft.AspNetCore.OData.Versioning.ApiExplorer/AspNetCore.Mvc.ApiExplorer/ApiDescriptionExtensions.cs

@@ -63,5 +63,16 @@ public static IEdmEntityType EntityType( this ApiDescription apiDescription )
             Arg.NotNull( apiDescription, nameof( apiDescription ) );
             return apiDescription.EntitySet()?.EntityType();
         }
+
+        /// <summary>
+        /// Gets the operation associated with the API description.
+        /// </summary>
+        /// <param name="apiDescription">The <see cref="ApiDescription">API description</see> to get the operation for.</param>
+        /// <returns>The associated <see cref="IEdmOperation">EDM operation</see> or <c>null</c> if there is no associated operation.</returns>
+        public static IEdmOperation Operation( this ApiDescription apiDescription )
+        {
+            Arg.NotNull( apiDescription, nameof( apiDescription ) );
+            return apiDescription.GetProperty<IEdmOperation>();
+        }
     }
 }

src/Microsoft.AspNetCore.OData.Versioning.ApiExplorer/AspNetCore.Mvc.ApiExplorer/ODataApiDescriptionProvider.cs

@@ -412,6 +412,16 @@ IEnumerable<ApiDescription> NewODataApiDescriptions( ControllerActionDescriptor
                     Properties = { [typeof( IEdmModel )] = routeContext.EdmModel },
                 };
 
+                if ( routeContext.EntitySet != null )
+                {
+                    apiDescription.Properties[typeof( IEdmEntitySet )] = routeContext.EntitySet;
+                }
+
+                if ( routeContext.Operation != null )
+                {
+                    apiDescription.Properties[typeof( IEdmOperation )] = routeContext.Operation;
+                }
+
                 foreach ( var parameter in parameters )
                 {
                     apiDescription.ParameterDescriptions.Add( parameter );

src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/ODataRouteBuilderContext.Core.cs

@@ -6,7 +6,6 @@
     using Microsoft.OData;
     using Microsoft.OData.Edm;
     using System;
-    using System.Collections.Generic;
     using System.Diagnostics.Contracts;
     using System.Reflection;
     using static Microsoft.OData.ODataUrlKeyDelimiter;