Fix Data Member Attribute json Serialized Model Casing Applied[#212]

src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Extensions/PropertyInfoExtensions.cs

@@ -1,5 +1,5 @@
 using System.Reflection;
-
+using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
@@ -23,11 +23,23 @@ public static bool HasJsonPropertyAttribute(this PropertyInfo element)
         }
 
         /// <summary>
-        /// Gets the name from <see cref="JsonPropertyAttribute"/> instance.
+        /// Checks whether the given <see cref="PropertyInfo"/> object has <see cref="DataMemberAttribute"/> or not.
+        /// </summary>
+        /// <param name="element"><see cref="PropertyInfo"/> instance.</param>
+        /// <returns>Returns <c>True</c>, if the given <see cref="PropertyInfo"/> object has <see cref="DataMemberAttribute"/>; otherwise, returns <c>False</c>.</returns>
+        public static bool HasDataMemberAttribute(this PropertyInfo element)
+        {
+            var exists = element.ExistsCustomAttribute<DataMemberAttribute>();
+
+            return exists;
+        }
+
+        /// <summary>
+        /// Gets the name from <see cref="JsonPropertyAttribute"/> or <see cref="DataMemberAttribute"/> instance.
         /// </summary>
         /// <param name="element"><see cref="PropertyInfo"/> instance.</param>
         /// <param name="namingStrategy"><see cref="NamingStrategy"/> instance.</param>
-        /// <returns>Returns the name from <see cref="JsonPropertyAttribute"/> instance.</returns>
+        /// <returns>Returns the name from <see cref="JsonPropertyAttribute"/> or <see cref="DataMemberAttribute"/> instance.</returns>
         public static string GetJsonPropertyName(this PropertyInfo element, NamingStrategy namingStrategy = null)
         {
             if (namingStrategy.IsNullOrDefault())
@@ -43,6 +55,14 @@ public static string GetJsonPropertyName(this PropertyInfo element, NamingStrate
 
             }
 
+            if (element.HasDataMemberAttribute())
+            {
+                var name = element.GetCustomAttribute<DataMemberAttribute>().Name ?? namingStrategy.GetPropertyName(element.Name, hasSpecifiedName: false);
+
+                return name;
+
+            }
+
             return namingStrategy.GetPropertyName(element.Name, hasSpecifiedName: false);
         }
     }

test-integration/Microsoft.Azure.WebJobs.Extensions.OpenApi.Document.Tests/Get_ApplicationJson_DataMember_Tests.cs

@@ -0,0 +1,86 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+
+using FluentAssertions;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Document.Tests
+{
+    [TestClass]
+    [TestCategory(Constants.TestCategory)]
+    public class Get_ApplicationJson_DataMember_Tests
+    {
+        private static HttpClient http = new HttpClient();
+
+        private JObject _doc;
+
+        [TestInitialize]
+        public async Task Init()
+        {
+            var json = await http.GetStringAsync(Constants.OpenApiDocEndpoint).ConfigureAwait(false);
+            this._doc = JsonConvert.DeserializeObject<JObject>(json);
+        }
+
+        [DataTestMethod]
+        [DataRow("/get-applicationjson-datamember", "get", "200")]
+        public void Given_OpenApiDocument_Then_It_Should_Return_OperationResponse(string path, string operationType, string responseCode)
+        {
+            var responses = this._doc["paths"][path][operationType]["responses"];
+
+            responses[responseCode].Should().NotBeNull();
+        }
+
+        [DataTestMethod]
+        [DataRow("/get-applicationjson-datamember", "get", "200", "application/json")]
+        public void Given_OpenApiDocument_Then_It_Should_Return_OperationResponseContentType(string path, string operationType, string responseCode, string contentType)
+        {
+            var content = this._doc["paths"][path][operationType]["responses"][responseCode]["content"];
+
+            content[contentType].Should().NotBeNull();
+        }
+
+        [DataTestMethod]
+        [DataRow("/get-applicationjson-datamember", "get", "200", "application/json", "dataMemberObjectModel")]
+        public void Given_OpenApiDocument_Then_It_Should_Return_OperationResponseContentTypeSchema(string path, string operationType, string responseCode, string contentType, string reference)
+        {
+            var content = this._doc["paths"][path][operationType]["responses"][responseCode]["content"];
+
+            var @ref = content[contentType]["schema"]["$ref"];
+
+            @ref.Value<string>().Should().Be($"#/components/schemas/{reference}");
+        }
+
+        [DataTestMethod]
+        [DataRow("dataMemberObjectModel", "object")]
+        public void Given_OpenApiDocument_Then_It_Should_Return_ComponentSchema(string @ref, string refType)
+        {
+            var schemas = this._doc["components"]["schemas"];
+
+            var schema = schemas[@ref];
+
+            schema.Should().NotBeNull();
+            schema.Value<string>("type").Should().Be(refType);
+        }
+
+        [DataTestMethod]
+        [DataRow("dataMemberObjectModel", "object", "DataMemberValue1", "string", null)]
+        [DataRow("dataMemberObjectModel", "object", "DataMemberValue2", "integer", "int32")]
+        [DataRow("dataMemberObjectModel", "object", "DataMemberValue3", "string", "date-time")]
+        [DataRow("dataMemberObjectModel", "object", "DataMemberValue4", "boolean", null)]
+        [DataRow("dataMemberObjectModel", "object", "DataMemberValue5", "number", "double")]
+        public void Given_OpenApiDocument_Then_It_Should_Return_ComponentSchemaProperty(string @ref, string refType, string propertyName, string propertyType, string propertyFormat)
+        {
+            var properties = this._doc["components"]["schemas"][@ref]["properties"];
+
+            var value = properties[propertyName];
+
+            value.Should().NotBeNull();
+            value.Value<string>("type").Should().Be(propertyType);
+            value.Value<string>("format").Should().Be(propertyFormat);
+        }
+    }
+}

