Dictionary lookups in property expressions now end up in the stringified paths, but collection lookups do NOT end up in the path by design. fix #324

Author: Mpdreamz

src/Nest.Tests.Unit/Internals/Inferno/PropertyNameResolverTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using System.Linq.Expressions;
 using Nest.Resolvers;
@@ -12,6 +13,9 @@ public class PropertyNameResolverTests : BaseJsonTests
 		internal class SomeClass
 		{
 			public MyCustomClass MyCustomClass { get; set; }
+			public Dictionary<string, SomeOtherClass> StringDict { get; set; }
+			public Dictionary<int, MyCustomClass> IntDict { get; set; }
+			public IList<MyCustomClass> ListOfCustomClasses { get; set; } 
 		}
 		[ElasticType(IdProperty = "Guid")]
 		internal class SomeOtherClass
@@ -44,6 +48,7 @@ public override string ToString()
 				return "static id ftw";
 			}
 		}
+		
 		[Test]
 		public void TestUsesElasticProperty()
 		{
@@ -52,6 +57,7 @@ public void TestUsesElasticProperty()
 			var expected = "myCustomClass.MID";
 			Assert.AreEqual(expected, propertyName);
 		}
+		
 		[Test]
 		public void TestUsesOtherElasticProperty()
 		{
@@ -60,6 +66,7 @@ public void TestUsesOtherElasticProperty()
 			var expected = "custom.MID";
 			Assert.AreEqual(expected, propertyName);
 		}
+		
 		[Test]
 		public void TestUsesOtherElasticTypePropertyIsIgnored()
 		{
@@ -68,6 +75,7 @@ public void TestUsesOtherElasticTypePropertyIsIgnored()
 			var expected = "myCustomOtherClass.MID";
 			Assert.AreEqual(expected, propertyName);
 		}
+		
 		[Test]
 		public void TestCreatedDate()
 		{
@@ -76,6 +84,34 @@ public void TestCreatedDate()
 			var expected = "CreateDate";
 			Assert.AreEqual(expected, propertyName);
 		}
+		
+		[Test]
+		public void TestDictionaryStringExpression()
+		{
+			Expression<Func<SomeClass, object>> exp = (m) => m.StringDict["someValue"].CreateDate;
+			var propertyName = new PropertyNameResolver().Resolve(exp);
+			var expected = "stringDict.someValue.CreateDate";
+			Assert.AreEqual(expected, propertyName);
+		}
+
+		[Test]
+		public void TestDictionaryIntExpression()
+		{
+			Expression<Func<SomeClass, object>> exp = (m) => m.IntDict[101].MyProperty;
+			var propertyName = new PropertyNameResolver().Resolve(exp);
+			var expected = "intDict.101.MID";
+			Assert.AreEqual(expected, propertyName);
+		}
+
+		[Test]
+		public void TestCollectionIndexExpressionDoesNotEndUpInPath()
+		{
+			Expression<Func<SomeClass, object>> exp = (m) => m.ListOfCustomClasses[101].MyProperty;
+			var propertyName = new PropertyNameResolver().Resolve(exp);
+			var expected = "listOfCustomClasses.MID";
+			Assert.AreEqual(expected, propertyName);
+		}
+
 		[Test] 
 		public void SearchUsesTheProperResolver()
 		{

src/Nest/Resolvers/PropertyNameResolver.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -137,6 +138,16 @@ protected override Expression VisitMethodCall(MethodCallExpression m, Stack<stri
 				if (constantExpression != null)
 					stack.Push(constantExpression.Value as string);
 			}
+			else if (m.Method.Name == "get_Item" && m.Arguments.Any())
+			{
+				if (!typeof(IDictionary).IsAssignableFrom(m.Object.Type))
+				{
+					return base.VisitMethodCall(m, stack, properties);
+				}
+				var constantExpression = m.Arguments.Last() as ConstantExpression;
+				if (constantExpression != null)
+					stack.Push(constantExpression.Value.ToString());
+			}
 			if (IsLinqOperator(m.Method))
 			{
 				for (int i = 1; i < m.Arguments.Count; i++)