Support for properties renamed with [DataMember] in OData models

src/Common.OData.ApiExplorer/AspNet.OData/DefaultModelTypeBuilder.cs

@@ -96,14 +96,26 @@ static Type GenerateTypeIfNeeded( IEdmStructuredType structuredType, BuilderCont
             const BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Instance;
 
             var properties = new List<ClassProperty>();
-            var structuralProperties = structuredType.Properties().ToDictionary( p => p.Name, StringComparer.OrdinalIgnoreCase );
+            var structuralProperties = new Dictionary<string, IEdmProperty>( StringComparer.OrdinalIgnoreCase );
+            var mappedClrProperties = new Dictionary<PropertyInfo, IEdmProperty>();
             var clrTypeMatchesEdmType = true;
             var hasUnfinishedTypes = false;
             var dependentProperties = new List<PropertyDependency>();
 
+            foreach ( var property in structuredType.Properties() )
+            {
+                structuralProperties.Add( property.Name, property );
+                var clrProperty = edmModel.GetAnnotationValue<ClrPropertyInfoAnnotation>( property )?.ClrPropertyInfo;
+                if ( clrProperty != null )
+                {
+                    mappedClrProperties.Add( clrProperty, property );
+                }
+            }
+
             foreach ( var property in clrType.GetProperties( bindingFlags ) )
             {
-                if ( !structuralProperties.TryGetValue( property.Name, out var structuralProperty ) )
+                if ( !structuralProperties.TryGetValue( property.Name, out var structuralProperty ) &&
+                     !mappedClrProperties.TryGetValue( property, out structuralProperty ) )
                 {
                     clrTypeMatchesEdmType = false;
                     continue;

test/Microsoft.AspNetCore.OData.Versioning.ApiExplorer.Tests/AspNet.OData/Contact.cs

@@ -1,19 +1,28 @@
-namespace Microsoft.AspNet.OData
+
+namespace Microsoft.AspNet.OData
 {
     using System.Collections.Generic;
+    using System.Runtime.Serialization;
 
+    [DataContract]
     public class Contact
     {
+        [DataMember]
         public int ContactId { get; set; }
 
+        [DataMember( Name = "first_name" )]
         public string FirstName { get; set; }
 
+        [DataMember]
         public string LastName { get; set; }
 
+        [DataMember]
         public string Email { get; set; }
 
+        [DataMember]
         public string Phone { get; set; }
 
+        [DataMember]
         public List<Address> Addresses { get; set; }
     }
 }

test/Microsoft.AspNetCore.OData.Versioning.ApiExplorer.Tests/AspNet.OData/DefaultModelTypeBuilderTest.cs

@@ -1,6 +1,8 @@
 namespace Microsoft.AspNet.OData
 {
     using FluentAssertions;
+    using FluentAssertions.Common;
+    using System.Runtime.Serialization;
     using Microsoft.AspNet.OData.Builder;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.DependencyInjection;
@@ -408,6 +410,25 @@ public void substitute_should_resolve_types_that_reference_a_model_that_match_th
             substitutionType.Should().NotBeOfType<TypeBuilder>();
         }
 
+        [Fact]
+        public void substituted_type_should_have_renamed_with_attribute_properties_from_original_type()
+        {
+            // arrange
+            var modelBuilder = new ODataConventionModelBuilder();
+            modelBuilder.EntitySet<Contact>( "Contacts" );
+
+            var context = NewContext( modelBuilder.GetEdmModel() );
+            var originalType = typeof( Contact );
+
+            // act
+            var substitutedType = originalType.SubstituteIfNecessary( context );
+
+            // assert
+            substitutedType.Should().HaveProperty<string>( nameof( Contact.FirstName ) );
+            substitutedType.GetRuntimeProperty( nameof( Contact.FirstName ) ).Should().NotBeNull();
+            substitutedType.GetRuntimeProperty( nameof( Contact.FirstName ) ).HasAttribute<DataMemberAttribute>();
+        }
+
         public static IEnumerable<object[]> SubstitutionNotRequiredData
         {
             get