test-integration/Microsoft.Azure.WebJobs.Extensions.OpenApi.TestApp/Get_ApplicationJson_DataMemberObject_HttpTrigger.cs

@@ -0,0 +1,28 @@
+using System.Net;
+using System.Threading.Tasks;
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Attributes;
+using Microsoft.Azure.WebJobs.Extensions.OpenApi.TestApp.Models;
+using Microsoft.Extensions.Logging;
+using Microsoft.OpenApi.Models;
+
+namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.TestApp
+{
+    public static class Get_ApplicationJson_DataMemberObject_HttpTrigger
+    {
+        [FunctionName(nameof(Get_ApplicationJson_DataMemberObject_HttpTrigger))]
+        [OpenApiOperation(operationId: nameof(Get_ApplicationJson_DataMemberObject_HttpTrigger.Get_ApplicationJson_DataMemberObject), tags: new[] { "datamember" })]
+        [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(DataMemberObjectModel), Description = "The OK response")]
+        public static async Task<IActionResult> Get_ApplicationJson_DataMemberObject(
+            [HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "get-applicationjson-datamember")] HttpRequest req,
+            ILogger log)
+        {
+            var result  = new OkResult();
+
+            return await Task.FromResult(result).ConfigureAwait(false);
+        }
+    }
+}

test-integration/Microsoft.Azure.WebJobs.Extensions.OpenApi.TestApp/Models/DataMemberObjectModel.cs

@@ -0,0 +1,25 @@
+using Newtonsoft.Json;
+using System;
+using System.Runtime.Serialization;
+
+namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.TestApp.Models
+{
+    public class DataMemberObjectModel
+    {
+        [DataMember(Name = "DataMemberValue1")]
+        public string DataMemberValue1 { get; set; }
+
+        [DataMember(Name = "DataMemberValue2")]
+        public int DataMemberValue2 { get; set; }
+
+        [DataMember(Name = "DataMemberValue3")]
+        public DateTime DataMemberValue3 { get; set; }
+
+        [DataMember(Name = "DataMemberValue4")]
+        public bool DataMemberValue4 { get; set; }
+
+        [DataMember(Name = "DataMemberValue5")]
+        public double DataMemberValue5 { get; set; }
+
+    }
+}

test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Fakes/FakeModel.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using System.Runtime.Serialization;
 
 namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Fakes
 {
@@ -25,6 +26,9 @@ public class FakeModel
         [JsonProperty]
         public string FakePropertyNoAnnotation { get; set; }
 
+        [DataMember(Name = "anotherDataMemberFakeProperty")]
+        public string DataMemberFakeProperty { get; set; } 
+
         public object FakeObject { get; set; }
 
         /// <summary>

test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/PropertyInfoExtensionsTests.cs

@@ -41,6 +41,19 @@ public void Given_Property_When_GetJsonPropertyName_Invoked_Then_It_Should_Retur
             result.Should().Be(jsonPropertyName);
         }
 
+        [TestMethod]
+        public void Given_Property_When_GetDataMemberName_Invoked_Then_It_Should_Return_DataMemberName()
+        {
+            var name = "DataMemberFakeProperty";
+            var jsonPropertyName = "anotherDataMemberFakeProperty";
+            var property = typeof(FakeModel).GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
+            var namingStrategy = new DefaultNamingStrategy();
+
+            var result = PropertyInfoExtensions.GetJsonPropertyName(property, namingStrategy);
+
+            result.Should().Be(jsonPropertyName);
+        }
+
         [TestMethod]
         public void Given_Property_When_GetJsonPropertyName_IsEmpty_Then_It_Should_Return_ElementName()
         {