Request Field Casing

AzureSearchToolkit.IntegrationTest/Models/Listing.cs

@@ -2,6 +2,7 @@
 using Microsoft.Azure.Search;
 using Microsoft.Azure.Search.Models;
 using Microsoft.Spatial;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -36,7 +37,7 @@ class Listing : IEquatable<Listing>
         [IsFilterable]
         public string[] Tags { get; set; }
 
-        [IsFilterable, IsSortable]
+        [IsFilterable, IsSortable, JsonProperty("placeCoordinates")]
         public GeographyPoint Place { get; set; }
 
         public Listing() { }

AzureSearchToolkit/Mapping/AzureSearchMapping.cs

@@ -100,7 +100,12 @@ private Dictionary<string, string> GetMappedPropertiesForType(Type sourceType)
 
                 foreach (var property in sourceType.GetProperties())
                 {
-                    if (camelCasePropertyAttribute != null)
+                    var jsonPropertyAttribute = property.GetCustomAttribute<JsonPropertyAttribute>();
+                    if(jsonPropertyAttribute != null)
+                    {
+                        mappedPropertiesCache[sourceType].Add(jsonPropertyAttribute.PropertyName, property.Name);
+                    }
+                    else if (camelCasePropertyAttribute != null)
                     {
                         var camelCasePropertyName = MappingHelper.ToCamelCase(property.Name);
 

AzureSearchToolkit/Request/Visitors/AzureSearchFieldsExpressionVisitor.cs

@@ -40,7 +40,7 @@ internal static Tuple<Expression, ParameterExpression> Rebind(Type sourceType, I
 
         protected virtual Expression VisitAzureSearchField(MemberExpression m)
         {
-            return Expression.Convert(Expression.Property(BindingParameter, "Item", Expression.Constant(m.Member.Name.ToLowerInvariant())), m.Type);
+            return Expression.Convert(Expression.Property(BindingParameter, "Item", Expression.Constant(NameHelper.GetMemberName(m.Member))), m.Type);
         }
     }
 }

AzureSearchToolkit/Request/Visitors/MemberProjectionExpressionVisitor.cs

@@ -1,11 +1,11 @@
 using AzureSearchToolkit.Mapping;
 using AzureSearchToolkit.Utilities;
 using Microsoft.Azure.Search.Models;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Text;
 
 namespace AzureSearchToolkit.Request.Visitors
 {
@@ -51,7 +51,7 @@ Expression VisitFieldSelection(MemberExpression m)
         {
             var member = base.VisitAzureSearchField(m);
 
-            fieldNames.Add(m.Member.Name.ToLowerInvariant());
+            fieldNames.Add(NameHelper.GetMemberName(m.Member));
 
             return member;
         }

AzureSearchToolkit/Utilities/NameHelper.cs

@@ -0,0 +1,29 @@
+using AzureSearchToolkit.Mapping;
+using Microsoft.Azure.Search.Models;
+using Newtonsoft.Json;
+using System.Reflection;
+
+namespace AzureSearchToolkit.Utilities
+{
+    static class NameHelper
+    {
+        public static string GetMemberName(MemberInfo member)
+        {
+            var jsonPropertyAttribute = member.GetCustomAttribute<JsonPropertyAttribute>();
+
+            if (jsonPropertyAttribute != null)
+            {
+                return jsonPropertyAttribute.PropertyName;
+            }
+
+            var camelCaseAttribute = member.DeclaringType.GetCustomAttribute<SerializePropertyNamesAsCamelCaseAttribute>();
+
+            if (camelCaseAttribute != null)
+            {
+                return MappingHelper.ToCamelCase(member.Name);
+            }
+
+            return member.Name;
+        }
+    }
+}